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 not recognizing ".mode_loop: false" for music
[rocksndiamonds.git]
/
src
/
game.c
diff --git
a/src/game.c
b/src/game.c
index e1522b58bb844136786b4113ee247df34506cfdb..4c9c56e8f81825e57bebbd3e92dd0f3bb6c3adaa 100644
(file)
--- a/
src/game.c
+++ b/
src/game.c
@@
-2224,7
+2224,8
@@
void UpdateGameControlValues()
/* update game panel control values */
/* update game panel control values */
- game_panel_controls[GAME_PANEL_LEVEL_NUMBER].value = level_nr;
+ /* used instead of "level_nr" (for network games) */
+ game_panel_controls[GAME_PANEL_LEVEL_NUMBER].value = levelset.level_nr;
game_panel_controls[GAME_PANEL_GEMS].value = gems;
game_panel_controls[GAME_PANEL_INVENTORY_COUNT].value = 0;
game_panel_controls[GAME_PANEL_GEMS].value = gems;
game_panel_controls[GAME_PANEL_INVENTORY_COUNT].value = 0;
@@
-3336,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();
@@
-4660,7
+4660,6
@@
void GameWon()
void GameEnd()
{
int hi_pos;
void GameEnd()
{
int hi_pos;
- int last_level_nr = level_nr;
local_player->LevelSolved_GameEnd = TRUE;
local_player->LevelSolved_GameEnd = TRUE;
@@
-4702,7
+4701,8
@@
void GameEnd()
}
if (setup.increment_levels &&
}
if (setup.increment_levels &&
- level_nr < leveldir_current->last_level)
+ level_nr < leveldir_current->last_level &&
+ !network_playing)
{
level_nr++; /* advance to next level */
TapeErase(); /* start with empty tape */
{
level_nr++; /* advance to next level */
TapeErase(); /* start with empty tape */
@@
-4715,23
+4715,25
@@
void GameEnd()
}
}
}
}
- hi_pos = NewHiScore(last_level_nr);
+ /* used instead of last "level_nr" (for network games) */
+ hi_pos = NewHiScore(levelset.level_nr);
if (hi_pos >= 0 && !setup.skip_scores_after_game)
{
SetGameStatus(GAME_MODE_SCORES);
if (hi_pos >= 0 && !setup.skip_scores_after_game)
{
SetGameStatus(GAME_MODE_SCORES);
- DrawHallOfFame(l
ast_
level_nr, hi_pos);
+ DrawHallOfFame(l
evelset.
level_nr, hi_pos);
}
}
- else if (!setup.auto_play_next_level || !setup.increment_levels)
+ else if (setup.auto_play_next_level && setup.increment_levels &&
+ !network_playing)
{
{
- SetGameStatus(GAME_MODE_MAIN);
-
- DrawMainMenu();
+ StartGameActions(network.enabled, setup.autorecord, level.random_seed);
}
else
{
}
else
{
- StartGameActions(network.enabled, setup.autorecord, level.random_seed);
+ SetGameStatus(GAME_MODE_MAIN);
+
+ DrawMainMenu();
}
}
}
}
@@
-11227,6
+11229,7
@@
void StartGameActions(boolean init_network_game, boolean record_tape,
if (init_network_game)
{
if (init_network_game)
{
+ SendToServer_LevelFile();
SendToServer_StartPlaying();
return;
SendToServer_StartPlaying();
return;
@@
-14591,7
+14594,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)