diff options
author | Robert Göffringmann | 2003-12-17 07:33:00 +0000 |
---|---|---|
committer | Robert Göffringmann | 2003-12-17 07:33:00 +0000 |
commit | 5fdff2824c7cf45edb0dc2fb6f0bdbe150e3a20f (patch) | |
tree | 040ef276db16211eab69244552e171ff1d612909 /sword1/mouse.cpp | |
parent | 4077b92c0263760643f81253ed06a24c5c488225 (diff) | |
download | scummvm-rg350-5fdff2824c7cf45edb0dc2fb6f0bdbe150e3a20f.tar.gz scummvm-rg350-5fdff2824c7cf45edb0dc2fb6f0bdbe150e3a20f.tar.bz2 scummvm-rg350-5fdff2824c7cf45edb0dc2fb6f0bdbe150e3a20f.zip |
fixed text output and logic bug. changed scrolling code.
hey, sword is running really nice already. :)
svn-id: r11703
Diffstat (limited to 'sword1/mouse.cpp')
-rw-r--r-- | sword1/mouse.cpp | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/sword1/mouse.cpp b/sword1/mouse.cpp index 6b243bd5b8..895edc5e33 100644 --- a/sword1/mouse.cpp +++ b/sword1/mouse.cpp @@ -110,13 +110,18 @@ void SwordMouse::engine(uint16 x, uint16 y, uint16 eventFlags) { _numObjs = 0; return; // no human, so we don't want the mouse engine } - - if (y < 40) { // okay, we are in the top menu. - if (!_inTopMenu) // are we just entering it? - _menu->fnStartMenu(); - _menu->checkTopMenu(); - _inTopMenu = true; - } else if (_inTopMenu) { // we're not in the menu. did we just leave it? + + if (!SwordLogic::_scriptVars[TOP_MENU_DISABLED]) { + if (y < 40) { // okay, we are in the top menu. + if (!_inTopMenu) // are we just entering it? + _menu->fnStartMenu(); + _menu->checkTopMenu(); + _inTopMenu = true; + } else if (_inTopMenu) { // we're not in the menu. did we just leave it? + _menu->fnEndMenu(); + _inTopMenu = false; + } + } else if (_inTopMenu) { _menu->fnEndMenu(); _inTopMenu = false; } |