diff Actor.cpp @ 500:63b171359be2

Слияние
author Ritor1
date Thu, 28 Feb 2013 10:36:37 +0600
parents a3939d5067c4
children cb0ad52d6a26
line wrap: on
line diff
--- a/Actor.cpp	Thu Feb 28 10:34:14 2013 +0600
+++ b/Actor.cpp	Thu Feb 28 10:36:37 2013 +0600
@@ -561,7 +561,7 @@
               v10 = v105;
 LABEL_29:
               spellnuma = (signed int)(60 * stru_5C6E00->uIntegerDoublePi) / 360;
-              a1.uItemType = stru_4E3ACC[15].uItemType;
+              a1.uItemType = stru_4E3ACC[15].field_0;
               v118 = (signed int)(60 * stru_5C6E00->uIntegerDoublePi) / 360 / (v10 - 1);
               v11 = 0;
               if ( (signed int)pObjectList->uNumObjects <= 0 )
@@ -572,7 +572,7 @@
               else
               {
                 v12 = &pObjectList->pObjects->uObjectID;
-                while ( stru_4E3ACC[15].uItemType != *v12 )
+                while ( stru_4E3ACC[15].field_0 != *v12 )
                 {
                   ++v11;
                   v12 += 28;
@@ -642,7 +642,7 @@
               return;
             }
 LABEL_159:
-            a1.uItemType = stru_4E3ACC[spellnum].uItemType;
+            a1.uItemType = stru_4E3ACC[spellnum].field_0;
             v119 = 0.0;
             if ( (signed int)pObjectList->uNumObjects <= 0 )
             {
@@ -790,7 +790,7 @@
                 pitch = stru_5C6E00->Atan2(v31, (signed __int64)spellnumc);
               }
               a1.stru_24.Reset();
-              a1.uItemType = stru_4E3ACC[9].uItemType;
+              a1.uItemType = stru_4E3ACC[9].field_0;
               spellnumd = 0;
               if ( (signed int)pObjectList->uNumObjects <= 0 )
               {
@@ -1334,7 +1334,7 @@
   v70 = v108;
 LABEL_179:
   spellnume = (signed int)(60 * stru_5C6E00->uIntegerDoublePi) / 360;
-  a1.uItemType = stru_4E3ACC[93].uItemType;
+  a1.uItemType = stru_4E3ACC[SPELL_DARK_SHARPMETAL].field_0;
   v116 = (signed int)(60 * stru_5C6E00->uIntegerDoublePi) / 360 / (v70 - 1);
   v71 = 0;
   if ( (signed int)pObjectList->uNumObjects <= 0 )
@@ -1345,7 +1345,7 @@
   else
   {
     v72 = &pObjectList->pObjects->uObjectID;
-    while ( stru_4E3ACC[93].uItemType != *v72 )
+    while ( stru_4E3ACC[SPELL_DARK_SHARPMETAL].field_0 != *v72 )
     {
       ++v71;
       v72 += 28;