projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added separate game variable to check for time limit setup option
[rocksndiamonds.git]
/
src
/
game.c
diff --git
a/src/game.c
b/src/game.c
index 01bea5abca7918ca1fa5e0f9f3d5a0d90b179c1d..e650f4d3a6c6d867fa9573eb1a67a65fdf3f6be1 100644
(file)
--- a/
src/game.c
+++ b/
src/game.c
@@
-3819,6
+3819,7
@@
void InitGame(void)
game.panel.active = TRUE;
game.no_level_time_limit = (level.time == 0);
game.panel.active = TRUE;
game.no_level_time_limit = (level.time == 0);
+ game.time_limit = (setup.time_limit);
game.yamyam_content_nr = 0;
game.robot_wheel_active = FALSE;
game.yamyam_content_nr = 0;
game.robot_wheel_active = FALSE;
@@
-10227,7
+10228,7
@@
static void ExecuteCustomElementAction(int x, int y, int element, int page)
DisplayGameControlValues();
DisplayGameControlValues();
- if (!TimeLeft &&
setup
.time_limit)
+ if (!TimeLeft &&
game
.time_limit)
for (i = 0; i < MAX_PLAYERS; i++)
KillPlayer(&stored_player[i]);
}
for (i = 0; i < MAX_PLAYERS; i++)
KillPlayer(&stored_player[i]);
}
@@
-11637,14
+11638,14
@@
static void CheckLevelTime_StepCounter(void)
{
TimeLeft--;
{
TimeLeft--;
- if (TimeLeft <= 10 &&
setup
.time_limit && !game.LevelSolved)
+ if (TimeLeft <= 10 &&
game
.time_limit && !game.LevelSolved)
PlaySound(SND_GAME_RUNNING_OUT_OF_TIME);
game_panel_controls[GAME_PANEL_TIME].value = TimeLeft;
DisplayGameControlValues();
PlaySound(SND_GAME_RUNNING_OUT_OF_TIME);
game_panel_controls[GAME_PANEL_TIME].value = TimeLeft;
DisplayGameControlValues();
- if (!TimeLeft &&
setup
.time_limit && !game.LevelSolved)
+ if (!TimeLeft &&
game
.time_limit && !game.LevelSolved)
for (i = 0; i < MAX_PLAYERS; i++)
KillPlayer(&stored_player[i]);
}
for (i = 0; i < MAX_PLAYERS; i++)
KillPlayer(&stored_player[i]);
}
@@
-11686,7
+11687,7
@@
static void CheckLevelTime(void)
{
TimeLeft--;
{
TimeLeft--;
- if (TimeLeft <= 10 &&
setup
.time_limit)
+ if (TimeLeft <= 10 &&
game
.time_limit)
PlaySound(SND_GAME_RUNNING_OUT_OF_TIME);
/* this does not make sense: game_panel_controls[GAME_PANEL_TIME].value
PlaySound(SND_GAME_RUNNING_OUT_OF_TIME);
/* this does not make sense: game_panel_controls[GAME_PANEL_TIME].value
@@
-11694,7
+11695,7
@@
static void CheckLevelTime(void)
game_panel_controls[GAME_PANEL_TIME].value = TimeLeft;
game_panel_controls[GAME_PANEL_TIME].value = TimeLeft;
- if (!TimeLeft &&
setup
.time_limit)
+ if (!TimeLeft &&
game
.time_limit)
{
if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
game_em.lev->killed_out_of_time = TRUE;
{
if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
game_em.lev->killed_out_of_time = TRUE;