libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-19 08:25:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Preventing scrolling while the menu is shown

Browse Source 
svn-id: r26440
This commit is contained in:
Sven Hesse 2007-04-09 18:29:51 +00:00
parent 258753e82c
commit 9c7a8bd963
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
engines/gob/game.cpp
View File

@ -76,6 +76,7 @@ Game::Game(GobEngine *vm) : _vm(vm) {
_activeCollIndex = 0;
_handleMouse = 0;
_forceHandleMouse = 0;
_menuLevel = 0;
_tempStr[0] = 0;
_curImaFile[0] = 0;

1
engines/gob/game.h
View File

@ -170,6 +170,7 @@ protected:
int16 _activeCollIndex;
byte _handleMouse;
char _forceHandleMouse;
uint32 _menuLevel;
char _tempStr[256];

8
engines/gob/game_v2.cpp
View File

@ -277,7 +277,11 @@ void Game_v2::playTot(int16 skipPlay) {
_vm->_global->_inter_execPtr = _totFileData;
_vm->_global->_inter_execPtr +=
READ_LE_UINT16(_totFileData + (skipPlay << 1) + 0x66);
_menuLevel++;
_vm->_inter->callSub(2);
_menuLevel--;
if (_vm->_inter->_terminate != 0)
_vm->_inter->_terminate = 2;
}
@ -444,7 +448,9 @@ int16 Game_v2::checkCollisions(byte handleMouse, int16 deltaTime, int16 *pResId,
key = checkKeys(&_vm->_global->_inter_mouseX,
&_vm->_global->_inter_mouseY, &_mouseButtons, handleMouse);
if ((_vm->_global->_videoMode == 0x14) && (handleMouse != 0)) {
if ((_vm->_global->_videoMode == 0x14) && (handleMouse != 0) &&
(_menuLevel == 0)) {
int16 cursorRight;
int16 screenRight;