diff mm7_2.cpp @ 44:916bec351934

22.10.12(pCurrentScreen)
author Ritor1
date Mon, 22 Oct 2012 17:28:15 +0600
parents f4450ff595fe
children 79a30ee1ecdb 6a62c4005f0e
line wrap: on
line diff
--- a/mm7_2.cpp	Sun Oct 21 23:26:23 2012 +0600
+++ b/mm7_2.cpp	Mon Oct 22 17:28:15 2012 +0600
@@ -4528,7 +4528,7 @@
 
   v0 = pPlayers[uActiveCharacter];
   v77 = pPlayers[uActiveCharacter];
-  if ( uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions == 14 )
+  if ( pCurrentScreen == 14 )
     goto LABEL_73;
   if ( !sub_4B1784_check_if_player_concious__draw_warning_else_mess_with_dlg_win() )
   {
@@ -12138,7 +12138,7 @@
   GUIButton *v14; // [sp+0h] [bp-3Ch]@27
   GUIWindow *v15; // [sp+4h] [bp-38h]@11
 
-  uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions = 0;
+  pCurrentScreen = 0;
   if (pAsyncMouse)
     pAsyncMouse->Resume();
   if ( LOBYTE(pGame->pKeyboardInstance->bUsingAsynKeyboard) && pAsyncKeyboard )
@@ -12208,8 +12208,8 @@
                                                     pExit,
                                                     0);
 
-  stru_506F20.Release();
-  stru_506F20.Load("title.pcx", 0);
+  pTexture_PCX.Release();
+  pTexture_PCX.Load("title.pcx", 0);
   SetCurrentMenuID(MENU_MAIN);
   SetForegroundWindow(hWnd);
   SendMessageW(hWnd, WM_ACTIVATEAPP, 1, 0);
@@ -12223,12 +12223,12 @@
     v15 = pWindow_MainMenu;
     if ( GetCurrentMenuID() == MENU_SAVELOAD)
     {
-      if ( uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions != 12 )
-      {
-        stru_506F20.Release();
-        stru_506F20.Load("lsave640.pcx", 0);
+      if ( pCurrentScreen != 12 )
+      {
+        pTexture_PCX.Release();
+        pTexture_PCX.Load("lsave640.pcx", 0);
         pGUIWindow2 = GUIWindow::Create(0, 0, 640, 480, WINDOW_MainMenu, 0, 0);
-        uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions = 12;
+        pCurrentScreen = 12;
         GameUI_DrawLoadMenu(0);
       }
       v15 = pGUIWindow_CurrentMenu;
@@ -12249,7 +12249,7 @@
     else
     {
       pRenderer->BeginScene();
-      pRenderer->DrawTextureRGB(0, 0, &stru_506F20);
+      pRenderer->DrawTextureRGB(0, 0, &pTexture_PCX);
       if (pAsyncMouse)
         pAsyncMouse->_46B736_consume_click_lists(1);
       GUI_MainMenuMessageProc();
@@ -12264,7 +12264,7 @@
           pIcons_LOD->_4114F2();
           pGUIWindow_CurrentMenu->Release();
           pGUIWindow_CurrentMenu = 0;
-          uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions = 0;
+          pCurrentScreen = 0;
           viewparams->bRedrawGameUI = 1;
         }
       }
@@ -12336,7 +12336,7 @@
   GUI_UpdateWindows();
   pRenderer->EndScene();
   pRenderer->Present();
-  stru_506F20.Release();
+  pTexture_PCX.Release();
   if ( pGUIWindow2 )
   {
     pGUIWindow2->Release();
@@ -12669,8 +12669,8 @@
           v35 = hWnd;
           goto LABEL_104;
         }
-        if ( uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions
-          && uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions != 21 )
+        if ( pCurrentScreen
+          && pCurrentScreen != 21 )
           return 0;
       }
       if ( !viewparams->field_4C )
@@ -15173,7 +15173,7 @@
   GUIWindow a1; // [sp+Ch] [bp-54h]@1
 
   memcpy(&a1, ptr_507BC4, sizeof(a1));
-  a1.str_48 = 0;
+  a1.Hint = 0;
   a1.uFrameX = 1;
   a1.uFrameY = 1;
   a1.uFrameWidth = 468;
@@ -15188,7 +15188,7 @@
   }
   a1.uFrameZ = a1.uFrameWidth + a1.uFrameX - 1;
   a1.uFrameW = v0 + a1.uFrameY - 1;
-  a1._415551(0);
+  a1.DrawMessageBox(0);
   a1.uFrameX += 12;
   a1.uFrameWidth -= 24;
   a1.uFrameY += 12;
@@ -15992,13 +15992,13 @@
       }
       if ( v5 & 0x100000 || (v6 = pIndoor->pFaceExtras[v4->uFaceExtraID].uEventID) == 0 )
         return 1;
-      if ( uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions != 19 )
+      if ( pCurrentScreen != 19 )
         goto LABEL_13;
       break;
   }
   return 0;
 }
-// 4E28F8: using guessed type int uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions;
+// 4E28F8: using guessed type int pCurrentScreen;
 
 //----- (0046A6AC) --------------------------------------------------------
 int __fastcall sub_46A6AC(int a1, int a2, int a3)