aboutsummaryrefslogtreecommitdiff
path: root/engines/gob/inter_bargon.cpp
diff options
context:
space:
mode:
authorChristopher Page2008-07-08 00:16:55 +0000
committerChristopher Page2008-07-08 00:16:55 +0000
commita43f016b94dd9214f0c72ae1f999a3a265977116 (patch)
tree83b2ba0813e4659bd660872baab3ef81b0ce1f69 /engines/gob/inter_bargon.cpp
parent41938b7644d2f1937f28641eac68218515e1f058 (diff)
downloadscummvm-rg350-a43f016b94dd9214f0c72ae1f999a3a265977116.tar.gz
scummvm-rg350-a43f016b94dd9214f0c72ae1f999a3a265977116.tar.bz2
scummvm-rg350-a43f016b94dd9214f0c72ae1f999a3a265977116.zip
GOB works with the new GMM implementation
svn-id: r32955
Diffstat (limited to 'engines/gob/inter_bargon.cpp')
-rw-r--r--engines/gob/inter_bargon.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/engines/gob/inter_bargon.cpp b/engines/gob/inter_bargon.cpp
index c2bc4ca01d..b0378f1bdb 100644
--- a/engines/gob/inter_bargon.cpp
+++ b/engines/gob/inter_bargon.cpp
@@ -24,6 +24,7 @@
*/
#include "common/endian.h"
+#include "common/events.h"
#include "gob/gob.h"
#include "gob/inter.h"
@@ -750,7 +751,7 @@ void Inter_Bargon::oBargon_intro2(OpGobParams &params) {
for (i = 320; i >= 0; i--) {
_vm->_util->setScrollOffset(i, 0);
if ((_vm->_game->checkKeys(&mouseX, &mouseY, &buttons, 0) == 0x11B) ||
- _vm->_quit) {
+ g_system->getEventManager()->shouldQuit()) {
_vm->_palAnim->fade(0, -2, 0);
_vm->_video->clearSurf(_vm->_draw->_frontSurface);
memset((char *) _vm->_draw->_vgaPalette, 0, 768);
@@ -760,7 +761,7 @@ void Inter_Bargon::oBargon_intro2(OpGobParams &params) {
break;
}
}
- if (!_vm->_quit)
+ if (!g_system->getEventManager()->shouldQuit())
_vm->_util->setScrollOffset(0, 0);
surface = 0;
if (VAR(57) == ((uint32) -1))
@@ -799,7 +800,7 @@ void Inter_Bargon::oBargon_intro3(OpGobParams &params) {
_vm->_util->longDelay(_vm->_util->getRandom(200));
}
if ((_vm->_game->checkKeys(&mouseX, &mouseY, &buttons, 0) == 0x11B) ||
- _vm->_quit) {
+ g_system->getEventManager()->shouldQuit()) {
_vm->_sound->blasterStop(10);
_vm->_palAnim->fade(0, -2, 0);
_vm->_video->clearSurf(_vm->_draw->_frontSurface);