[Scummvm-cvs-logs] SF.net SVN: scummvm:[34310] scummvm/trunk
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Wed Sep 3 18:56:50 CEST 2008
Revision: 34310
http://scummvm.svn.sourceforge.net/scummvm/?rev=34310&view=rev
Author: fingolfin
Date: 2008-09-03 16:56:40 +0000 (Wed, 03 Sep 2008)
Log Message:
-----------
Moved check for shouldRTL() from engines to scummvm_main
Modified Paths:
--------------
scummvm/trunk/base/main.cpp
scummvm/trunk/engines/agi/agi.cpp
scummvm/trunk/engines/agi/preagi.cpp
scummvm/trunk/engines/agos/agos.cpp
scummvm/trunk/engines/cine/cine.cpp
scummvm/trunk/engines/engine.h
scummvm/trunk/engines/gob/gob.cpp
scummvm/trunk/engines/kyra/kyra_hof.cpp
scummvm/trunk/engines/kyra/kyra_lok.cpp
scummvm/trunk/engines/kyra/kyra_mr.cpp
scummvm/trunk/engines/lure/lure.cpp
scummvm/trunk/engines/parallaction/parallaction_br.cpp
scummvm/trunk/engines/parallaction/parallaction_ns.cpp
scummvm/trunk/engines/queen/queen.cpp
scummvm/trunk/engines/saga/saga.cpp
scummvm/trunk/engines/scumm/scumm.cpp
scummvm/trunk/engines/sky/sky.cpp
scummvm/trunk/engines/sword1/sword1.cpp
scummvm/trunk/engines/sword2/sword2.cpp
scummvm/trunk/engines/tinsel/tinsel.cpp
scummvm/trunk/engines/touche/touche.cpp
Modified: scummvm/trunk/base/main.cpp
===================================================================
--- scummvm/trunk/base/main.cpp 2008-09-03 15:58:40 UTC (rev 34309)
+++ scummvm/trunk/base/main.cpp 2008-09-03 16:56:40 UTC (rev 34310)
@@ -201,8 +201,8 @@
// Reset the file/directory mappings
Common::File::resetDefaultDirectories();
- // If result=1 return to the launcher, else quit ScummVM
- return result;
+ // Return result (== 0 means no error)
+ return result;
}
@@ -285,16 +285,19 @@
// Try to run the game
int result = runGame(plugin, system, specialDebug);
- // TODO: We should keep running if starting the selected game failed
- // (so instead of just quitting, show a nice error dialog to the
- // user and let him pick another game).
-
+
+ // Did an error occur ?
+ if (result != 0) {
+ // TODO: Show an informative error dialog if starting the selected game failed.
+ }
+
+ // Quit unless an error occurred, or Return to launcher was requested
+ if (result == 0 && !g_system->getEventManager()->shouldRTL())
+ break;
+
// Reset RTL flag in case we want to load another engine
- g_system->getEventManager()->resetRTL();
+ g_system->getEventManager()->resetRTL();
- if (result == 0)
- break;
-
// Discard any command line options. It's unlikely that the user
// wanted to apply them to *all* games ever launched.
ConfMan.getDomain(Common::ConfigManager::kTransientDomain)->clear();
Modified: scummvm/trunk/engines/agi/agi.cpp
===================================================================
--- scummvm/trunk/engines/agi/agi.cpp 2008-09-03 15:58:40 UTC (rev 34309)
+++ scummvm/trunk/engines/agi/agi.cpp 2008-09-03 16:56:40 UTC (rev 34310)
@@ -807,7 +807,7 @@
runGame();
- return _eventMan->shouldRTL();
+ return 0;
}
void AgiEngine::syncSoundSettings() {
Modified: scummvm/trunk/engines/agi/preagi.cpp
===================================================================
--- scummvm/trunk/engines/agi/preagi.cpp 2008-09-03 15:58:40 UTC (rev 34309)
+++ scummvm/trunk/engines/agi/preagi.cpp 2008-09-03 16:56:40 UTC (rev 34310)
@@ -227,7 +227,7 @@
error("Unknown preagi engine");
break;
}
- return _eventMan->shouldRTL();
+ return 0;
}
} // End of namespace Agi
Modified: scummvm/trunk/engines/agos/agos.cpp
===================================================================
--- scummvm/trunk/engines/agos/agos.cpp 2008-09-03 15:58:40 UTC (rev 34309)
+++ scummvm/trunk/engines/agos/agos.cpp 2008-09-03 16:56:40 UTC (rev 34310)
@@ -1023,7 +1023,7 @@
delay(100);
}
- return _eventMan->shouldRTL();
+ return 0;
}
Modified: scummvm/trunk/engines/cine/cine.cpp
===================================================================
--- scummvm/trunk/engines/cine/cine.cpp 2008-09-03 15:58:40 UTC (rev 34309)
+++ scummvm/trunk/engines/cine/cine.cpp 2008-09-03 16:56:40 UTC (rev 34310)
@@ -101,7 +101,7 @@
delete[] collisionPage;
delete g_sound;
- return _eventMan->shouldRTL();
+ return 0;
}
int CineEngine::getTimerDelay() const {
Modified: scummvm/trunk/engines/engine.h
===================================================================
--- scummvm/trunk/engines/engine.h 2008-09-03 15:58:40 UTC (rev 34309)
+++ scummvm/trunk/engines/engine.h 2008-09-03 16:56:40 UTC (rev 34310)
@@ -90,7 +90,7 @@
* Start the main engine loop.
* The return value is not yet used, but could indicate whether the user
* wants to return to the launch or to fully quit ScummVM.
- * @return a result code
+ * @return 0 for success, else an error code.
*/
virtual int go() = 0;
Modified: scummvm/trunk/engines/gob/gob.cpp
===================================================================
--- scummvm/trunk/engines/gob/gob.cpp 2008-09-03 15:58:40 UTC (rev 34309)
+++ scummvm/trunk/engines/gob/gob.cpp 2008-09-03 16:56:40 UTC (rev 34310)
@@ -112,7 +112,7 @@
int GobEngine::go() {
_init->initGame(0);
- return _eventMan->shouldRTL();
+ return 0;
}
const char *GobEngine::getLangDesc(int16 language) const {
Modified: scummvm/trunk/engines/kyra/kyra_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_hof.cpp 2008-09-03 15:58:40 UTC (rev 34309)
+++ scummvm/trunk/engines/kyra/kyra_hof.cpp 2008-09-03 16:56:40 UTC (rev 34310)
@@ -325,7 +325,7 @@
seq_playSequences(kSequenceFunters, kSequenceFrash);
}
- return _eventMan->shouldRTL();
+ return 0;
}
void KyraEngine_HoF::startup() {
Modified: scummvm/trunk/engines/kyra/kyra_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_lok.cpp 2008-09-03 15:58:40 UTC (rev 34309)
+++ scummvm/trunk/engines/kyra/kyra_lok.cpp 2008-09-03 16:56:40 UTC (rev 34310)
@@ -304,7 +304,7 @@
setGameFlag(0xEF);
seq_intro();
if (quit())
- return _eventMan->shouldRTL();
+ return 0;
if (_skipIntroFlag && _abortIntroFlag)
resetGameFlag(0xEF);
}
@@ -312,7 +312,7 @@
resetGameFlag(0xEF);
mainLoop();
}
- return _eventMan->shouldRTL();
+ return 0;
}
Modified: scummvm/trunk/engines/kyra/kyra_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_mr.cpp 2008-09-03 15:58:40 UTC (rev 34309)
+++ scummvm/trunk/engines/kyra/kyra_mr.cpp 2008-09-03 16:56:40 UTC (rev 34310)
@@ -324,7 +324,7 @@
if (_showOutro)
playVQA("CREDITS");
- return _eventMan->shouldRTL();
+ return 0;
}
void KyraEngine_MR::initMainMenu() {
Modified: scummvm/trunk/engines/lure/lure.cpp
===================================================================
--- scummvm/trunk/engines/lure/lure.cpp 2008-09-03 15:58:40 UTC (rev 34309)
+++ scummvm/trunk/engines/lure/lure.cpp 2008-09-03 16:56:40 UTC (rev 34310)
@@ -137,7 +137,7 @@
bool result = dialog->show();
delete dialog;
if (quit())
- return _eventMan->shouldRTL();
+ return 0;
if (!result)
error("Sorry - copy protection failed");
@@ -160,7 +160,7 @@
}
delete gameInstance;
- return _eventMan->shouldRTL();
+ return 0;
}
void LureEngine::pauseEngineIntern(bool pause) {
Modified: scummvm/trunk/engines/parallaction/parallaction_br.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction_br.cpp 2008-09-03 15:58:40 UTC (rev 34309)
+++ scummvm/trunk/engines/parallaction/parallaction_br.cpp 2008-09-03 16:56:40 UTC (rev 34310)
@@ -125,7 +125,7 @@
cleanupGame();
}
- return _eventMan->shouldRTL();
+ return 0;
}
Modified: scummvm/trunk/engines/parallaction/parallaction_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction_ns.cpp 2008-09-03 15:58:40 UTC (rev 34309)
+++ scummvm/trunk/engines/parallaction/parallaction_ns.cpp 2008-09-03 16:56:40 UTC (rev 34310)
@@ -235,7 +235,7 @@
runGame();
}
- return _eventMan->shouldRTL();
+ return 0;
}
void Parallaction_ns::switchBackground(const char* background, const char* mask) {
Modified: scummvm/trunk/engines/queen/queen.cpp
===================================================================
--- scummvm/trunk/engines/queen/queen.cpp 2008-09-03 15:58:40 UTC (rev 34309)
+++ scummvm/trunk/engines/queen/queen.cpp 2008-09-03 16:56:40 UTC (rev 34310)
@@ -444,7 +444,7 @@
update(true);
}
}
- return _eventMan->shouldRTL();
+ return 0;
}
int QueenEngine::init() {
Modified: scummvm/trunk/engines/saga/saga.cpp
===================================================================
--- scummvm/trunk/engines/saga/saga.cpp 2008-09-03 15:58:40 UTC (rev 34309)
+++ scummvm/trunk/engines/saga/saga.cpp 2008-09-03 16:56:40 UTC (rev 34310)
@@ -310,7 +310,7 @@
_system->delayMillis(10);
}
- return _eventMan->shouldRTL();
+ return 0;
}
void SagaEngine::loadStrings(StringsTable &stringsTable, const byte *stringsPointer, size_t stringsLength) {
Modified: scummvm/trunk/engines/scumm/scumm.cpp
===================================================================
--- scummvm/trunk/engines/scumm/scumm.cpp 2008-09-03 15:58:40 UTC (rev 34309)
+++ scummvm/trunk/engines/scumm/scumm.cpp 2008-09-03 16:56:40 UTC (rev 34310)
@@ -1756,7 +1756,7 @@
}
}
- return _eventMan->shouldRTL();
+ return 0;
}
void ScummEngine::waitForTimer(int msec_delay) {
Modified: scummvm/trunk/engines/sky/sky.cpp
===================================================================
--- scummvm/trunk/engines/sky/sky.cpp 2008-09-03 15:58:40 UTC (rev 34309)
+++ scummvm/trunk/engines/sky/sky.cpp 2008-09-03 16:56:40 UTC (rev 34310)
@@ -426,7 +426,7 @@
_skyMusic->stopMusic();
ConfMan.flushToDisk();
delay(1500);
- return _eventMan->shouldRTL();
+ return 0;
}
int SkyEngine::init() {
Modified: scummvm/trunk/engines/sword1/sword1.cpp
===================================================================
--- scummvm/trunk/engines/sword1/sword1.cpp 2008-09-03 15:58:40 UTC (rev 34309)
+++ scummvm/trunk/engines/sword1/sword1.cpp 2008-09-03 16:56:40 UTC (rev 34310)
@@ -727,7 +727,7 @@
}
}
- return _eventMan->shouldRTL();
+ return 0;
}
void SwordEngine::checkCd(void) {
Modified: scummvm/trunk/engines/sword2/sword2.cpp
===================================================================
--- scummvm/trunk/engines/sword2/sword2.cpp 2008-09-03 15:58:40 UTC (rev 34309)
+++ scummvm/trunk/engines/sword2/sword2.cpp 2008-09-03 16:56:40 UTC (rev 34310)
@@ -499,7 +499,7 @@
#endif
}
- return _eventMan->shouldRTL();
+ return 0;
}
void Sword2Engine::restartGame() {
Modified: scummvm/trunk/engines/tinsel/tinsel.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/tinsel.cpp 2008-09-03 15:58:40 UTC (rev 34309)
+++ scummvm/trunk/engines/tinsel/tinsel.cpp 2008-09-03 16:56:40 UTC (rev 34310)
@@ -774,7 +774,7 @@
// Write configuration
WriteConfig();
- return _eventMan->shouldRTL();
+ return 0;
}
Modified: scummvm/trunk/engines/touche/touche.cpp
===================================================================
--- scummvm/trunk/engines/touche/touche.cpp 2008-09-03 15:58:40 UTC (rev 34309)
+++ scummvm/trunk/engines/touche/touche.cpp 2008-09-03 16:56:40 UTC (rev 34310)
@@ -111,7 +111,7 @@
res_deallocateTables();
res_closeDataFile();
- return _eventMan->shouldRTL();
+ return 0;
}
void ToucheEngine::restart() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list