Mercurial > mm7

diff mm7_3.cpp @ 857:e4bd2a0bf08b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Sun, 31 Mar 2013 16:52:23 +0600
parents cb0b3badc7f7 8fafe3645f36
children 8fc2f035abc0 cd355e4c6104
line wrap: on
line diff
--- a/mm7_3.cpp	Sun Mar 31 16:51:52 2013 +0600
+++ b/mm7_3.cpp	Sun Mar 31 16:52:23 2013 +0600
@@ -6225,7 +6225,7 @@
       uFaceID = v65;
     }
     v56 = 8 * uFaceID;
-    LOBYTE(v56) = 8 * uFaceID | 6;
+    LOBYTE(v56) = PID(uFaceID,OBJECT_BModel);
     v57 = v56;
     v58 = pFace->GetTexture();
     pRenderer->DrawIndoorPolygon(v3, pFace, pBitmaps_LOD->pHardwareTextures[pFace->uBitmapID], v58, v57, -1, 0);
@@ -14971,7 +14971,7 @@
   {
     v20 = &pActors[ai_near_actors_ids[v18]];
     if ( v20->uAttributes & 0x8000
-      || (v21 = sub_4070EF_prolly_collide_objects(8 * ai_near_actors_ids[v18] | 3, 4u), v18 = i, v21) )
+      || (v21 = sub_4070EF_prolly_collide_objects(PID(ai_near_actors_ids[v18],OBJECT_Actor), 4u), v18 = i, v21) )
     {
       v22 = ai_near_actors_ids[v18];
       v20->uAttributes |= 0x8000u;