Mercurial > mm7
diff mm7_2.cpp @ 151:9abdd40a107b
pCurrentScreen
author | Ritor1 |
---|---|
date | Tue, 12 Feb 2013 15:28:08 +0600 |
parents | d92c78ab54fe |
children | 86a2637ba125 |
line wrap: on
line diff
--- a/mm7_2.cpp Tue Feb 12 10:17:35 2013 +0600 +++ b/mm7_2.cpp Tue Feb 12 15:28:08 2013 +0600 @@ -4518,7 +4518,7 @@ v0 = pPlayers[uActiveCharacter]; v77 = pPlayers[uActiveCharacter]; - if ( pCurrentScreen == 14 ) + if ( pCurrentScreen == SCREEN_E ) goto LABEL_73; if ( !sub_4B1784_check_if_player_concious__draw_warning_else_mess_with_dlg_win() ) { @@ -12038,7 +12038,7 @@ GUIButton *pButton2; // [sp+0h] [bp-3Ch]@27 GUIWindow *pWindow; // [sp+4h] [bp-38h]@11 - pCurrentScreen = 0; // окно Главное меню + pCurrentScreen = SCREEN_GAME; if (pAsyncMouse) pAsyncMouse->Resume(); if ( LOBYTE(pGame->pKeyboardInstance->bUsingAsynKeyboard) && pAsyncKeyboard ) @@ -12074,12 +12074,12 @@ pWindow = pWindow_MainMenu; if ( GetCurrentMenuID() == MENU_SAVELOAD)//если меню загрузки { - if ( pCurrentScreen != 12 )//если не окно загрузки игры + if ( pCurrentScreen != SCREEN_LOADGAME ) { pTexture_PCX.Release(); pTexture_PCX.Load("lsave640.pcx", 0); pGUIWindow2 = GUIWindow::Create(0, 0, 640, 480, WINDOW_MainMenu, 0, 0); - pCurrentScreen = 12; //окно загрузки игры + pCurrentScreen = SCREEN_LOADGAME; GameUI_DrawLoadMenu(0);//процесс прорисовки окна Загрузка } pWindow = pGUIWindow_CurrentMenu; @@ -12114,7 +12114,7 @@ pIcons_LOD->_4114F2(); pGUIWindow_CurrentMenu->Release(); pGUIWindow_CurrentMenu = 0; - pCurrentScreen = 0; + pCurrentScreen = SCREEN_GAME; viewparams->bRedrawGameUI = 1; } } @@ -12497,7 +12497,7 @@ goto LABEL_104; } if ( pCurrentScreen - && pCurrentScreen != 21 ) + && pCurrentScreen != SCREEN_PRESS_ESCAPE_MESSAGE ) return 0; } if ( !viewparams->field_4C ) @@ -15820,7 +15820,7 @@ } if ( v5 & 0x100000 || (v6 = pIndoor->pFaceExtras[v4->uFaceExtraID].uEventID) == 0 ) return 1; - if ( pCurrentScreen != 19 ) + if ( pCurrentScreen != SCREEN_BRANCHLESS_NPC_DIALOG ) goto LABEL_13; break; }