X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.h;h=d1c41d2a91164a39378f07590767a0b548bf61c3;hb=1bd9644544424ed912d886777c6e8ed387aac24a;hp=f51df0548596588c4713ba7bb289b242756f23d0;hpb=ad8306cba93c058f00e21871a290302ce728d6b8;p=rocksndiamonds.git

diff --git a/src/libgame/system.h b/src/libgame/system.h
index f51df054..d1c41d2a 100644
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -126,6 +126,11 @@
 #define ANIM_RANDOM		(1 << 4)
 #define ANIM_REVERSE		(1 << 5)
 
+/* values for special (non game element) animation modes */
+#define ANIM_HORIZONTAL		(1 << 6)
+#define ANIM_VERTICAL		(1 << 7)
+
+#define ANIM_DEFAULT		ANIM_LOOP
 
 /* values for redraw_mask */
 #define REDRAW_NONE		(0)
@@ -198,6 +203,7 @@
 #define RO_BASE_PATH		RO_GAME_DIR
 #define RW_BASE_PATH		RW_GAME_DIR
 
+/* directory names */
 #define GRAPHICS_DIRECTORY	"graphics"
 #define SOUNDS_DIRECTORY	"sounds"
 #define MUSIC_DIRECTORY		"music"
@@ -207,13 +213,38 @@
 #define DOCS_DIRECTORY		"docs"
 
 #if !defined(PLATFORM_MSDOS)
-#define GRAPHICS_SUBDIR		"gfx_classic"
-#define SOUNDS_SUBDIR		"snd_classic"
-#define MUSIC_SUBDIR		"mus_classic"
+#define GFX_CLASSIC_SUBDIR	"gfx_classic"
+#define SND_CLASSIC_SUBDIR	"snd_classic"
+#define MUS_CLASSIC_SUBDIR	"mus_classic"
+#else
+#define GFX_CLASSIC_SUBDIR	"gfx_orig"
+#define SND_CLASSIC_SUBDIR	"snd_orig"
+#define MUS_CLASSIC_SUBDIR	"mus_orig"
+#endif
+
+/* file names and filename extensions */
+#if !defined(PLATFORM_MSDOS)
+#define LEVELSETUP_DIRECTORY	"levelsetup"
+#define SETUP_FILENAME		"setup.conf"
+#define LEVELSETUP_FILENAME	"levelsetup.conf"
+#define LEVELINFO_FILENAME	"levelinfo.conf"
+#define GRAPHICSINFO_FILENAME	"graphicsinfo.conf"
+#define SOUNDSINFO_FILENAME	"soundsinfo.conf"
+#define MUSICINFO_FILENAME	"musicinfo.conf"
+#define LEVELFILE_EXTENSION	"level"
+#define TAPEFILE_EXTENSION	"tape"
+#define SCOREFILE_EXTENSION	"score"
 #else
-#define GRAPHICS_SUBDIR		"gfx_orig"
-#define SOUNDS_SUBDIR		"snd_orig"
-#define MUSIC_SUBDIR		"mus_orig"
+#define LEVELSETUP_DIRECTORY	"lvlsetup"
+#define SETUP_FILENAME		"setup.cnf"
+#define LEVELSETUP_FILENAME	"lvlsetup.cnf"
+#define LEVELINFO_FILENAME	"lvlinfo.cnf"
+#define GRAPHICSINFO_FILENAME	"gfxinfo.cnf"
+#define SOUNDSINFO_FILENAME	"sndinfo.cnf"
+#define MUSICINFO_FILENAME	"musinfo.cnf"
+#define LEVELFILE_EXTENSION	"lvl"
+#define TAPEFILE_EXTENSION	"tap"
+#define SCOREFILE_EXTENSION	"sco"
 #endif
 
 
@@ -319,6 +350,30 @@
 				 (artwork).snd_current_identifier :	\
 				 (artwork).mus_current_identifier)
 
+#define ARTWORKINFO_FILENAME(type)					\
+				((type) == ARTWORK_TYPE_GRAPHICS ?	\
+				 GRAPHICSINFO_FILENAME :		\
+				 (type) == ARTWORK_TYPE_SOUNDS ?	\
+				 SOUNDSINFO_FILENAME :			\
+				 (type) == ARTWORK_TYPE_MUSIC ?		\
+				 MUSICINFO_FILENAME : "")
+
+#define ARTWORK_DIRECTORY(type)						\
+				((type) == ARTWORK_TYPE_GRAPHICS ?	\
+				 GRAPHICS_DIRECTORY :			\
+				 (type) == ARTWORK_TYPE_SOUNDS ?	\
+				 SOUNDS_DIRECTORY :			\
+				 (type) == ARTWORK_TYPE_MUSIC ?		\
+				 MUSIC_DIRECTORY : "")
+
+#define OPTIONS_ARTWORK_DIRECTORY(type)					\
+				((type) == ARTWORK_TYPE_GRAPHICS ?	\
+				 options.graphics_directory :		\
+				 (type) == ARTWORK_TYPE_SOUNDS ?	\
+				 options.sounds_directory :		\
+				 (type) == ARTWORK_TYPE_MUSIC ?		\
+				 options.music_directory : "")
+
 
 /* type definitions */
 typedef int (*EventFilter)(const Event *);
@@ -485,6 +540,8 @@ struct SetupEditorInfo
   boolean el_chars;
   boolean el_custom;
   boolean el_custom_more;
+
+  boolean el_headlines;
 };
 
 struct SetupShortcutInfo