added level info config option to disable time limit for all levels

[rocksndiamonds.git] / src / game.c

diff --git a/src/game.c b/src/game.c
index e650f4d3a6c6d867fa9573eb1a67a65fdf3f6be1..ce452e67efc236e49f1615de39f27c00480a3809 100644 (file)
--- a/src/game.c
+++ b/src/game.c
@@ -3819,7 +3819,7 @@ void InitGame(void)
   game.panel.active = TRUE;
 
   game.no_level_time_limit = (level.time == 0);
-  game.time_limit = (setup.time_limit);
+  game.time_limit = (leveldir_current->time_limit && setup.time_limit);
 
   game.yamyam_content_nr = 0;
   game.robot_wheel_active = FALSE;