diff options
author | Christopher Page | 2008-07-09 02:27:05 +0000 |
---|---|---|
committer | Christopher Page | 2008-07-09 02:27:05 +0000 |
commit | e808cdf7a08d641389ecc81063b3b1016c7bc8cf (patch) | |
tree | dd21fa0f4b624d426675820b318aa3e41707c3ca /engines/gob/game_v2.cpp | |
parent | b8fe71e7a12e60f0c19fa86da83f270dc09e14fd (diff) | |
download | scummvm-rg350-e808cdf7a08d641389ecc81063b3b1016c7bc8cf.tar.gz scummvm-rg350-e808cdf7a08d641389ecc81063b3b1016c7bc8cf.tar.bz2 scummvm-rg350-e808cdf7a08d641389ecc81063b3b1016c7bc8cf.zip |
Reimplemented pushEvent() and artificialEventQueue to work with Events instead of EventTypes. Reimplemented Queue as a List instead of Array. Updated AGOS, AGI, CINE, GOB, and KYRA to work with the current implementation of the GMM
svn-id: r32971
Diffstat (limited to 'engines/gob/game_v2.cpp')
-rw-r--r-- | engines/gob/game_v2.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/gob/game_v2.cpp b/engines/gob/game_v2.cpp index cf7beec031..d99b9e82fc 100644 --- a/engines/gob/game_v2.cpp +++ b/engines/gob/game_v2.cpp @@ -71,7 +71,7 @@ void Game_v2::playTot(int16 skipPlay) { strcpy(savedTotName, _curTotFile); if (skipPlay <= 0) { - while (!g_system->getEventManager()->shouldQuit()) { + while (!_vm->quit()) { if (_vm->_inter->_variables) _vm->_draw->animateCursor(4); @@ -439,7 +439,7 @@ int16 Game_v2::checkCollisions(byte handleMouse, int16 deltaTime, int16 *pResId, timeKey = _vm->_util->getTimeKey(); while (1) { - if (_vm->_inter->_terminate || g_system->getEventManager()->shouldQuit()) { + if (_vm->_inter->_terminate || _vm->quit()) { if (handleMouse) _vm->_draw->blitCursor(); return 0; @@ -1044,7 +1044,7 @@ void Game_v2::collisionsBlock(void) { WRITE_VAR(16, 0); _activeCollResId = 0; } - while ((_activeCollResId == 0) && !_vm->_inter->_terminate && !g_system->getEventManager()->shouldQuit()); + while ((_activeCollResId == 0) && !_vm->_inter->_terminate && !_vm->quit()); if ((_activeCollResId & 0xFFF) == collResId) { collStackPos = 0; @@ -1466,7 +1466,7 @@ int16 Game_v2::inputArea(int16 xPos, int16 yPos, int16 width, int16 height, key = checkCollisions(handleMouse, -300, collResId, collIndex); if ((key != 0) || (*collResId != 0) || - _vm->_inter->_terminate || g_system->getEventManager()->shouldQuit()) + _vm->_inter->_terminate || _vm->quit()) break; if (*pTotTime > 0) { @@ -1480,7 +1480,7 @@ int16 Game_v2::inputArea(int16 xPos, int16 yPos, int16 width, int16 height, } if ((key == 0) || (*collResId != 0) || - _vm->_inter->_terminate || g_system->getEventManager()->shouldQuit()) + _vm->_inter->_terminate || _vm->quit()) return 0; switch (key) { |