Mercurial > mm7

comparison mm7_4.cpp @ 165:572d821561f3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
MenuID
author Ritor1
date Thu, 14 Feb 2013 14:48:43 +0600
parents 796b79187c27
children 90521fb9766c
comparison
equal deleted inserted replaced
164:4b61b82a0bf7 165:572d821561f3
5448 { 5448 {
5449 if ( v14 == 1 ) 5449 if ( v14 == 1 )
5450 { 5450 {
5451 pGUIWindow_CurrentMenu->field_40 = 0; 5451 pGUIWindow_CurrentMenu->field_40 = 0;
5452 pGUIWindow_CurrentMenu->DrawTextInRect(pFontCreate, pOrder, 124, 0, player->pName, 130, 0); 5452 pGUIWindow_CurrentMenu->DrawTextInRect(pFontCreate, pOrder, 124, 0, player->pName, 130, 0);
5453 SetCurrentMenuID(MENU_7); 5453 SetCurrentMenuID(MENU_NAMEPANELESC);
5454 } 5454 }
5455 } 5455 }
5456 else 5456 else
5457 { 5457 {
5458 pGUIWindow_CurrentMenu->field_40 = 0; 5458 pGUIWindow_CurrentMenu->field_40 = 0;
6206 pColor2, pString, pTexture2.pPixels, (signed __int16)pTexture2.uWidth); 6206 pColor2, pString, pTexture2.pPixels, (signed __int16)pTexture2.uWidth);
6207 free(pString); 6207 free(pString);
6208 pWindow_MainMenu = GUIWindow::Create(0, 0, 640, 480, WINDOW_MainMenu, 0, (int)ptr); 6208 pWindow_MainMenu = GUIWindow::Create(0, 0, 640, 480, WINDOW_MainMenu, 0, (int)ptr);
6209 pWindow_MainMenu->CreateButton(0, 0, 0, 0, 1, 0, 0x71u, 0, 0x1Bu, "", 0); 6209 pWindow_MainMenu->CreateButton(0, 0, 0, 0, 1, 0, 0x71u, 0, 0x1Bu, "", 0);
6210 pCurrentScreen = SCREEN_CREATORS; 6210 pCurrentScreen = SCREEN_CREATORS;
6211 SetCurrentMenuID(MENU_Credits); 6211 SetCurrentMenuID(MENU_CREDITSPROC);
6212 do 6212 do
6213 { 6213 {
6214 while ( PeekMessageA(&Msg, 0, 0, 0, 1) ) 6214 while ( PeekMessageA(&Msg, 0, 0, 0, 1) )
6215 { 6215 {
6216 if ( Msg.message == 18 ) 6216 if ( Msg.message == 18 )
6238 pRenderer->Present(); 6238 pRenderer->Present();
6239 pCurrentScreen = SCREEN_GAME;//Ritor1: temporarily, must be corrected GUI_MainMenuMessageProc() 6239 pCurrentScreen = SCREEN_GAME;//Ritor1: temporarily, must be corrected GUI_MainMenuMessageProc()
6240 GUI_MainMenuMessageProc(); 6240 GUI_MainMenuMessageProc();
6241 } 6241 }
6242 } 6242 }
6243 while ( GetCurrentMenuID() == MENU_Credits ); 6243 while ( GetCurrentMenuID() == MENU_CREDITSPROC );
6244 pAudioPlayer->_4AA258(1); 6244 pAudioPlayer->_4AA258(1);
6245 pAllocator->FreeChunk(ptr); 6245 pAllocator->FreeChunk(ptr);
6246 pAllocator->FreeChunk(pFontQuick); 6246 pAllocator->FreeChunk(pFontQuick);
6247 pAllocator->FreeChunk(pFontCChar); 6247 pAllocator->FreeChunk(pFontCChar);
6248 pWindow_MainMenu->Release(); 6248 pWindow_MainMenu->Release();
11080 //----- (004B3E1E) -------------------------------------------------------- 11080 //----- (004B3E1E) --------------------------------------------------------
11081 void __cdecl sub_4B3E1E() 11081 void __cdecl sub_4B3E1E()
11082 { 11082 {
11083 NPCData *v0; // ST40_4@1 11083 NPCData *v0; // ST40_4@1
11084 signed int v1; // edi@1 11084 signed int v1; // edi@1
11085 GUIWindow *v2; // ecx@1 11085 //GUIWindow *v2; // ecx@1
11086 11086
11087 v0 = GetNPCData(uDialogue_SpeakingActorNPC_ID); 11087 v0 = GetNPCData(uDialogue_SpeakingActorNPC_ID);
11088 v1 = 0; 11088 v1 = 0;
11089 pDialogueWindow->eWindowType = WINDOW_MainMenu; 11089 pDialogueWindow->eWindowType = WINDOW_MainMenu;
11090 pDialogueWindow->Release(); 11090 pDialogueWindow->Release();
11091 v2 = GUIWindow::Create(0, 0, 640, 480, WINDOW_A, 1, 0); 11091 pDialogueWindow = GUIWindow::Create(0, 0, 640, 480, WINDOW_Dialogue, 1, 0);
11092 pDialogueWindow = v2;
11093 if ( *(&pNPCStats->field_13A5C + 5 * v0->uProfession) ) 11092 if ( *(&pNPCStats->field_13A5C + 5 * v0->uProfession) )
11094 { 11093 {
11095 v2->CreateButton( 11094 pDialogueWindow->CreateButton(480, 160, 140, 28, 1, 0, 136, 77, 0, pGlobalTXT_LocalizationStrings[407], 0);
11096 0x1E0u,
11097 0xA0u,
11098 0x8Cu,
11099 0x1Eu,
11100 1,
11101 0,
11102 0x88u,
11103 0x4Du,
11104 0,
11105 pGlobalTXT_LocalizationStrings[407],
11106 0);
11107 v1 = 1; 11095 v1 = 1;
11108 } 11096 }
11109 pDialogueWindow->CreateButton( 11097 pDialogueWindow->CreateButton(480, 30 * v1 + 160, 140, 30, 1, 0, 136, 76, 0, pGlobalTXT_LocalizationStrings[406], 0);//Нанять
11110 0x1E0u,
11111 30 * v1 + 160,
11112 0x8Cu,
11113 0x1Eu,
11114 1,
11115 0,
11116 0x88u,
11117 0x4Cu,
11118 0,
11119 pGlobalTXT_LocalizationStrings[406],
11120 0);
11121 pDialogueWindow->_41D08F(v1 + 1, 1, 0, 1); 11098 pDialogueWindow->_41D08F(v1 + 1, 1, 0, 1);
11122 } 11099 }
11123 11100
11124 //----- (004B3EF0) -------------------------------------------------------- 11101 //----- (004B3EF0) --------------------------------------------------------
11125 void __fastcall sub_4B3EF0(int a4) 11102 void __fastcall sub_4B3EF0(int a4)
11309 0x59u, 11286 0x59u,
11310 byte_591098, 11287 byte_591098,
11311 (Texture *)(uTextureID_BUTTYES2 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_BUTTYES2] : 0), 11288 (Texture *)(uTextureID_BUTTYES2 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_BUTTYES2] : 0),
11312 0); 11289 0);
11313 pDialogueWindow->CreateButton( 11290 pDialogueWindow->CreateButton(
11314 _4E5E50_transui_x, 11291 pNPCPortraits_x,
11315 _4E5EE0_transui_y, 11292 pNPCPortraits_y,
11316 63u, 11293 63u,
11317 73u, 11294 73u,
11318 1, 11295 1,
11319 0, 11296 0,
11320 0xBFu, 11297 0xBFu,