Mercurial > mm7

comparison mm7_5.cpp @ 358:4a236657a0be

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
GameMenuButton fix
author Ritor1
date Thu, 21 Feb 2013 17:23:53 +0600
parents 37b19ff5addd
children 57d81602e72c
comparison
equal deleted inserted replaced
356:b9aff98467e3 358:4a236657a0be
3223 papredoll_dbrds[2] = pIcons_LOD->LoadTexture("BUTTEXI1", TEXTURE_16BIT_PALETTE); 3223 papredoll_dbrds[2] = pIcons_LOD->LoadTexture("BUTTEXI1", TEXTURE_16BIT_PALETTE);
3224 pBtn_ExitCancel = pGUIWindow_CurrentMenu->CreateButton(0x187u, 0x13Cu, 0x4Bu, 0x21u, v0, 0, 0x71u, 0, 0, 3224 pBtn_ExitCancel = pGUIWindow_CurrentMenu->CreateButton(0x187u, 0x13Cu, 0x4Bu, 0x21u, v0, 0, 0x71u, 0, 0,
3225 pGlobalTXT_LocalizationStrings[79],// "Exit" 3225 pGlobalTXT_LocalizationStrings[79],// "Exit"
3226 (Texture *)(uTextureID_BUTTDESC2 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_BUTTDESC2] : 0), 0); //, v179); 3226 (Texture *)(uTextureID_BUTTDESC2 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_BUTTDESC2] : 0), 0); //, v179);
3227 continue; 3227 continue;
3228 case UIMSG_6B: 3228 case UIMSG_GameMenuButton:
3229 if ( pCurrentScreen ) 3229 if ( pCurrentScreen )
3230 { 3230 {
3231 pGUIWindow_CurrentMenu->Release(); 3231 pGUIWindow_CurrentMenu->Release();
3232 pEventTimer->Resume(); 3232 pEventTimer->Resume();
3233 pCurrentScreen = SCREEN_GAME; 3233 pCurrentScreen = SCREEN_GAME;
3237 uNumSeconds = (unsigned int)MakeScreenshot(155, 117); 3237 uNumSeconds = (unsigned int)MakeScreenshot(155, 117);
3238 pRenderer->SavePCXImage("gamma.pcx", (char *)uNumSeconds, 155, 117); 3238 pRenderer->SavePCXImage("gamma.pcx", (char *)uNumSeconds, 155, 117);
3239 free((void *)uNumSeconds); 3239 free((void *)uNumSeconds);
3240 stru_506E40._40E55E("gamma.pcx", 0); 3240 stru_506E40._40E55E("gamma.pcx", 0);
3241 GUIWindow::Create(0x25Au, 0x1C2u, 0, 0, WINDOW_VoiceSwitcherButton, (int)pBtn_GameSettings, 0); 3241 GUIWindow::Create(0x25Au, 0x1C2u, 0, 0, WINDOW_VoiceSwitcherButton, (int)pBtn_GameSettings, 0);
3242 uNumVisibleWindows = uNumVisibleWindows - 1; //Ritor1: Insert
3242 //LABEL_453: 3243 //LABEL_453:
3243 if ( (signed int)pMessageQueue_50CBD0->uNumMessages >= 40 ) 3244 if ( (signed int)pMessageQueue_50CBD0->uNumMessages >= 40 )
3244 continue; 3245 continue;
3245 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = (UIMessageType)113; 3246 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = (UIMessageType)113;
3246 //goto LABEL_770; 3247 //goto LABEL_770;
3991 } 3992 }
3992 GUIWindow::Create(pMainMenu_BtnExit->uX, pMainMenu_BtnExit->uY, 0, 0, (enum WindowType)90, (int)pMainMenu_BtnExit, 0); 3993 GUIWindow::Create(pMainMenu_BtnExit->uX, pMainMenu_BtnExit->uY, 0, 0, (enum WindowType)90, (int)pMainMenu_BtnExit, 0);
3993 SetCurrentMenuID(MENU_10); 3994 SetCurrentMenuID(MENU_10);
3994 continue; 3995 continue;
3995 } 3996 }
3996 if ( pUIMessageType == UIMSG_6B )//unknow 3997 if ( pUIMessageType == UIMSG_GameMenuButton )//unknow
3997 { 3998 {
3998 __debugbreak(); 3999 __debugbreak();
3999 if ( pCurrentScreen ) 4000 if ( pCurrentScreen )
4000 { 4001 {
4001 pGUIWindow_CurrentMenu->Release(); 4002 pGUIWindow_CurrentMenu->Release();
16705 goto LABEL_132; 16706 goto LABEL_132;
16706 } 16707 }
16707 if ( pCurrentScreen == SCREEN_HOUSE ) 16708 if ( pCurrentScreen == SCREEN_HOUSE )
16708 { 16709 {
16709 if ( (signed int)pY < 345 && (signed int)pX < 469 ) 16710 if ( (signed int)pY < 345 && (signed int)pX < 469 )
16710 sub_4B1A2D(); 16711 sub_4B1A2D();//identify item in inventory
16711 goto LABEL_132; 16712 goto LABEL_132;
16712 } 16713 }
16713 if ( pCurrentScreen <= SCREEN_HOUSE ) 16714 if ( pCurrentScreen <= SCREEN_HOUSE )
16714 goto LABEL_132; 16715 goto LABEL_132;
16715 if ( pCurrentScreen <= SCREEN_F ) 16716 if ( pCurrentScreen <= SCREEN_F )