diff Actor.cpp @ 924:a78f08dbeb88

CastSpellInfo
author Ritor1
date Wed, 01 May 2013 14:50:52 +0600
parents 8cd0b155bebe
children 5a2dbb00c399
line wrap: on
line diff
--- a/Actor.cpp	Tue Apr 30 20:08:42 2013 +0600
+++ b/Actor.cpp	Wed May 01 14:50:52 2013 +0600
@@ -14,7 +14,7 @@
 #include "FactionTable.h"
 #include "TurnEngine.h"
 #include "MapInfo.h"
-#include "stru277.h"
+#include "CastSpellInfo.h"
 #include "Time.h"
 #include "LOD.h"
 #include "Party.h"
@@ -581,7 +581,7 @@
               v10 = v105;
 LABEL_29:
               spellnuma = (signed int)(60 * stru_5C6E00->uIntegerDoublePi) / 360;
-              a1.uType = stru_4E3ACC[15].field_0;
+              a1.uType = stru_4E3ACC[15].uType;
               v118 = (signed int)(60 * stru_5C6E00->uIntegerDoublePi) / 360 / (v10 - 1);
               v11 = 0;
               if ( (signed int)pObjectList->uNumObjects <= 0 )
@@ -592,7 +592,7 @@
               else
               {
                 v12 = &pObjectList->pObjects->uObjectID;
-                while ( stru_4E3ACC[15].field_0 != *v12 )
+                while ( stru_4E3ACC[15].uType != *v12 )
                 {
                   ++v11;
                   v12 += 28;
@@ -660,7 +660,7 @@
               return;
             }
 LABEL_159:
-            a1.uType = stru_4E3ACC[spellnum].field_0;
+            a1.uType = stru_4E3ACC[spellnum].uType;
             v119 = 0.0;
             if ( (signed int)pObjectList->uNumObjects <= 0 )
             {
@@ -806,7 +806,7 @@
                 pitch = stru_5C6E00->Atan2(v31, (signed __int64)spellnumc);
               }
               a1.stru_24.Reset();
-              a1.uType = stru_4E3ACC[9].field_0;
+              a1.uType = stru_4E3ACC[9].uType;
               spellnumd = 0;
               if ( (signed int)pObjectList->uNumObjects <= 0 )
               {
@@ -1350,7 +1350,7 @@
   v70 = v108;
 LABEL_179:
   spellnume = (signed int)(60 * stru_5C6E00->uIntegerDoublePi) / 360;
-  a1.uType = stru_4E3ACC[SPELL_DARK_SHARPMETAL].field_0;
+  a1.uType = stru_4E3ACC[SPELL_DARK_SHARPMETAL].uType;
   v116 = (signed int)(60 * stru_5C6E00->uIntegerDoublePi) / 360 / (v70 - 1);
   v71 = 0;
   if ( (signed int)pObjectList->uNumObjects <= 0 )
@@ -1361,7 +1361,7 @@
   else
   {
     v72 = &pObjectList->pObjects->uObjectID;
-    while ( stru_4E3ACC[SPELL_DARK_SHARPMETAL].field_0 != *v72 )
+    while ( stru_4E3ACC[SPELL_DARK_SHARPMETAL].uType != *v72 )
     {
       ++v71;
       v72 += 28;
@@ -2446,7 +2446,7 @@
   result = pPlayer->CanAct();
   if ( result )
   {
-    pStru277->_427D48(v1);
+    pCastSpellInfo->_427D48(v1);
     v4 = 0;
     v5 = pMapStats->GetMapInfo(pCurrentMapName);
     if ( v5 )