projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed bugs with wrong X/Y access in element mask in MM engine
[rocksndiamonds.git]
/
src
/
game.h
diff --git
a/src/game.h
b/src/game.h
index 9bfa0cd52d078c5d6ad6c67b02b2cd724b60fa45..7eb19cdedbb1e7d60b241dabdc915803dd587975 100644
(file)
--- a/
src/game.h
+++ b/
src/game.h
@@
-4,7
+4,7
@@
// (c) 1995-2014 by Artsoft Entertainment
// Holger Schemel
// info@artsoft.org
// (c) 1995-2014 by Artsoft Entertainment
// Holger Schemel
// info@artsoft.org
-// http://www.artsoft.org/
+// http
s
://www.artsoft.org/
// ----------------------------------------------------------------------------
// game.h
// ============================================================================
// ----------------------------------------------------------------------------
// game.h
// ============================================================================
@@
-36,6
+36,11
@@
#define STR_SNAPSHOT_MODE_EVERY_COLLECT "every_collect"
#define STR_SNAPSHOT_MODE_DEFAULT STR_SNAPSHOT_MODE_OFF
#define STR_SNAPSHOT_MODE_EVERY_COLLECT "every_collect"
#define STR_SNAPSHOT_MODE_DEFAULT STR_SNAPSHOT_MODE_OFF
+#define STR_SCORES_TYPE_LOCAL_ONLY "local_scores_only"
+#define STR_SCORES_TYPE_SERVER_ONLY "server_scores_only"
+#define STR_SCORES_TYPE_LOCAL_AND_SERVER "local_and_server_scores"
+#define STR_SCORES_TYPE_DEFAULT STR_SCORES_TYPE_LOCAL_AND_SERVER
+
#define SNAPSHOT_MODE_OFF 0
#define SNAPSHOT_MODE_EVERY_STEP 1
#define SNAPSHOT_MODE_EVERY_MOVE 2
#define SNAPSHOT_MODE_OFF 0
#define SNAPSHOT_MODE_EVERY_STEP 1
#define SNAPSHOT_MODE_EVERY_MOVE 2
@@
-129,6
+134,9
@@
struct GameButtonInfo
struct XY panel_sound_music;
struct XY panel_sound_loops;
struct XY panel_sound_simple;
struct XY panel_sound_music;
struct XY panel_sound_loops;
struct XY panel_sound_simple;
+
+ struct XY touch_stop;
+ struct XY touch_pause;
};
struct GameSnapshotInfo
};
struct GameSnapshotInfo
@@
-153,6
+161,8
@@
struct GameInfo
boolean use_native_emc_graphics_engine;
boolean use_native_sp_graphics_engine;
boolean use_masked_pushing;
boolean use_native_emc_graphics_engine;
boolean use_native_sp_graphics_engine;
boolean use_masked_pushing;
+ boolean use_masked_elements;
+ boolean use_masked_elements_initial;
int forced_scroll_delay_value;
int scroll_delay_value;
int tile_size;
int forced_scroll_delay_value;
int scroll_delay_value;
int tile_size;
@@
-175,6
+185,10
@@
struct GameInfo
boolean max_num_changes_per_frame;
boolean use_reverse_scan_direction;
boolean max_num_changes_per_frame;
boolean use_reverse_scan_direction;
+ // flags to indicate which game actions are used in this game
+ boolean use_key_actions;
+ boolean use_mouse_actions;
+
// variable within running game
int yamyam_content_nr;
boolean robot_wheel_active;
// variable within running game
int yamyam_content_nr;
boolean robot_wheel_active;
@@
-189,7
+203,11
@@
struct GameInfo
boolean explosions_delayed;
boolean envelope_active;
boolean explosions_delayed;
boolean envelope_active;
- boolean no_time_limit; // (variable only in very special case)
+ boolean no_level_time_limit; // (variable only in very special case)
+ boolean time_limit; // forced by levelset config or setup option
+
+ int time_final; // time (in seconds) or steps left or played
+ int score_time_final; // time (in frames) or steps played
int score;
int score_final;
int score;
int score_final;
@@
-212,7
+230,7
@@
struct GameInfo
// values for the new EMC elements
int lenses_time_left;
int magnify_time_left;
// values for the new EMC elements
int lenses_time_left;
int magnify_time_left;
- boolean ball_
stat
e;
+ boolean ball_
activ
e;
int ball_content_nr;
// values for player idle animation (no effect on engine)
int ball_content_nr;
// values for player idle animation (no effect on engine)
@@
-224,16
+242,18
@@
struct GameInfo
// values for special game initialization control
boolean restart_level;
// values for special game initialization control
boolean restart_level;
- // trigger message to ask for restarting the game
- char *restart_game_message;
-
// values for special request dialog control
boolean request_active;
// values for special request dialog control
boolean request_active;
+ boolean request_active_or_moving;
// values for special game control
int centered_player_nr;
int centered_player_nr_next;
boolean set_centered_player;
// values for special game control
int centered_player_nr;
int centered_player_nr_next;
boolean set_centered_player;
+ boolean set_centered_player_wrap;
+
+ // values for single step mode control
+ boolean enter_single_step_mode;
// values for random number generator initialization after snapshot
unsigned int num_random_calls;
// values for random number generator initialization after snapshot
unsigned int num_random_calls;
@@
-356,7
+376,7
@@
struct PlayerInfo
int push_delay;
int push_delay_value;
int push_delay;
int push_delay_value;
-
unsigned int
actual_frame_counter;
+
DelayCounter
actual_frame_counter;
int drop_delay;
int drop_pressed_delay;
int drop_delay;
int drop_pressed_delay;
@@
-369,6
+389,8
@@
struct PlayerInfo
int shield_normal_time_left;
int shield_deadly_time_left;
int shield_normal_time_left;
int shield_deadly_time_left;
+ int last_removed_element;
+
int inventory_element[MAX_INVENTORY_SIZE];
int inventory_infinite_element;
int inventory_size;
int inventory_element[MAX_INVENTORY_SIZE];
int inventory_infinite_element;
int inventory_size;
@@
-387,7
+409,7
@@
int GetElementFromGroupElement(int);
int getPlayerInventorySize(int);
int getPlayerInventorySize(int);
-void
DrawGameValue_Time(int
);
+void
UpdateGameDoorValues(void
);
void DrawGameDoorValues(void);
void UpdateAndDisplayGameControlValues(void);
void DrawGameDoorValues(void);
void UpdateAndDisplayGameControlValues(void);
@@
-399,9
+421,13
@@
void UpdateEngineValues(int, int, int, int);
void GameWon(void);
void GameEnd(void);
void GameWon(void);
void GameEnd(void);
+void MergeServerScore(void);
+
void InitPlayerGfxAnimation(struct PlayerInfo *, int, int);
void InitPlayerGfxAnimation(struct PlayerInfo *, int, int);
+
void Moving2Blocked(int, int, int *, int *);
void Blocked2Moving(int, int, int *, int *);
void Moving2Blocked(int, int, int *, int *);
void Blocked2Moving(int, int, int *, int *);
+
void DrawDynamite(int, int);
void StartGameActions(boolean, boolean, int);
void DrawDynamite(int, int);
void StartGameActions(boolean, boolean, int);
@@
-428,9
+454,8
@@
void RaiseScoreElement(int);
void RequestQuitGameExt(boolean, boolean, char *);
void RequestQuitGame(boolean);
void RequestQuitGameExt(boolean, boolean, char *);
void RequestQuitGame(boolean);
-void RequestRestartGame(char *);
-void CheckGameOver(void);
+boolean CheckRestartGame(void);
boolean checkGameSolved(void);
boolean checkGameFailed(void);
boolean checkGameEnded(void);
boolean checkGameSolved(void);
boolean checkGameFailed(void);
boolean checkGameEnded(void);
@@
-450,8
+475,8
@@
boolean CheckEngineSnapshotList(void);
void CreateGameButtons(void);
void FreeGameButtons(void);
void CreateGameButtons(void);
void FreeGameButtons(void);
+void MapLoadSaveButtons(void);
void MapUndoRedoButtons(void);
void MapUndoRedoButtons(void);
-void UnmapUndoRedoButtons(void);
void ModifyPauseButtons(void);
void MapGameButtons(void);
void UnmapGameButtons(void);
void ModifyPauseButtons(void);
void MapGameButtons(void);
void UnmapGameButtons(void);