libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-15 14:18:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SAGA works with new GMM implementation

Browse Source 
svn-id: r33000
This commit is contained in:
Christopher Page 2008-07-11 01:09:48 +00:00
parent 67c8c39fdf
commit cbadb51ce7
7 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engines/saga/input.cpp
View File

@ -141,9 +141,6 @@ int SagaEngine::processInput() {
break; break;
case Common::EVENT_MOUSEMOVE: case Common::EVENT_MOUSEMOVE:
break; break;
case Common::EVENT_QUIT:
shutDown();
break;
default: default:
break; break;
} }

4
engines/saga/interface.cpp
View File

@ -688,7 +688,7 @@ bool Interface::processAscii(Common::KeyState keystate) {
setMode(kPanelMain); setMode(kPanelMain);
_vm->_script->setNoPendingVerb(); _vm->_script->setNoPendingVerb();
} else if (ascii == 'q' || ascii == 'Q') { } else if (ascii == 'q' || ascii == 'Q') {
_vm->shutDown(); _vm->quitGame();
} }
break; break;
case kPanelBoss: case kPanelBoss:
@ -1081,7 +1081,7 @@ void Interface::setQuit(PanelButton *panelButton) {
if (_vm->getGameId() == GID_IHNM_DEMO) if (_vm->getGameId() == GID_IHNM_DEMO)
_vm->_scene->creditsScene(); // display sales info for IHNM demo _vm->_scene->creditsScene(); // display sales info for IHNM demo
else else
_vm->shutDown(); _vm->quitGame();
break; break;
} }
} }

9
engines/saga/introproc_ihnm.cpp
View File

@ -59,8 +59,12 @@ int Scene::IHNMStartProc() {
// Play Cyberdreams logo for 168 frames // Play Cyberdreams logo for 168 frames
if (!playTitle(0, logoLength, true)) { if (!playTitle(0, logoLength, true)) {
if (_vm->quit())
return !SUCCESS;
// Play Dreamers Guild logo for 10 seconds // Play Dreamers Guild logo for 10 seconds
if (!playLoopingTitle(1, 10)) { if (!playLoopingTitle(1, 10)) {
if (_vm->quit())
return !SUCCESS;
// Play the title music // Play the title music
_vm->_music->play(1, MUSIC_NORMAL); _vm->_music->play(1, MUSIC_NORMAL);
// Play title screen // Play title screen
@ -70,6 +74,8 @@ int Scene::IHNMStartProc() {
} else { } else {
_vm->_music->play(1, MUSIC_NORMAL); _vm->_music->play(1, MUSIC_NORMAL);
playTitle(0, 10); playTitle(0, 10);
if (_vm->quit())
return !SUCCESS;
playTitle(2, 12); playTitle(2, 12);
} }
@ -144,7 +150,6 @@ bool Scene::checkKey() {
switch (event.type) { switch (event.type) {
case Common::EVENT_QUIT: case Common::EVENT_QUIT:
res = true; res = true;
_vm->shutDown();
break; break;
case Common::EVENT_KEYDOWN: case Common::EVENT_KEYDOWN:
// Don't react to modifier keys alone. The original did // Don't react to modifier keys alone. The original did
@ -187,7 +192,7 @@ bool Scene::playTitle(int title, int time, int mode) {
_vm->_gfx->getCurrentPal(pal_cut); _vm->_gfx->getCurrentPal(pal_cut);
while (!done) { while (!done && !_vm->quit()) {
curTime = _vm->_system->getMillis(); curTime = _vm->_system->getMillis();
switch (phase) { switch (phase) {

4
engines/saga/saga.cpp
View File

@ -261,7 +261,7 @@ int SagaEngine::go() {
uint32 currentTicks; uint32 currentTicks;
while (!_quit) { while (!quit()) {
if (_console->isAttached()) if (_console->isAttached())
_console->onFrame(); _console->onFrame();
@ -301,7 +301,7 @@ int SagaEngine::go() {
_system->delayMillis(10); _system->delayMillis(10);
} }
return _rtl; return _eventMan->shouldRTL();
} }
void SagaEngine::loadStrings(StringsTable &stringsTable, const byte *stringsPointer, size_t stringsLength) { void SagaEngine::loadStrings(StringsTable &stringsTable, const byte *stringsPointer, size_t stringsLength) {

1
engines/saga/saga.h
View File

@ -491,7 +491,6 @@ protected:
public: public:
SagaEngine(OSystem *syst, const SAGAGameDescription *gameDesc); SagaEngine(OSystem *syst, const SAGAGameDescription *gameDesc);
virtual ~SagaEngine(); virtual ~SagaEngine();
void shutDown() { _quit = true; }
void save(const char *fileName, const char *saveName); void save(const char *fileName, const char *saveName);
void load(const char *fileName); void load(const char *fileName);

2
engines/saga/scene.cpp
View File

@ -315,7 +315,7 @@ void Scene::creditsScene() {
break; break;
} }
_vm->shutDown(); _vm->quitGame();
return; return;
} }

4
engines/saga/sfuncs.cpp
View File

@ -356,7 +356,7 @@ void Script::sfMainMode(SCRIPTFUNC_PARAMS) {
// exit the game. Known non-interactive demos are GID_ITE_MACDEMO1 and // exit the game. Known non-interactive demos are GID_ITE_MACDEMO1 and
// GID_ITE_WINDEMO1 // GID_ITE_WINDEMO1
if (_vm->getFeatures() & GF_NON_INTERACTIVE) if (_vm->getFeatures() & GF_NON_INTERACTIVE)
_vm->shutDown(); _vm->quitGame();
} }
// Script function #6 (0x06) blocking // Script function #6 (0x06) blocking
@ -572,7 +572,7 @@ void Script::sfScriptGotoScene(SCRIPTFUNC_PARAMS) {
} }
if (_vm->getGameType() == GType_ITE && sceneNumber < 0) { if (_vm->getGameType() == GType_ITE && sceneNumber < 0) {
_vm->shutDown(); _vm->quitGame();
return; return;
} }