diff mm7_3.cpp @ 726:9d13d2ec35a6

Слияние
author Ritor1
date Fri, 22 Mar 2013 01:29:46 +0600
parents 737d7fec67f0 e7c86528a2b3
children 2f4e33c1ed24 7378398c34e4
line wrap: on
line diff
--- a/mm7_3.cpp	Fri Mar 22 01:29:25 2013 +0600
+++ b/mm7_3.cpp	Fri Mar 22 01:29:46 2013 +0600
@@ -8220,7 +8220,7 @@
   }
   else
   {
-    v19 = (unsigned __int16 *)v18->pLevelOfDetail0;
+    v19 = (unsigned __int16 *)v18->pLevelOfDetail0_prolly_alpha_mask;
   }
   a1.pTextureLOD = v19;
   X = (unsigned __int64)(v36 * (signed __int64)v38) >> 16;
@@ -8424,7 +8424,7 @@
   {
     v19 = v3->pTexture;
     v84 = 0;
-    v18 = (unsigned __int16 *)v19->pLevelOfDetail0;
+    v18 = (unsigned __int16 *)v19->pLevelOfDetail0_prolly_alpha_mask;
   }
   a1.pTextureLOD = v18;
 LABEL_16:
@@ -8880,7 +8880,7 @@
   {
     v22 = v5->pTexture;
     v75 = 0;
-    v21 = (unsigned __int16 *)v22->pLevelOfDetail0;
+    v21 = (unsigned __int16 *)v22->pLevelOfDetail0_prolly_alpha_mask;
   }
   a1.pTextureLOD = v21;
 LABEL_12:
@@ -9137,7 +9137,7 @@
   {
     v20 = v3->pTexture;
     v44 = 0;
-    v21 = (unsigned __int16 *)v20->pLevelOfDetail0;
+    v21 = (unsigned __int16 *)v20->pLevelOfDetail0_prolly_alpha_mask;
 LABEL_11:
     a1.pTextureLOD = v21;
     goto LABEL_12;
@@ -9313,7 +9313,7 @@
   if ( v17 < mipmapping_terrain_mm1 << 16 )
   {
     v20 = 0;
-    v21 = (unsigned __int16 *)v3->pTexture->pLevelOfDetail0;
+    v21 = (unsigned __int16 *)v3->pTexture->pLevelOfDetail0_prolly_alpha_mask;
 LABEL_11:
     v35.pTextureLOD = v21;
     goto LABEL_12;
@@ -9538,7 +9538,7 @@
   else
   {
     v16 = 0;
-    v17 = (unsigned __int16 *)v4->pTexture->pLevelOfDetail0;
+    v17 = (unsigned __int16 *)v4->pTexture->pLevelOfDetail0_prolly_alpha_mask;
   }
   sr.pTextureLOD = v17;
 LABEL_14:
@@ -9888,7 +9888,7 @@
   {
     v21 = v5->pTexture;
     v49 = 0;
-    pLOD = v21->pLevelOfDetail0;
+    pLOD = v21->pLevelOfDetail0_prolly_alpha_mask;
   }
   a1a.pTextureLOD = (unsigned __int16 *)pLOD;
 LABEL_12:
@@ -12328,8 +12328,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;
@@ -12478,7 +12478,7 @@
     sprintf(sHouseName, pGlobalTXT_LocalizationStrings[410], pMapStats->pInfos[v1].pName);// "Leave %s"
   else
     strcpy(sHouseName, pGlobalTXT_LocalizationStrings[79]);// "Exit"
-  result = GUIWindow::Create(0, 0, 640, 480, (enum WindowType)17, 0, (int)sHouseName);
+  result = GUIWindow::Create(0, 0, 640, 480, WINDOW_ChangeLocation, 0, (int)sHouseName);
   pDialogueWindow = result;
   return result;
 }
@@ -12643,7 +12643,7 @@
     dword_5C3418 = v4;
     dword_5C341C = v3;
     _591094_decoration = activeLevelDecoration;
-    pGUIWindow2 = GUIWindow::Create(0, 0, 640u, 480u, (enum WindowType)19, a4, 0);
+    pGUIWindow2 = GUIWindow::Create(0, 0, 640u, 480u, WINDOW_GreetingNPC, a4, 0);
     pGUIWindow2->CreateButton(61u, 424u, 0x1Fu, 0x28u, 2, 94, 0x6Eu, 1u, 0x31u, "", 0);
     pGUIWindow2->CreateButton(177u, 424u, 0x1Fu, 0x28u, 2, 94, 0x6Eu, 2u, 0x32u, "", 0);
     pGUIWindow2->CreateButton(292u, 424u, 0x1Fu, 0x28u, 2, 94, 0x6Eu, 3u, 0x33u, "", 0);
@@ -13213,7 +13213,7 @@
   }
   if ( npcid >= 5000 )
     goto LABEL_7;
-  if ( (sDialogue_SpeakingActorNPC_ID & 0x80000000u) == 0 )
+  if ( sDialogue_SpeakingActorNPC_ID >= 0 )
   {
     *(int *)a2 = 0;
     result = 0;
@@ -15758,7 +15758,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) )