diff options
author | Max Horn | 2004-11-23 00:03:25 +0000 |
---|---|---|
committer | Max Horn | 2004-11-23 00:03:25 +0000 |
commit | aad9f122c0c37b152e70a01da48dc86a441ef819 (patch) | |
tree | a8dbee1f4e1e57de1ee5088e707f295df4986d12 /scumm/scumm.cpp | |
parent | 8ac347fd952a3811e6a948dfca3dec081882c335 (diff) | |
download | scummvm-rg350-aad9f122c0c37b152e70a01da48dc86a441ef819.tar.gz scummvm-rg350-aad9f122c0c37b152e70a01da48dc86a441ef819.tar.bz2 scummvm-rg350-aad9f122c0c37b152e70a01da48dc86a441ef819.zip |
Added Engine::init() method; added return value to Engine::go()
svn-id: r15865
Diffstat (limited to 'scumm/scumm.cpp')
-rw-r--r-- | scumm/scumm.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp index f8abc97773..7df2d8d8ec 100644 --- a/scumm/scumm.cpp +++ b/scumm/scumm.cpp @@ -972,16 +972,11 @@ ScummEngine_v70he::ScummEngine_v70he(GameDetector *detector, OSystem *syst, cons _heSndSoundFreq = 0; } -void ScummEngine::go() { - mainInit(); - mainRun(); -} - #pragma mark - #pragma mark --- Initialization --- #pragma mark - -void ScummEngine::mainInit() { +int ScummEngine::init() { // Initialize backend _system->initSize(_screenWidth, _screenHeight); @@ -1119,6 +1114,8 @@ void ScummEngine::mainInit() { } else { _saveLoadFlag = 0; } + + return 0; } void ScummEngine::scummInit() { @@ -1397,7 +1394,7 @@ void ScummEngine::setupMusic(int midi) { #pragma mark --- Main loop --- #pragma mark - -void ScummEngine::mainRun() { +int ScummEngine::go() { int delta = 0; int diff = _system->getMillis(); @@ -1418,6 +1415,8 @@ void ScummEngine::mainRun() { // TODO: Maybe perform an autosave on exit? } } + + return 0; } void ScummEngine::waitForTimer(int msec_delay) { |