diff options
| author | Eugene Sandulenko | 2005-01-07 21:13:26 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2005-01-07 21:13:26 +0000 |
| commit | eb76ac619fdb9cccf0e3ba97115894d046a8f563 (patch) | |
| tree | b910f28ee684bb1ee60231c1802c9fb0185b0cf0 /saga | |
| parent | 0a89a28e4588a64e8a7b62d34f3cd621f666c0f0 (diff) | |
| download | scummvm-rg350-eb76ac619fdb9cccf0e3ba97115894d046a8f563.tar.gz scummvm-rg350-eb76ac619fdb9cccf0e3ba97115894d046a8f563.tar.bz2 scummvm-rg350-eb76ac619fdb9cccf0e3ba97115894d046a8f563.zip | |
o Last fixes for panels. Now they work like in original.
o Code formatting in scene.h
svn-id: r16479
Diffstat (limited to 'saga')
| -rw-r--r-- | saga/interface.cpp | 10 | ||||
| -rw-r--r-- | saga/scene.h | 4 |
2 files changed, 5 insertions, 9 deletions
diff --git a/saga/interface.cpp b/saga/interface.cpp index b20334635e..96813e6ad4 100644 --- a/saga/interface.cpp +++ b/saga/interface.cpp @@ -303,9 +303,9 @@ int Interface::setMode(int mode, bool force) { // TODO: Is this where we should hide/show the mouse cursor? int newmode = mode; - if (_panelMode == kPanelConverse) + if (mode == kPanelConverse) _inMainMode = false; - else if (_panelMode == kPanelInventory) { + else if (mode == kPanelInventory) { _inMainMode = true; newmode = kPanelMain; } @@ -366,9 +366,8 @@ int Interface::draw() { back_buf = _vm->_gfx->getBackBuffer(); - if (!_active) { + if (_vm->_scene->isInDemo() || _panelMode == kPanelFade) return SUCCESS; - } // Get game display info _vm->getDisplayInfo(&g_di); @@ -424,9 +423,8 @@ int Interface::update(const Point& imousePt, int update_flag) { int imouse_x, imouse_y; - if (!_active) { + if (_vm->_scene->isInDemo() || _panelMode == kPanelFade) return SUCCESS; - } imouse_x = imousePt.x; imouse_y = imousePt.y; diff --git a/saga/scene.h b/saga/scene.h index 4b33b131cc..4f6e302b10 100644 --- a/saga/scene.h +++ b/saga/scene.h @@ -237,9 +237,7 @@ class Scene { bool isInDemo() { return !_inGame; } void getBGMaskInfo(int &width, int &height, byte *&buffer, size_t &bufferLength); - int isBGMaskPresent() { - return _bgMask.loaded; - } + int isBGMaskPresent() { return _bgMask.loaded; } int getBGMaskType(const Point &testPoint); bool validBGMaskPoint(const Point &testPoint); bool canWalk(const Point &testPoint); |