aboutsummaryrefslogtreecommitdiff
path: root/sky/sky.cpp
diff options
context:
space:
mode:
authorRobert Göffringmann2003-07-10 00:08:07 +0000
committerRobert Göffringmann2003-07-10 00:08:07 +0000
commit96f442923c70cdb57001ec141c25ff070587ffed (patch)
tree5ddb02bfdcb00a9a1a6eeebd46586c8c2a068e04 /sky/sky.cpp
parent5f9845b2cb3f3bbe2ac5eccc919139114a9edd3a (diff)
downloadscummvm-rg350-96f442923c70cdb57001ec141c25ff070587ffed.tar.gz
scummvm-rg350-96f442923c70cdb57001ec141c25ff070587ffed.tar.bz2
scummvm-rg350-96f442923c70cdb57001ec141c25ff070587ffed.zip
implemented fnRestartGame() and skipping of 2nd intro part
svn-id: r8885
Diffstat (limited to 'sky/sky.cpp')
-rw-r--r--sky/sky.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/sky/sky.cpp b/sky/sky.cpp
index 049788de06..8197c86f95 100644
--- a/sky/sky.cpp
+++ b/sky/sky.cpp
@@ -116,7 +116,7 @@ void SkyState::go() {
initialise();
bool introSkipped;
- if (!isDemo() || isCDVersion())
+ if (_systemVars.gameVersion != 267) // don't do intro for floppydemo
introSkipped = !intro();
else introSkipped = false;
@@ -126,8 +126,8 @@ void SkyState::go() {
_paintGrid = false;
- /*if (introSkipped)
- _skyControl->restartGame();*/
+ if (introSkipped)
+ _skyControl->restartGame();
while (1) {
delay(_systemVars.gameSpeed);
@@ -148,8 +148,10 @@ void SkyState::go() {
_key_pressed = 0;
_skyControl->doControlPanel();
}
- /*if ((_key_pressed == 27) && (!_systemVars.pastIntro))
- _skyControl->restartGame();*/
+ if ((_key_pressed == 27) && (!_systemVars.pastIntro)) {
+ _skyControl->restartGame();
+ _key_pressed = 0;
+ }
_skySound->checkFxQueue();
_skyMouse->mouseEngine((uint16)_sdl_mouse_x, (uint16)_sdl_mouse_y);