aboutsummaryrefslogtreecommitdiff
path: root/sky
diff options
context:
space:
mode:
authorMax Horn2004-11-23 00:03:25 +0000
committerMax Horn2004-11-23 00:03:25 +0000
commitaad9f122c0c37b152e70a01da48dc86a441ef819 (patch)
treea8dbee1f4e1e57de1ee5088e707f295df4986d12 /sky
parent8ac347fd952a3811e6a948dfca3dec081882c335 (diff)
downloadscummvm-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 'sky')
-rw-r--r--sky/sky.cpp10
-rw-r--r--sky/sky.h4
2 files changed, 8 insertions, 6 deletions
diff --git a/sky/sky.cpp b/sky/sky.cpp
index 072c958525..17a2747191 100644
--- a/sky/sky.cpp
+++ b/sky/sky.cpp
@@ -183,9 +183,7 @@ void SkyEngine::handleKey(void) {
_key_pressed = 0;
}
-void SkyEngine::go() {
-
- initialise();
+int SkyEngine::go() {
_sdl_mouse_x = GAME_SCREEN_WIDTH / 2;
_sdl_mouse_y = GAME_SCREEN_HEIGHT / 2;
@@ -243,9 +241,11 @@ void SkyEngine::go() {
_skyScreen->flip();
}
}
+
+ return 0;
}
-void SkyEngine::initialise(void) {
+int SkyEngine::init() {
_system->initSize(320, 200);
if (!_mixer->isReady())
@@ -359,6 +359,8 @@ void SkyEngine::initialise(void) {
_skyMusic->setVolume(ConfMan.getInt("music_volume") >> 1);
_debugger = new Debugger(_skyLogic, _skyMouse, _skyScreen);
+
+ return 0;
}
void SkyEngine::initItemList() {
diff --git a/sky/sky.h b/sky/sky.h
index 0eee981dea..d4e57e9a7a 100644
--- a/sky/sky.h
+++ b/sky/sky.h
@@ -93,14 +93,14 @@ protected:
void logic_engine();
void delay(uint amount);
- void go();
+ int go();
void doCheat(uint8 num);
void handleKey(void);
uint32 _lastSaveTime;
Text *getText();
- void initialise();
+ int init();
void initItemList();
void initVirgin();