Mercurial > mm7
diff mm7_4.cpp @ 165:572d821561f3
MenuID
author | Ritor1 |
---|---|
date | Thu, 14 Feb 2013 14:48:43 +0600 |
parents | 796b79187c27 |
children | 90521fb9766c |
line wrap: on
line diff
--- a/mm7_4.cpp Thu Feb 14 09:27:19 2013 +0600 +++ b/mm7_4.cpp Thu Feb 14 14:48:43 2013 +0600 @@ -5450,7 +5450,7 @@ { pGUIWindow_CurrentMenu->field_40 = 0; pGUIWindow_CurrentMenu->DrawTextInRect(pFontCreate, pOrder, 124, 0, player->pName, 130, 0); - SetCurrentMenuID(MENU_7); + SetCurrentMenuID(MENU_NAMEPANELESC); } } else @@ -6208,7 +6208,7 @@ pWindow_MainMenu = GUIWindow::Create(0, 0, 640, 480, WINDOW_MainMenu, 0, (int)ptr); pWindow_MainMenu->CreateButton(0, 0, 0, 0, 1, 0, 0x71u, 0, 0x1Bu, "", 0); pCurrentScreen = SCREEN_CREATORS; - SetCurrentMenuID(MENU_Credits); + SetCurrentMenuID(MENU_CREDITSPROC); do { while ( PeekMessageA(&Msg, 0, 0, 0, 1) ) @@ -6240,7 +6240,7 @@ GUI_MainMenuMessageProc(); } } - while ( GetCurrentMenuID() == MENU_Credits ); + while ( GetCurrentMenuID() == MENU_CREDITSPROC ); pAudioPlayer->_4AA258(1); pAllocator->FreeChunk(ptr); pAllocator->FreeChunk(pFontQuick); @@ -11082,42 +11082,19 @@ { NPCData *v0; // ST40_4@1 signed int v1; // edi@1 - GUIWindow *v2; // ecx@1 + //GUIWindow *v2; // ecx@1 v0 = GetNPCData(uDialogue_SpeakingActorNPC_ID); v1 = 0; pDialogueWindow->eWindowType = WINDOW_MainMenu; pDialogueWindow->Release(); - v2 = GUIWindow::Create(0, 0, 640, 480, WINDOW_A, 1, 0); - pDialogueWindow = v2; + pDialogueWindow = GUIWindow::Create(0, 0, 640, 480, WINDOW_Dialogue, 1, 0); if ( *(&pNPCStats->field_13A5C + 5 * v0->uProfession) ) { - v2->CreateButton( - 0x1E0u, - 0xA0u, - 0x8Cu, - 0x1Eu, - 1, - 0, - 0x88u, - 0x4Du, - 0, - pGlobalTXT_LocalizationStrings[407], - 0); + pDialogueWindow->CreateButton(480, 160, 140, 28, 1, 0, 136, 77, 0, pGlobalTXT_LocalizationStrings[407], 0); v1 = 1; } - pDialogueWindow->CreateButton( - 0x1E0u, - 30 * v1 + 160, - 0x8Cu, - 0x1Eu, - 1, - 0, - 0x88u, - 0x4Cu, - 0, - pGlobalTXT_LocalizationStrings[406], - 0); + pDialogueWindow->CreateButton(480, 30 * v1 + 160, 140, 30, 1, 0, 136, 76, 0, pGlobalTXT_LocalizationStrings[406], 0);//Нанять pDialogueWindow->_41D08F(v1 + 1, 1, 0, 1); } @@ -11311,8 +11288,8 @@ (Texture *)(uTextureID_BUTTYES2 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_BUTTYES2] : 0), 0); pDialogueWindow->CreateButton( - _4E5E50_transui_x, - _4E5EE0_transui_y, + pNPCPortraits_x, + pNPCPortraits_y, 63u, 73u, 1,