Mercurial > mm7

changeset 1667:c586fa9e4cbb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
MainMenuUI_Credits_Loop() cleaning(continue)
author Ritor1
date Wed, 18 Sep 2013 17:23:54 +0600
parents 5302a9811767
children 4bbb80c7dba7 53291e8f3848
files Texture.cpp Texture.h UI/UIMainMenu.cpp
diffstat 3 files changed, 218 insertions(+), 227 deletions(-) [+]
line wrap: on
line diff
--- a/Texture.cpp	Wed Sep 18 16:20:15 2013 +0600
+++ b/Texture.cpp	Wed Sep 18 17:23:54 2013 +0600
@@ -129,7 +129,9 @@
 
 
 unsigned int uTextureID_ib_td5_A;
-unsigned int uTextureID_ib_td2_A; // weak
+unsigned int uTextureID_ib_td4_A;
+unsigned int uTextureID_ib_td3_A;
+unsigned int uTextureID_ib_td2_A;
 unsigned int uTextureID_ib_td1_A;
 int uTextureID_CharacterUI_InventoryBackground; // weak
 int uTextureID_50795C; // weak
--- a/Texture.h	Wed Sep 18 16:20:15 2013 +0600
+++ b/Texture.h	Wed Sep 18 17:23:54 2013 +0600
@@ -228,7 +228,9 @@
 
 
 extern unsigned int uTextureID_ib_td5_A;
-extern unsigned int uTextureID_ib_td2_A; // weak
+extern unsigned int uTextureID_ib_td4_A;
+extern unsigned int uTextureID_ib_td3_A;
+extern unsigned int uTextureID_ib_td2_A;
 extern unsigned int uTextureID_ib_td1_A;
 extern int uTextureID_CharacterUI_InventoryBackground; // weak
 extern int uTextureID_50795C; // weak
--- a/UI/UIMainMenu.cpp	Wed Sep 18 16:20:15 2013 +0600
+++ b/UI/UIMainMenu.cpp	Wed Sep 18 17:23:54 2013 +0600
@@ -67,253 +67,240 @@
 //----- (0041B690) --------------------------------------------------------
 void MainMenuUI_Create()
 {
-    unsigned int v14; // eax@1
-    unsigned int uTextureID_ib_td4_A; // eax@1
+  pIconsFrameTable->InitializeAnimation(pIconsFrameTable->FindIcon("wizeyeC"));
+  pIconsFrameTable->InitializeAnimation(pIconsFrameTable->FindIcon("wizeyeB"));
+  pIconsFrameTable->InitializeAnimation(pIconsFrameTable->FindIcon("wizeyeA"));
+  pIconsFrameTable->InitializeAnimation(pIconsFrameTable->FindIcon("torchC"));
+  pIconsFrameTable->InitializeAnimation(pIconsFrameTable->FindIcon("torchB"));
+  pIconsFrameTable->InitializeAnimation(pIconsFrameTable->FindIcon("torchA"));
 
-    pIconsFrameTable->InitializeAnimation(pIconsFrameTable->FindIcon("wizeyeC"));
-    pIconsFrameTable->InitializeAnimation(pIconsFrameTable->FindIcon("wizeyeB"));
-    pIconsFrameTable->InitializeAnimation(pIconsFrameTable->FindIcon("wizeyeA"));
-    pIconsFrameTable->InitializeAnimation(pIconsFrameTable->FindIcon("torchC"));
-    pIconsFrameTable->InitializeAnimation(pIconsFrameTable->FindIcon("torchB"));
-    pIconsFrameTable->InitializeAnimation(pIconsFrameTable->FindIcon("torchA"));
-
-    pTextureIDs_pMapDirs[0] = pIcons_LOD->LoadTexture("MAPDIR1", TEXTURE_16BIT_PALETTE);
-    pTextureIDs_pMapDirs[1] = pIcons_LOD->LoadTexture("MAPDIR2", TEXTURE_16BIT_PALETTE);
-    pTextureIDs_pMapDirs[2] = pIcons_LOD->LoadTexture("MAPDIR3", TEXTURE_16BIT_PALETTE);
-    pTextureIDs_pMapDirs[3] = pIcons_LOD->LoadTexture("MAPDIR4", TEXTURE_16BIT_PALETTE);
-    pTextureIDs_pMapDirs[4] = pIcons_LOD->LoadTexture("MAPDIR5", TEXTURE_16BIT_PALETTE);
-    pTextureIDs_pMapDirs[5] = pIcons_LOD->LoadTexture("MAPDIR6", TEXTURE_16BIT_PALETTE);
-    pTextureIDs_pMapDirs[6] = pIcons_LOD->LoadTexture("MAPDIR7", TEXTURE_16BIT_PALETTE);
-    pTextureIDs_pMapDirs[7] = pIcons_LOD->LoadTexture("MAPDIR8", TEXTURE_16BIT_PALETTE);
+  pTextureIDs_pMapDirs[0] = pIcons_LOD->LoadTexture("MAPDIR1", TEXTURE_16BIT_PALETTE);
+  pTextureIDs_pMapDirs[1] = pIcons_LOD->LoadTexture("MAPDIR2", TEXTURE_16BIT_PALETTE);
+  pTextureIDs_pMapDirs[2] = pIcons_LOD->LoadTexture("MAPDIR3", TEXTURE_16BIT_PALETTE);
+  pTextureIDs_pMapDirs[3] = pIcons_LOD->LoadTexture("MAPDIR4", TEXTURE_16BIT_PALETTE);
+  pTextureIDs_pMapDirs[4] = pIcons_LOD->LoadTexture("MAPDIR5", TEXTURE_16BIT_PALETTE);
+  pTextureIDs_pMapDirs[5] = pIcons_LOD->LoadTexture("MAPDIR6", TEXTURE_16BIT_PALETTE);
+  pTextureIDs_pMapDirs[6] = pIcons_LOD->LoadTexture("MAPDIR7", TEXTURE_16BIT_PALETTE);
+  pTextureIDs_pMapDirs[7] = pIcons_LOD->LoadTexture("MAPDIR8", TEXTURE_16BIT_PALETTE);
 
-    uTextureID_BarBlue = pIcons_LOD->LoadTexture("ib-statB", TEXTURE_16BIT_PALETTE);
-    uTextureID_BarGreen = pIcons_LOD->LoadTexture("ib-statG", TEXTURE_16BIT_PALETTE);
-    uTextureID_BarYellow = pIcons_LOD->LoadTexture("ib-statY", TEXTURE_16BIT_PALETTE);
-    uTextureID_BarRed = pIcons_LOD->LoadTexture("ib-statR", TEXTURE_16BIT_PALETTE);
-    uTextureID_mhp_bd = pIcons_LOD->LoadTexture("mhp_bg", TEXTURE_16BIT_PALETTE);
-    uTextureID_mhp_capl = pIcons_LOD->LoadTexture("mhp_capl", TEXTURE_16BIT_PALETTE);
-    uTextureID_mhp_capr = pIcons_LOD->LoadTexture("mhp_capr", TEXTURE_16BIT_PALETTE);
-    uTextureID_mhp_grn = pIcons_LOD->LoadTexture("mhp_grn", TEXTURE_16BIT_PALETTE);
-    uTextureID_mhp_red = pIcons_LOD->LoadTexture("mhp_red", TEXTURE_16BIT_PALETTE);
-    uTextureID_mhp_yel = pIcons_LOD->LoadTexture("mhp_yel", TEXTURE_16BIT_PALETTE);
-    uTextureID_Leather = pIcons_LOD->LoadTexture("LEATHER", TEXTURE_16BIT_PALETTE);
-    pTexture_Leather = pIcons_LOD->LoadTexturePtr("ibground", TEXTURE_16BIT_PALETTE);
-    uTextureID_x_x_u = pIcons_LOD->LoadTexture("x_x_u", TEXTURE_16BIT_PALETTE);
-    uTextureID_BUTTDESC2 = pIcons_LOD->LoadTexture("BUTTESC2", TEXTURE_16BIT_PALETTE);
-    uTextureID_x_ok_u = pIcons_LOD->LoadTexture("x_ok_u", TEXTURE_16BIT_PALETTE);
-    uTextureID_BUTTYES2 = pIcons_LOD->LoadTexture("BUTTYES2", TEXTURE_16BIT_PALETTE);
-    uTextureID_BUTTMAKE = pIcons_LOD->LoadTexture("BUTTMAKE", TEXTURE_16BIT_PALETTE);
-    uTextureID_BUTTMAKE2 = pIcons_LOD->LoadTexture("BUTTMAKE2", TEXTURE_16BIT_PALETTE);
+  uTextureID_BarBlue = pIcons_LOD->LoadTexture("ib-statB", TEXTURE_16BIT_PALETTE);
+  uTextureID_BarGreen = pIcons_LOD->LoadTexture("ib-statG", TEXTURE_16BIT_PALETTE);
+  uTextureID_BarYellow = pIcons_LOD->LoadTexture("ib-statY", TEXTURE_16BIT_PALETTE);
+  uTextureID_BarRed = pIcons_LOD->LoadTexture("ib-statR", TEXTURE_16BIT_PALETTE);
+  uTextureID_mhp_bd = pIcons_LOD->LoadTexture("mhp_bg", TEXTURE_16BIT_PALETTE);
+  uTextureID_mhp_capl = pIcons_LOD->LoadTexture("mhp_capl", TEXTURE_16BIT_PALETTE);
+  uTextureID_mhp_capr = pIcons_LOD->LoadTexture("mhp_capr", TEXTURE_16BIT_PALETTE);
+  uTextureID_mhp_grn = pIcons_LOD->LoadTexture("mhp_grn", TEXTURE_16BIT_PALETTE);
+  uTextureID_mhp_red = pIcons_LOD->LoadTexture("mhp_red", TEXTURE_16BIT_PALETTE);
+  uTextureID_mhp_yel = pIcons_LOD->LoadTexture("mhp_yel", TEXTURE_16BIT_PALETTE);
+  uTextureID_Leather = pIcons_LOD->LoadTexture("LEATHER", TEXTURE_16BIT_PALETTE);
+  pTexture_Leather = pIcons_LOD->LoadTexturePtr("ibground", TEXTURE_16BIT_PALETTE);
+  uTextureID_x_x_u = pIcons_LOD->LoadTexture("x_x_u", TEXTURE_16BIT_PALETTE);
+  uTextureID_BUTTDESC2 = pIcons_LOD->LoadTexture("BUTTESC2", TEXTURE_16BIT_PALETTE);
+  uTextureID_x_ok_u = pIcons_LOD->LoadTexture("x_ok_u", TEXTURE_16BIT_PALETTE);
+  uTextureID_BUTTYES2 = pIcons_LOD->LoadTexture("BUTTYES2", TEXTURE_16BIT_PALETTE);
+  uTextureID_BUTTMAKE = pIcons_LOD->LoadTexture("BUTTMAKE", TEXTURE_16BIT_PALETTE);
+  uTextureID_BUTTMAKE2 = pIcons_LOD->LoadTexture("BUTTMAKE2", TEXTURE_16BIT_PALETTE);
 
-    pPrimaryWindow = GUIWindow::Create(0, 0, 640, 480, WINDOW_MainMenu, 0, 0);
-    pPrimaryWindow->CreateButton(7, 8, 460, 343, 1, 0, UIMSG_MouseLeftClickInGame, 0, 0, "", 0);
+  pPrimaryWindow = GUIWindow::Create(0, 0, 640, 480, WINDOW_MainMenu, 0, 0);
+  pPrimaryWindow->CreateButton(7, 8, 460, 343, 1, 0, UIMSG_MouseLeftClickInGame, 0, 0, "", 0);
 
-    pPrimaryWindow->CreateButton(61, 424, 31, 40, 2, 94, UIMSG_SelectCharacter, 1, '1', "", 0);
-    pPrimaryWindow->CreateButton(177, 424, 31, 40, 2, 94, UIMSG_SelectCharacter, 2, '2', "", 0);
-    pPrimaryWindow->CreateButton(292, 424, 31, 40, 2, 94, UIMSG_SelectCharacter, 3, '3', "", 0);
-    pPrimaryWindow->CreateButton(407, 424, 31, 40, 2, 94, UIMSG_SelectCharacter, 4, '4', "", 0);
+  pPrimaryWindow->CreateButton(61, 424, 31, 40, 2, 94, UIMSG_SelectCharacter, 1, '1', "", 0);
+  pPrimaryWindow->CreateButton(177, 424, 31, 40, 2, 94, UIMSG_SelectCharacter, 2, '2', "", 0);
+  pPrimaryWindow->CreateButton(292, 424, 31, 40, 2, 94, UIMSG_SelectCharacter, 3, '3', "", 0);
+  pPrimaryWindow->CreateButton(407, 424, 31, 40, 2, 94, UIMSG_SelectCharacter, 4, '4', "", 0);
 
-    pPrimaryWindow->CreateButton(24, 404, 5, 49, 1, 93, UIMSG_0, 1, 0, "", 0);
-    pPrimaryWindow->CreateButton(139, 404, 5, 49, 1, 93, UIMSG_0, 2, 0, "", 0);
-    pPrimaryWindow->CreateButton(255, 404, 5, 49, 1, 93, UIMSG_0, 3, 0, "", 0);
-    pPrimaryWindow->CreateButton(370, 404, 5, 49, 1, 93, UIMSG_0, 4, 0, "", 0);
+  pPrimaryWindow->CreateButton(24, 404, 5, 49, 1, 93, UIMSG_0, 1, 0, "", 0);
+  pPrimaryWindow->CreateButton(139, 404, 5, 49, 1, 93, UIMSG_0, 2, 0, "", 0);
+  pPrimaryWindow->CreateButton(255, 404, 5, 49, 1, 93, UIMSG_0, 3, 0, "", 0);
+  pPrimaryWindow->CreateButton(370, 404, 5, 49, 1, 93, UIMSG_0, 4, 0, "", 0);
 
-    pPrimaryWindow->CreateButton(97, 404, 5, 49, 1, 93, UIMSG_0, 1, 0, "", 0);
-    pPrimaryWindow->CreateButton(212, 404, 5, 49, 1, 93, UIMSG_0, 2, 0, "", 0);
-    pPrimaryWindow->CreateButton(328, 404, 5, 49, 1, 93, UIMSG_0, 3, 0, "", 0);
-    pPrimaryWindow->CreateButton(443, 404, 5, 49, 1, 93, UIMSG_0, 4, 0, "", 0);
+  pPrimaryWindow->CreateButton(97, 404, 5, 49, 1, 93, UIMSG_0, 1, 0, "", 0);
+  pPrimaryWindow->CreateButton(212, 404, 5, 49, 1, 93, UIMSG_0, 2, 0, "", 0);
+  pPrimaryWindow->CreateButton(328, 404, 5, 49, 1, 93, UIMSG_0, 3, 0, "", 0);
+  pPrimaryWindow->CreateButton(443, 404, 5, 49, 1, 93, UIMSG_0, 4, 0, "", 0);
 
-    uTextureID_ib_td1_A = pIcons_LOD->LoadTexture("ib-td1-A", TEXTURE_16BIT_PALETTE);
-    pBtn_Quests = pPrimaryWindow->CreateButton(491, 353, pIcons_LOD->GetTexture(uTextureID_ib_td1_A)->uTextureWidth,
-        pIcons_LOD->GetTexture(uTextureID_ib_td1_A)->uTextureHeight, 1, 0, UIMSG_OpenQuestBook, 0, pKeyActionMap->GetActionVKey(INPUT_Quest),
-        pGlobalTXT_LocalizationStrings[174], pIcons_LOD->GetTexture(uTextureID_ib_td1_A), 0); //Quests
+  uTextureID_ib_td1_A = pIcons_LOD->LoadTexture("ib-td1-A", TEXTURE_16BIT_PALETTE);
+  pBtn_Quests = pPrimaryWindow->CreateButton(491, 353, pIcons_LOD->GetTexture(uTextureID_ib_td1_A)->uTextureWidth,
+      pIcons_LOD->GetTexture(uTextureID_ib_td1_A)->uTextureHeight, 1, 0, UIMSG_OpenQuestBook, 0, pKeyActionMap->GetActionVKey(INPUT_Quest),
+      pGlobalTXT_LocalizationStrings[174], pIcons_LOD->GetTexture(uTextureID_ib_td1_A), 0); //Quests
 
-    uTextureID_ib_td2_A = pIcons_LOD->LoadTexture("ib-td2-A", TEXTURE_16BIT_PALETTE);
-    pBtn_Autonotes = pPrimaryWindow->CreateButton(527, 353, pIcons_LOD->GetTexture(uTextureID_ib_td2_A)->uTextureWidth,
-       pIcons_LOD->GetTexture(uTextureID_ib_td2_A)->uTextureHeight, 1, 0, UIMSG_OpenAutonotes, 0, pKeyActionMap->GetActionVKey(INPUT_Autonotes),
-       pGlobalTXT_LocalizationStrings[154], pIcons_LOD->GetTexture(uTextureID_ib_td2_A), 0);//Autonotes
+  uTextureID_ib_td2_A = pIcons_LOD->LoadTexture("ib-td2-A", TEXTURE_16BIT_PALETTE);
+  pBtn_Autonotes = pPrimaryWindow->CreateButton(527, 353, pIcons_LOD->GetTexture(uTextureID_ib_td2_A)->uTextureWidth,
+     pIcons_LOD->GetTexture(uTextureID_ib_td2_A)->uTextureHeight, 1, 0, UIMSG_OpenAutonotes, 0, pKeyActionMap->GetActionVKey(INPUT_Autonotes),
+     pGlobalTXT_LocalizationStrings[154], pIcons_LOD->GetTexture(uTextureID_ib_td2_A), 0);//Autonotes
 
-    v14 = pIcons_LOD->LoadTexture("ib-td3-A", TEXTURE_16BIT_PALETTE);
-    pBtn_Maps = pPrimaryWindow->CreateButton(546, 353, pIcons_LOD->GetTexture(v14)->uTextureWidth,
-       pIcons_LOD->GetTexture(v14)->uTextureHeight, 1, 0, UIMSG_OpenMapBook, 0, pKeyActionMap->GetActionVKey(INPUT_Mapbook),
-       pGlobalTXT_LocalizationStrings[139], pIcons_LOD->GetTexture(v14), 0); //Maps
+  uTextureID_ib_td3_A = pIcons_LOD->LoadTexture("ib-td3-A", TEXTURE_16BIT_PALETTE);
+  pBtn_Maps = pPrimaryWindow->CreateButton(546, 353, pIcons_LOD->GetTexture(uTextureID_ib_td3_A)->uTextureWidth,
+     pIcons_LOD->GetTexture(uTextureID_ib_td3_A)->uTextureHeight, 1, 0, UIMSG_OpenMapBook, 0, pKeyActionMap->GetActionVKey(INPUT_Mapbook),
+     pGlobalTXT_LocalizationStrings[139], pIcons_LOD->GetTexture(uTextureID_ib_td3_A), 0); //Maps
 
-    uTextureID_ib_td4_A = pIcons_LOD->LoadTexture("ib-td4-A", TEXTURE_16BIT_PALETTE);
-    pBtn_Calendar = pPrimaryWindow->CreateButton(570, 353, pIcons_LOD->GetTexture(uTextureID_ib_td4_A)->uTextureWidth,
-       pIcons_LOD->GetTexture(uTextureID_ib_td4_A)->uTextureHeight, 1, 0, UIMSG_OpenCalendar, 0, pKeyActionMap->GetActionVKey(INPUT_TimeCal),
-       pGlobalTXT_LocalizationStrings[78], pIcons_LOD->GetTexture(uTextureID_ib_td4_A), 0);//Calendar
+  uTextureID_ib_td4_A = pIcons_LOD->LoadTexture("ib-td4-A", TEXTURE_16BIT_PALETTE);
+  pBtn_Calendar = pPrimaryWindow->CreateButton(570, 353, pIcons_LOD->GetTexture(uTextureID_ib_td4_A)->uTextureWidth,
+     pIcons_LOD->GetTexture(uTextureID_ib_td4_A)->uTextureHeight, 1, 0, UIMSG_OpenCalendar, 0, pKeyActionMap->GetActionVKey(INPUT_TimeCal),
+     pGlobalTXT_LocalizationStrings[78], pIcons_LOD->GetTexture(uTextureID_ib_td4_A), 0);//Calendar
 
-    uTextureID_ib_td5_A = pIcons_LOD->LoadTexture("ib-td5-A", TEXTURE_16BIT_PALETTE);
-    pBtn_History = pPrimaryWindow->CreateButton(600, 361, pIcons_LOD->GetTexture(uTextureID_ib_td5_A)->uTextureWidth,
-        pIcons_LOD->GetTexture(uTextureID_ib_td5_A)->uTextureHeight, 1, 0, UIMSG_OpenHistoryBook, 0, 72,
-        pGlobalTXT_LocalizationStrings[602], pIcons_LOD->GetTexture(uTextureID_ib_td5_A), 0);//History
+  uTextureID_ib_td5_A = pIcons_LOD->LoadTexture("ib-td5-A", TEXTURE_16BIT_PALETTE);
+  pBtn_History = pPrimaryWindow->CreateButton(600, 361, pIcons_LOD->GetTexture(uTextureID_ib_td5_A)->uTextureWidth,
+      pIcons_LOD->GetTexture(uTextureID_ib_td5_A)->uTextureHeight, 1, 0, UIMSG_OpenHistoryBook, 0, 72,//ascii
+      pGlobalTXT_LocalizationStrings[602], pIcons_LOD->GetTexture(uTextureID_ib_td5_A), 0);//History
 
-    bFlashAutonotesBook = 0;
-    bFlashQuestBook = 0;
-    bFlashHistoryBook = 0;
+  bFlashAutonotesBook = 0;
+  bFlashQuestBook = 0;
+  bFlashHistoryBook = 0;
 
-    pBtn_ZoomIn = pPrimaryWindow->CreateButton(574, 136, pIcons_LOD->pTextures[uTextureID_Btn_ZoomIn].uTextureWidth,
-       pIcons_LOD->pTextures[uTextureID_Btn_ZoomIn].uTextureHeight, 2, 0, UIMSG_ClickZoomInBtn, 0, pKeyActionMap->GetActionVKey(INPUT_ZoomIn),
-       pGlobalTXT_LocalizationStrings[252], &pIcons_LOD->pTextures[uTextureID_Btn_ZoomIn], 0); // Zoom In
+  pBtn_ZoomIn = pPrimaryWindow->CreateButton(574, 136, pIcons_LOD->pTextures[uTextureID_Btn_ZoomIn].uTextureWidth,
+     pIcons_LOD->pTextures[uTextureID_Btn_ZoomIn].uTextureHeight, 2, 0, UIMSG_ClickZoomInBtn, 0, pKeyActionMap->GetActionVKey(INPUT_ZoomIn),
+     pGlobalTXT_LocalizationStrings[252], &pIcons_LOD->pTextures[uTextureID_Btn_ZoomIn], 0); // Zoom In
 
-    pBtn_ZoomOut = pPrimaryWindow->CreateButton(519, 136, pIcons_LOD->pTextures[uTextureID_Btn_ZoomOut].uTextureWidth,
-       pIcons_LOD->pTextures[uTextureID_Btn_ZoomOut].uTextureHeight, 2, 0, UIMSG_ClickZoomOutBtn, 0, pKeyActionMap->GetActionVKey(INPUT_ZoomOut),
-       pGlobalTXT_LocalizationStrings[251], &pIcons_LOD->pTextures[uTextureID_Btn_ZoomOut], 0); // Zoom Out
+  pBtn_ZoomOut = pPrimaryWindow->CreateButton(519, 136, pIcons_LOD->pTextures[uTextureID_Btn_ZoomOut].uTextureWidth,
+     pIcons_LOD->pTextures[uTextureID_Btn_ZoomOut].uTextureHeight, 2, 0, UIMSG_ClickZoomOutBtn, 0, pKeyActionMap->GetActionVKey(INPUT_ZoomOut),
+     pGlobalTXT_LocalizationStrings[251], &pIcons_LOD->pTextures[uTextureID_Btn_ZoomOut], 0); // Zoom Out
 
-    pPrimaryWindow->CreateButton(481, 0, 153, 67, 1, 92, UIMSG_0, 0, 0, "", 0);
-    pPrimaryWindow->CreateButton(491, 149, 64, 74, 1, 0, UIMSG_StartHireling1Dialogue, 0, '5', "", 0);
-    pPrimaryWindow->CreateButton(561, 149, 64, 74, 1, 0, UIMSG_StartHireling2Dialogue, 0, '6', "", 0);
-    pPrimaryWindow->CreateButton(476, 322, 77, 17, 1, 100, UIMSG_0, 0, 0, "", 0);
-    pPrimaryWindow->CreateButton(555, 322, 77, 17, 1, 101, UIMSG_0, 0, 0, "", 0);
+  pPrimaryWindow->CreateButton(481, 0, 153, 67, 1, 92, UIMSG_0, 0, 0, "", 0);
+  pPrimaryWindow->CreateButton(491, 149, 64, 74, 1, 0, UIMSG_StartHireling1Dialogue, 0, '5', "", 0);
+  pPrimaryWindow->CreateButton(561, 149, 64, 74, 1, 0, UIMSG_StartHireling2Dialogue, 0, '6', "", 0);
+  pPrimaryWindow->CreateButton(476, 322, 77, 17, 1, 100, UIMSG_0, 0, 0, "", 0);
+  pPrimaryWindow->CreateButton(555, 322, 77, 17, 1, 101, UIMSG_0, 0, 0, "", 0);
 
-    pBtn_CastSpell = pPrimaryWindow->CreateButton(476, 450,
-        pIcons_LOD->GetTexture(uTextureID_Btn_CastSpell)->uTextureWidth,
-        pIcons_LOD->GetTexture(uTextureID_Btn_CastSpell)->uTextureHeight,
-        1, 0, UIMSG_SpellBookWindow, 0, 67, pGlobalTXT_LocalizationStrings[38], pIcons_LOD->GetTexture(uTextureID_Btn_CastSpell), 0);
-    pBtn_Rest = pPrimaryWindow->CreateButton(518, 450,
-        pIcons_LOD->GetTexture(uTextureID_Btn_Rest)->uTextureWidth,
-        pIcons_LOD->GetTexture(uTextureID_Btn_Rest)->uTextureHeight,
-        1, 0, UIMSG_RestWindow, 0, 82, pGlobalTXT_LocalizationStrings[182], pIcons_LOD->GetTexture(uTextureID_Btn_Rest), 0);
-    pBtn_QuickReference = pPrimaryWindow->CreateButton(560, 450,
-        pIcons_LOD->GetTexture(uTextureID_Btn_QuickReference)->uTextureWidth,
-        pIcons_LOD->GetTexture(uTextureID_Btn_QuickReference)->uTextureHeight,
-        1, 0, UIMSG_QuickReference, 0, 90, pGlobalTXT_LocalizationStrings[173], pIcons_LOD->GetTexture(uTextureID_Btn_QuickReference), 0);
-    pBtn_GameSettings = pPrimaryWindow->CreateButton(602, 450,
-        pIcons_LOD->GetTexture(uTextureID_Btn_GameSettings)->uTextureWidth,
-        pIcons_LOD->GetTexture(uTextureID_Btn_GameSettings)->uTextureHeight,
-        1, 0, UIMSG_GameMenuButton, 0, 0, pGlobalTXT_LocalizationStrings[93], pIcons_LOD->GetTexture(uTextureID_Btn_GameSettings), 0);
+  pBtn_CastSpell = pPrimaryWindow->CreateButton(476, 450,
+      pIcons_LOD->GetTexture(uTextureID_Btn_CastSpell)->uTextureWidth,
+      pIcons_LOD->GetTexture(uTextureID_Btn_CastSpell)->uTextureHeight,
+      1, 0, UIMSG_SpellBookWindow, 0, 67, pGlobalTXT_LocalizationStrings[38], pIcons_LOD->GetTexture(uTextureID_Btn_CastSpell), 0);
+  pBtn_Rest = pPrimaryWindow->CreateButton(518, 450,
+      pIcons_LOD->GetTexture(uTextureID_Btn_Rest)->uTextureWidth,
+      pIcons_LOD->GetTexture(uTextureID_Btn_Rest)->uTextureHeight,
+      1, 0, UIMSG_RestWindow, 0, 82, pGlobalTXT_LocalizationStrings[182], pIcons_LOD->GetTexture(uTextureID_Btn_Rest), 0);
+  pBtn_QuickReference = pPrimaryWindow->CreateButton(560, 450,
+      pIcons_LOD->GetTexture(uTextureID_Btn_QuickReference)->uTextureWidth,
+      pIcons_LOD->GetTexture(uTextureID_Btn_QuickReference)->uTextureHeight,
+      1, 0, UIMSG_QuickReference, 0, 90, pGlobalTXT_LocalizationStrings[173], pIcons_LOD->GetTexture(uTextureID_Btn_QuickReference), 0);
+  pBtn_GameSettings = pPrimaryWindow->CreateButton(602, 450,
+      pIcons_LOD->GetTexture(uTextureID_Btn_GameSettings)->uTextureWidth,
+      pIcons_LOD->GetTexture(uTextureID_Btn_GameSettings)->uTextureHeight,
+      1, 0, UIMSG_GameMenuButton, 0, 0, pGlobalTXT_LocalizationStrings[93], pIcons_LOD->GetTexture(uTextureID_Btn_GameSettings), 0);
 
-    pBtn_NPCLeft = pPrimaryWindow->CreateButton(469, 178,
-        pIcons_LOD->GetTexture(uTextureID_Btn_NPCLeft)->uTextureWidth,
-        pIcons_LOD->GetTexture(uTextureID_Btn_NPCLeft)->uTextureHeight,
-        1, 0, UIMSG_ScrollNPCPanel, 0, 0, "", pIcons_LOD->GetTexture(uTextureID_Btn_NPCLeft), 0);
-    pBtn_NPCRight = pPrimaryWindow->CreateButton(626, 178,
-        pIcons_LOD->GetTexture(uTextureID_Btn_NPCRight)->uTextureWidth,
-        pIcons_LOD->GetTexture(uTextureID_Btn_NPCRight)->uTextureHeight,
-        1, 0, UIMSG_ScrollNPCPanel, 1, 0, "", pIcons_LOD->GetTexture(uTextureID_Btn_NPCRight), 0);
-    LoadPartyBuffIcons();
+  pBtn_NPCLeft = pPrimaryWindow->CreateButton(469, 178,
+      pIcons_LOD->GetTexture(uTextureID_Btn_NPCLeft)->uTextureWidth,
+      pIcons_LOD->GetTexture(uTextureID_Btn_NPCLeft)->uTextureHeight,
+      1, 0, UIMSG_ScrollNPCPanel, 0, 0, "", pIcons_LOD->GetTexture(uTextureID_Btn_NPCLeft), 0);
+  pBtn_NPCRight = pPrimaryWindow->CreateButton(626, 178,
+      pIcons_LOD->GetTexture(uTextureID_Btn_NPCRight)->uTextureWidth,
+      pIcons_LOD->GetTexture(uTextureID_Btn_NPCRight)->uTextureHeight,
+      1, 0, UIMSG_ScrollNPCPanel, 1, 0, "", pIcons_LOD->GetTexture(uTextureID_Btn_NPCRight), 0);
+  LoadPartyBuffIcons();
 }
 
 //----- (004979D2) --------------------------------------------------------
 MENU_STATE MainMenuUI_Credits_Loop()
 {
-        char *v0; // eax@5
-        char *v1; // edi@5
-        FILE *pFile; // eax@5
-        unsigned int pSize; // esi@7
-        GUIFont *pFont; // edx@9
-        GUIFont *pFont2; // ecx@9
-        __int16 pHeight; // ax@9
-        void *v7; // eax@9
-        unsigned int pNumPixels; // ST2C_4@9
-        unsigned int teal; // eax@9
-        unsigned int v10; // ST2C_4@19
-        MSG Msg; // [sp+84h] [bp-B8h]@10
-        int v17; // [sp+A0h] [bp-9Ch]@9
-        GUIWindow a2;
-        int pColor2; // [sp+F8h] [bp-44h]@9
-        int pColor1; // [sp+FCh] [bp-40h]@9
-        int a5; // [sp+128h] [bp-14h]@1
-        char *pString; // [sp+12Ch] [bp-10h]@9
-        char *ptr; // [sp+130h] [bp-Ch]@5
-        GUIFont *pFontQuick; // [sp+134h] [bp-8h]@1
-        GUIFont *pFontCChar; // [sp+138h] [bp-4h]@1
-        RGBTexture pTexture; // [sp+54h] [bp-E8h]@1
-        RGBTexture pTexture2; // [sp+100h] [bp-3Ch]@1
-        Texture pTexture3; // [sp+Ch] [bp-130h]@5
+  char *v1; // edi@5
+  FILE *pFile; // eax@5
+  unsigned int pSize; // esi@7
+  __int16 pHeight; // ax@9
+  void *v7; // eax@9
+  unsigned int pNumPixels; // ST2C_4@9
+  unsigned int v10; // ST2C_4@19
+  MSG Msg; // [sp+84h] [bp-B8h]@10
+  int v17; // [sp+A0h] [bp-9Ch]@9
+  GUIWindow credit_window;
+  int a5; // [sp+128h] [bp-14h]@1
+  char *pString; // [sp+12Ch] [bp-10h]@9
+  char *ptr; // [sp+130h] [bp-Ch]@5
+  GUIFont *pFontQuick; // [sp+134h] [bp-8h]@1
+  GUIFont *pFontCChar; // [sp+138h] [bp-4h]@1
+  RGBTexture pTexture; // [sp+54h] [bp-E8h]@1
+  RGBTexture pTexture2; // [sp+100h] [bp-3Ch]@1
+  Texture pTexture3; // [sp+Ch] [bp-130h]@5
 
-        a5 = 0;
-        pFontQuick = LoadFont("quick.fnt", "FONTPAL", NULL);
-        pFontCChar = LoadFont("cchar.fnt", "FONTPAL", NULL);
-        if ( pMessageQueue_50CBD0->uNumMessages )
-            pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0;
-        ++pIcons_LOD->uTexturePacksCount;
-        if ( !pIcons_LOD->uNumPrevLoadedFiles )
-            pIcons_LOD->uNumPrevLoadedFiles = pIcons_LOD->uNumLoadedFiles;
-        dword_A74C88 = 0;
-        pAudioPlayer->PlayMusicTrack(MUSIC_Credits);
-        pTexture.Load("mm6title.pcx", 0);
-        v0 = (char *)pEvents_LOD->LoadRaw("credits.txt", 0);
-        v1 = v0;
-        ptr = v0;
-        pFile = pEvents_LOD->FindContainer("credits.txt", 0);
-        if ( !pFile )
-            Error(pGlobalTXT_LocalizationStrings[63]); // "Might and Magic VII is having trouble loading files. 
+  a5 = 0;
+  pFontQuick = LoadFont("quick.fnt", "FONTPAL", NULL);
+  pFontCChar = LoadFont("cchar.fnt", "FONTPAL", NULL);
+  if ( pMessageQueue_50CBD0->uNumMessages )
+    pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0;
+  ++pIcons_LOD->uTexturePacksCount;
+  if ( !pIcons_LOD->uNumPrevLoadedFiles )
+    pIcons_LOD->uNumPrevLoadedFiles = pIcons_LOD->uNumLoadedFiles;
+  dword_A74C88 = 0;
+  pAudioPlayer->PlayMusicTrack(MUSIC_Credits);
+  pTexture.Load("mm6title.pcx", 0);
+  ptr = (char *)pEvents_LOD->LoadRaw("credits.txt", 0);
+  v1 = ptr;
+  pFile = pEvents_LOD->FindContainer("credits.txt", 0);
+  if ( !pFile )
+    Error(pGlobalTXT_LocalizationStrings[63]); // "Might and Magic VII is having trouble loading files. 
 
-        // Please re-install to fix this problem. Note: Re-installing will not destroy your save games."
-        fread(&pTexture3, 1, 0x30, pFile);
-        pSize = pTexture3.uDecompressedSize;
-        if ( !pTexture3.uDecompressedSize )
-            pSize = pTexture3.uTextureSize;
-        memset(&pTexture3, 0, 0x48);
-        pFont = pFontCChar;
-        pFont2 = pFontQuick;
-        v1[pSize] = 0;
-        
-        a2.uFrameWidth = 250;
-        a2.uFrameHeight = 440;
-        a2.uFrameX = 389;
-        a2.uFrameY = 19;
+  // Please re-install to fix this problem. Note: Re-installing will not destroy your save games."
+  fread(&pTexture3, 1, 0x30, pFile);
+  pSize = pTexture3.uDecompressedSize;
+  if ( !pTexture3.uDecompressedSize )
+    pSize = pTexture3.uTextureSize;
+  memset(&pTexture3, 0, 0x48);
+  v1[pSize] = 0;
+
+  credit_window.uFrameWidth = 250;
+  credit_window.uFrameHeight = 440;
+  credit_window.uFrameX = 389;
+  credit_window.uFrameY = 19;
 
-        pTexture2.uWidth = 250;
-        pHeight = pFont2->GetStringHeight2(pFont, v1, &a2, 0, 1);
-        pTexture2.uHeight = pHeight + 2 * a2.uFrameHeight;
-        pTexture2.uNumPixels = (signed __int16)pTexture2.uWidth * (signed __int16)pTexture2.uHeight;
-        v7 = malloc(2 * pTexture2.uNumPixels);//, "scrollermap");
-        pNumPixels = pTexture2.uNumPixels;
-        pTexture2.pPixels = (unsigned __int16 *)v7;
-        teal = TargetColor(0, 0xFFu, 0xFFu);
-        fill_pixels_fast(teal, pTexture2.pPixels, pNumPixels);
-        pTexture2._allocation_flags = 0;
-        pColor1 = TargetColor(0x70u, 0x8Fu, 0xFEu);
-        pColor2 = TargetColor(0xECu, 0xE6u, 0x9Cu);
-        pString = (char *)malloc(2 * pSize);
-        strncpy(pString, ptr, pSize);
-        pString[pSize]=0;
-        pFontQuick->_44D2FD_prolly_draw_credits_entry(pFontCChar, 0, a2.uFrameHeight, (signed __int16)pTexture2.uWidth, (signed __int16)pTexture2.uHeight, pColor1, 
-            pColor2, pString, pTexture2.pPixels, (signed __int16)pTexture2.uWidth);
-        free(pString);
-        pWindow_MainMenu = GUIWindow::Create(0, 0, 640, 480, WINDOW_MainMenu, 0, ptr);
-        pWindow_MainMenu->CreateButton(0, 0, 0, 0, 1, 0, UIMSG_Escape, 0, 0x1Bu, "", 0);
-        pCurrentScreen = SCREEN_CREATORS;
-        SetCurrentMenuID(MENU_CREDITSPROC);
-        do
-            {
-            while ( PeekMessageA(&Msg, 0, 0, 0, 1) )
-                {
-                if ( Msg.message == 18 )
-                    Game_DeinitializeAndTerminate(0);
-                TranslateMessage(&Msg);
-                DispatchMessageA(&Msg);
-                }
-            if ( BYTE1(dword_6BE364_game_settings_1) & 1 )
-                {
-                WaitMessage();
-                }
-            else
-                {
-                pRenderer->BeginScene();
-                pRenderer->DrawTextureRGB(0, 0, &pTexture);
-                pRenderer->SetTextureClipRect(a2.uFrameX, a2.uFrameY, a2.uFrameX + a2.uFrameWidth, a2.uFrameY + a2.uFrameHeight);
-                pRenderer->_4A5D33(a2.uFrameX, a2.uFrameY, 0, a5, &pTexture2);
-                pRenderer->ResetTextureClipRect();
-                pRenderer->EndScene();
-                ++a5;
-                if ( a5 >= (signed __int16)pTexture2.uHeight )
-                    SetCurrentMenuID(MENU_MAIN);
-                pRenderer->Present();
-                pCurrentScreen = SCREEN_GAME;//Ritor1: temporarily, must be corrected GUI_MainMenuMessageProc()
-                GUI_MainMenuMessageProc();
-                }
-            }
-            while ( GetCurrentMenuID() == MENU_CREDITSPROC );
-            pAudioPlayer->_4AA258(1);
-            free(ptr);
-            free(pFontQuick);
-            free(pFontCChar);
-            pWindow_MainMenu->Release();
-            pIcons_LOD->RemoveTexturesPackFromTextureList();
-            pTexture.Release();
-            pTexture2.Release();
-            return MENU_MAIN;     // return MENU_Main
-        }
+  pTexture2.uWidth = 250;
+  pHeight = pFontQuick->GetStringHeight2(pFontCChar, v1, &credit_window, 0, 1);
+  pTexture2.uHeight = pHeight + 2 * credit_window.uFrameHeight;
+  pTexture2.uNumPixels = (signed __int16)pTexture2.uWidth * (signed __int16)pTexture2.uHeight;
+  v7 = malloc(2 * pTexture2.uNumPixels);//, "scrollermap");
+  pNumPixels = pTexture2.uNumPixels;
+  pTexture2.pPixels = (unsigned __int16 *)v7;
+  fill_pixels_fast(TargetColor(0, 0xFFu, 0xFFu), pTexture2.pPixels, pNumPixels);
+  pTexture2._allocation_flags = 0;
+  pString = (char *)malloc(2 * pSize);
+  strncpy(pString, ptr, pSize);
+  pString[pSize]=0;
+  pFontQuick->_44D2FD_prolly_draw_credits_entry(pFontCChar, 0, credit_window.uFrameHeight, (signed __int16)pTexture2.uWidth,
+       (signed __int16)pTexture2.uHeight, TargetColor(0x70u, 0x8Fu, 0xFEu), TargetColor(0xECu, 0xE6u, 0x9Cu), pString, pTexture2.pPixels,
+       (signed __int16)pTexture2.uWidth);
+  free(pString);
+  pWindow_MainMenu = GUIWindow::Create(0, 0, 640, 480, WINDOW_MainMenu, 0, ptr);
+  pWindow_MainMenu->CreateButton(0, 0, 0, 0, 1, 0, UIMSG_Escape, 0, 0x1Bu, "", 0);
+  pCurrentScreen = SCREEN_CREATORS;
+  SetCurrentMenuID(MENU_CREDITSPROC);
+  do
+  {
+    while ( PeekMessageA(&Msg, 0, 0, 0, 1) )
+    {
+      if ( Msg.message == 18 )
+        Game_DeinitializeAndTerminate(0);
+      TranslateMessage(&Msg);
+      DispatchMessageA(&Msg);
+    }
+    if ( BYTE1(dword_6BE364_game_settings_1) & 1 )
+    {
+      WaitMessage();
+    }
+    else
+    {
+      pRenderer->BeginScene();
+      pRenderer->DrawTextureRGB(0, 0, &pTexture);
+      pRenderer->SetTextureClipRect(credit_window.uFrameX, credit_window.uFrameY, credit_window.uFrameX + credit_window.uFrameWidth,
+           credit_window.uFrameY + credit_window.uFrameHeight);
+      pRenderer->_4A5D33(credit_window.uFrameX, credit_window.uFrameY, 0, a5, &pTexture2);
+      pRenderer->ResetTextureClipRect();
+      pRenderer->EndScene();
+      ++a5;
+      if ( a5 >= (signed __int16)pTexture2.uHeight )
+        SetCurrentMenuID(MENU_MAIN);
+      pRenderer->Present();
+      pCurrentScreen = SCREEN_GAME;//Ritor1: temporarily, must be corrected GUI_MainMenuMessageProc()
+      GUI_MainMenuMessageProc();
+    }
+  }
+  while ( GetCurrentMenuID() == MENU_CREDITSPROC );
+  pAudioPlayer->_4AA258(1);
+  free(ptr);
+  free(pFontQuick);
+  free(pFontCChar);
+  pWindow_MainMenu->Release();
+  pIcons_LOD->RemoveTexturesPackFromTextureList();
+  pTexture.Release();
+  pTexture2.Release();
+  return MENU_MAIN;     // return MENU_Main
+}
\ No newline at end of file