projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changed starting music for MM game engine after charging laser
[rocksndiamonds.git]
/
src
/
game.c
diff --git
a/src/game.c
b/src/game.c
index f8606638343c4427fddb0d3f93790a1d4a4e48e0..6d07ec5489b05a0a8cec073449b8bd2af0e6eed3 100644
(file)
--- a/
src/game.c
+++ b/
src/game.c
@@
-3305,17
+3305,18
@@
void InitGame()
ExpireSoundLoops(TRUE);
ExpireSoundLoops(TRUE);
- FadeOut(fade_mask);
+ if (!level_editor_test_game)
+ FadeOut(fade_mask);
/* needed if different viewport properties defined for playing */
ChangeViewportPropertiesIfNeeded();
ClearField();
/* needed if different viewport properties defined for playing */
ChangeViewportPropertiesIfNeeded();
ClearField();
- OpenDoor(GetDoorState() | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
-
DrawCompleteVideoDisplay();
DrawCompleteVideoDisplay();
+ OpenDoor(GetDoorState() | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
+
InitGameEngine();
InitGameControlValues();
InitGameEngine();
InitGameControlValues();
@@
-3344,10
+3345,12
@@
void InitGame()
player->mouse_action.lx = 0;
player->mouse_action.ly = 0;
player->mouse_action.button = 0;
player->mouse_action.lx = 0;
player->mouse_action.ly = 0;
player->mouse_action.button = 0;
+ player->mouse_action.button_hint = 0;
player->effective_mouse_action.lx = 0;
player->effective_mouse_action.ly = 0;
player->effective_mouse_action.button = 0;
player->effective_mouse_action.lx = 0;
player->effective_mouse_action.ly = 0;
player->effective_mouse_action.button = 0;
+ player->effective_mouse_action.button_hint = 0;
player->score = 0;
player->score_final = 0;
player->score = 0;
player->score_final = 0;
@@
-4183,11
+4186,6
@@
void InitGame()
OpenDoor(DOOR_OPEN_ALL);
OpenDoor(DOOR_OPEN_ALL);
- PlaySound(SND_GAME_STARTING);
-
- if (setup.sound_music)
- PlayLevelMusic();
-
KeyboardAutoRepeatOffUnlessAutoplay();
#if DEBUG_INIT_PLAYER
KeyboardAutoRepeatOffUnlessAutoplay();
#if DEBUG_INIT_PLAYER
@@
-4233,6
+4231,14
@@
void InitGame()
InitGameActions_MM();
SaveEngineSnapshotToListInitial();
InitGameActions_MM();
SaveEngineSnapshotToListInitial();
+
+ if (!game.restart_level)
+ {
+ PlaySound(SND_GAME_STARTING);
+
+ if (setup.sound_music)
+ PlayLevelMusic();
+ }
}
void UpdateEngineValues(int actual_scroll_x, int actual_scroll_y,
}
void UpdateEngineValues(int actual_scroll_x, int actual_scroll_y,
@@
-4699,7
+4705,7
@@
void GameEnd()
if (!global.use_envelope_request)
CloseDoor(DOOR_CLOSE_1);
if (!global.use_envelope_request)
CloseDoor(DOOR_CLOSE_1);
- SaveTapeChecked
(tape.level_nr);
/* ask to save tape */
+ SaveTapeChecked
_LevelSolved(tape.level_nr);
/* ask to save tape */
}
/* if no tape is to be saved, close both doors simultaneously */
}
/* if no tape is to be saved, close both doors simultaneously */