Mercurial > mm7
diff Game.cpp @ 2186:7a517c9a1d5b
CastSpell continue
| author | Ritor1 |
|---|---|
| date | Mon, 27 Jan 2014 17:33:34 +0600 |
| parents | 385040580292 |
| children | 42c8807225a2 34035536bbf5 |
line wrap: on
line diff
--- a/Game.cpp Mon Jan 27 00:13:01 2014 +0600 +++ b/Game.cpp Mon Jan 27 17:33:34 2014 +0600 @@ -3838,7 +3838,7 @@ case UIMSG_SpellBookWindow: if ( pTurnEngine->turn_stage == 3 ) continue; - if ( bUnderwater == 1 ) + if ( bUnderwater == true ) { ShowStatusBarString(pGlobalTXT_LocalizationStrings[652], 2);// "You can not do that while you are underwater!" pAudioPlayer->PlaySound((SoundID)27, 0, 0, -1, 0, 0, 0, 0); @@ -3849,9 +3849,9 @@ pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0; if ( uActiveCharacter && !pPlayers[uActiveCharacter]->uTimeToRecovery ) { - if ( !pCurrentScreen ) + if ( pCurrentScreen == SCREEN_GAME ) { - GUIWindow::Create(0x1DCu, 0x1C2u, 0, 0, WINDOW_PressedButton2, (int)pBtn_CastSpell, 0); + GUIWindow::Create(476, 450, 0, 0, WINDOW_PressedButton2, (int)pBtn_CastSpell, 0); pCurrentScreen = SCREEN_SPELL_BOOK; pEventTimer->Pause(); pGUIWindow_CurrentMenu = GUIWindow::Create(0, 0, 640, 480, WINDOW_SpellBook, 0, 0); @@ -3859,13 +3859,11 @@ viewparams->field_48 = 1; continue; } - if ( pCurrentScreen != SCREEN_REST - && pCurrentScreen != SCREEN_CHARACTERS - && (pCurrentScreen <= SCREEN_63 - || pCurrentScreen > SCREEN_67) ) + if ( pCurrentScreen != SCREEN_REST && pCurrentScreen != SCREEN_CHARACTERS + && (pCurrentScreen <= SCREEN_63 || pCurrentScreen > SCREEN_67) ) { pGUIWindow_CurrentMenu->Release(); - GUIWindow::Create(0x1DCu, 0x1C2u, 0, 0, WINDOW_PressedButton2, (int)pBtn_CastSpell, 0); + GUIWindow::Create(476, 450, 0, 0, WINDOW_PressedButton2, (int)pBtn_CastSpell, 0); pCurrentScreen = SCREEN_SPELL_BOOK; pEventTimer->Pause(); pGUIWindow_CurrentMenu = GUIWindow::Create(0, 0, 640, 480, WINDOW_SpellBook, 0, 0);