Mercurial > might-and-magic-trilogy
changeset 167:90a9c828c2a6
pWindow and pBtn
| author | Ritor1 |
|---|---|
| date | Wed, 12 Dec 2012 12:52:40 +0600 |
| parents | 87c503d426e0 |
| children | 12a0213e66c7 |
| files | Arcomage.cpp GUIButton.cpp GUIButton.h GUIWindow.cpp mm7_1.cpp mm7_2.cpp mm7_3.cpp mm7_4.cpp mm7_5.cpp mm7_6.cpp mm7_data.h |
| diffstat | 11 files changed, 241 insertions(+), 242 deletions(-) [+] |
line wrap: on
line diff
--- a/Arcomage.cpp Tue Dec 11 17:23:17 2012 +0600 +++ b/Arcomage.cpp Wed Dec 12 12:52:40 2012 +0600 @@ -1735,7 +1735,7 @@ v0 = 0; v11[1] = 200; v11[0] = 320 - 12 * v0 / 2; - pGUIWindow0_draws_text(-1, Dest, v11); + pPrimaryWindow_draws_text(-1, Dest, v11); am_byte_4FAA75 = 1; v1 = amuint_4FAA6C + 1; v3 = __OFSUB__(amuint_4FAA6C + 1, 2); @@ -1749,7 +1749,7 @@ v4 = 0; v11[1] = 260; v11[0] = 320 - 12 * v4 / 2; - pGUIWindow0_draws_text(-1, Dest, v11); + pPrimaryWindow_draws_text(-1, Dest, v11); v6 = 0; v8 = 640; v7 = 0; @@ -2243,36 +2243,36 @@ inv_strcpy(pGlobalTXT_LocalizationStrings[266], Dest);// DISCARD A CARD v12[0] = 320 - pArcomageGame->pFont2->GetLineWidth(Dest) / 2; v12[1] = 306; - pGUIWindow0_draws_text(-1, Dest, v12); + pPrimaryWindow_draws_text(-1, Dest, v12); } inv_strcpy((const char *)stru_505708, Dest); if ( !amuint_4FAA6C ) inv_strcat("***", Dest); v12[0] = 47 - pArcomageGame->pFont1->GetLineWidth(Dest) / 2; v12[1] = 21; - pGUIWindow0_draws_text(-1, Dest, v12); + pPrimaryWindow_draws_text(-1, Dest, v12); inv_strcpy(stru_505708[1].pPlayerName, Dest); if ( amuint_4FAA6C == 1 ) inv_strcat("***", Dest); v12[0] = 595 - pArcomageGame->pFont1->GetLineWidth(Dest) / 2; v12[1] = 21; - pGUIWindow0_draws_text(-1, Dest, v12); + pPrimaryWindow_draws_text(-1, Dest, v12); intToString(stru_505708[0].field_24, Dest); v12[0] = 123 - pArcomageGame->pFont1->GetLineWidth(Dest) / 2; v12[1] = 305; - pGUIWindow0_draws_text(-1, Dest, v12); + pPrimaryWindow_draws_text(-1, Dest, v12); intToString(stru_505708[1].field_24, Dest); v12[0] = 515 - pArcomageGame->pFont1->GetLineWidth(Dest) / 2; v12[1] = 305; - pGUIWindow0_draws_text(-1, Dest, v12); + pPrimaryWindow_draws_text(-1, Dest, v12); intToString(stru_505708[0].field_28, Dest); v12[0] = 188 - pArcomageGame->pFont1->GetLineWidth(Dest) / 2; v12[1] = 305; - pGUIWindow0_draws_text(-1, Dest, v12); + pPrimaryWindow_draws_text(-1, Dest, v12); intToString(stru_505708[1].field_28, Dest); v12[0] = 451 - pArcomageGame->pFont1->GetLineWidth(Dest) / 2; v12[1] = 305; - pGUIWindow0_draws_text(-1, Dest, v12); + pPrimaryWindow_draws_text(-1, Dest, v12); v0 = stru_505708[0].field_2C; if ( byte_4E185E ) v0 = dword_4E1878 + stru_505708[0].field_2C; @@ -5503,7 +5503,7 @@ v2 = 0; xy[1] = 160; xy[0] = 320 - 12 * v2 / 2; - pGUIWindow0_draws_text(-1, pText, xy); + pPrimaryWindow_draws_text(-1, pText, xy); if ( stru_505708[0].field_24 < dword_4E1884 ) { if ( stru_505708[1].field_24 < dword_4E1884 )
--- a/GUIButton.cpp Tue Dec 11 17:23:17 2012 +0600 +++ b/GUIButton.cpp Wed Dec 12 12:52:40 2012 +0600 @@ -10,8 +10,8 @@ -struct GUIButton *ptr_5064F4; -struct GUIButton *ptr_5064F8; +struct GUIButton *pBtn_CloseBook; +struct GUIButton *pBtn_InstallRemoveSpell; struct GUIButton *pBtn_Autonotes_Instructors; struct GUIButton *pBtn_Autonotes_Misc; struct GUIButton *pBtn_Book_6; @@ -24,39 +24,39 @@ struct GUIButton *pPlayerCreationUI_BtnReset; struct GUIButton *pPlayerCreationUI_BtnOK; -struct GUIButton *ptr_5076F4; -struct GUIButton *ptr_5076FC; +struct GUIButton *pBtn_ExitCancel; +struct GUIButton *pBtn_YES; struct GUIButton *pPlayerCreationUI_BtnPlus; struct GUIButton *pPlayerCreationUI_BtnMinus; -struct GUIButton *pButton_RestUI_507634; +struct GUIButton *pButton_RestUI_Main; struct GUIButton *pButton_RestUI_Exit; struct GUIButton *pButton_RestUI_Wait5Minutes; struct GUIButton *pButton_RestUI_WaitUntilDawn; struct GUIButton *pButton_RestUI_Wait1Hour; -struct GUIButton *ptr_50767C; +struct GUIButton *pCharacterScreen_ExitBtn; struct GUIButton *pCharacterScreen_AwardsBtn; struct GUIButton *pCharacterScreen_InventoryBtn; struct GUIButton *pCharacterScreen_SkillsBtn; struct GUIButton *pCharacterScreen_StatsBtn; -struct GUIButton *ptr_507690; -struct GUIButton *ptr_507694; +struct GUIButton *pCharacterScreen_DollBtn; +struct GUIButton *pCharacterScreen_DetalizBtn; -struct GUIButton *ptr_5079E8; -struct GUIButton *ptr_5079EC; -struct GUIButton *ptr_5079F0; -struct GUIButton *ptr_5079F4; -struct GUIButton *ptr_5079F8; -struct GUIButton *ptr_5079FC; -struct GUIButton *ptr_507A00; -struct GUIButton *dword_507A04; -struct GUIButton *ptr_507A08; -struct GUIButton *ptr_507A0C; -struct GUIButton *ptr_507A10; +struct GUIButton *pBtn_NPCRight; +struct GUIButton *pBtn_NPCLeft; +struct GUIButton *pBtn_GameSettings; +struct GUIButton *pBtn_QuickReference; +struct GUIButton *pBtn_CastSpell; +struct GUIButton *pBtn_Rest; +struct GUIButton *pBtn_History; +struct GUIButton *pBtn_Calendar; +struct GUIButton *pBtn_Maps; +struct GUIButton *pBtn_Autonotes; +struct GUIButton *pBtn_Quests; struct GUIButton *pMainMenu_BtnExit; @@ -65,33 +65,35 @@ struct GUIButton *pMainMenu_BtnNew; -struct GUIButton *ptr_507B9C; -struct GUIButton *ptr_507BA0; +struct GUIButton *pBtn_Up; +struct GUIButton *pBtn_Down; struct GUIButton *ptr_507BA4; -struct GUIWindow *pGUIWindow0; -struct GUIWindow *ptr_507BB8; +struct GUIWindow *pPrimaryWindow; +struct GUIWindow *pChestWindow; struct GUIWindow *pDialogueWindow; struct GUIWindow *ptr_507BC0; -struct GUIWindow *ptr_507BC4; +struct GUIWindow *pGUIWindow_ScrollWindow; struct GUIWindow *ptr_507BC8; struct GUIWindow *pGUIWindow_CurrentMenu; struct GUIWindow *ptr_507BD0; struct GUIWindow *pGUIWindow_Settings; struct GUIWindow *ptr_507BDC; -struct GUIWindow *ptr_507BE0; +struct GUIWindow *pGUIWindow_EscMessageWindow; +struct GUIWindow *pBooksWindow; struct GUIWindow *pGUIWindow2; -struct GUIButton *ptr_50C9B0; -struct GUIButton *ptr_50C9B4; -struct GUIButton *pyt_50C9B8; -struct GUIButton *ptr_50C9BC; -struct GUIButton *ptr_50C9C0; -struct GUIButton *ptr_50C9C4; -struct GUIButton *ptr_50C9C8; -struct GUIButton *ptr_50C9CC; +struct GUIButton *pBtn_Resume; +struct GUIButton *pBtn_QuitGame; +struct GUIButton *pBtn_GameControls; +struct GUIButton *pBtn_LoadGame; +struct GUIButton *pBtn_SaveGame; +struct GUIButton *pBtn_NewGame; + +struct GUIButton *pBtn_SliderRight; +struct GUIButton *pBtn_SliderLeft; struct GUIButton *ptr_69BD58;
--- a/GUIButton.h Tue Dec 11 17:23:17 2012 +0600 +++ b/GUIButton.h Wed Dec 12 12:52:40 2012 +0600 @@ -36,8 +36,8 @@ -extern struct GUIButton *ptr_5064F4; -extern struct GUIButton *ptr_5064F8; +extern struct GUIButton *pBtn_CloseBook; +extern struct GUIButton *pBtn_InstallRemoveSpell; extern struct GUIButton *pBtn_Autonotes_Instructors; extern struct GUIButton *pBtn_Autonotes_Misc; extern struct GUIButton *pBtn_Book_6; @@ -50,39 +50,39 @@ extern struct GUIButton *pPlayerCreationUI_BtnReset; extern struct GUIButton *pPlayerCreationUI_BtnOK; -extern struct GUIButton *ptr_5076F4; -extern struct GUIButton *ptr_5076FC; +extern struct GUIButton *pBtn_ExitCancel; +extern struct GUIButton *pBtn_YES; extern struct GUIButton *pPlayerCreationUI_BtnPlus; extern struct GUIButton *pPlayerCreationUI_BtnMinus; -extern struct GUIButton *pButton_RestUI_507634; +extern struct GUIButton *pButton_RestUI_Main; extern struct GUIButton *pButton_RestUI_Exit; extern struct GUIButton *pButton_RestUI_Wait5Minutes; extern struct GUIButton *pButton_RestUI_WaitUntilDawn; extern struct GUIButton *pButton_RestUI_Wait1Hour; -extern struct GUIButton *ptr_50767C; +extern struct GUIButton *pCharacterScreen_ExitBtn; extern struct GUIButton *pCharacterScreen_AwardsBtn; extern struct GUIButton *pCharacterScreen_InventoryBtn; extern struct GUIButton *pCharacterScreen_SkillsBtn; extern struct GUIButton *pCharacterScreen_StatsBtn; -extern struct GUIButton *ptr_507690; -extern struct GUIButton *ptr_507694; +extern struct GUIButton *pCharacterScreen_DollBtn; +extern struct GUIButton *pCharacterScreen_DetalizBtn; -extern struct GUIButton *ptr_5079E8; -extern struct GUIButton *ptr_5079EC; -extern struct GUIButton *ptr_5079F0; -extern struct GUIButton *ptr_5079F4; -extern struct GUIButton *ptr_5079F8; -extern struct GUIButton *ptr_5079FC; -extern struct GUIButton *ptr_507A00; -extern struct GUIButton *dword_507A04; -extern struct GUIButton *ptr_507A08; -extern struct GUIButton *ptr_507A0C; -extern struct GUIButton *ptr_507A10; +extern struct GUIButton *pBtn_NPCRight; +extern struct GUIButton *pBtn_NPCLeft; +extern struct GUIButton *pBtn_GameSettings; +extern struct GUIButton *pBtn_QuickReference; +extern struct GUIButton *pBtn_CastSpell; +extern struct GUIButton *pBtn_Rest; +extern struct GUIButton *pBtn_History; +extern struct GUIButton *pBtn_Calendar; +extern struct GUIButton *pBtn_Maps; +extern struct GUIButton *pBtn_Autonotes; +extern struct GUIButton *pBtn_Quests; extern struct GUIButton *pMainMenu_BtnExit; @@ -91,33 +91,35 @@ extern struct GUIButton *pMainMenu_BtnNew; -extern struct GUIButton *ptr_507B9C; -extern struct GUIButton *ptr_507BA0; +extern struct GUIButton *pBtn_Up; +extern struct GUIButton *pBtn_Down; extern struct GUIButton *ptr_507BA4; -extern struct GUIWindow *pGUIWindow0; -extern struct GUIWindow *ptr_507BB8; +extern struct GUIWindow *pPrimaryWindow; +extern struct GUIWindow *pChestWindow; extern struct GUIWindow *pDialogueWindow; extern struct GUIWindow *ptr_507BC0; -extern struct GUIWindow *ptr_507BC4; +extern struct GUIWindow *pGUIWindow_ScrollWindow; extern struct GUIWindow *ptr_507BC8; extern struct GUIWindow *pGUIWindow_CurrentMenu; extern struct GUIWindow *ptr_507BD0; extern struct GUIWindow *pGUIWindow_Settings; extern struct GUIWindow *ptr_507BDC; -extern struct GUIWindow *ptr_507BE0; +extern struct GUIWindow *pGUIWindow_EscMessageWindow; +extern struct GUIWindow *pBooksWindow; extern struct GUIWindow *pGUIWindow2; -extern struct GUIButton *ptr_50C9B0; -extern struct GUIButton *ptr_50C9B4; -extern struct GUIButton *pyt_50C9B8; -extern struct GUIButton *ptr_50C9BC; -extern struct GUIButton *ptr_50C9C0; -extern struct GUIButton *ptr_50C9C4; -extern struct GUIButton *ptr_50C9C8; -extern struct GUIButton *ptr_50C9CC; +extern struct GUIButton *pBtn_Resume; +extern struct GUIButton *pBtn_QuitGame; +extern struct GUIButton *pBtn_GameControls; +extern struct GUIButton *pBtn_LoadGame; +extern struct GUIButton *pBtn_SaveGame; +extern struct GUIButton *pBtn_NewGame; + +extern struct GUIButton *pBtn_SliderRight; +extern struct GUIButton *pBtn_SliderLeft; extern struct GUIButton *ptr_69BD58;
--- a/GUIWindow.cpp Tue Dec 11 17:23:17 2012 +0600 +++ b/GUIWindow.cpp Wed Dec 12 12:52:40 2012 +0600 @@ -1250,7 +1250,7 @@ 0, "", 0); - ptr_5064F8 = v2->CreateButton( + pBtn_InstallRemoveSpell = v2->CreateButton( 0x1DCu, 0x1C2u, 0x30u, @@ -1288,7 +1288,7 @@ pGlobalTXT_LocalizationStrings[79], ptr_506440, 0); - ptr_5064F4 = result; + pBtn_CloseBook = result; return result; } // 50640C: using guessed type int dword_50640C[]; @@ -2140,7 +2140,7 @@ case WINDOW_A: dword_506978 = pCurrentScreen; pCurrentScreen = 4; - ptr_5076F4 = pWindow->CreateButton( + pBtn_ExitCancel = pWindow->CreateButton( 0x1D7u, 0x1BDu, 0xA9u, @@ -2337,7 +2337,7 @@ case WINDOW_11: dword_506978 = pCurrentScreen; pCurrentScreen = 17; - ptr_5076F4 = pWindow->CreateButton( + pBtn_ExitCancel = pWindow->CreateButton( 0x236u, 0x1BDu, 0x4Bu, @@ -2350,7 +2350,7 @@ pGlobalTXT_LocalizationStrings[156], (Texture *)(uTextureID_BUTTDESC2 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_BUTTDESC2] : 0), 0); - ptr_5076FC = pWindow->CreateButton( + pBtn_YES = pWindow->CreateButton( 0x1E6u, 0x1BDu, 0x4Bu, @@ -2402,7 +2402,7 @@ if (eWindowType == WINDOW_HouseInterior) { pCurrentScreen = 13; - ptr_5076F4 = pWindow->CreateButton( + pBtn_ExitCancel = pWindow->CreateButton( 0x1D7u, 0x1BDu, 0xA9u, @@ -2469,7 +2469,7 @@ { dword_506978 = pCurrentScreen; pCurrentScreen = 18; - ptr_5076F4 = pWindow->CreateButton( + pBtn_ExitCancel = pWindow->CreateButton( 0x236u, 0x1BDu, 0x4Bu, @@ -2482,7 +2482,7 @@ pGlobalTXT_LocalizationStrings[34], (Texture *)(uTextureID_BUTTDESC2 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_BUTTDESC2] : 0), 0); - ptr_5076FC = pWindow->CreateButton( + pBtn_YES = pWindow->CreateButton( 0x1E6u, 0x1BDu, 0x4Bu, @@ -2523,7 +2523,7 @@ if (eWindowType == WINDOW_1F) { pMouse->SetCursorBitmap("MICON2"); - ptr_5076F4 = pWindow->CreateButton( + pBtn_ExitCancel = pWindow->CreateButton( 0x188u, 0x13Eu, 0x4Bu,
--- a/mm7_1.cpp Tue Dec 11 17:23:17 2012 +0600 +++ b/mm7_1.cpp Wed Dec 12 12:52:40 2012 +0600 @@ -1353,9 +1353,9 @@ v1 = uGameUIFontShadow; v2 = sub_44100D() != 0 ? 381 : 322; sprintf(pTmpBuf, "\r087%lu", pParty->uNumFoodRations); - pGUIWindow0->DrawText(pFontSmallnum, 0, v2, v0, pTmpBuf, 0, 0, v1); + pPrimaryWindow->DrawText(pFontSmallnum, 0, v2, v0, pTmpBuf, 0, 0, v1); sprintf(pTmpBuf, "\r028%lu", pParty->uNumGold); - pGUIWindow0->DrawText(pFontSmallnum, 0, v2, v0, pTmpBuf, 0, 0, v1); + pPrimaryWindow->DrawText(pFontSmallnum, 0, v2, v0, pTmpBuf, 0, 0, v1); } } @@ -1757,25 +1757,25 @@ uTextureID_BUTTMAKE = pIcons_LOD->LoadTexture("BUTTMAKE", TEXTURE_16BIT_PALETTE); uTextureID_BUTTMAKE2 = pIcons_LOD->LoadTexture("BUTTMAKE2", TEXTURE_16BIT_PALETTE); - pGUIWindow0 = GUIWindow::Create(0, 0, 640, 480, WINDOW_MainMenu, 0, 0); - pGUIWindow0->CreateButton(7u, 8u, 0x1CCu, 0x157u, 1, 0, 0xAu, 0, 0, "", 0); - pGUIWindow0->CreateButton(0x3Du, 0x1A8u, 0x1Fu, 0x28u, 2, 94, 0x6Eu, 1u, 0x31u, "", 0); - pGUIWindow0->CreateButton(0xB1u, 0x1A8u, 0x1Fu, 0x28u, 2, 94, 0x6Eu, 2u, 0x32u, "", 0); - pGUIWindow0->CreateButton(0x124u, 0x1A8u, 0x1Fu, 0x28u, 2, 94, 0x6Eu, 3u, 0x33u, "", 0); - pGUIWindow0->CreateButton(0x197u, 0x1A8u, 0x1Fu, 0x28u, 2, 94, 0x6Eu, 4u, 0x34u, "", 0); - pGUIWindow0->CreateButton(0x18u, 0x194u, 5u, 0x31u, 1, 93, 0, 1u, 0, "", 0); - pGUIWindow0->CreateButton(0x8Bu, 0x194u, 5u, 0x31u, 1, 93, 0, 2u, 0, "", 0); - pGUIWindow0->CreateButton(0xFFu, 0x194u, 5u, 0x31u, 1, 93, 0, 3u, 0, "", 0); - pGUIWindow0->CreateButton(0x172u, 0x194u, 5u, 0x31u, 1, 93, 0, 4u, 0, "", 0); - pGUIWindow0->CreateButton(0x61u, 0x194u, 5u, 0x31u, 1, 93, 0, 1u, 0, "", 0); - pGUIWindow0->CreateButton(0xD4u, 0x194u, 5u, 0x31u, 1, 93, 0, 2u, 0, "", 0); - pGUIWindow0->CreateButton(0x148u, 0x194u, 5u, 0x31u, 1, 93, 0, 3u, 0, "", 0); - pGUIWindow0->CreateButton(0x1BBu, 0x194u, 5u, 0x31u, 1, 93, 0, 4u, 0, "", 0); + pPrimaryWindow = GUIWindow::Create(0, 0, 640, 480, WINDOW_MainMenu, 0, 0); + pPrimaryWindow->CreateButton(7u, 8u, 0x1CCu, 0x157u, 1, 0, 0xAu, 0, 0, "", 0); + pPrimaryWindow->CreateButton(0x3Du, 0x1A8u, 0x1Fu, 0x28u, 2, 94, 0x6Eu, 1u, 0x31u, "", 0); + pPrimaryWindow->CreateButton(0xB1u, 0x1A8u, 0x1Fu, 0x28u, 2, 94, 0x6Eu, 2u, 0x32u, "", 0); + pPrimaryWindow->CreateButton(0x124u, 0x1A8u, 0x1Fu, 0x28u, 2, 94, 0x6Eu, 3u, 0x33u, "", 0); + pPrimaryWindow->CreateButton(0x197u, 0x1A8u, 0x1Fu, 0x28u, 2, 94, 0x6Eu, 4u, 0x34u, "", 0); + pPrimaryWindow->CreateButton(0x18u, 0x194u, 5u, 0x31u, 1, 93, 0, 1u, 0, "", 0); + pPrimaryWindow->CreateButton(0x8Bu, 0x194u, 5u, 0x31u, 1, 93, 0, 2u, 0, "", 0); + pPrimaryWindow->CreateButton(0xFFu, 0x194u, 5u, 0x31u, 1, 93, 0, 3u, 0, "", 0); + pPrimaryWindow->CreateButton(0x172u, 0x194u, 5u, 0x31u, 1, 93, 0, 4u, 0, "", 0); + pPrimaryWindow->CreateButton(0x61u, 0x194u, 5u, 0x31u, 1, 93, 0, 1u, 0, "", 0); + pPrimaryWindow->CreateButton(0xD4u, 0x194u, 5u, 0x31u, 1, 93, 0, 2u, 0, "", 0); + pPrimaryWindow->CreateButton(0x148u, 0x194u, 5u, 0x31u, 1, 93, 0, 3u, 0, "", 0); + pPrimaryWindow->CreateButton(0x1BBu, 0x194u, 5u, 0x31u, 1, 93, 0, 4u, 0, "", 0); uTextureID_ib_td1_A = pIcons_LOD->LoadTexture("ib-td1-A", TEXTURE_16BIT_PALETTE); v6 = (Texture *)(uTextureID_ib_td1_A != -1 ? &pIcons_LOD->pTextures[uTextureID_ib_td1_A] : 0); v7 = pGlobalTXT_LocalizationStrings[174]; v8 = pKeyActionMap->GetActionVKey(INPUT_Quest); - ptr_507A10 = pGUIWindow0->CreateButton( + pBtn_Quests = pPrimaryWindow->CreateButton( 0x1EBu, 0x161u, v6->uTextureWidth, @@ -1791,7 +1791,7 @@ v10 = (Texture *)(uTextureID_ib_td2_A != -1 ? &pIcons_LOD->pTextures[uTextureID_ib_td2_A] : 0); v11 = pGlobalTXT_LocalizationStrings[154]; v12 = pKeyActionMap->GetActionVKey(INPUT_Autonotes); - ptr_507A0C = pGUIWindow0->CreateButton( + pBtn_Autonotes = pPrimaryWindow->CreateButton( 0x20Fu, 0x161u, v10->uTextureWidth, @@ -1807,7 +1807,7 @@ v15 = (Texture *)(v14 != -1 ? (int)&pIcons_LOD->pTextures[v14] : 0); v16 = pGlobalTXT_LocalizationStrings[139]; v17 = pKeyActionMap->GetActionVKey(INPUT_Mapbook); - ptr_507A08 = pGUIWindow0->CreateButton( + pBtn_Maps = pPrimaryWindow->CreateButton( 0x222u, 0x161u, v15->uTextureWidth, @@ -1823,7 +1823,7 @@ v20 = (Texture *)(uTextureID_ib_td4_A != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_ib_td4_A] : 0); v21 = pGlobalTXT_LocalizationStrings[78]; v22 = pKeyActionMap->GetActionVKey(INPUT_TimeCal); - dword_507A04 = pGUIWindow0->CreateButton( + pBtn_Calendar = pPrimaryWindow->CreateButton( 0x23Au, 0x161u, v20->uTextureWidth, @@ -1836,7 +1836,7 @@ v21, v20); uTextureID_ib_td5_A = pIcons_LOD->LoadTexture("ib-td5-A", TEXTURE_16BIT_PALETTE); - ptr_507A00 = pGUIWindow0->CreateButton( + pBtn_History = pPrimaryWindow->CreateButton( 0x258u, 0x169u, (uTextureID_ib_td5_A != -1 ? pIcons_LOD->pTextures[uTextureID_ib_td5_A].uTextureWidth : 24), @@ -1857,7 +1857,7 @@ v27 = pGlobalTXT_LocalizationStrings[252]; bFlashQuestBook = 0; v28 = pKeyActionMap->GetActionVKey(INPUT_ZoomIn); - dword_507A18 = pGUIWindow0->CreateButton( + dword_507A18 = pPrimaryWindow->CreateButton( 0x23Eu, 0x88u, v25->uTextureWidth, @@ -1875,7 +1875,7 @@ v31 = (Texture *)(uTextureID_507984 != -1 ? (int)v29 : 0); v32 = pGlobalTXT_LocalizationStrings[251]; v33 = pKeyActionMap->GetActionVKey(INPUT_ZoomOut); - dword_507A14 = pGUIWindow0->CreateButton( + dword_507A14 = pPrimaryWindow->CreateButton( 0x207u, 0x88u, v30->uTextureWidth, @@ -1888,12 +1888,12 @@ v32, v31, 0); - pGUIWindow0->CreateButton(0x1E1u, 0, 0x99u, 0x43u, 1, 92, 0, 0, 0, "", 0); - pGUIWindow0->CreateButton(0x1EBu, 0x95u, 0x40u, 0x4Au, 1, 0, 0x86u, 0, 0x35u, "", 0); - pGUIWindow0->CreateButton(0x231u, 0x95u, 0x40u, 0x4Au, 1, 0, 0x87u, 0, 0x36u, "", 0); - pGUIWindow0->CreateButton(0x1DCu, 0x142u, 0x4Du, 0x11u, 1, 100, 0, 0, 0, "", 0); - pGUIWindow0->CreateButton(0x22Bu, 0x142u, 0x4Du, 0x11u, 1, 101, 0, 0, 0, "", 0); - ptr_5079F8 = pGUIWindow0->CreateButton( + pPrimaryWindow->CreateButton(0x1E1u, 0, 0x99u, 0x43u, 1, 92, 0, 0, 0, "", 0); + pPrimaryWindow->CreateButton(0x1EBu, 0x95u, 0x40u, 0x4Au, 1, 0, 0x86u, 0, 0x35u, "", 0); + pPrimaryWindow->CreateButton(0x231u, 0x95u, 0x40u, 0x4Au, 1, 0, 0x87u, 0, 0x36u, "", 0); + pPrimaryWindow->CreateButton(0x1DCu, 0x142u, 0x4Du, 0x11u, 1, 100, 0, 0, 0, "", 0); + pPrimaryWindow->CreateButton(0x22Bu, 0x142u, 0x4Du, 0x11u, 1, 101, 0, 0, 0, "", 0); + pBtn_CastSpell = pPrimaryWindow->CreateButton( 0x1DCu, 0x1C2u, (uTextureID_50797C != -1 ? pIcons_LOD->pTextures[uTextureID_50797C].uTextureWidth : 24), @@ -1906,7 +1906,7 @@ pGlobalTXT_LocalizationStrings[38], (Texture *)(uTextureID_50797C != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_50797C] : 0), 0); - ptr_5079FC = pGUIWindow0->CreateButton( + pBtn_Rest = pPrimaryWindow->CreateButton( 0x206u, 0x1C2u, (uTextureID_507978 != -1 ? pIcons_LOD->pTextures[uTextureID_507978].uTextureWidth : 24), @@ -1919,7 +1919,7 @@ pGlobalTXT_LocalizationStrings[182], (Texture *)(uTextureID_507978 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_507978] : 0), 0); - ptr_5079F4 = pGUIWindow0->CreateButton( + pBtn_QuickReference = pPrimaryWindow->CreateButton( 0x230u, 0x1C2u, (dword_507974 != -1 ? pIcons_LOD->pTextures[dword_507974].uTextureWidth : 24), @@ -1932,7 +1932,7 @@ pGlobalTXT_LocalizationStrings[173], (Texture *)(dword_507974 != -1 ? &pIcons_LOD->pTextures[dword_507974] : 0), 0); - ptr_5079F0 = pGUIWindow0->CreateButton( + pBtn_GameSettings = pPrimaryWindow->CreateButton( 0x25Au, 0x1C2u, (uTextureID_507970 != -1 ? pIcons_LOD->pTextures[uTextureID_507970].uTextureWidth : 24), @@ -1945,7 +1945,7 @@ pGlobalTXT_LocalizationStrings[93], (Texture *)(uTextureID_507970 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_507970] : 0), 0); - ptr_5079EC = pGUIWindow0->CreateButton( + pBtn_NPCLeft = pPrimaryWindow->CreateButton( 0x1D5u, 0xB2u, (uTextureID_507990 != -1 ? pIcons_LOD->pTextures[uTextureID_507990].uTextureWidth : 24), @@ -1958,7 +1958,7 @@ "", (Texture *)(uTextureID_507990 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_507990] : 0), 0); - ptr_5079E8 = pGUIWindow0->CreateButton( + pBtn_NPCRight = pPrimaryWindow->CreateButton( 0x272u, 0xB2u, (uTextureID_50798C != -1 ? pIcons_LOD->pTextures[uTextureID_50798C].uTextureWidth : 24), @@ -2003,7 +2003,7 @@ v3 = v1; v4 = v0; v5 = pFontLucida->AlignText_Center(0x1C2u, v1); - pGUIWindow0->DrawText(pFontLucida, v5 + 11, 357, v4, v3, 0, 0, v2); + pPrimaryWindow->DrawText(pFontLucida, v5 + 11, 357, v4, v3, 0, 0, v2); } //----- (0041C0B8) -------------------------------------------------------- @@ -2086,7 +2086,7 @@ { v10 = uGameUIFontMain; v11 = pFontLucida->AlignText_Center(v3, v1); - pGUIWindow0->DrawText(pFontLucida, v11 + 11, 357, v10, v1, 0, 0, v0); + pPrimaryWindow->DrawText(pFontLucida, v11 + 11, 357, v10, v1, 0, 0, v0); } } } @@ -3804,7 +3804,7 @@ } pEventTimer->Pause(); if ( dword_506F14 != 2 ) - GUIWindow::Create(518u, 450u, 0, 0, (enum WindowType)90, (int)ptr_5079FC, 0); + GUIWindow::Create(518u, 450u, 0, 0, (enum WindowType)90, (int)pBtn_Rest, 0); _506F18_num_hours_to_sleep = 0; dword_506F14 = 0; uRestUI_FoodRequiredToRest = 2; @@ -3861,7 +3861,7 @@ "", (Texture *)(uTextureID_RestUI_restexit != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_RestUI_restexit] : 0), 0); - pButton_RestUI_507634 = pGUIWindow_CurrentMenu->CreateButton( + pButton_RestUI_Main = pGUIWindow_CurrentMenu->CreateButton( 24u, 154u, 225u, @@ -4186,7 +4186,7 @@ v22 = 0; if ( v5 > 0 ) { - while ( !Chest::CanPlaceItemAt(v22, v4->uItemID, (unsigned int)ptr_507BB8->ptr_1C) ) + while ( !Chest::CanPlaceItemAt(v22, v4->uItemID, (unsigned int)pChestWindow->ptr_1C) ) { ++v22; if ( v22 >= v5 ) @@ -4423,13 +4423,9 @@ v1 = pRenderer->pActiveZBuffer[v0->x + pSRZBufferLineOffsets[pMouse->GetCursorPos(&v3)->y]]; if ( v1 ) { - auto _w = (ItemGen *)(&pOtherOverlayList->pOverlays[49].field_4 - + 2662 * (unsigned int)ptr_507BB8->ptr_1C - + 18 - * *((short *)&pChests[0].mm7__vector_pItems[139].uExpireTime - + v1 - + 2662 * (unsigned int)ptr_507BB8->ptr_1C - + 3)); + auto _w = (ItemGen *)(&pOtherOverlayList->pOverlays[49].field_4 + 2662 * (unsigned int)pChestWindow->ptr_1C + + 18 * *((short *)&pChests[0].mm7__vector_pItems[139].uExpireTime + + v1 + 2662 * (unsigned int)pChestWindow->ptr_1C + 3)); v2 = _w->GetDisplayName(); sub_41C0B8_set_status_string(v2); } @@ -4635,8 +4631,8 @@ dword_507CD8 = 0; v3 = GUIWindow::Create(0, 0, 640u, 480u, WINDOW_Chest, a4, 0); pGUIWindow_CurrentMenu = v3; - ptr_507BB8 = v3; - ptr_5076F4 = v3->CreateButton( + pChestWindow = v3; + pBtn_ExitCancel = v3->CreateButton( 0x1D7u, 0x1BDu, 0xA9u, @@ -4649,7 +4645,7 @@ pGlobalTXT_LocalizationStrings[79],// Exit (Texture *)(uTextureID_506438 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_506438] : 0), 0); - ptr_507BB8->CreateButton(7u, 8u, 460u, 343u, 1, 0, 0xCu, 0, 0, "", 0); + pChestWindow->CreateButton(7u, 8u, 460u, 343u, 1, 0, 0xCu, 0, 0, "", 0); pCurrentScreen = 10; pEventTimer->Pause(); return 1; @@ -4734,8 +4730,8 @@ while ( v23 < v21 * v19 ); } pRenderer->DrawTextureIndexed( - ptr_5076F4->uX, - ptr_5076F4->uY, + pBtn_ExitCancel->uX, + pBtn_ExitCancel->uY, (Texture *)(uTextureID_506438 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_506438] : 0)); } @@ -4765,7 +4761,7 @@ int v22; // [sp+1Ch] [bp-4h]@8 v19 = a2; - v2 = ptr_507BB8->ptr_1C; + v2 = pChestWindow->ptr_1C; v20 = v2; v2 = (void *)(5324 * (int)v2); v3 = (ItemGen *)((char *)v2 + 36 * a1 + (int)((char *)pChests + 4)); @@ -5423,7 +5419,7 @@ (Texture *)(papredoll_dbrds[4] != -1 ? (int)&pIcons_LOD->pTextures[papredoll_dbrds[4]] : 0), papredoll_dbrds[3] != -1 ? (int)&pIcons_LOD->pTextures[papredoll_dbrds[3]] : 0, 0); - ptr_50767C = v2->CreateButton( + pCharacterScreen_ExitBtn = v2->CreateButton( pViewport->uViewportX + 371, pViewport->uViewportY + 308, (papredoll_dbrds[1] != -1 ? pIcons_LOD->pTextures[papredoll_dbrds[1]].uTextureWidth : 24), @@ -5438,7 +5434,7 @@ papredoll_dbrds[1] != -1 ? (int)&pIcons_LOD->pTextures[papredoll_dbrds[1]] : 0, 0); v2->CreateButton(0, 0, 0x1DCu, 0x159u, 1, 122, 0x78u, 0, 0, "", 0); - ptr_507694 = v2->CreateButton( + pCharacterScreen_DetalizBtn = v2->CreateButton( 0x258u, 0x12Cu, 0x1Eu, @@ -5450,7 +5446,7 @@ 0, pGlobalTXT_LocalizationStrings[64], 0); - ptr_507690 = v2->CreateButton(0x1DCu, 0, 0xA4u, 0x159u, 1, 0, 0x85u, 0, 0, "", 0); + pCharacterScreen_DollBtn = v2->CreateButton(0x1DCu, 0, 0xA4u, 0x159u, 1, 0, 0x85u, 0, 0, "", 0); v2->CreateButton(0x3Du, 0x1A8u, 0x1Fu, 0, 2, 94, 0x6Eu, 1u, 0x31u, "", 0); v2->CreateButton(0xB1u, 0x1A8u, 0x1Fu, 0, 2, 94, 0x6Eu, 2u, 0x32u, "", 0); v2->CreateButton(0x124u, 0x1A8u, 0x1Fu, 0, 2, 94, 0x6Eu, 3u, 0x33u, "", 0); @@ -5476,7 +5472,7 @@ CharacterUI_LoadPaperdollTextures(); pCurrentScreen = 23; v2 = GUIWindow::Create(0, 0, 640, 480, (WindowType)(WINDOW_HouseInterior|WINDOW_Options), v1, 0); - ptr_50767C = v2->CreateButton( + pCharacterScreen_ExitBtn = v2->CreateButton( 394u, 318u, 75u, @@ -5491,7 +5487,7 @@ papredoll_dbrds[1] != -1 ? (int)&pIcons_LOD->pTextures[papredoll_dbrds[1]] : 0, 0); v2->CreateButton(0, 0, 0x1DCu, 0x159u, 1, 122, 0x78u, 0, 0, "", 0); - ptr_507690 = v2->CreateButton(0x1DCu, 0, 0xA4u, 0x159u, 1, 0, 0x85u, 0, 0, "", 0); + pCharacterScreen_DollBtn = v2->CreateButton(0x1DCu, 0, 0xA4u, 0x159u, 1, 0, 0x85u, 0, 0, "", 0); v2->CreateButton(61u, 424u, 0x1Fu, 0, 2, 94, 0x6Eu, 1u, 0x31u, "", 0); v2->CreateButton(177u, 424u, 0x1Fu, 0, 2, 94, 0x6Eu, 2u, 0x32u, "", 0); v2->CreateButton(292u, 424u, 0x1Fu, 0, 2, 94, 0x6Eu, 3u, 0x33u, "", 0);
--- a/mm7_2.cpp Tue Dec 11 17:23:17 2012 +0600 +++ b/mm7_2.cpp Wed Dec 12 12:52:40 2012 +0600 @@ -3150,7 +3150,7 @@ uDialogueType = 83; pDialogueWindow->Release(); pDialogueWindow = GUIWindow::Create(0, 0, 640, 350, WINDOW_MainMenu, 0, 0); - ptr_5076F4 = pDialogueWindow->CreateButton( + pBtn_ExitCancel = pDialogueWindow->CreateButton( 471u, 445u, 169u, @@ -3303,7 +3303,7 @@ pDialogueWindow->pControlsHead = 0; pDialogueWindow->pControlsTail = 0; pDialogueWindow->uNumControls = 0; - ptr_5076F4 = pDialogueWindow->CreateButton( + pBtn_ExitCancel = pDialogueWindow->CreateButton( 0x1D7u, 0x1BDu, 0xA9u, @@ -3696,7 +3696,7 @@ { pDialogueWindow->Release(); pDialogueWindow = GUIWindow::Create(0, 0, 640, 0x159u, WINDOW_MainMenu, 0, 0); - ptr_5076F4 = pDialogueWindow->CreateButton( + pBtn_ExitCancel = pDialogueWindow->CreateButton( 0x1D7u, 0x1BDu, 0xA9u, @@ -3812,7 +3812,7 @@ LABEL_9: pDialogueWindow->Release(); pDialogueWindow = GUIWindow::Create(0, 0, 640, 0x159u, WINDOW_MainMenu, v1, v1); - ptr_5076F4 = pDialogueWindow->CreateButton( + pBtn_ExitCancel = pDialogueWindow->CreateButton( 526, 445, 75, @@ -4406,7 +4406,7 @@ if ( uNumDialogueNPCPortraits != 1 ) { v2 = 0; - ptr_5076F4 = ptr_507BC0->pControlsHead; + pBtn_ExitCancel = ptr_507BC0->pControlsHead; if ( uNumDialogueNPCPortraits > 0 ) { v3 = byte_591180; @@ -15017,12 +15017,12 @@ signed int v1; // esi@1 v1 = a1; - if ( !ptr_507BC4 && a1 >= 700 ) + if ( !pGUIWindow_ScrollWindow && a1 >= 700 ) { if ( a1 <= 782 ) { uTextureID_720980 = pIcons_LOD->LoadTexture("leather", TEXTURE_16BIT_PALETTE); - ptr_507BC4 = GUIWindow::Create(0, 0, 640, 480, (enum WindowType)30, v1 - 700, 0); + pGUIWindow_ScrollWindow = GUIWindow::Create(0, 0, 640, 480, (enum WindowType)30, v1 - 700, 0); } } } @@ -15031,10 +15031,10 @@ //----- (00467F9F) -------------------------------------------------------- void __cdecl free_book_subwindow() { - if ( ptr_507BC4 ) - { - ptr_507BC4->Release(); - ptr_507BC4 = 0; + if ( pGUIWindow_ScrollWindow ) + { + pGUIWindow_ScrollWindow->Release(); + pGUIWindow_ScrollWindow = 0; } } @@ -15046,12 +15046,12 @@ unsigned int v2; // eax@3 GUIWindow a1; // [sp+Ch] [bp-54h]@1 - memcpy(&a1, ptr_507BC4, sizeof(a1)); + memcpy(&a1, pGUIWindow_ScrollWindow, sizeof(a1)); a1.Hint = 0; a1.uFrameX = 1; a1.uFrameY = 1; a1.uFrameWidth = 468; - v0 = pFontSmallnum->CalcTextHeight(pScrolls[(unsigned int)ptr_507BC4->ptr_1C], &a1, 0, 0) + v0 = pFontSmallnum->CalcTextHeight(pScrolls[(unsigned int)pGUIWindow_ScrollWindow->ptr_1C], &a1, 0, 0) + 2 * LOBYTE(pFontCreate->uFontHeight) + 24; a1.uFrameHeight = v0; @@ -15069,7 +15069,7 @@ a1.uFrameHeight -= 12; a1.uFrameZ = a1.uFrameWidth + a1.uFrameX - 1; a1.uFrameW = a1.uFrameHeight + a1.uFrameY - 1; - v1 = pItemsTable->pItems[(unsigned int)ptr_507BC4->ptr_1C + 700].pName; + v1 = pItemsTable->pItems[(unsigned int)pGUIWindow_ScrollWindow->ptr_1C + 700].pName; v2 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu); sprintf(pTmpBuf, format_4E2D80, v2, v1); a1.DrawText2(pFontCreate, 0, 0, 0, pTmpBuf, 3u); @@ -15078,7 +15078,7 @@ 1, LOBYTE(pFontCreate->uFontHeight) - 3, 0, - pScrolls[(unsigned int)ptr_507BC4->ptr_1C], + pScrolls[(unsigned int)pGUIWindow_ScrollWindow->ptr_1C], 0, 0, 0);
--- a/mm7_3.cpp Tue Dec 11 17:23:17 2012 +0600 +++ b/mm7_3.cpp Wed Dec 12 12:52:40 2012 +0600 @@ -15785,7 +15785,7 @@ unsigned int v10; // [sp+64h] [bp-8h]@1 int a3; // [sp+6Bh] [bp-1h]@11 - memcpy(&v8, pGUIWindow0, sizeof(v8)); + memcpy(&v8, pPrimaryWindow, sizeof(v8)); v10 = pMapStats->GetMapInfo(pCurrentMapName); v9 = IndoorLocation::GetLocationIndex(dword_591164_teleport_map_name); pRenderer->DrawTextureIndexed(0x1DDu, 0, pTexture_Dialogue_Background); @@ -15917,7 +15917,7 @@ char pDestinationMapName[32]; // [sp+60h] [bp-24h]@1 unsigned int v9; // [sp+80h] [bp-4h]@1 - memcpy(&v7, pGUIWindow0, sizeof(v7)); + memcpy(&v7, pPrimaryWindow, sizeof(v7)); v9 = pMapStats->GetMapInfo(pCurrentMapName); pOutdoor->GetTravelDestination(pParty->vPosition.x, pParty->vPosition.y, pDestinationMapName, 20); v0 = pMapStats->GetMapInfo(pDestinationMapName);
--- a/mm7_4.cpp Tue Dec 11 17:23:17 2012 +0600 +++ b/mm7_4.cpp Wed Dec 12 12:52:40 2012 +0600 @@ -9170,7 +9170,7 @@ else { pDialogueWindow->pNumPresenceButton = 0; - memcpy(&v4, pGUIWindow0, sizeof(v4)); + memcpy(&v4, pPrimaryWindow, sizeof(v4)); v4.uFrameX = 483; v4.uFrameWidth = 148; v4.uFrameZ = 334; @@ -11217,7 +11217,7 @@ sub_4B29F2(a4); pDialogueWindow->Release(); pDialogueWindow = GUIWindow::Create(0, 0, 640, 0x15E, WINDOW_MainMenu, v1, 0); - ptr_5076F4 = pDialogueWindow->CreateButton( + pBtn_ExitCancel = pDialogueWindow->CreateButton( 0x1D7, 0x1BD, 0xA9, @@ -11261,7 +11261,7 @@ pDialogueWindow->Release(); pDialogueWindow = GUIWindow::Create(0, 0, 640, 0x15Eu, WINDOW_MainMenu, v1, 0); v2 = ""; - ptr_5076F4 = pDialogueWindow->CreateButton( + pBtn_ExitCancel = pDialogueWindow->CreateButton( 0x1D7u, 0x1BDu, 0xA9u, @@ -11294,7 +11294,7 @@ v1 = array_5913D8[(unsigned int)((char *)array_5913D8[6] + -(dword_591080 != 0) - 1)]; pDialogueWindow->Release(); pDialogueWindow = GUIWindow::Create(0, 0, 640, 0x15Eu, WINDOW_MainMenu, 0, 0); - ptr_5076F4 = pDialogueWindow->CreateButton( + pBtn_ExitCancel = pDialogueWindow->CreateButton( 0x1D7u, 0x1BDu, 0xA9u, @@ -11369,7 +11369,7 @@ pDialogueWindow->Release(); pDialogueWindow = GUIWindow::Create(0, 0, 640, 480, WINDOW_MainMenu, 0, 0); sprintf(byte_591098, pGlobalTXT_LocalizationStrings[411], pMapStats->pInfos[uHouse_ExitPic].pName); - ptr_5076F4 = pDialogueWindow->CreateButton( + pBtn_ExitCancel = pDialogueWindow->CreateButton( 0x236u, 0x1BDu, 0x4Bu, @@ -11382,7 +11382,7 @@ pGlobalTXT_LocalizationStrings[34],// "Cancel" (Texture *)(uTextureID_BUTTDESC2 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_BUTTDESC2] : 0), 0); - ptr_5076FC = pDialogueWindow->CreateButton( + pBtn_YES = pDialogueWindow->CreateButton( 486u, 445u, 75u, @@ -11423,7 +11423,7 @@ } v4 = 1; pDialogueWindow = GUIWindow::Create(0, 0, 640, 0x159u, WINDOW_MainMenu, 0, 0); - ptr_5076F4 = pDialogueWindow->CreateButton( + pBtn_ExitCancel = pDialogueWindow->CreateButton( 471u, 445u, 169u, @@ -11597,7 +11597,7 @@ v3 = a5; pRenderer->DrawTextureRGB(0, 0x160u, pTexture_StatusBar); v4 = pFontLucida->AlignText_Center(0x1C2u, v2); - return pGUIWindow0->DrawText(pFontLucida, v4 + 11, 357, v3, v2, 0, 0, 0); + return pPrimaryWindow->DrawText(pFontLucida, v4 + 11, 357, v3, v2, 0, 0, 0); } //----- (004B46F8) --------------------------------------------------------
--- a/mm7_5.cpp Tue Dec 11 17:23:17 2012 +0600 +++ b/mm7_5.cpp Wed Dec 12 12:52:40 2012 +0600 @@ -671,7 +671,7 @@ 0, v1, 0); - ptr_50C9CC = pGUIWindow_CurrentMenu->CreateButton( + pBtn_SliderLeft = pGUIWindow_CurrentMenu->CreateButton( 243u, 162u, 16u, @@ -684,7 +684,7 @@ v1, &pIcons_LOD->pTextures[uTextureID_507C70], 0); - ptr_50C9C8 = pGUIWindow_CurrentMenu->CreateButton( + pBtn_SliderRight = pGUIWindow_CurrentMenu->CreateButton( 0x1B3u, 0xA2u, 0x10u, @@ -698,7 +698,7 @@ &pIcons_LOD->pTextures[uTextureID_507C74], 0); pGUIWindow_CurrentMenu->CreateButton(0x107u, 0xA2u, 0xACu, 0x11u, v0, 0, 0x6Fu, 0, 0, v1, 0); - ptr_50C9CC = pGUIWindow_CurrentMenu->CreateButton( + pBtn_SliderLeft = pGUIWindow_CurrentMenu->CreateButton( 0xF3u, 0xD8u, 0x10u, @@ -711,7 +711,7 @@ v1, &pIcons_LOD->pTextures[uTextureID_507C70], 0); - ptr_50C9C8 = pGUIWindow_CurrentMenu->CreateButton( + pBtn_SliderRight = pGUIWindow_CurrentMenu->CreateButton( 0x1B3u, 0xD8u, 0x10u, @@ -725,7 +725,7 @@ &pIcons_LOD->pTextures[uTextureID_507C74], 0); pGUIWindow_CurrentMenu->CreateButton(0x107u, 0xD8u, 0xACu, 0x11u, v0, 0, 0x70u, 0, 0, v1, 0); - ptr_50C9CC = pGUIWindow_CurrentMenu->CreateButton( + pBtn_SliderLeft = pGUIWindow_CurrentMenu->CreateButton( 0xF3u, 0x10Eu, 0x10u, @@ -738,7 +738,7 @@ v1, &pIcons_LOD->pTextures[uTextureID_507C70], 0); - ptr_50C9C8 = pGUIWindow_CurrentMenu->CreateButton( + pBtn_SliderRight = pGUIWindow_CurrentMenu->CreateButton( 0x1B3u, 0x10Eu, 0x10u, @@ -907,7 +907,7 @@ v0 = 1; if ( GammaController::IsGammaSupported() ) { - ptr_50C9CC = pGUIWindow_CurrentMenu->CreateButton( + pBtn_SliderLeft = pGUIWindow_CurrentMenu->CreateButton( 0x15u, 0xA1u, 0x10u, @@ -920,7 +920,7 @@ v1, &pIcons_LOD->pTextures[uTextureID_507C20], 0); - ptr_50C9C8 = pGUIWindow_CurrentMenu->CreateButton( + pBtn_SliderRight = pGUIWindow_CurrentMenu->CreateButton( 0xD5u, 0xA1u, 0x10u, @@ -972,7 +972,7 @@ v19 = (double)(signed int)uGammaPos * 0.1 + 0.6; pGame->pGammaController->Initialize(v19); v166 = v0; - v152 = (int)ptr_50C9CC; + v152 = (int)pBtn_SliderLeft; v145 = (WindowType)90; v140 = 0; v136 = 0; @@ -988,7 +988,7 @@ pGame->pGammaController->Initialize(v21); v20 = 213; v166 = v0; - v152 = (int)ptr_50C9C8; + v152 = (int)pBtn_SliderRight; v145 = (WindowType)90; v140 = 0; v136 = 0; @@ -1031,7 +1031,7 @@ uMusicVolimeMultiplier = 0; v167 = v0; v23 = 243; - v153 = (int)ptr_50C9CC; + v153 = (int)pBtn_SliderLeft; LABEL_136: GUIWindow::Create(v23, 0xD8u, 0, 0, (enum WindowType)90, v153, v167); goto LABEL_143; @@ -1043,7 +1043,7 @@ uMusicVolimeMultiplier = 9; v167 = v0; v23 = 435; - v153 = (int)ptr_50C9C8; + v153 = (int)pBtn_SliderRight; goto LABEL_136; } uMusicVolimeMultiplier = (pMouse->GetCursorPos(&v202)->x - 263) / 17; @@ -1071,7 +1071,7 @@ uSoundVolumeMultiplier = 0; v168 = v0; v24 = 243; - v154 = (int)ptr_50C9CC; + v154 = (int)pBtn_SliderLeft; LABEL_150: GUIWindow::Create(v24, 0xA2u, 0, 0, (enum WindowType)90, v154, v168); goto LABEL_157; @@ -1083,7 +1083,7 @@ uSoundVolumeMultiplier = 9; v168 = v0; v24 = 435; - v154 = (int)ptr_50C9C8; + v154 = (int)pBtn_SliderRight; goto LABEL_150; } uSoundVolumeMultiplier = (pMouse->GetCursorPos(&v207)->x - 263) / 17; @@ -1121,7 +1121,7 @@ uVoicesVolumeMultiplier = 0; v169 = v0; v25 = 243; - v155 = (int)ptr_50C9CC; + v155 = (int)pBtn_SliderLeft; LABEL_166: GUIWindow::Create(v25, 0x10Eu, 0, 0, (enum WindowType)90, v155, v169); goto LABEL_173; @@ -1133,7 +1133,7 @@ uVoicesVolumeMultiplier = 9; v169 = v0; v25 = 435; - v155 = (int)ptr_50C9C8; + v155 = (int)pBtn_SliderRight; goto LABEL_166; } uVoicesVolumeMultiplier = (pMouse->GetCursorPos(&v205)->x - 263) / 17; @@ -1192,7 +1192,7 @@ pEventTimer->Pause(); pAudioPlayer->StopChannels(-1, -1); pGUIWindow_CurrentMenu = GUIWindow::Create(0, 0, 640u, 480u, WINDOW_Book, uMessage, 0); - ptr_507BE0 = GUIWindow::Create(493u, 355u, 0, 0, (enum WindowType)99, (int)ptr_507A10, 0); + pBooksWindow = GUIWindow::Create(493u, 355u, 0, 0, (enum WindowType)99, (int)pBtn_Quests, 0); bFlashQuestBook = 0; goto _continue; case UIMSG_OpenAutonotes: @@ -1203,7 +1203,7 @@ pEventTimer->Pause(); pAudioPlayer->StopChannels(-1, -1); pGUIWindow_CurrentMenu = GUIWindow::Create(0, 0, 640u, 480u, WINDOW_Book, uMessage, 0); - ptr_507BE0 = GUIWindow::Create(527u, 353u, 0, 0, (enum WindowType)99, (int)ptr_507A0C, 0); + pBooksWindow = GUIWindow::Create(527u, 353u, 0, 0, (enum WindowType)99, (int)pBtn_Autonotes, 0); bFlashAutonotesBook = 0; goto _continue; case UIMSG_OpenMapBook: @@ -1219,7 +1219,7 @@ v27 = 353; v28 = 546; v170 = 0; - v156 = (int)ptr_507A08; + v156 = (int)pBtn_Maps; goto LABEL_210; case UIMSG_OpenCalendar: if ( pMessageQueue_50CBD0->uNumMessages ) @@ -1232,10 +1232,10 @@ v27 = 354; v28 = 570; v170 = 0; - v156 = (int)dword_507A04; + v156 = (int)pBtn_Calendar; LABEL_210: pGUIWindow_CurrentMenu = v26; - ptr_507BE0 = GUIWindow::Create(v28, v27, 0, 0, (enum WindowType)99, v156, v170); + pBooksWindow = GUIWindow::Create(v28, v27, 0, 0, (enum WindowType)99, v156, v170); goto _continue; case UIMSG_OpenHistoryBook: if ( pMessageQueue_50CBD0->uNumMessages ) @@ -1245,7 +1245,7 @@ pEventTimer->Pause(); pAudioPlayer->StopChannels(-1, -1); pGUIWindow_CurrentMenu = GUIWindow::Create(0, 0, 640, 480, WINDOW_Book, uMessage, 0); - ptr_507BE0 = GUIWindow::Create(0x258u, 0x169u, 0, 0, (enum WindowType)99, (int)ptr_507A00, 0); + pBooksWindow = GUIWindow::Create(0x258u, 0x169u, 0, 0, (enum WindowType)99, (int)pBtn_History, 0); bFlashHistoryBook = 0; goto _continue; case UIMSG_CloseBook: @@ -1322,9 +1322,9 @@ } goto LABEL_322; case 3: - ptr_507BE0->Release(); + pBooksWindow->Release(); //crt_deconstruct_ptr_6A0118(); - ptr_507BE0 = 0; + pBooksWindow = 0; pEventTimer->Resume(); goto LABEL_322; case 11: @@ -1336,7 +1336,7 @@ pCurrentScreen = 10; goto _continue; case 10: - v29 = ptr_507BB8; + v29 = pChestWindow; goto LABEL_249; case 25: v29 = ptr_507BC8; @@ -1584,7 +1584,7 @@ if ( !pGUIWindow_Settings ) { dword_6BE138 = -1; - GUIWindow::Create(0x25Au, 0x1C2u, 0, 0, (enum WindowType)90, (int)ptr_5079F0, v0); + GUIWindow::Create(0x25Au, 0x1C2u, 0, 0, (enum WindowType)90, (int)pBtn_GameSettings, v0); pEventTimer->Pause(); pAudioPlayer->StopChannels(-1, -1); ++pIcons_LOD->uTexturePacksCount; @@ -1599,7 +1599,7 @@ uTextureID_507934 = pIcons_LOD->LoadTexture("controls1", TEXTURE_16BIT_PALETTE); uTextureID_507930 = pIcons_LOD->LoadTexture("resume1", TEXTURE_16BIT_PALETTE); uTextureID_50792C = pIcons_LOD->LoadTexture("quit1", TEXTURE_16BIT_PALETTE); - ptr_50C9C4 = pGUIWindow_CurrentMenu->CreateButton( + pBtn_NewGame = pGUIWindow_CurrentMenu->CreateButton( 0x13u, 0x9Bu, 0xD6u, @@ -1612,7 +1612,7 @@ pGlobalTXT_LocalizationStrings[614],// "New Game" (Texture *)(uTextureID_507940 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_507940] : 0), 0); - ptr_50C9C0 = pGUIWindow_CurrentMenu->CreateButton( + pBtn_SaveGame = pGUIWindow_CurrentMenu->CreateButton( 0x13u, 0xD1u, 0xD6u, @@ -1625,7 +1625,7 @@ pGlobalTXT_LocalizationStrings[615],// "Save Game" (Texture *)(uTextureID_507938 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_507938] : 0), 0); - ptr_50C9BC = pGUIWindow_CurrentMenu->CreateButton( + pBtn_LoadGame = pGUIWindow_CurrentMenu->CreateButton( 0x13u, 0x107u, 0xD6u, @@ -1638,7 +1638,7 @@ pGlobalTXT_LocalizationStrings[616],// "Load Game" (Texture *)(uTextureID_50793C != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_50793C] : 0), 0); - pyt_50C9B8 = pGUIWindow_CurrentMenu->CreateButton( + pBtn_GameControls = pGUIWindow_CurrentMenu->CreateButton( 0xF1u, 0x9Bu, 0xD6u, @@ -1651,7 +1651,7 @@ pGlobalTXT_LocalizationStrings[617],// ""Sound, Keyboard, Game Options:"" (Texture *)(uTextureID_507934 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_507934] : 0), 0); - ptr_50C9B4 = pGUIWindow_CurrentMenu->CreateButton( + pBtn_QuitGame = pGUIWindow_CurrentMenu->CreateButton( 0xF1u, 0xD1u, 0xD6u, @@ -1664,7 +1664,7 @@ pGlobalTXT_LocalizationStrings[618],// "Quit" (Texture *)(uTextureID_50792C != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_50792C] : 0), 0); - ptr_50C9B0 = pGUIWindow_CurrentMenu->CreateButton( + pBtn_Resume = pGUIWindow_CurrentMenu->CreateButton( 0xF1u, 0x107u, 0xD6u, @@ -1694,7 +1694,7 @@ case UIMSG_BC: if ( uMessageParam ) { - GUIWindow::Create(0x272u, 0xB3u, 0, 0, (enum WindowType)90, (int)ptr_5079E8, 0); + GUIWindow::Create(0x272u, 0xB3u, 0, 0, (enum WindowType)90, (int)pBtn_NPCRight, 0); v37 = (pParty->pHirelings[0].pName != 0) + (pParty->pHirelings[1].pName != 0) + (unsigned __int8)pParty->field_70A @@ -1711,7 +1711,7 @@ } else { - GUIWindow::Create(0x1D5u, 0xB3u, 0, 0, (enum WindowType)90, (int)ptr_5079EC, 0); + GUIWindow::Create(0x1D5u, 0xB3u, 0, 0, (enum WindowType)90, (int)pBtn_NPCLeft, 0); if ( pParty->field_709 ) { --pParty->field_709; @@ -2148,9 +2148,9 @@ ++pMessageQueue_50CBD0->uNumMessages; } //crt_deconstruct_ptr_6A0118(); - ptr_507BE0->Release(); + pBooksWindow->Release(); pGUIWindow_CurrentMenu->Release(); - ptr_507BE0 = 0; + pBooksWindow = 0; pGUIWindow_CurrentMenu = 0; } else @@ -2709,7 +2709,7 @@ sub_41C0B8_set_status_string(pTmpBuf); goto LABEL_91; case 0x58: - GUIWindow::Create(ptr_5064F8->uX, ptr_5064F8->uY, 0, 0, (enum WindowType)90, (int)ptr_5064F8, 0); + GUIWindow::Create(pBtn_InstallRemoveSpell->uX, pBtn_InstallRemoveSpell->uY, 0, 0, (enum WindowType)90, (int)pBtn_InstallRemoveSpell, 0); if ( !uActiveCharacter ) goto _continue; thisk = pPlayers[uActiveCharacter]; @@ -2879,7 +2879,7 @@ { pGUIWindow_CurrentMenu->Release(); LABEL_693: - GUIWindow::Create(0x1DCu, 0x1C2u, 0, 0, (enum WindowType)90, (int)ptr_5079F8, 0); + GUIWindow::Create(0x1DCu, 0x1C2u, 0, 0, (enum WindowType)90, (int)pBtn_CastSpell, 0); pCurrentScreen = 8; pEventTimer->Pause(); pGUIWindow_CurrentMenu = GUIWindow::Create(0, 0, 640, 480, (enum WindowType)18, 0, 0); @@ -2898,14 +2898,14 @@ ++pIcons_LOD->uTexturePacksCount; if ( !pIcons_LOD->uNumPrevLoadedFiles ) pIcons_LOD->uNumPrevLoadedFiles = pIcons_LOD->uNumLoadedFiles; - GUIWindow::Create(0x230u, 0x1C2u, 0, 0, (enum WindowType)90, (int)ptr_5079F4, 0); + GUIWindow::Create(0x230u, 0x1C2u, 0, 0, (enum WindowType)90, (int)pBtn_QuickReference, 0); viewparams->bRedrawGameUI = v0; pEventTimer->Pause(); pAudioPlayer->StopChannels(-1, -1); pCurrentScreen = 104; pGUIWindow_CurrentMenu = GUIWindow::Create(0, 0, 640, 480, (enum WindowType)12, 5, 0); papredoll_dbrds[2] = pIcons_LOD->LoadTexture("BUTTEXI1", TEXTURE_16BIT_PALETTE); - ptr_5076F4 = pGUIWindow_CurrentMenu->CreateButton( + pBtn_ExitCancel = pGUIWindow_CurrentMenu->CreateButton( 0x187u, 0x13Cu, 0x4Bu, @@ -2933,7 +2933,7 @@ pRenderer->SavePCXImage("gamma.pcx", (char *)uNumSeconds, 155, 117); free((void *)uNumSeconds); stru_506E40._40E55E("gamma.pcx", 0); - GUIWindow::Create(0x25Au, 0x1C2u, 0, 0, (enum WindowType)92, (int)ptr_5079F0, 0); + GUIWindow::Create(0x25Au, 0x1C2u, 0, 0, (enum WindowType)92, (int)pBtn_GameSettings, 0); LABEL_453: if ( (signed int)pMessageQueue_50CBD0->uNumMessages >= 40 ) goto _continue; @@ -2945,19 +2945,19 @@ dword_50651C = -1; goto _continue; case UIMSG_A9: - GUIWindow::Create(ptr_507B9C->uX, ptr_507B9C->uY, 0, 0, (WindowType)(WINDOW_HouseInterior|0x42), (int)ptr_507B9C, 0); + GUIWindow::Create(pBtn_Up->uX, pBtn_Up->uY, 0, 0, (WindowType)(WINDOW_HouseInterior|0x42), (int)pBtn_Up, 0); LABEL_707: dword_506548 = v0; goto _continue; case UIMSG_AA: - GUIWindow::Create(ptr_507BA0->uX, ptr_507BA0->uY, 0, 0, (WindowType)(WINDOW_HouseInterior|0x42), (int)ptr_507BA0, 0); + GUIWindow::Create(pBtn_Down->uX, pBtn_Down->uY, 0, 0, (WindowType)(WINDOW_HouseInterior|0x42), (int)pBtn_Down, 0); LABEL_709: dword_506544 = v0; goto _continue; case 0x55: bRingsShownInCharScreen ^= v0; - GUIButton::_41D0D8(ptr_507694); - GUIButton::_41D0D8(ptr_507690); + GUIButton::_41D0D8(pCharacterScreen_DetalizBtn); + GUIButton::_41D0D8(pCharacterScreen_DollBtn); if ( bRingsShownInCharScreen ) { v128 = (uTextureID_5118C8 != -1 ? pIcons_LOD->pTextures[uTextureID_5118C8].uTextureHeight : 26); @@ -2972,7 +2972,7 @@ v123 = 300; v121 = 600; } - ptr_507694 = pGUIWindow_CurrentMenu->CreateButton( + pCharacterScreen_DetalizBtn = pGUIWindow_CurrentMenu->CreateButton( v121, v123, v125, @@ -2984,7 +2984,7 @@ 0, pGlobalTXT_LocalizationStrings[64],// "Detail Toggle" 0); - ptr_507690 = pGUIWindow_CurrentMenu->CreateButton( + pCharacterScreen_DollBtn = pGUIWindow_CurrentMenu->CreateButton( 0x1DCu, 0, 0xA4u, @@ -3055,9 +3055,9 @@ v142 = (WindowType)91; goto LABEL_731; case UIMSG_A8: - v85 = ptr_50767C; + v85 = pCharacterScreen_ExitBtn; v163 = 0; - v149 = ptr_50767C; + v149 = pCharacterScreen_ExitBtn; v142 = (WindowType)97; goto LABEL_731; case UIMSG_CloseBook|0x4: @@ -3362,10 +3362,9 @@ dword_507BF0_is_there_popup_onscreen = 0; dword_4E455C = 1; dword_50CDCC = 0; - if ( ptr_507BC4 ) + if ( pGUIWindow_ScrollWindow ) free_book_subwindow(); - if ( !pCurrentScreen - && !pGUIWindow_Settings ) + if ( !pCurrentScreen && !pGUIWindow_Settings ) pEventTimer->Resume(); viewparams->bRedrawGameUI = 1; } @@ -3596,7 +3595,7 @@ pCurrentScreen = 0; viewparams->bRedrawGameUI = 1; } - GUIWindow::Create(602, 450, 0, 0, (enum WindowType)92, (int)ptr_5079F0, 0); + GUIWindow::Create(602, 450, 0, 0, (enum WindowType)92, (int)pBtn_GameSettings, 0); if ( (signed int)pMessageQueue_50CBD0->uNumMessages >= 40 ) continue; pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = UIMSG_CloseBook; @@ -8373,8 +8372,8 @@ 0, (Texture *)(uTextureID_507B04 != -1 ? &pIcons_LOD->pTextures[uTextureID_507B04] : 0)); pRenderer->DrawTextureIndexed( - ptr_507694->uX, - ptr_507694->uY, + pCharacterScreen_DetalizBtn->uX, + pCharacterScreen_DetalizBtn->uY, (Texture *)(uTextureID_5118C8 != -1 ? &pIcons_LOD->pTextures[uTextureID_5118C8] : 0)); v3 = 0; v46 = (int)&pPlayer->pEquipment.field_28; @@ -11984,14 +11983,14 @@ //----- (0040D75D) -------------------------------------------------------- -char __fastcall pGUIWindow0_draws_text(int a1, const char *pText, int *pXY) +char __fastcall pPrimaryWindow_draws_text(int a1, const char *pText, int *pXY) { const char *v3; // ST0C_4@1 __int64 v4; // qax@1 v3 = pText; v4 = LOBYTE(pFontComic->uFontHeight) - 3; - return pGUIWindow0->DrawText( + return pPrimaryWindow->DrawText( pFontComic, *pXY, pXY[1] - (((signed int)v4 - HIDWORD(v4)) >> 1) + 3, @@ -15069,8 +15068,8 @@ CharacterUI_InventoryTab_Draw(uActiveCharacter, 1); CharacterUI_DrawPaperdoll(uActiveCharacter); pRenderer->DrawTextureTransparent( - ptr_5076F4->uX, - ptr_5076F4->uY, + pBtn_ExitCancel->uX, + pBtn_ExitCancel->uY, (Texture *)(uTextureID_x_x_u != -1 ? &pIcons_LOD->pTextures[uTextureID_x_x_u] : 0)); } } @@ -15118,8 +15117,8 @@ draw_leather(); CharacterUI_InventoryTab_Draw(uActiveCharacter, 1); pRenderer->DrawTextureIndexed( - ptr_5076F4->uX, - ptr_5076F4->uY, + pBtn_ExitCancel->uX, + pBtn_ExitCancel->uY, (Texture *)(uTextureID_506438 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_506438] : 0)); } } @@ -15829,7 +15828,7 @@ return; } } - if ( pParty->pPickedItem.uItemID ) + if ( pParty->pPickedItem.uItemID )//нажатие на портрет перса правой кнопкой мыши с раствором { //v1 = 0; //do @@ -15869,8 +15868,8 @@ v9 = pX + pSRZBufferLineOffsets[pY]; if ( !(pRenderer->pActiveZBuffer[v9] & 0xFFFF) ) goto LABEL_132; - v8 = (ItemGen *)(&pOtherOverlayList->pOverlays[49].field_4 + 2662 * (unsigned int)ptr_507BB8->ptr_1C + 18* *((short *)&pChests[0].mm7__vector_pItems[139].uExpireTime - + (pRenderer->pActiveZBuffer[v9] & 0xFFFF) + 2662 * (unsigned int)ptr_507BB8->ptr_1C + 3)); + v8 = (ItemGen *)(&pOtherOverlayList->pOverlays[49].field_4 + 2662 * (unsigned int)pChestWindow->ptr_1C + 18* *((short *)&pChests[0].mm7__vector_pItems[139].uExpireTime + + (pRenderer->pActiveZBuffer[v9] & 0xFFFF) + 2662 * (unsigned int)pChestWindow->ptr_1C + 3)); } else { @@ -17426,7 +17425,7 @@ i->uX = 0; } } - ptr_507B9C = pGUIWindow_CurrentMenu->CreateButton( + pBtn_Up = pGUIWindow_CurrentMenu->CreateButton( 0x1B6u, 0x2Eu, (uTextureID_ar_up_up != -1 ? pIcons_LOD->pTextures[uTextureID_ar_up_up].uTextureWidth : 24), @@ -17440,7 +17439,7 @@ (Texture *)(uTextureID_ar_up_up != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_ar_up_up] : 0), uTextureID_ar_up_dn != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_ar_up_dn] : 0, 0); - ptr_507BA0 = pGUIWindow_CurrentMenu->CreateButton( + pBtn_Down = pGUIWindow_CurrentMenu->CreateButton( 0x1B6u, 0x124u, (uTextureID_ar_dn_up != -1 ? pIcons_LOD->pTextures[uTextureID_ar_dn_up].uTextureWidth : 24), @@ -17480,10 +17479,10 @@ { dword_507CBC = 0; GUIButton::_41D0D8(ptr_507BA4); - GUIButton::_41D0D8(ptr_507B9C); - GUIButton::_41D0D8(ptr_507BA0); - ptr_507BA0 = 0; - ptr_507B9C = 0; + GUIButton::_41D0D8(pBtn_Up); + GUIButton::_41D0D8(pBtn_Down); + pBtn_Down = 0; + pBtn_Up = 0; for ( i = pGUIWindow_CurrentMenu->pControlsHead; i; i = i->pNext ) { if ( i->uControlID == 120 )
--- a/mm7_6.cpp Tue Dec 11 17:23:17 2012 +0600 +++ b/mm7_6.cpp Wed Dec 12 12:52:40 2012 +0600 @@ -2422,7 +2422,7 @@ if ( HIBYTE(v6) & 2 && !pGUIWindow_Settings ) { pGUIWindow_Settings = GUIWindow::Create(0, 0, 640, 480, (WindowType)(WINDOW_HouseInterior|0x2), 20 * result + 5292232, 0); - ptr_5079EC = pGUIWindow_Settings->CreateButton( + pBtn_NPCLeft = pGUIWindow_Settings->CreateButton( 0x1D5u, 0xB2u, (uTextureID_507990 != -1 ? pIcons_LOD->pTextures[uTextureID_507990].uTextureWidth : 24), @@ -2435,7 +2435,7 @@ "", (Texture *)(uTextureID_507990 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_507990] : 0), 0); - ptr_5079E8 = pGUIWindow_Settings->CreateButton( + pBtn_NPCRight = pGUIWindow_Settings->CreateButton( 0x272u, 0xB2u, (uTextureID_50798C != -1 ? pIcons_LOD->pTextures[uTextureID_50798C].uTextureWidth : 24), @@ -8847,7 +8847,7 @@ void __cdecl sub_42FBDD() { pAudioPlayer->PlaySound((SoundID)75, 0, 0, -1, 0, 0, 0, 0); - pRenderer->DrawTextureTransparent(ptr_5076FC->uX, ptr_5076FC->uY, ptr_5076FC->pTextures[0]); + pRenderer->DrawTextureTransparent(pBtn_YES->uX, pBtn_YES->uY, pBtn_YES->pTextures[0]); pRenderer->Present(); } @@ -8855,7 +8855,7 @@ void __cdecl sub_42FC15() { pAudioPlayer->PlaySound((SoundID)75, -2, 0, -1, 0, 0, 0, 0); - pRenderer->DrawTextureTransparent(ptr_5076F4->uX, ptr_5076F4->uY, ptr_5076F4->pTextures[0]); + pRenderer->DrawTextureTransparent(pBtn_ExitCancel->uX, pBtn_ExitCancel->uY, pBtn_ExitCancel->pTextures[0]); pRenderer->Present(); }
--- a/mm7_data.h Tue Dec 11 17:23:17 2012 +0600 +++ b/mm7_data.h Wed Dec 12 12:52:40 2012 +0600 @@ -1788,7 +1788,7 @@ int __fastcall am_40D402(int, int); // weak int __cdecl am_40D444(); struct GUIWindow *__fastcall ModalWindow(const char *pStr, int a4); -char __fastcall pGUIWindow0_draws_text(int a1, const char *pText, int *pXY); +char __fastcall pPrimaryWindow_draws_text(int a1, const char *pText, int *pXY); void __thiscall am_BeginScene(unsigned __int16 *pPcxPixels, int a2, int a3); // idb void __fastcall Blt_Chroma(struct ArcomageRect *pSrcXYZW, int *pTargetXY, int a3, int a4); void __fastcall Blt_Copy(struct ArcomageRect *pSrcXYZW, int *pTargetXY, int a3);