changeset 974:8a6b995a84a5

m
author Ritor1
date Wed, 08 May 2013 17:36:19 +0600
parents e655624e4b7c
children e875f5ab0cfb
files UIPartyCreation.cpp mm7_5.cpp
diffstat 2 files changed, 30 insertions(+), 49 deletions(-) [+]
line wrap: on
line diff
--- a/UIPartyCreation.cpp	Tue May 07 22:02:45 2013 +0600
+++ b/UIPartyCreation.cpp	Wed May 08 17:36:19 2013 +0600
@@ -134,10 +134,10 @@
 //----- (00495B39) --------------------------------------------------------
 void __cdecl PlayerCreationUI_Draw()
 {
-  const char *uTitleText; // ST10_4@3
+  //const char *uTitleText; // ST10_4@3
   int pTextCenter; // eax@3
   IconFrame *v3; // eax@3
-  int v4; // ecx@7
+  int pX; // ecx@7
   GUIButton *uPosActiveItem; // edi@12
   int v6; // esi@14
   int uNumLet; // eax@14
@@ -237,39 +237,35 @@
   //if (uPlayerCreationUI_SkySliderPos > 640)
     //uPlayerCreationUI_SkySliderPos = 0;
   pRenderer->DrawTextureTransparent(0, 0, pTexture_MAKETOP);
-  uTitleText = pGlobalTXT_LocalizationStrings[51];
+  //uTitleText = pGlobalTXT_LocalizationStrings[51];
   uPlayerCreationUI_SelectedCharacter = (pGUIWindow_CurrentMenu->pCurrentPosActiveItem - pGUIWindow_CurrentMenu->pStartingPosActiveItem) / 7;
   pTextCenter = pFontCChar->AlignText_Center(640, pGlobalTXT_LocalizationStrings[51]);
-  pGUIWindow_CurrentMenu->DrawText(pFontCChar, pTextCenter + 1, 0, 0, uTitleText, 0, 0, 0);
+  pGUIWindow_CurrentMenu->DrawText(pFontCChar, pTextCenter + 1, 0, 0, pGlobalTXT_LocalizationStrings[51], 0, 0, 0);
   pRenderer->DrawTextureTransparent(17, 35, pPlayerPortraits[pParty->pPlayers[0].uFace]);
   pRenderer->DrawTextureTransparent(176, 35, pPlayerPortraits[pParty->pPlayers[1].uFace]);
   pRenderer->DrawTextureTransparent(335, 35, pPlayerPortraits[pParty->pPlayers[2].uFace]);
   pRenderer->DrawTextureTransparent(494, 35, pPlayerPortraits[pParty->pPlayers[3].uFace]);
   v3 = pIconsFrameTable->GetFrame(uIconID_CharacterFrame, pEventTimer->uStartTime);
-  if ( uPlayerCreationUI_SelectedCharacter )
+  switch ( uPlayerCreationUI_SelectedCharacter )
   {
-    switch ( uPlayerCreationUI_SelectedCharacter )
-    {
-      case 1:
-        v4 = 171;
-        break;
-      case 2:
-        v4 = 329;
-        break;
-      case 3:
-        v4 = 488;
-        break;
-      default:
-        v4 = v123;
-        break;
-    }
-  }
-  else
-  {
-    v4 = 12;
+    case 0:
+      pX = 12;
+      break;
+    case 1:
+      pX = 171;
+      break;
+    case 2:
+      pX = 329;
+      break;
+    case 3:
+      pX = 488;
+      break;
+    default:
+      pX = v123;
+      break;
   }
 
-  pRenderer->DrawTextureTransparent(v4, 29, &pIcons_LOD->pTextures[v3->uTextureID]);
+  pRenderer->DrawTextureTransparent(pX, 29, &pIcons_LOD->pTextures[v3->uTextureID]);
   uPosActiveItem = pGUIWindow_CurrentMenu->GetControl(pGUIWindow_CurrentMenu->pCurrentPosActiveItem);
   uPlayerCreationUI_ArrowAnim = 19 - (GetTickCount() % 500) / 25;
   pRenderer->DrawTextureTransparent(uPosActiveItem->uZ - 4, uPosActiveItem->uY, pTextures_arrowl[uPlayerCreationUI_ArrowAnim]);
--- a/mm7_5.cpp	Tue May 07 22:02:45 2013 +0600
+++ b/mm7_5.cpp	Wed May 08 17:36:19 2013 +0600
@@ -3305,8 +3305,8 @@
   PLAYER_SKILL_TYPE v6; // edi@37
   GUIWindow *pWindow; // eax@56
   GUIButton *pButton; // eax@59
-  int v15; // edi@70
-  char v16; // zf@73
+  //int v15; // edi@70
+  //char v16; // zf@73
   char v20; // dl@116
   unsigned int v21; // eax@116
   unsigned int v25; // eax@120
@@ -3535,13 +3535,11 @@
           }
           if ( !(BYTE1(dword_6BE364_game_settings_1) & 0x40) )
             break;
-          v15 = 1;
           pVideoPlayer->bStopBeforeSchedule = 1;
           viewparams->bRedrawGameUI = 1;
           viewparams->field_48 = 1;
           if ( !GetCurrentMenuID() || GetCurrentMenuID() == MENU_CREATEPARTY || GetCurrentMenuID() == MENU_NAMEPANELESC )
           {
-LABEL_83:
             if ( pCurrentScreen == SCREEN_VIDEO )
               pVideoPlayer->FastForwardToFrame(pVideoPlayer->pResetflag);
             if (GetCurrentMenuID() == MENU_NAMEPANELESC)
@@ -3549,26 +3547,14 @@
               SetCurrentMenuID(MENU_CREATEPARTY);
               break;
             }
-            if (GetCurrentMenuID() == MENU_CREDITSPROC)
-            {
-              SetCurrentMenuID(MENU_CREDITSCLOSE);
-              break;
-            }
-            /*if ( (signed int)pMessageQueue_50CBD0->uNumMessages < 40 )
-            {
-              pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = (UIMessageType)5;
-//LABEL_93:
-              pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = 0;
-              *(&pMessageQueue_50CBD0->uNumMessages + 3 * pMessageQueue_50CBD0->uNumMessages + 3) = 0;
-              ++pMessageQueue_50CBD0->uNumMessages;
-              continue;
-            }*/
             pMessageQueue_50CBD0->AddMessage(UIMSG_ChangeGameState, 0, 0);
             break;
           }
-          v16 = GetCurrentMenuID() == 8;
-          if ( v16 && !pCurrentScreen )
-            goto LABEL_83;
+          if ( GetCurrentMenuID() == MENU_CREDITSPROC && !pCurrentScreen )
+          {
+            SetCurrentMenuID(MENU_CREDITSCLOSE);
+            break;
+          }
           if ( pCurrentScreen == SCREEN_LOADGAME )
           {
             pIcons_LOD->_4114F2();
@@ -3576,13 +3562,12 @@
             pTexture_PCX.Release();
             pTexture_PCX.Load("title.pcx", 0);
             SetCurrentMenuID(MENU_MAIN);
-            v15 = 1;
             pGUIWindow_CurrentMenu->Release();
             pGUIWindow2->Release();
             pGUIWindow2 = 0;
             pEventTimer->Resume();
             pCurrentScreen = SCREEN_GAME;
-            viewparams->bRedrawGameUI = v15;
+            viewparams->bRedrawGameUI = 1;
             break;
           }
           if ( pCurrentScreen == SCREEN_VIDEO )
@@ -3598,7 +3583,7 @@
               pGUIWindow2 = 0;
               pEventTimer->Resume();
               pCurrentScreen = SCREEN_GAME;
-              viewparams->bRedrawGameUI = v15;
+              viewparams->bRedrawGameUI = 1;
               break;
             }
             //VideoPlayer::dtor();