Mercurial > mm7

diff mm7_3.cpp @ 711:a5e587c8e30e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
some cleaning
author Gloval
date Thu, 21 Mar 2013 23:10:57 +0400
parents af5771589d22
children e7c86528a2b3
line wrap: on
line diff
--- a/mm7_3.cpp	Thu Mar 21 12:37:49 2013 +0200
+++ b/mm7_3.cpp	Thu Mar 21 23:10:57 2013 +0400
@@ -12362,8 +12362,8 @@
   v19 = (double)viewparams->field_2C * 0.000015258789;
   if ( viewparams->field_2C == 384 )
   {
-    v20 = viewparams->field_38;
-    v21 = viewparams->field_3A;
+    v20 = viewparams->indoor_center_x;
+    v21 = viewparams->indoor_center_y;
   }
   v17 = 0;
   v16 = pOutdoor->uNumBModels;
@@ -13247,7 +13247,7 @@
   }
   if ( npcid >= 5000 )
     goto LABEL_7;
-  if ( (sDialogue_SpeakingActorNPC_ID & 0x80000000u) == 0 )
+  if ( sDialogue_SpeakingActorNPC_ID >= 0 )
   {
     *(int *)a2 = 0;
     result = 0;
@@ -15792,7 +15792,7 @@
       v21->uCurrentActionTime += pMiscTimer->uTimeElapsed;
       if ( (signed int)v28 > 0 )
         v21->pMonsterInfo.uRecoveryTime = v28 - v27;
-      if ( (v21->pMonsterInfo.uRecoveryTime & 0x80000000u) != 0 )
+      if ( v21->pMonsterInfo.uRecoveryTime< 0 )
         v21->pMonsterInfo.uRecoveryTime = 0;
       v29 = v21->uAttributes;
       if ( !(v29 & 0x8000) )