Mercurial > might-and-magic-trilogy

diff Indoor.cpp @ 131:d2ca891da89f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Wed, 07 Nov 2012 22:10:04 +0600
parents 7b12505a23c0 8be5293b6b33
children b07ebaa9a30d
line wrap: on
line diff
--- a/Indoor.cpp	Wed Nov 07 22:09:43 2012 +0600
+++ b/Indoor.cpp	Wed Nov 07 22:10:04 2012 +0600
@@ -4493,8 +4493,8 @@
     Abortf("Out of memory loading indoor level");
   if ( !(dword_6BE364_game_settings_1 & 0x2000) )
   {
-    UpdateActors();
-    UpdateLayingItems();
+    InitializeActors();
+    InitializeLayingItems();
   }
   BYTE1(dword_6BE364_game_settings_1) &= 0xDFu;
   if ( !v39 )
@@ -4653,8 +4653,8 @@
           if ( v35 < 124 )
           {
             v21 = v35 + 1;
-            pDecortaion->field_1C = v35 + 75;
-            v22 = stru_5E4C90.field_0[v21 + 74];
+            pDecortaion->_idx_in_stru123 = v35 + 75;
+            v22 = stru_5E4C90._decor_events[v21 + 74 - 75];
             v35 = v21;
             if ( !v22 )
               pDecortaion->field_2 |= 0x20;