Fix scroll handler

svn-id: r26541
This commit is contained in:
Sven Hesse 2007-04-17 09:40:10 +00:00
parent 245d8fa63d
commit 7d7cee6649
3 changed files with 4 additions and 2 deletions

View File

@ -78,6 +78,7 @@ Game::Game(GobEngine *vm) : _vm(vm) {
_forceHandleMouse = 0;
_menuLevel = 0;
_noScroll = true;
_scrollHandleMouse = false;
_tempStr[0] = 0;
_curImaFile[0] = 0;
@ -290,7 +291,7 @@ void Game::freeSoundSlot(int16 slot) {
}
void Game::evaluateScroll(int16 x, int16 y) {
if ((_handleMouse == 0) || (_menuLevel > 0))
if (!_scrollHandleMouse || (_menuLevel > 0))
return;
if (_noScroll || (_vm->_global->_videoMode != 0x14))

View File

@ -129,6 +129,7 @@ public:
int16 _mouseButtons;
bool _noScroll;
bool _scrollHandleMouse;
Game(GobEngine *vm);
virtual ~Game();

View File

@ -407,7 +407,7 @@ int16 Game_v2::checkCollisions(byte handleMouse, int16 deltaTime, int16 *pResId,
int16 newkey;
uint32 timeKey;
_handleMouse = handleMouse;
_scrollHandleMouse = handleMouse != 0;
if (deltaTime >= -1) {
_lastCollKey = 0;