diff options
| author | athrxx | 2011-07-29 15:57:02 +0200 |
|---|---|---|
| committer | Johannes Schickel | 2011-12-26 16:18:13 +0100 |
| commit | 84900e8e50df8490fbdebc3acb25a338949f2de9 (patch) | |
| tree | f0aa2113c8ce6b7f70213758725632c540f804b9 /engines/kyra/gui_eob.cpp | |
| parent | 0e4c184e285c9b20b90536eb485a7f8a50833da3 (diff) | |
| download | scummvm-rg350-84900e8e50df8490fbdebc3acb25a338949f2de9.tar.gz scummvm-rg350-84900e8e50df8490fbdebc3acb25a338949f2de9.tar.bz2 scummvm-rg350-84900e8e50df8490fbdebc3acb25a338949f2de9.zip | |
KYRA: (EOB) - add turn undead spell, add some screen fades, fix some bugs
Diffstat (limited to 'engines/kyra/gui_eob.cpp')
| -rw-r--r-- | engines/kyra/gui_eob.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp index c7972299d1..ce5f3ea53f 100644 --- a/engines/kyra/gui_eob.cpp +++ b/engines/kyra/gui_eob.cpp @@ -149,17 +149,19 @@ Button *EobCoreEngine::gui_getButton(Button *buttonList, int index) { return 0; } -void EobCoreEngine::gui_drawPlayField(int pageNum) { +void EobCoreEngine::gui_drawPlayField(bool refresh) { _screen->loadEobCpsFileToPage("PLAYFLD", 0, 5, 3, 2); int cp = _screen->setCurPage(2); gui_drawCompass(true); - if (pageNum && !_sceneDrawPage2) + if (refresh && !_sceneDrawPage2) drawScene(0); _screen->setCurPage(cp); _screen->copyRegion(0, 0, 0, 0, 320, 200, 2, 0, Screen::CR_NO_P_CHECK); - _screen->updateScreen(); + + if (!_loading) + _screen->updateScreen(); _screen->loadEobCpsFileToPage("INVENT", 0, 5, 3, 2); } @@ -167,7 +169,7 @@ void EobCoreEngine::gui_drawPlayField(int pageNum) { void EobCoreEngine::gui_restorePlayField() { loadVcnData(0, 0); _screen->_curPage = 0; - gui_drawPlayField(1); + gui_drawPlayField(true); gui_drawAllCharPortraitsWithStats(); } @@ -706,7 +708,8 @@ void EobCoreEngine::gui_drawSpellbook() { _screen->setCurPage(0); _screen->copyRegion(64, 121, 64, 121, 112, 56, 2, 0, Screen::CR_NO_P_CHECK); - _screen->updateScreen(); + if (!_loading) + _screen->updateScreen(); } void EobCoreEngine::gui_drawSpellbookScrollArrow(int x, int y, int direction) { @@ -2245,7 +2248,7 @@ void GUI_Eob::runCampMenu() { if (cnt > 4) { _vm->dropCharacter(selectCharacterDialogue(53)); - _vm->gui_drawPlayField(0); + _vm->gui_drawPlayField(false); res = true; _screen->copyRegion(0, 120, 0, 0, 176, 24, 0, 14, Screen::CR_NO_P_CHECK); _screen->setFont(Screen::FID_6_FNT); |