X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.h;h=730c8a7fd1e3c245bc8283aac4886b271358ac6d;hb=8d7a5267680e5bb2dbe9925e3d20ef32fda0c734;hp=b6cea7b51ea2d38ed0d5fddae8174d9fa114521a;hpb=67b32ebb347487d2d3a9d926ad8d1c4ed3d9aec6;p=rocksndiamonds.git

diff --git a/src/libgame/system.h b/src/libgame/system.h
index b6cea7b5..730c8a7f 100644
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -324,6 +324,19 @@
 
 #define STYLE_DEFAULT		STYLE_NONE
 
+/* values for special global animation events */
+#define ANIM_EVENT_NONE		0
+#define ANIM_EVENT_SELF		(1 << 16)
+#define ANIM_EVENT_ANY		(1 << 17)
+
+#define ANIM_EVENT_ANIM_BIT	0
+#define ANIM_EVENT_PART_BIT	8
+
+#define ANIM_EVENT_ANIM_MASK	(0xff << ANIM_EVENT_ANIM_BIT)
+#define ANIM_EVENT_PART_MASK	(0xff << ANIM_EVENT_PART_BIT)
+
+#define ANIM_EVENT_DEFAULT	ANIM_EVENT_NONE
+
 /* values for fade mode */
 #define FADE_TYPE_NONE		0
 #define FADE_TYPE_FADE_IN	(1 << 0)
@@ -357,6 +370,7 @@
 #define POS_LOWER		5
 #define POS_BOTTOM		6
 #define POS_ANY			7
+#define POS_LAST		8
 
 /* values for text alignment */
 #define ALIGN_LEFT		(1 << 0)
@@ -428,6 +442,10 @@
 /* maximum number of levels in a level set */
 #define MAX_LEVELS		1000
 
+/* maximum number of global animation and parts */
+#define MAX_GLOBAL_ANIMS		32
+#define MAX_GLOBAL_ANIM_PARTS		32
+
 /* default name for empty highscore entry */
 #define EMPTY_PLAYER_NAME	"no name"
 
@@ -480,6 +498,7 @@
 #define SCORES_DIRECTORY	"scores"
 #define DOCS_DIRECTORY		"docs"
 #define CACHE_DIRECTORY		"cache"
+#define CONF_DIRECTORY		"conf"
 
 #define GFX_CLASSIC_SUBDIR	"gfx_classic"
 #define SND_CLASSIC_SUBDIR	"snd_classic"
@@ -508,10 +527,13 @@
 #define SOUNDSINFO_FILENAME	"soundsinfo.conf"
 #define MUSICINFO_FILENAME	"musicinfo.conf"
 #define ARTWORKINFO_CACHE_FILE	"artworkinfo.cache"
+#define LEVELTEMPLATE_FILENAME	"template.level"
 #define LEVELFILE_EXTENSION	"level"
 #define TAPEFILE_EXTENSION	"tape"
 #define SCOREFILE_EXTENSION	"score"
 
+#define GAMECONTROLLER_BASENAME	"gamecontrollerdb.txt"
+
 #define LOG_OUT_BASENAME	"stdout.txt"
 #define LOG_ERR_BASENAME	"stderr.txt"
 
@@ -757,9 +779,16 @@ struct ProgramInfo
   int version_build;
   int version_ident;
 
+  char *version_string;
+
   char *(*window_title_function)(void);
   void (*exit_message_function)(char *, va_list);
   void (*exit_function)(int);
+
+  boolean global_scores;
+  boolean many_scores_per_name;
+
+  boolean headless;
 };
 
 struct OptionInfo
@@ -774,11 +803,13 @@ struct OptionInfo
   char *sounds_directory;
   char *music_directory;
   char *docs_directory;
+  char *conf_directory;
 
   char *execute_command;
 
   char *special_flags;
 
+  boolean mytapes;
   boolean serveronly;
   boolean network;
   boolean verbose;
@@ -914,13 +945,14 @@ struct GfxInfo
 
 struct OverlayInfo
 {
-  boolean active;
+  boolean enabled;		/* overlay generally enabled or disabled */
+  boolean active;		/* overlay activated (depending on game mode) */
 };
 
 struct JoystickInfo
 {
   int status;
-  int fd[MAX_PLAYERS];		/* file descriptor of player's joystick */
+  int nr[MAX_PLAYERS];		/* joystick number for each player */
 };
 
 struct SetupJoystickInfo
@@ -962,8 +994,14 @@ struct SetupEditorInfo
   boolean el_supaplex;
   boolean el_diamond_caves;
   boolean el_dx_boulderdash;
+
+  boolean el_mirror_magic;
+  boolean el_deflektor;
+
   boolean el_chars;
   boolean el_steel_chars;
+
+  boolean el_classic;
   boolean el_custom;
   boolean el_user_defined;
   boolean el_dynamic;
@@ -974,6 +1012,8 @@ struct SetupEditorInfo
   boolean el_by_type;
 
   boolean show_element_token;
+
+  boolean use_template_for_new_levels;
 };
 
 struct SetupEditorCascadeInfo
@@ -986,6 +1026,8 @@ struct SetupEditorCascadeInfo
   boolean el_sp;
   boolean el_dc;
   boolean el_dx;
+  boolean el_mm;
+  boolean el_df;
   boolean el_chars;
   boolean el_steel_chars;
   boolean el_ce;
@@ -1031,6 +1073,7 @@ struct SetupSystemInfo
 struct SetupInternalInfo
 {
   char *program_title;
+  char *program_version;
   char *program_author;
   char *program_email;
   char *program_website;
@@ -1053,6 +1096,7 @@ struct SetupInternalInfo
   int default_window_height;
 
   boolean choose_from_top_leveldir;
+  boolean show_scaling_in_title;
 };
 
 struct SetupDebugInfo
@@ -1061,6 +1105,7 @@ struct SetupDebugInfo
   Key frame_delay_key[10];
   boolean frame_delay_use_mod_key;
   boolean frame_delay_game_only;
+  boolean show_frames_per_second;
 };
 
 struct SetupInfo
@@ -1083,6 +1128,7 @@ struct SetupInfo
   boolean team_mode;
   boolean handicap;
   boolean skip_levels;
+  boolean increment_levels;
   boolean time_limit;
   boolean fullscreen;
   int window_scaling_percent;
@@ -1412,8 +1458,9 @@ extern int			FrameCounter;
 /* function definitions */
 
 void InitProgramInfo(char *, char *, char *, char *, char *, char *, char *,
-		     int);
+		     char *, int);
 
+void InitScoresInfo();
 void SetWindowTitle();
 
 void InitWindowTitleFunction(char *(*window_title_function)(void));
@@ -1436,9 +1483,11 @@ void InitGfxDrawGlobalBorderFunction(void (*draw_global_border_function)(int));
 void InitGfxCustomArtworkInfo();
 void InitGfxOtherSettings();
 void InitOverlayInfo();
+void SetOverlayEnabled(boolean);
 void SetOverlayActive(boolean);
 boolean GetOverlayActive();
 void SetDrawDeactivationMask(int);
+int GetDrawDeactivationMask(void);
 void SetDrawBackgroundMask(int);
 void SetWindowBackgroundBitmap(Bitmap *);
 void SetMainBackgroundBitmap(Bitmap *);
@@ -1462,6 +1511,7 @@ void FillRectangle(Bitmap *, int, int, int, int, Pixel);
 void ClearRectangle(Bitmap *, int, int, int, int);
 void ClearRectangleOnBackground(Bitmap *, int, int, int, int);
 void BlitBitmapMasked(Bitmap *, Bitmap *, int, int, int, int, int, int);
+boolean DrawingDeactivatedField(void);
 boolean DrawingDeactivated(int, int, int, int);
 boolean DrawingOnBackground(int, int);
 boolean DrawingAreaChanged();
@@ -1501,8 +1551,9 @@ void CloseAudio(void);
 void SetAudioMode(boolean);
 
 boolean PendingEvent(void);
-void NextEvent(Event *event);
+void WaitEvent(Event *event);
 void PeekEvent(Event *event);
+void CheckQuitEvent(void);
 Key GetEventKey(KeyEvent *, boolean);
 KeyMod HandleKeyModState(Key, int);
 KeyMod GetKeyModState();
@@ -1513,5 +1564,7 @@ boolean CheckCloseWindowEvent(ClientMessageEvent *);
 
 void InitJoysticks();
 boolean ReadJoystick(int, int *, int *, boolean *, boolean *);
+boolean CheckJoystickOpened(int);
+void ClearJoystickState();
 
 #endif /* SYSTEM_H */