Mercurial > mm7

changeset 239:ea0b5ff2ae23

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
DrawBook_Map_sub remove goto part2
author zipi
date Sun, 17 Feb 2013 21:13:30 +0000
parents b070b83a897b
children e9fabaf75628
files mm7_3.cpp
diffstat 1 files changed, 15 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/mm7_3.cpp	Mon Feb 18 00:49:50 2013 +0400
+++ b/mm7_3.cpp	Sun Feb 17 21:13:30 2013 +0000
@@ -14455,7 +14455,7 @@
   unsigned int v72; // [sp-8h] [bp-4806Ch]@80
   signed int v73; // [sp-4h] [bp-48068h]@59
   unsigned __int16 v74; // [sp-4h] [bp-48068h]@79
-  char v75; // [sp+Ch] [bp-48058h]@23
+  char v75[65535]; // [sp+Ch] [bp-48058h]@23
   int v76; // [sp+4800Ch] [bp-58h]@23
   unsigned __int16 *v77; // [sp+48010h] [bp-54h]@27
   unsigned __int16 *v78; // [sp+48014h] [bp-50h]@23
@@ -14498,9 +14498,17 @@
       if ( uCurrentlyLoadedLevelType == LEVEL_Indoor)
 		v5 = 680;
     }
-    if ( uCurrentlyLoadedLevelType == LEVEL_Indoor)
-      goto LABEL_8;
-LABEL_23:
+  }
+  else
+  {
+	  v6 = viewparams->field_38;
+	  v86 = viewparams->field_38;
+	  v84 = viewparams->field_3A;
+	  if ( uCurrentlyLoadedLevelType == LEVEL_Indoor)
+	    v5 = viewparams->field_2C - 34;
+  }
+  if ( uCurrentlyLoadedLevelType != LEVEL_Indoor)
+  {
     v94 = a4 - x_ + 1;
     v92 = a5 - y_ + 1;
     v93 = &pRenderer->pTargetSurface[x_ + y_ * v79];
@@ -14513,7 +14521,7 @@
     v97 = (const void *)((unsigned int)(signed __int64)((double)(v6 - 22528 / (v5 / 384) + 32768) / v30) << 16);
     v96 = 32768 - black - v84;
     v31 = (signed __int64)((double)v96 / v30);
-    v32 = &v75;
+    v32 = v75;
     v33 = pIcons_LOD->pTextures[viewparams->uTextureID_LocationMap].uTextureWidth;
     v34 = (int)v31 << 16;
     v81 = (signed __int16)(signed __int64)((double)(v6 - 22528 / (v5 / 384) + 32768) / v30);
@@ -14590,13 +14598,6 @@
   }
   else
   {
-	  v6 = viewparams->field_38;
-	  v86 = viewparams->field_38;
-	  v84 = viewparams->field_3A;
-	  if ( uCurrentlyLoadedLevelType != LEVEL_Indoor)
-		goto LABEL_23;
-	  v5 = viewparams->field_2C - 34;
-	LABEL_8:
 	  black = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0, 0, 0);
 	  teal = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0, 0xFFu, 0xFFu);
 	  v7 = (uint *)pIndoor->pMapOutlines;
@@ -14848,7 +14849,7 @@
     v62 = (int)v61 << 16;
     teal = v60 >> 16;
     v63 = (signed __int16)v61;
-    a4a = &v75;
+    a4a = v75;
     result = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xCu, 0xCu, 0xCu);
     v85 = 0;
     for ( i = result; v85 < (signed int)v95; result = v85 )
@@ -14888,7 +14889,7 @@
       teal = (unsigned int)v78;
     }
     v65 = v95;
-    v66 = &v75;
+    v66 = v75;
     if ( (signed int)v95 > 0 )
     {
       v67 = v77;