mm7: mm7_5.cpp comparison

comparison mm7_5.cpp @ 1033:3a5c8df8381d

* UI cleans and moves * Deleted many junk global variables.

author	Nomad
date	Tue, 21 May 2013 23:44:51 +0200
parents	f93d17337113
children	306ec23b37df 7f8be9f9769e

comparison

equal deleted inserted replaced

-:f93d17337113
+:3a5c8df8381d
 {
 //Actor::Actor(&actor);
 memset(&actor, 0, 0x344u);
 dword_5B65D0_dialogue_actor_npc_id = bDialogueUI_InitializeActor_NPC_ID;
 actor.sNPC_ID = bDialogueUI_InitializeActor_NPC_ID;
-actor.InitializeDialogue(0);
+GameUI_InitializeDialogue(&actor, false);
 bDialogueUI_InitializeActor_NPC_ID = 0;
 }
 if ( pMessageQueue_50CBD0->uNumMessages )
 {
 //v1 = "";
 if ( pMessageQueue_50CBD0->uNumMessages )
 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0;
 dword_5B65D0_dialogue_actor_npc_id = pActors[uMessageParam].sNPC_ID;
 pActor = &pActors[uMessageParam];
 //goto _actor_init_dlg;
-pActor->InitializeDialogue(1);
+GameUI_InitializeDialogue(pActor, true);
 continue;
 case UIMSG_StartHireling1Dialogue:
 case UIMSG_StartHireling2Dialogue:
 {
 if (bNoNPCHiring || pCurrentScreen)
 {
 //Actor::Actor(&actor);
 memset(&actor, 0, 0x344u);
 actor.sNPC_ID += -1 - (unsigned __int8)pParty->field_709 - hireling_idx;
 pActor = &actor;
-pActor->InitializeDialogue(1);
+GameUI_InitializeDialogue(&actor, true);
 }
 }
 continue;
 case UIMSG_BuyInShop_Identify_Repair:
 pIcons_LOD->_4114F2();
 if ( pMessageQueue_50CBD0->uNumMessages )
 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0;
 pGUIWindow_CurrentMenu->Release();
 pCurrentScreen = SCREEN_LOADGAME;
-GameUI_DrawLoadMenu(1);
+LoadUI_Load(1);
 continue;
 case UIMSG_Quit:
 if ( dword_6BE138 == 132 || uMessageParam )
 {
 pIcons_LOD->SyncLoadedFilesCount();
 stru_506E40.Release();
 continue;
 case UIMSG_Game_OpenSaveGameDialog:
 pGUIWindow_CurrentMenu->Release();
 pCurrentScreen = SCREEN_SAVEGAME;
-GameUI_DrawSaveMenu();
+SaveUI_Load();
 continue;
 case UIMSG_Game_OpenOptionsDialog://Open
 if ( pMessageQueue_50CBD0->uNumMessages )
 pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0;
 pGUIWindow_CurrentMenu->Release();
 dword_506F14 = 1;
 _506F18_num_hours_to_sleep = 60;
 continue;
 case UIMSG_RentRoom:
 dword_506F14 = 2;
-RestUI_Initialize();
+RestUI_Load();
 v86 = 60 * (_494820_training_time(pParty->uCurrentHour) + 1) - pParty->uCurrentMinute;
 _506F18_num_hours_to_sleep = v86;
 if ( uMessageParam == 111 || uMessageParam == 114 || uMessageParam == 116 )
 _506F18_num_hours_to_sleep = v86 + 720;
 dword_506F14 = 2;
 ShowStatusBarString(pGlobalTXT_LocalizationStrings[478], 2);// "You can't rest in turn-based mode!"
 continue;
 }
 if ( !(pParty->uFlags & 0x88) )
 {
-RestUI_Initialize();
+RestUI_Load();
 continue;
 }
 if ( pParty->bTurnBasedModeOn == 1 )
 {
 ShowStatusBarString(pGlobalTXT_LocalizationStrings[478], 2);// "You can't rest in turn-based mode!"
 else
 result = flt_4E4A80[0];
 }
 else
 {
-result = (flt_4E4A80[v2] - *(float *)&aAuthenticamd[4 * v2 + 12])
+result = (flt_4E4A80[v2] - flt_4E4A80[v2 - 3]) * (v3 - flt_4E4A80[v2 + 4]) / (flt_4E4A80[v2 + 5] - flt_4E4A80[v2 + 4]) + flt_4E4A80[v2];
-* (v3 - flt_4E4A80[v2 + 4])
-/ (flt_4E4A80[v2 + 5] - flt_4E4A80[v2 + 4])
-+ flt_4E4A80[v2];
 }
 return result;
 }
 //----- (0043AFE3) --------------------------------------------------------
 //----- (004156F0) --------------------------------------------------------
 void GUI_UpdateWindows()
 {
 GUIWindow *pWindow; // esi@4
-unsigned int pWindowType; // eax@4
+//unsigned int pWindowType; // eax@4
 char *pHint; // edx@66
 GUIButton *pButtonPtr_1C; // ebp@79
 char *pHint1; // edx@80
 int v26; // eax@98
 unsigned int v27; // ebp@106
 UI_OnKeyDown(VK_NEXT);
 for ( i = 1; i <= uNumVisibleWindows; ++i )
 {
 pWindow = &pWindowList[pVisibleWindowsIdxs[i] - 1];
-pWindowType = pWindow->eWindowType;
 switch (pWindow->eWindowType)
 {
 case WINDOW_OptionsButtons:
 {
 pRenderer->DrawTextureIndexed(pViewport->uViewportTL_Y,
 BookUI_Draw((WindowType)(int)pWindow->ptr_1C);
 continue;
 }
 case WINDOW_Dialogue:
 {
-DrawDialogueUI();
+GameUI_DrawDialogue();
 continue;
 }
 case WINDOW_QuickReference:
 {
 GameUI_QuickRef_Draw();
 DrawSpellBookContent(pPlayers[uActiveCharacter]);
 continue;
 }
 case WINDOW_GreetingNPC:
 {
-DrawBranchlessDialogueUI();
+GameUI_DrawBranchlessDialogue();
 continue;
 }
 case WINDOW_Chest:
 {
 if ( pCurrentScreen == SCREEN_CHEST )
 }
 continue;
 }
 case WINDOW_SaveLoadButtons:
 {
-sub_4606FE();
+SaveUI_Draw();
 continue;
 }
 case WINDOW_MainMenu_Load:
 {
-GameUI_MainMenu_DrawLoad();
+LoadUI_Draw();
 continue;
 }
 case WINDOW_HouseInterior:
 {
 pWindowList[pVisibleWindowsIdxs[i] - 1].HouseDialogManager();
 case WINDOW_BooksWindow:
 {
 pButton = (GUIButton *)pWindow->ptr_1C;
 pRenderer->DrawTextureIndexed(pWindow->uFrameY,
 pWindow->uFrameX, pButton->pTextures[0]);
-viewparams->bRedrawGameUI = 1;
+viewparams->bRedrawGameUI = true;
 continue;
 }
 case WINDOW_CharacterWindow_Inventory:
 {
 pWindow->DrawMessageBox(0);
 if ( sub_4637E0_is_there_popup_onscreen() )
 sub_416D62_ShowPopupWindow_MonsterRecord_ItemInfo_etcsub_416D62(0);
 }
 //----- (00416196) --------------------------------------------------------
-void __cdecl identify_item()
+void identify_item()
 {
 Player *v0; // esi@2
 POINT *v1; // edi@2
 signed int v2; // ecx@5
 signed int v3; // eax@5
 v26 = rand();
 v0->ReceiveDamage(v26 % 11 + 10, 0);
 pAudioPlayer->PlaySound(SOUND_8, 0, 0, -1, 0, 0, 0, 0);
 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0);
-/*if ( (signed int)pMessageQueue_50CBD0->uNumMessages < 40 )
-{
-pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = UIMSG_Escape;
-pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = 0;
-*(&pMessageQueue_50CBD0->uNumMessages + 3 * pMessageQueue_50CBD0->uNumMessages + 3) = 0;
-++pMessageQueue_50CBD0->uNumMessages;
-}*/
 v42 = (int *)&a2.y;
 v41 = (int *)&y.y;
 v40 = (int *)&pOut;
 v39.z = pParty->vPosition.z + pParty->sEyelevel;
 }
 }
 v0->ItemsEnchant(v23);
 pAudioPlayer->PlaySound(SOUND_8, 0, 0, -1, 0, 0, 0, 0);
 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 0, 0);
-/*if ( (signed int)pMessageQueue_50CBD0->uNumMessages < 40 )
-{
-pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = UIMSG_Escape;
-pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = 0;
-*(&pMessageQueue_50CBD0->uNumMessages + 3 * pMessageQueue_50CBD0->uNumMessages + 3) = 0;
-++pMessageQueue_50CBD0->uNumMessages;
-}*/
 v42 = (int *)&a2.y;
 v41 = (int *)&y.y;
 v40 = (int *)&pOut;
 v39.z = pParty->vPosition.z + pParty->sEyelevel;
 }
 }
 }
 //----- (00416B01) --------------------------------------------------------
-void __thiscall sub_416B01(void *_this)//PopupWindowForBenefitAndJoinText
+void GameUI_DrawNPCPopup(void *_this)//PopupWindowForBenefitAndJoinText
 {
 int v1; // edi@2
 int v2; // ecx@2
 NPCData *v3; // eax@2
 NPCData *v4; // esi@7

Mercurial > mm7

comparison mm7_5.cpp @ 1033:3a5c8df8381d