diff stru6.cpp @ 828:0f56abdcce94

Massive refactors of spells + PID (packed id) macros introduced.
author Nomad
date Wed, 27 Mar 2013 00:27:38 +0200
parents c232f160e6f3
children ceef50611567
line wrap: on
line diff
--- a/stru6.cpp	Tue Mar 26 20:06:51 2013 +0200
+++ b/stru6.cpp	Wed Mar 27 00:27:38 2013 +0200
@@ -17,6 +17,8 @@
 #include "Overlays.h"
 #include "stru160.h"
 
+#include "MM7.h"
+
 
 
 
@@ -831,8 +833,8 @@
       if (pRenderer->pRenderD3D)
       {
         result = a2->spell_caster_pid & 7;
-        if ((a2->spell_caster_pid & 7) != OBJECT_Actor &&
-            (a2->spell_caster_pid & 7) != OBJECT_Item)
+        if (PID_TYPE(a2->spell_caster_pid) != OBJECT_Actor &&
+            PID_TYPE(a2->spell_caster_pid) != OBJECT_Item)
         {
           if (field_204 != 4)
           {