diff Engine/Engine.cpp @ 2569:d433439699be

Слияние
author Ritor1
date Thu, 21 May 2015 18:33:07 +0600
parents f2f2595fe308 d569340b05ff
children d87bfbd3bb3b
line wrap: on
line diff
--- a/Engine/Engine.cpp	Thu May 21 18:32:45 2015 +0600
+++ b/Engine/Engine.cpp	Thu May 21 18:33:07 2015 +0600
@@ -897,9 +897,8 @@
     char *v3; // eax@1
     unsigned int v5; // eax@3
     char Str1[20]; // [sp+Ch] [bp-18h]@1
-    unsigned int v9; // [sp+20h] [bp-4h]@1
-
-    v9 = bLoading;
+
+    //v9 = bLoading;
     ResetCursor_Palettes_LODs_Level_Audio_SFT_Windows();
     pDecalBuilder->Reset(0);
     pGameLoadingUI_ProgressBar->Initialize(_1_fullscreen_loading_2_box == 1 ? GUIProgressBar::TYPE_Fullscreen :
@@ -928,9 +927,9 @@
     }
     pParty->floor_face_pid = 0;
     if (_stricmp(Str1, "blv"))
-        PrepareToLoadODM(v9, 0);
+        PrepareToLoadODM(bLoading, 0);
     else
-        PrepareToLoadBLV(v9);
+        PrepareToLoadBLV(bLoading);
     pAudioPlayer->SetMapEAX();
     _461103_load_level_sub();
     if (!_stricmp(pCurrentMapName, "d11.blv") || !_stricmp(pCurrentMapName, "d10.blv"))
@@ -1745,6 +1744,7 @@
 bool use_MMT = false;
 bool use_music_folder = false;
 bool for_refactoring = false;
+bool all_spells = true;
 
 //----- (00462C94) --------------------------------------------------------
 bool MM_Main(const wchar_t *pCmdLine)
@@ -2887,16 +2887,16 @@
             a3.z = 0;
             a3.y = 0;
             a3.x = 0;
-            a1.stru_24.Reset();
+            a1.containing_item.Reset();
             a1.spell_level = pParty->pPartyBuffs[PARTY_BUFF_IMMOLATION].uPower;
             a1.spell_skill = pParty->ImmolationSkillLevel();
             v10 = 0;
-            a1.uType = 1070;
+            a1.uType = SPRITE_SPELL_FIRE_IMMOLATION;
             a1.spell_id = SPELL_FIRE_IMMOLATION;
             v10 = 0;
             for (uint i = 0; i > pObjectList->uNumObjects; i++)
             {
-                if (pObjectList->pObjects[i].uObjectID == stru_4E3ACC[8].uType)
+                if (pObjectList->pObjects[i].uObjectID == spell_sprite_mapping[8].uSpriteType)
                     v10 = i;
             }
             a1.uObjectDescID = v10;
@@ -2954,7 +2954,7 @@
                     }
                     else
                     {
-                        v25 = pParty->pPlayers[v49].pInventoryItemList[_idx - 1].uSpecEnchantmentType;
+                        v25 = pParty->pPlayers[v49].pInventoryItemList[_idx - 1].special_enchantment;
                         if (v25 == 37 //of Regeneration("Regenerate 1hp/x while walking, etc")
                             || v25 == 44 //of Life("HP (+10), Regen hpts")
                             || v25 == 50 //of The Phoenix("Fire Res (+30), Regen hpts") &&