mm7: mm7_5.cpp comparison

comparison mm7_5.cpp @ 1458:934074e7fcc1

ModalWindow __thiscall and __cdecl removed Some random renames & refactors

author	Nomad
date	Wed, 21 Aug 2013 14:26:36 +0200
parents	bfe342ae0c1f
children	2ca62c9e7b3c

comparison

equal deleted inserted replaced

-:9dc33590f93e
+:934074e7fcc1
 #include "UI\UIHouses.h"
 #include "Lights.h"
 #include "Lights.h"
 //----- (004304E7) --------------------------------------------------------
-void __cdecl GameUI_MsgProc()
+void  GameUI_MsgProc()
 {
 //signed int v0; // edi@6
 //char *v1; // esi@6
 unsigned int v2; // edx@7
 Actor *pActor; // ecx@13
 byte_6BE388_graphicsmode = 1;
 }
 MM7Initialization();
 continue;
 }
-ModalWindow(pNPCTopics[453].pText, 0);
+ModalWindow(pNPCTopics[453].pText, UIMSG_0);
 continue;
 case UIMSG_GameMenu_ReturnToGame:
 pGUIWindow_CurrentMenu->Release();
 pEventTimer->Resume();
 pCurrentScreen = SCREEN_GAME;
 uMessageParam = 1;
 break;
 }
 break;
 }
-if ( !ptr_507BDC )
+if ( !pModalWindow )
 {
 pRenderer->ClearZBuffer(0, 479);
 viewparams->bRedrawGameUI = 1;
 viewparams->field_48 = 1;
 if ( pCurrentScreen )
 case SCREEN_VIDEO:
 pVideoPlayer->Unload();
 continue;
 case SCREEN_CHARACTERS:
 CharacterUI_ReleaseButtons();
-sub_419379();
+ReleaseAwardsScrollBar();
 pIcons_LOD->RemoveTexturesPackFromTextureList();
 if ( pGUIWindow_Settings )
 {
 if ( pCurrentScreen == SCREEN_CHARACTERS )
 {
 viewparams->bRedrawGameUI = true;
 pIcons_LOD->RemoveTexturesFromTextureList();
 continue;
 }
 CharacterUI_ReleaseButtons();
-sub_419379();
+ReleaseAwardsScrollBar();
 pIcons_LOD->RemoveTexturesPackFromTextureList();
 }
 if ( pGUIWindow_Settings )
 {
 if ( pCurrentScreen == SCREEN_CHARACTERS )
 GameUI_Footer_TimeLeft = 0;
 unk_50C9A0 = 0;
 back_to_game();
 continue;
 }
-sub_41426F();
+ModalWindow_Release();
 continue;
 case UIMSG_ScrollNPCPanel://Right and Left button for NPCPanel
 if ( uMessageParam )
 {
 GUIWindow::Create(626, 179, 0, 0, WINDOW_PressedButton2, (int)pBtn_NPCRight, 0);
 continue;
 case UIMSG_ShowFinalWindow:
 sprintfex(pFinalMessage.data(), "%s\n \n%s\n \n%s", pGlobalTXT_LocalizationStrings[151],// "Congratulations Adventurer."
 pGlobalTXT_LocalizationStrings[118],// "We hope that you've enjoyed playing Might and Magic VII as much as we did making it. We have saved this screen as MM7_WIN.PCX in your MM7 directory. You can print it out as proof of your accomplishment."
 pGlobalTXT_LocalizationStrings[167]);// "- The Might and Magic VII Development Team."
-ModalWindow(pFinalMessage.data(), 196);
+ModalWindow(pFinalMessage.data(), UIMSG_OnFinalWindowClose);
 uGameState = GAME_STATE_FINAL_WINDOW;
 continue;
-case UIMSG_C4:
+case UIMSG_OnFinalWindowClose:
 			__debugbreak();
 uGameState = GAME_STATE_PLAYING;
 strcpy((char *)pKeyActionMap->pPressedKeysBuffer, "2");
+__debugbreak(); // missed break/continue?
 case UIMSG_DD:
 			__debugbreak();
 sprintf(pTmpBuf.data(), "%s", pKeyActionMap->pPressedKeysBuffer);
 memcpy(&v216, txt_file_frametable_parser((const char *)pKeyActionMap->pPressedKeysBuffer, &v218), sizeof(v216));
 if ( v216.uPropCount == 1 )
 case UIMSG_RestWindow:
 if ( pMessageQueue_50CBD0->uNumMessages )
 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0;
 if ( pCurrentScreen )
 continue;
-if ( sub_42F4DA() )
+if ( _42F4DA_check_actor_proximity() )
 {
 if ( pParty->bTurnBasedModeOn == 1 )
 {
 ShowStatusBarString(pGlobalTXT_LocalizationStrings[478], 2);// "You can't rest in turn-based mode!"
 continue;
 OnPaperdollLeftClick();
 continue;
 case UIMSG_ClickStatsBtn:
 pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] = 100;
 CharacterUI_ReleaseButtons();
-sub_419379();
+ReleaseAwardsScrollBar();
 GUIWindow::Create(pCharacterScreen_StatsBtn->uX, pCharacterScreen_StatsBtn->uY, 0, 0, WINDOW_CharactersPressedButton, (int)pCharacterScreen_StatsBtn, 0);
 continue;
 case UIMSG_ClickSkillsBtn:
 pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] = 101;
 CharacterUI_ReleaseButtons();
-sub_419379();
+ReleaseAwardsScrollBar();
 CharacterUI_SkillsTab_CreateButtons();
 GUIWindow::Create(pCharacterScreen_SkillsBtn->uX, pCharacterScreen_SkillsBtn->uY, 0, 0, WINDOW_CharactersPressedButton, (int)pCharacterScreen_SkillsBtn, 0);
 continue;
 case UIMSG_SkillUp:
 pPlayer4 = pPlayers[uActiveCharacter];
 }
 ShowStatusBarString(v87, 2);
 continue;
 case UIMSG_ClickInventoryBtn:
 pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] = 103;
-sub_419379();
+ReleaseAwardsScrollBar();
 CharacterUI_ReleaseButtons();
 GUIWindow::Create(pCharacterScreen_InventoryBtn->uX, pCharacterScreen_InventoryBtn->uY, 0, 0, WINDOW_CharactersPressedButton, (int)pCharacterScreen_InventoryBtn, 0);
 continue;
 case UIMSG_ClickExitCharacterWindowBtn:
 GUIWindow::Create(pCharacterScreen_ExitBtn->uX, pCharacterScreen_ExitBtn->uY, 0, 0, WINDOW_ExitCharacterWindow, (int)pCharacterScreen_ExitBtn, 0);
 continue;
 case UIMSG_ClickAwardsBtn:
-sub_419379();
+ReleaseAwardsScrollBar();
 CharacterUI_ReleaseButtons();
 CreateAwardsScrollBar();
 pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] = 102;
 GUIWindow::Create(pCharacterScreen_AwardsBtn->uX, pCharacterScreen_AwardsBtn->uY, 0, 0, WINDOW_CharactersPressedButton, (int)pCharacterScreen_AwardsBtn, 0);
 FillAwardsData();
 }
 pCastSpellInfo.data()->_427E01_cast_spell();
 }
 //----- (004356FF) --------------------------------------------------------
-void __cdecl back_to_game()
+void  back_to_game()
 {
 dword_507BF0_is_there_popup_onscreen = 0;
 dword_4E455C = 1;
 dword_50CDCC = 0;
 if ( pGUIWindow_ScrollWindow )
 pEventTimer->Resume();
 viewparams->bRedrawGameUI = 1;
 }
 //----- (00435748) --------------------------------------------------------
-void __cdecl GUI_MainMenuMessageProc()
+void  GUI_MainMenuMessageProc()
 {
 Player *pPlayer; // ebx@2
 void *v3; // edi@21
 signed int v4; // eax@29
 int v5; // ecx@29
 break;
 case UIMSG_ChangeCursor:
 pMouse->SetCursorBitmap("MICON2");
 break;
 case UIMSG_3A:
-SetCurrentMenuID(MENU_10);
+SetCurrentMenuID(MENU_DebugBLVLevel);
 break;
 case UIMSG_LoadGame:
 if (!pSavegameUsedSlots[uLoadGameUI_SelectedSlot])
 break;
 SetCurrentMenuID(MENU_LoadingProcInMainMenu);
 GUIWindow::Create(pMainMenu_BtnNew->uX, pMainMenu_BtnNew->uY, 0, 0, WINDOW_PressedButton2, (int)pMainMenu_BtnNew, 0);
 SetCurrentMenuID(MENU_LoadingProcInMainMenu);
 break;
 case UIMSG_AE:
 GUIWindow::Create(pMainMenu_BtnExit->uX, pMainMenu_BtnExit->uY, 0, 0, WINDOW_PressedButton2, (int)pMainMenu_BtnExit, 0);
-SetCurrentMenuID(MENU_10);
+SetCurrentMenuID(MENU_DebugBLVLevel);
 break;
 case UIMSG_Escape:
-if ( ptr_507BDC )
+if ( pModalWindow )
 {
-sub_41426F();
+ModalWindow_Release();
 break;
 }
 if ( !(BYTE1(dword_6BE364_game_settings_1) & 0x40) )
 break;
 v15 = 1;
 while ( pMessageQueue_50CBD0->uNumMessages );
 }
 }
 //----- (00436427) --------------------------------------------------------
-double __cdecl get_shading_dist_mist()
+double  get_shading_dist_mist()
 {
 if (uCurrentlyLoadedLevelType == LEVEL_Outdoor)
 return (double)pOutdoorCamera->shading_dist_mist;
 else
 return 16192.0;
 int v28; // [sp+8h] [bp-14h]@14
 int v29; // [sp+10h] [bp-Ch]@14
 signed int a3a; // [sp+24h] [bp+8h]@14
 int a4a; // [sp+28h] [bp+Ch]@2
+__debugbreak();
 v4 = a4;
 v5 = a4->uAttributes;
 if ( v5 & 0x100 )
 {
 v6 = 0;
 signed __int64 v23; // qtt@22
 bool result; // eax@25
 int v25; // [sp+14h] [bp-8h]@14
 int a4a; // [sp+28h] [bp+Ch]@2
 signed int a5a; // [sp+2Ch] [bp+10h]@14
+__debugbreak();
 v5 = a4;
 v6 = a4->uAttributes;
 v7 = 0;
 if ( v6 & 0x100 )
 return ((unsigned int)b >> (8 - LOBYTE(pRenderer->uTargetBBits))) | pRenderer->uTargetGMask & (g << (LOBYTE(pRenderer->uTargetGBits) +
 LOBYTE(pRenderer->uTargetBBits) - 8)) | pRenderer->uTargetRMask & (r << (LOBYTE(pRenderer->uTargetGBits) +
 LOBYTE(pRenderer->uTargetRBits) + LOBYTE(pRenderer->uTargetBBits) - 8));
 }
-//----- (0040DFA7) --------------------------------------------------------
-int __stdcall retzero_sub_40DFA7(int a1)
-{
-return 0;
-}
-// 40DFA7: using guessed type int __stdcall retzero_sub_40DFA7(int);
 //----- (0040F82D) --------------------------------------------------------
 void __fastcall ZBuffer_Fill(int *pZBuffer, int uTextureId, int iZValue)
 {
 free(v12);
 }
 }
 //----- (0040F92A) --------------------------------------------------------
-void __fastcall sub_40F92A(int *pZBuffer, Texture *a2, int a3)
+void __fastcall ZBuffer_DoFill2(int *pZBuffer, Texture *a2, int a3)
 {
 Texture *v3; // esi@1
 void *v4; // eax@3
 int *v5; // edi@5
 int v6; // ecx@6
 free(v4);
 }
 }
 //----- (00410D99) --------------------------------------------------------
-signed int __fastcall sub_410D99_get_map_index(int a1)
+int __fastcall sub_410D99_get_map_index(int a1)
 {
 int v1; // edi@1
 signed int v2; // ebp@1
 const char **v3; // esi@2
 char *v4; // ebx@2

Mercurial > mm7

comparison mm7_5.cpp @ 1458:934074e7fcc1