diff mm7_3.cpp @ 712:e7c86528a2b3

Merge
author Gloval
date Thu, 21 Mar 2013 23:11:54 +0400
parents a5e587c8e30e 735dab8d3c9a
children 9d13d2ec35a6
line wrap: on
line diff
--- a/mm7_3.cpp	Thu Mar 21 23:10:57 2013 +0400
+++ b/mm7_3.cpp	Thu Mar 21 23:11:54 2013 +0400
@@ -8254,7 +8254,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;
@@ -8458,7 +8458,7 @@
   {
     v19 = v3->pTexture;
     v84 = 0;
-    v18 = (unsigned __int16 *)v19->pLevelOfDetail0;
+    v18 = (unsigned __int16 *)v19->pLevelOfDetail0_prolly_alpha_mask;
   }
   a1.pTextureLOD = v18;
 LABEL_16:
@@ -8914,7 +8914,7 @@
   {
     v22 = v5->pTexture;
     v75 = 0;
-    v21 = (unsigned __int16 *)v22->pLevelOfDetail0;
+    v21 = (unsigned __int16 *)v22->pLevelOfDetail0_prolly_alpha_mask;
   }
   a1.pTextureLOD = v21;
 LABEL_12:
@@ -9171,7 +9171,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;
@@ -9347,7 +9347,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;
@@ -9572,7 +9572,7 @@
   else
   {
     v16 = 0;
-    v17 = (unsigned __int16 *)v4->pTexture->pLevelOfDetail0;
+    v17 = (unsigned __int16 *)v4->pTexture->pLevelOfDetail0_prolly_alpha_mask;
   }
   sr.pTextureLOD = v17;
 LABEL_14:
@@ -9922,7 +9922,7 @@
   {
     v21 = v5->pTexture;
     v49 = 0;
-    pLOD = v21->pLevelOfDetail0;
+    pLOD = v21->pLevelOfDetail0_prolly_alpha_mask;
   }
   a1a.pTextureLOD = (unsigned __int16 *)pLOD;
 LABEL_12:
@@ -12512,7 +12512,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;
 }
@@ -12677,7 +12677,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);