[Scummvm-cvs-logs] CVS: scummvm/sky sky.cpp,1.157,1.158 sky.h,1.60,1.61
Max Horn
fingolfin at users.sourceforge.net
Mon Nov 22 16:04:04 CET 2004
Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32311/sky
Modified Files:
sky.cpp sky.h
Log Message:
Added Engine::init() method; added return value to Engine::go()
Index: sky.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.cpp,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -d -r1.157 -r1.158
--- sky.cpp 20 Nov 2004 23:49:11 -0000 1.157
+++ sky.cpp 23 Nov 2004 00:03:23 -0000 1.158
@@ -183,9 +183,7 @@
_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 @@
_skyScreen->flip();
}
}
+
+ return 0;
}
-void SkyEngine::initialise(void) {
+int SkyEngine::init() {
_system->initSize(320, 200);
if (!_mixer->isReady())
@@ -359,6 +359,8 @@
_skyMusic->setVolume(ConfMan.getInt("music_volume") >> 1);
_debugger = new Debugger(_skyLogic, _skyMouse, _skyScreen);
+
+ return 0;
}
void SkyEngine::initItemList() {
Index: sky.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.h,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- sky.h 13 Sep 2004 17:05:23 -0000 1.60
+++ sky.h 23 Nov 2004 00:03:24 -0000 1.61
@@ -93,14 +93,14 @@
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();
More information about the Scummvm-git-logs
mailing list