Mercurial > might-and-magic-trilogy

diff mm7_4.cpp @ 75:ad87d8679e02

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Sun, 28 Oct 2012 00:49:10 +0600
parents 08ab7b5b85d8 8453114181af
children 75994455e457 e49e6d3042f2
line wrap: on
line diff
--- a/mm7_4.cpp	Sun Oct 28 00:48:57 2012 +0600
+++ b/mm7_4.cpp	Sun Oct 28 00:49:10 2012 +0600
@@ -234,7 +234,7 @@
 // 6836C8: using guessed type int 6836C8_num_decorations_6807E8;
 
 //----- (0046CEC3) --------------------------------------------------------
-int __fastcall _46CEC3_get_floor_level(signed int a1, signed int a2, int a3, unsigned int uSectorID, int *a5)
+int __fastcall _46CEC3_get_floor_level(signed int a1, signed int a2, int a3, unsigned int uSectorID, unsigned int *pFaceID)
 {
   BLVSector *v5; // edi@1
   int v6; // ecx@1
@@ -481,12 +481,12 @@
   v35 = 1;
   if ( v55 == 1 )
   {
-    *a5 = dword_721200[0];
+    *pFaceID = dword_721200[0];
     return dword_7212C8[0];
   }
   if ( !v55 )
     return -30000;
-  *a5 = dword_721200[0];
+  *pFaceID = dword_721200[0];
   result = dword_7212C8[0];
   if ( v55 > 1 )
   {
@@ -507,7 +507,7 @@
       goto LABEL_68;
 LABEL_67:
     result = dword_7212C8[v35];
-    *a5 = dword_721200[v35];
+    *pFaceID = dword_721200[v35];
     goto LABEL_68;
   }
   return result;