might-and-magic-trilogy: mm7

comparison mm7_4.cpp @ 44:916bec351934

22.10.12(pCurrentScreen)

author	Ritor1
date	Mon, 22 Oct 2012 17:28:15 +0600
parents	484492a6dd28
children	79a30ee1ecdb 6a62c4005f0e

comparison

equal deleted inserted replaced

-:484492a6dd28
+:916bec351934
 }
 v51 = v65;
 if ( v65 )
 goto LABEL_135;
-if ( uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions != 5 )
+if ( pCurrentScreen != 5 )
 {
 v52 = (signed int)&pPlayers[1];
 while ( 1 )
 {
 v53 = *(int *)v52;
 }
 *(int *)(v53 + 16) = 0;
 *(int *)(v53 + 20) = 0;
 v51 = 1;
 LABEL_135:
-if ( uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions != 5
+if ( pCurrentScreen != 5
 && (!v51 || dword_5C35C0) )
 uGameState = 8;
 }
 if ( uActiveCharacter )
 {
-if ( uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions != 5 )
+if ( pCurrentScreen != 5 )
 {
 v54 = pPlayers[uActiveCharacter];
 if ( v54->pConditions[2]
 || v54->pConditions[12]
 || v54->pConditions[13]
 uColor1 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xD1u, 0xBBu, 0x61u);
 uColorTeal = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0, 0xF7u, 0xF7u);
 uColorGreen = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0, 0xFFu, 0);
 uColorWhite = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0xFFu);
 pRenderer->BeginScene();
-pRenderer->DrawTextureRGB(0, 0, &stru_506F20);
+pRenderer->DrawTextureRGB(0, 0, &pTexture_PCX);
 v0 = pTexture_MAKESKY;
 pRenderer->DrawTextureIndexed(uPlayerCreationUI_SkySliderPos, 2u, pTexture_MAKESKY);
 pRenderer->DrawTextureIndexed(uPlayerCreationUI_SkySliderPos++ - 640, 2u, v0);
 if ( (signed int)uPlayerCreationUI_SkySliderPos > 640 )
 uPlayerCreationUI_SkySliderPos = 0;
 }
 uNumRace = pPlayer->GetRace();
 switch (uNumRace)
 {
 case 0:  uRaceName = pGlobalTXT_LocalizationStrings[99]; break; // "Human"
-case 1:  uRaceName = pGlobalTXT_LocalizationStrings[101]; break; // "Dwarf"
+case 1:  uRaceName = pGlobalTXT_LocalizationStrings[103]; break; // "Dwarf"
 case 2:  uRaceName = pGlobalTXT_LocalizationStrings[106]; break; // "Goblin"
-	  case 3:  uRaceName = pGlobalTXT_LocalizationStrings[103]; break; // "Elf"
+	  case 3:  uRaceName = pGlobalTXT_LocalizationStrings[101]; break; // "Elf"
 };
 	strcpy(pTmpBuf, uRaceName);
 pGUIWindow_CurrentMenu->DrawTextInRect(pFontCreate, v134 + 72, v128 + 12, 0, pTmpBuf, 130, 0);
 v21 = uColor1;
 v22 = pFontCreate->AlignText_Center(0x96u, Str1);
 strcpy(Str1, pSkillNames[v102]);
 v103 = strlen(Str1);
 v104 = 0;
 if ( (signed int)v103 > 0 )
 {
-while ( Str1[v104] != 32 )
+	  if ( Str1[v104] == 32 )
-{
+	  {
-++v104;
+		Str1[v104] = 0;
-if ( v104 >= (signed int)v103 )
+	  }
-goto LABEL_77;
+	  else
-}
+	  {
-Str1[v104] = 0;
+		while ( Str1[v104] != 32 )
-}
+		{
-LABEL_77:
+		  ++v104;
+		  if ( v104 >= (signed int)v103 )
+		   break;
+		}
+	  }
+}
 uColorGreen = -5;
 if ( (signed int)v124 <= 3 )
 uColorGreen = 0;
 v105 = uColorTeal;
 if ( !pParty->pPlayers[0].pActiveSkills[v102 + 3486 * uPlayerCreationUI_SelectedCharacter] )
 v114 = uColorWhite;
 v115 = pFontCreate->AlignText_Center(84u, pTmpBuf);
 pGUIWindow_CurrentMenu->DrawText(pFontCreate, v115 + 530, 410, v114, pTmpBuf, 0, 0, 0);
 if ( GameUI_StatusBar_TimedStringTimeLeft > GetTickCount() )
 {
-pWindow.str_48 = pGlobalTXT_LocalizationStrings[412];// "Create Party cannot be completed unless you have assigned all characters 2 extra skills and have spent all of your bonus points."
+pWindow.Hint = pGlobalTXT_LocalizationStrings[412];// "Create Party cannot be completed unless you have assigned all characters 2 extra skills and have spent all of your bonus points."
 if ( v113 < 0 )
-pWindow.str_48 = pGlobalTXT_LocalizationStrings[413];// "You can't spend more than 50 points."
+pWindow.Hint = pGlobalTXT_LocalizationStrings[413];// "You can't spend more than 50 points."
 pWindow.uFrameWidth = 300;
 pWindow.uFrameHeight = 100;
 pWindow.uFrameX = 170;
 pWindow.uFrameY = 140;
 pWindow.uFrameZ = 469;
 pWindow.uFrameW = 239;
-pWindow._415551(0);
+pWindow.DrawMessageBox(0);
 }
 pRenderer->EndScene();
 }
 //----- (0049695A) --------------------------------------------------------
 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0;
 pAudioPlayer->SetMusicVolume((signed __int64)(pSoundVolumeLevels[(char)uMusicVolimeMultiplier] * 64.0));
 ++pIcons_LOD->uTexturePacksCount;
 if ( !pIcons_LOD->uNumPrevLoadedFiles )
 pIcons_LOD->uNumPrevLoadedFiles = pIcons_LOD->uNumLoadedFiles;
-uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions = 21;
+pCurrentScreen = 21;
 uPlayerCreationUI_ArrowAnim = 0;
 uPlayerCreationUI_SkySliderPos = 0;
 uPlayerCreationUI_SelectedCharacter = 0;
 v0 = LOBYTE(pFontCreate->uFontHeight) - 2;
 pTexture_IC_KNIGHT[0] = &pIcons_LOD->pTextures[pIcons_LOD->LoadTexture("IC_KNIGHT", TEXTURE_16BIT_PALETTE)];
 nullstring,
 pTexture_buttplus,
 0);
 pFontCChar = LoadFont("cchar.fnt", "FONTPAL", 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;
 //----- (0049750E) --------------------------------------------------------
 void __cdecl DeleteCCharFont()
 {
 pAllocator->FreeChunk(pFontCChar);
 MSG Msg; // [sp+50h] [bp-30h]@17
 POINT v25; // [sp+6Ch] [bp-14h]@6
 bool v26; // [sp+74h] [bp-Ch]@1
 POINT v24; // [sp+78h] [bp-8h]@6
-v0 = &stru_506F20;
+v0 = &pTexture_PCX;
 v1 = 0;
 v26 = 0;
-stru_506F20.Release();
+pTexture_PCX.Release();
-stru_506F20.Load("makeme.pcx", 0);
+pTexture_PCX.Load("makeme.pcx", 0);
 if (pAsyncMouse)
 pAsyncMouse->Resume();
 v2 = 6;
 pGUIWindow_CurrentMenu->field_40 = 0;
 LABEL_27:
 if ( v5 != (GUIButton *)v1 )
 {
 v6 = pMessageQueue_50CBD0->uNumMessages;
 do
 {
-if ( uMouseX >= (signed int)v5->uX
+if ( uMouseX >= (signed int)v5->uX //mouse movement
 && uMouseX <= (signed int)v5->uZ
 && uMouseY >= (signed int)v5->uY
 && uMouseY <= (signed int)v5->uW )
 {
 v7 = v5->uControlParam;
 if ( (signed int)v6 < 40 )
 {
 pMessageQueue_50CBD0->pMessages[v6].eType = (UIMessageType)v5->field_1C;
-v0 = &stru_506F20;
+v0 = &pTexture_PCX;
 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = v7;
 *(&pMessageQueue_50CBD0->uNumMessages + 3 * pMessageQueue_50CBD0->uNumMessages + 3) = 0;
 v6 = pMessageQueue_50CBD0->uNumMessages + 1;
 ++pMessageQueue_50CBD0->uNumMessages;
 }
 v21.pPixels,
 (signed __int16)v21.uWidth);
 free(pString);
 pWindow_MainMenu = GUIWindow::Create(0, 0, 640, 480, WINDOW_MainMenu, 0, (int)ptr);
 pWindow_MainMenu->CreateButton(0, 0, 0, 0, 1, 0, 0x71u, 0, 0x1Bu, nullstring, 0);
-uGame_if_0_else_ui_id__11_save__else_load__8_drawSpellInfoPopup__22_final_window__26_keymapOptions__2_options__28_videoOptions = 9;
+pCurrentScreen = 9;
 SetCurrentMenuID(MENU_Credits);
 pRenderer->BeginScene();
 pRenderer->DrawTextureRGB(0, 0, &v16);
 pRenderer->Clip(a2, a3, a2 + v20, a3 + a4);
 pRenderer->_4A5D33(a2, a3, 0, 0, &v21);
 sprintfex(pTmpBuf, "%s%03d", spellbook_texture_filename_suffices[v11 / 4], v2);
 if ( pMouse->GetCursorPos(&a2)->y <= 320 )
 v3 = pMouse->GetCursorPos(&a2)->y + 30;
 else
 v3 = 30;
-a1.str_48 = 0;
+a1.Hint = 0;
 a1.uFrameY = v3;
 a1.uFrameWidth = 328;
 a1.uFrameHeight = 68;
 a1.uFrameX = 90;
 a1.uFrameZ = 417;
 v6 = pFontSmallnum->CalcTextHeight(pTmpBuf2, &a1, 0, 0);
 a1.uFrameHeight += v6;
 if ( (signed int)a1.uFrameHeight < 150 )
 a1.uFrameHeight = 150;
 a1.uFrameWidth = 460;
-a1._415551(0);
+a1.DrawMessageBox(0);
 a1.uFrameWidth -= 12;
 a1.uFrameHeight -= 12;
 v7 = pSpellStats->pInfos[v1].pName;
 a1.uFrameZ = a1.uFrameX + a1.uFrameWidth - 1;
 a1.uFrameW = a1.uFrameHeight + a1.uFrameY - 1;

Mercurial > might-and-magic-trilogy

comparison mm7_4.cpp @ 44:916bec351934