Merge branch 'master' into releases

[rocksndiamonds.git] / src / game.h

diff --git a/src/game.h b/src/game.h
index 241889b08291aad0e16a7d8802c4363ba9376f32..c1fb5b127127675c74e5ac749ad53eb9f2d7eccc 100644 (file)
--- a/src/game.h
+++ b/src/game.h
@@ -26,6 +26,7 @@
 #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
 
@@ -74,6 +75,7 @@ struct GamePanelInfo
   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];
@@ -113,6 +115,7 @@ struct GameInfo
   struct GameButtonInfo button;
 
   /* values for graphics engine customization */
+  boolean use_native_emc_graphics_engine;
   int forced_scroll_delay_value;
   int scroll_delay_value;
 
@@ -304,6 +307,8 @@ int GetElementFromGroupElement(int);
 void DrawGameValue_Time(int);
 void DrawGameDoorValues(void);
 
+void UpdateAndDisplayGameControlValues();
+
 void InitGameSound();
 void InitGame();