Mercurial > mm7

diff Outdoor.cpp @ 828:0f56abdcce94

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Massive refactors of spells + PID (packed id) macros introduced.
author Nomad
date Wed, 27 Mar 2013 00:27:38 +0200
parents d37b03507b3b
children 0b4fc79351b6 710cf848ad24
line wrap: on
line diff
--- a/Outdoor.cpp	Tue Mar 26 20:06:51 2013 +0200
+++ b/Outdoor.cpp	Wed Mar 27 00:27:38 2013 +0200
@@ -24,7 +24,7 @@
 #include "Events.h"
 
 #include "mm7_data.h"
-//#include "MM7.h"
+#include "MM7.h"
 
 
 
@@ -2949,8 +2949,8 @@
 	  y = actor->vPosition.y;
       if (actor->uAIState == Summoned)
       {
-		if ((actor->uSummonerID & 7) != OBJECT_Actor ||
-             pActors[actor->uSummonerID >> 3].pMonsterInfo.uSpecialAbilityDamageDiceSides != 1 )
+		if (PID_TYPE(actor->uSummonerID) != OBJECT_Actor ||
+             pActors[PID_ID(actor->uSummonerID)].pMonsterInfo.uSpecialAbilityDamageDiceSides != 1 )
         {
           z += floorf(actor->uActorHeight * 0.5f + 0.5f);
         }
@@ -3115,7 +3115,7 @@
         HIWORD(v34) = HIWORD(X);
         LOWORD(v34) = 0;
         v28->dimming_level = 0;
-        v28->sZValue = v34 + (8 * i | OBJECT_Actor);
+        v28->sZValue = v34 + PID(OBJECT_Actor, i);
         v28->field_14_actor_id = i;
         v35 = pMonsterList->pMonsters;
 		v36 = actor->pMonsterInfo.uID;