projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
disabled auto-incrementing level number when playing in network mode
[rocksndiamonds.git]
/
src
/
game.c
diff --git
a/src/game.c
b/src/game.c
index 380614c4b9799c766d0104d11135be76aa127648..a84acfb8f5b90cfe87c819c8e270b4aec70d6e49 100644
(file)
--- a/
src/game.c
+++ b/
src/game.c
@@
-4703,7
+4703,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 */
@@
-4724,15
+4725,16
@@
void GameEnd()
DrawHallOfFame(last_level_nr, hi_pos);
}
DrawHallOfFame(last_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();
}
}
}
}