projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed bug with calling function with invalid (although ignored) parameter
[rocksndiamonds.git]
/
src
/
game.c
diff --git
a/src/game.c
b/src/game.c
index d63944fa4acd4bd6c9437a917624103ee9b6a406..e0f9c8781c8f199311028141fe57aee066ad09b1 100644
(file)
--- a/
src/game.c
+++ b/
src/game.c
@@
-3337,8
+3337,7
@@
void InitGame()
ExpireSoundLoops(TRUE);
ExpireSoundLoops(TRUE);
- if (!level_editor_test_game)
- FadeOut(fade_mask);
+ FadeOut(fade_mask);
/* needed if different viewport properties defined for playing */
ChangeViewportPropertiesIfNeeded();
/* needed if different viewport properties defined for playing */
ChangeViewportPropertiesIfNeeded();
@@
-3574,6
+3573,8
@@
void InitGame()
game.ball_state = level.ball_state_initial;
game.ball_content_nr = 0;
game.ball_state = level.ball_state_initial;
game.ball_content_nr = 0;
+ game.explosions_delayed = TRUE;
+
game.envelope_active = FALSE;
for (i = 0; i < NUM_BELTS; i++)
game.envelope_active = FALSE;
for (i = 0; i < NUM_BELTS; i++)
@@
-3955,6
+3956,9
@@
void InitGame()
if (stored_player[i].active)
local_player->players_still_needed++;
if (stored_player[i].active)
local_player->players_still_needed++;
+ if (level.solved_by_one_player)
+ local_player->players_still_needed = 1;
+
/* when recording the game, store which players take part in the game */
if (tape.recording)
{
/* when recording the game, store which players take part in the game */
if (tape.recording)
{
@@
-13424,7
+13428,8
@@
void ExitPlayer(struct PlayerInfo *player)
DrawPlayer(player); /* needed here only to cleanup last field */
RemovePlayer(player);
DrawPlayer(player); /* needed here only to cleanup last field */
RemovePlayer(player);
- local_player->players_still_needed--;
+ if (local_player->players_still_needed > 0)
+ local_player->players_still_needed--;
}
static void setFieldForSnapping(int x, int y, int element, int direction)
}
static void setFieldForSnapping(int x, int y, int element, int direction)
@@
-14595,7
+14600,7
@@
static void PlayLevelMusic()
char *next_music = getMusicInfoEntryFilename(music_nr);
if (!strEqual(curr_music, next_music))
char *next_music = getMusicInfoEntryFilename(music_nr);
if (!strEqual(curr_music, next_music))
- PlayMusic(music_nr);
+ PlayMusic
Loop
(music_nr);
}
void PlayLevelSound_EM(int xx, int yy, int element_em, int sample)
}
void PlayLevelSound_EM(int xx, int yy, int element_em, int sample)