projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into releases
[rocksndiamonds.git]
/
src
/
game.h
diff --git
a/src/game.h
b/src/game.h
index ace61a5b14884658f9253b36bca9b5b43510c819..c1fb5b127127675c74e5ac749ad53eb9f2d7eccc 100644
(file)
--- a/
src/game.h
+++ b/
src/game.h
@@
-26,6
+26,8
@@
#define NUM_BELT_PARTS 3
#define NUM_PANEL_INVENTORY 8
#define NUM_BELT_PARTS 3
#define NUM_PANEL_INVENTORY 8
+#define NUM_PANEL_GRAPHICS 8
+#define NUM_PANEL_ELEMENTS 8
#define NUM_PANEL_CE_SCORE 8
#if 1
#define NUM_PANEL_CE_SCORE 8
#if 1
@@
-73,6
+75,9
@@
struct GamePanelInfo
struct TextPosInfo magic_wall;
struct TextPosInfo magic_wall_time;
struct TextPosInfo gravity_state;
struct TextPosInfo magic_wall;
struct TextPosInfo magic_wall_time;
struct TextPosInfo gravity_state;
+ struct TextPosInfo graphic[NUM_PANEL_GRAPHICS];
+ struct TextPosInfo element[NUM_PANEL_ELEMENTS];
+ struct TextPosInfo element_count[NUM_PANEL_ELEMENTS];
struct TextPosInfo ce_score[NUM_PANEL_CE_SCORE];
struct TextPosInfo ce_score_element[NUM_PANEL_CE_SCORE];
struct TextPosInfo player_name;
struct TextPosInfo ce_score[NUM_PANEL_CE_SCORE];
struct TextPosInfo ce_score_element[NUM_PANEL_CE_SCORE];
struct TextPosInfo player_name;
@@
-110,6
+115,7
@@
struct GameInfo
struct GameButtonInfo button;
/* values for graphics engine customization */
struct GameButtonInfo button;
/* values for graphics engine customization */
+ boolean use_native_emc_graphics_engine;
int forced_scroll_delay_value;
int scroll_delay_value;
int forced_scroll_delay_value;
int scroll_delay_value;
@@
-212,6
+218,8
@@
struct PlayerInfo
boolean LevelSolved_PanelOff;
boolean LevelSolved_SaveTape;
boolean LevelSolved_SaveScore;
boolean LevelSolved_PanelOff;
boolean LevelSolved_SaveTape;
boolean LevelSolved_SaveScore;
+ int LevelSolved_CountingTime;
+ int LevelSolved_CountingScore;
int last_move_dir;
int last_move_dir;
@@
-299,6
+307,8
@@
int GetElementFromGroupElement(int);
void DrawGameValue_Time(int);
void DrawGameDoorValues(void);
void DrawGameValue_Time(int);
void DrawGameDoorValues(void);
+void UpdateAndDisplayGameControlValues();
+
void InitGameSound();
void InitGame();
void InitGameSound();
void InitGame();
@@
-339,5
+349,6
@@
boolean CheckEngineSnapshot();
void CreateGameButtons();
void FreeGameButtons();
void UnmapGameButtons();
void CreateGameButtons();
void FreeGameButtons();
void UnmapGameButtons();
+void RedrawGameButtons();
#endif
#endif