# HG changeset patch
# User Ritor1
# Date 1371319112 -21600
# Node ID d8033eb56d7e77b0ac07198442c5d905e9fb5588
# Parent  62f4cdaa726b4796b6bc1941377d7a518bc14177# Parent  89210052dbb43a8e32a61fc4a28824a92159136f
Слияние

diff -r 62f4cdaa726b -r d8033eb56d7e mm7_2.cpp
--- a/mm7_2.cpp	Sat Jun 15 23:58:19 2013 +0600
+++ b/mm7_2.cpp	Sat Jun 15 23:58:32 2013 +0600
@@ -9635,7 +9635,11 @@
     }
   }
   if ( v151 == OBJECT_BModel && PID_TYPE(v2->spell_caster_pid) != OBJECT_Player)
-    BYTE2(pActors[PID_ID(v2->spell_caster_pid)].uAttributes) |= 4u;
+      {
+      if (PID_ID(v2->spell_caster_pid)<500)  //bugfix  PID_ID(v2->spell_caster_pid)==1000
+         BYTE2(pActors[PID_ID(v2->spell_caster_pid)].uAttributes) |= 4;
+      }
+
   v6 = v2->uType;
   v7 = v2->uType;
   if ( v7 > 3060 )