projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed unused code
[rocksndiamonds.git]
/
src
/
game.c
diff --git
a/src/game.c
b/src/game.c
index 94b74f786cdc2c7d211af21d484a3cec17a22eb0..d1bf2d7d0f2a334760196aab48140344b55d1ba2 100644
(file)
--- a/
src/game.c
+++ b/
src/game.c
@@
-3095,6
+3095,9
@@
static void InitGameEngine(void)
game_em.use_single_button =
(game.engine_version > VERSION_IDENT(4,0,0,2));
game_em.use_single_button =
(game.engine_version > VERSION_IDENT(4,0,0,2));
+ game_em.use_push_delay =
+ (game.engine_version > VERSION_IDENT(4,3,7,1));
+
game_em.use_snap_key_bug =
(game.engine_version < VERSION_IDENT(4,0,1,0));
game_em.use_snap_key_bug =
(game.engine_version < VERSION_IDENT(4,0,1,0));
@@
-3279,6
+3282,8
@@
static void InitGameEngine(void)
change->actual_trigger_side = CH_SIDE_NONE;
change->actual_trigger_ce_value = 0;
change->actual_trigger_ce_score = 0;
change->actual_trigger_side = CH_SIDE_NONE;
change->actual_trigger_ce_value = 0;
change->actual_trigger_ce_score = 0;
+ change->actual_trigger_x = -1;
+ change->actual_trigger_y = -1;
}
}
}
}
@@
-3865,6
+3870,8
@@
void InitGame(void)
game.LevelSolved_CountingScore = 0;
game.LevelSolved_CountingHealth = 0;
game.LevelSolved_CountingScore = 0;
game.LevelSolved_CountingHealth = 0;
+ game.RestartGameRequested = FALSE;
+
game.panel.active = TRUE;
game.no_level_time_limit = (level.time == 0);
game.panel.active = TRUE;
game.no_level_time_limit = (level.time == 0);
@@
-3971,6
+3978,10
@@
void InitGame(void)
InitBeltMovement();
InitBeltMovement();
+ // required if level does not contain any "empty space" element
+ if (element_info[EL_EMPTY].use_gfx_element)
+ game.use_masked_elements = TRUE;
+
for (i = 0; i < MAX_PLAYERS; i++)
{
struct PlayerInfo *player = &stored_player[i];
for (i = 0; i < MAX_PLAYERS; i++)
{
struct PlayerInfo *player = &stored_player[i];
@@
-4540,9
+4551,7
@@
void InitGame(void)
}
game.restart_level = FALSE;
}
game.restart_level = FALSE;
-
game.request_active = FALSE;
game.request_active = FALSE;
- game.request_active_or_moving = FALSE;
if (level.game_engine_type == GAME_ENGINE_TYPE_MM)
InitGameActions_MM();
if (level.game_engine_type == GAME_ENGINE_TYPE_MM)
InitGameActions_MM();
@@
-10759,6
+10768,8
@@
static boolean ChangeElement(int x, int y, int element, int page)
change->actual_trigger_side = CH_SIDE_NONE;
change->actual_trigger_ce_value = 0;
change->actual_trigger_ce_score = 0;
change->actual_trigger_side = CH_SIDE_NONE;
change->actual_trigger_ce_value = 0;
change->actual_trigger_ce_score = 0;
+ change->actual_trigger_x = -1;
+ change->actual_trigger_y = -1;
}
// do not change elements more than a specified maximum number of changes
}
// do not change elements more than a specified maximum number of changes
@@
-10768,7
+10779,9
@@
static boolean ChangeElement(int x, int y, int element, int page)
ChangeCount[x][y]++; // count number of changes in the same frame
if (ei->has_anim_event)
ChangeCount[x][y]++; // count number of changes in the same frame
if (ei->has_anim_event)
- HandleGlobalAnimEventByElementChange(element, page, x, y);
+ HandleGlobalAnimEventByElementChange(element, page, x, y,
+ change->actual_trigger_x,
+ change->actual_trigger_y);
if (change->explode)
{
if (change->explode)
{
@@
-11098,6
+11111,8
@@
static boolean CheckTriggeredElementChangeExt(int trigger_x, int trigger_y,
change->actual_trigger_side = trigger_side;
change->actual_trigger_ce_value = CustomValue[trigger_x][trigger_y];
change->actual_trigger_ce_score = GET_CE_SCORE(trigger_element);
change->actual_trigger_side = trigger_side;
change->actual_trigger_ce_value = CustomValue[trigger_x][trigger_y];
change->actual_trigger_ce_score = GET_CE_SCORE(trigger_element);
+ change->actual_trigger_x = trigger_x;
+ change->actual_trigger_y = trigger_y;
if ((change->can_change && !change_done) || change->has_action)
{
if ((change->can_change && !change_done) || change->has_action)
{
@@
-11212,6
+11227,8
@@
static boolean CheckElementChangeExt(int x, int y,
change->actual_trigger_side = trigger_side;
change->actual_trigger_ce_value = CustomValue[x][y];
change->actual_trigger_ce_score = GET_CE_SCORE(trigger_element);
change->actual_trigger_side = trigger_side;
change->actual_trigger_ce_value = CustomValue[x][y];
change->actual_trigger_ce_score = GET_CE_SCORE(trigger_element);
+ change->actual_trigger_x = x;
+ change->actual_trigger_y = y;
// special case: trigger element not at (x,y) position for some events
if (check_trigger_element)
// special case: trigger element not at (x,y) position for some events
if (check_trigger_element)
@@
-11235,6
+11252,8
@@
static boolean CheckElementChangeExt(int x, int y,
change->actual_trigger_ce_value = CustomValue[xx][yy];
change->actual_trigger_ce_score = GET_CE_SCORE(trigger_element);
change->actual_trigger_ce_value = CustomValue[xx][yy];
change->actual_trigger_ce_score = GET_CE_SCORE(trigger_element);
+ change->actual_trigger_x = xx;
+ change->actual_trigger_y = yy;
}
if (change->can_change && !change_done)
}
if (change->can_change && !change_done)
@@
-15785,10
+15804,14
@@
boolean CheckRestartGame(void)
return FALSE;
}
return FALSE;
}
- // do not
handle game over
if request dialog is already active
+ // do not
ask to play again
if request dialog is already active
if (game.request_active)
return FALSE;
if (game.request_active)
return FALSE;
+ // do not ask to play again if request dialog already handled
+ if (game.RestartGameRequested)
+ return FALSE;
+
// do not ask to play again if game was never actually played
if (!game.GamePlayed)
return FALSE;
// do not ask to play again if game was never actually played
if (!game.GamePlayed)
return FALSE;
@@
-15797,6
+15820,8
@@
boolean CheckRestartGame(void)
if (!setup.ask_on_game_over)
return FALSE;
if (!setup.ask_on_game_over)
return FALSE;
+ game.RestartGameRequested = TRUE;
+
RequestRestartGame();
return TRUE;
RequestRestartGame();
return TRUE;