diff mm7_3.cpp @ 2373:b4a79e3ef2f0

Arena dialogue and other
author Ritor1
date Sun, 01 Jun 2014 17:20:22 +0600
parents bbf8a522dcec
children 41c36ecc9f32
line wrap: on
line diff
--- a/mm7_3.cpp	Sun Jun 01 15:18:00 2014 +0600
+++ b/mm7_3.cpp	Sun Jun 01 17:20:22 2014 +0600
@@ -524,9 +524,7 @@
     result = 0;
   }
   else
-  {
     result = 1;
-  }
   return result;
 }
 
@@ -610,9 +608,7 @@
     result = 0;
   }
   else
-  {
     result = 1;
-  }
   return result;
 }
 
@@ -621,7 +617,7 @@
 {
   int v3; // ebx@6
   int v5; // eax@10
-  int v6; // ecx@10
+  //int v6; // ecx@10
   signed int v8; // ebx@17
 //  unsigned __int8 v10; // sf@17
 //  unsigned __int16 v11; // ax@21
@@ -663,8 +659,10 @@
 
   for (v75 = 0; v75 < uNumActors; ++v75)
   {
-    if ( pActors[v75].uAIState == Removed || pActors[v75].uAIState == Disabled || pActors[v75].uAIState == Summoned
-     || !pActors[v75].uMovementSpeed )
+    if ( pActors[v75].uAIState == Removed
+      || pActors[v75].uAIState == Disabled
+      || pActors[v75].uAIState == Summoned
+      || !pActors[v75].uMovementSpeed )
       continue;
     v3 = 0;
     v69 = 0;
@@ -677,10 +675,10 @@
     v70 = IsTerrainSlopeTooHigh(pActors[v75].vPosition.x, pActors[v75].vPosition.y);
     v5 = ODM_GetFloorLevel(pActors[v75].vPosition.x, pActors[v75].vPosition.y, pActors[v75].vPosition.z,
            pActors[v75].uActorHeight, &uIsOnWater, (int *)&v69, v3);
-    v6 = pActors[v75].vPosition.z;
+    //v6 = pActors[v75].vPosition.z;
     uIsAboveFloor = 0;
     v67 = v69 == 0;
-    if ( v6 > v5 + 1 )
+    if ( pActors[v75].vPosition.z > v5 + 1 )
       uIsAboveFloor = 1;
     if ( pActors[v75].uAIState == Dead && uIsOnWater && !uIsAboveFloor )
     {
@@ -967,18 +965,11 @@
 //----- (0047253E) --------------------------------------------------------
 void UpdateObjects()
 {
-//  unsigned int v0; // ebx@0
   ObjectDesc *object; // eax@5
   int v5; // ecx@6
-//  __int16 v6; // cx@7
   signed int v7; // eax@9
   signed int v11; // eax@17
   int v12; // edi@27
-//  int v13; // eax@27
-//  int v14; // ebx@27
-//  unsigned int v15; // ecx@27
-//  unsigned int v16; // edx@30
-//  unsigned int v17; // edx@32
   int v18; // [sp+4h] [bp-10h]@27
   int v19; // [sp+8h] [bp-Ch]@27
 
@@ -2677,9 +2668,7 @@
     v3 = v4->uRespawnIntervalDays;
   }
   else
-  {
     v4 = (MapInfo *)thisa;
-  }
   day_attrib &= ~DAY_ATTRIB_FOG;
   dword_6BE13C_uCurrentlyLoadedLocationID = v2;
   pOutdoor->Initialize(