Mercurial > mm7

diff mm7_2.cpp @ 303:3dcc9d945eeb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
DamageMonsterFromParty
author Nomad
date Tue, 19 Feb 2013 15:39:50 +0200
parents af7e848d6def
children 2a09e1d6fc8f
line wrap: on
line diff
--- a/mm7_2.cpp	Tue Feb 19 13:31:50 2013 +0200
+++ b/mm7_2.cpp	Tue Feb 19 15:39:50 2013 +0200
@@ -8065,7 +8065,7 @@
   a1a.field_48 = 0;
   v30 = pIndoor->GetSector(v28, v27, v29);
   a1a.field_5C = 0;
-  a1a.field_58 = 0;
+  a1a.field_58_pid = 0;
   a1a.uSpriteFrameID = 0;
   a1a.uSectorID = v30;
   return a1a.Create(0, 0, 0, 0);
@@ -16034,12 +16034,12 @@
   v151 = a2 & 7;
   if ( (a2 & 7) == OBJECT_Actor)
   {
-    if ( (v2->field_58 & 7) == OBJECT_Actor && !pActors[v2->field_58 >> 3].GetActorsRelation(&pActors[a2 >> 3]) )
+    if ( (v2->field_58_pid & 7) == OBJECT_Actor && !pActors[v2->field_58_pid >> 3].GetActorsRelation(&pActors[a2 >> 3]) )
       return 1;
   }
   else
   {
-    if ( (a2 & 7) == OBJECT_Player && (v2->field_58 & 7) == OBJECT_Player)
+    if ( (a2 & 7) == OBJECT_Player && (v2->field_58_pid & 7) == OBJECT_Player)
       return 1;
   }
   if ( pParty->bTurnBasedModeOn == 1 )
@@ -16051,8 +16051,8 @@
       v2->uAttributes = v5 & 0xFFFB;
     }
   }
-  if ( v151 == OBJECT_BModel && (v2->field_58 & 7) != OBJECT_Player)
-    BYTE2(pActors[v2->field_58 >> 3].uAttributes) |= 4u;
+  if ( v151 == OBJECT_BModel && (v2->field_58_pid & 7) != OBJECT_Player)
+    BYTE2(pActors[v2->field_58_pid >> 3].uAttributes) |= 4u;
   v6 = v2->uItemType;
   v7 = v2->uItemType;
   if ( v7 > 3060 )