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/inter_bargon.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/inter_bargon.cpp')
| -rw-r--r-- | engines/gob/inter_bargon.cpp | 6 | 
1 files changed, 3 insertions, 3 deletions
| diff --git a/engines/gob/inter_bargon.cpp b/engines/gob/inter_bargon.cpp index b0378f1bdb..25d75589df 100644 --- a/engines/gob/inter_bargon.cpp +++ b/engines/gob/inter_bargon.cpp @@ -751,7 +751,7 @@ void Inter_Bargon::oBargon_intro2(OpGobParams ¶ms) {  	for (i = 320; i >= 0; i--) {  		_vm->_util->setScrollOffset(i, 0);  		if ((_vm->_game->checkKeys(&mouseX, &mouseY, &buttons, 0) == 0x11B) || -				g_system->getEventManager()->shouldQuit()) { +				_vm->quit()) {  			_vm->_palAnim->fade(0, -2, 0);  			_vm->_video->clearSurf(_vm->_draw->_frontSurface);  			memset((char *) _vm->_draw->_vgaPalette, 0, 768); @@ -761,7 +761,7 @@ void Inter_Bargon::oBargon_intro2(OpGobParams ¶ms) {  			break;  		}  	} -	if (!g_system->getEventManager()->shouldQuit()) +	if (!_vm->quit())  		_vm->_util->setScrollOffset(0, 0);  	surface = 0;  	if (VAR(57) == ((uint32) -1)) @@ -800,7 +800,7 @@ void Inter_Bargon::oBargon_intro3(OpGobParams ¶ms) {  			_vm->_util->longDelay(_vm->_util->getRandom(200));  		}  		if ((_vm->_game->checkKeys(&mouseX, &mouseY, &buttons, 0) == 0x11B) || -				g_system->getEventManager()->shouldQuit()) { +				_vm->quit()) {  			_vm->_sound->blasterStop(10);  			_vm->_palAnim->fade(0, -2, 0);  			_vm->_video->clearSurf(_vm->_draw->_frontSurface); | 
