X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.h;h=1ade3147a3705ae787d2fca34cdb78b71982a5b3;hb=b81f28710057e7d84528b65b92e9b4d1aaadab6c;hp=f3569763da539a17284b19110d516426b7896033;hpb=5361c043c5668c9801b4682e0691d34ec428545f;p=rocksndiamonds.git

diff --git a/src/libgame/system.h b/src/libgame/system.h
index f3569763..1ade3147 100644
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -172,6 +172,10 @@
 #define VERSION_MINOR(x)	(((x) % 10000) / 100)
 #define VERSION_PATCH(x)	((x) % 100)
 
+/* functions for parent/child process identification */
+#define IS_PARENT_PROCESS(pid)	((pid) > 0)
+#define IS_CHILD_PROCESS(pid)	((pid) == 0)
+
 
 /* type definitions */
 typedef int (*EventFilter)(const Event *);
@@ -217,6 +221,7 @@ struct OptionInfo
   boolean network;
   boolean verbose;
   boolean debug;
+  char *debug_command;
 };
 
 struct VideoSystemInfo
@@ -230,21 +235,20 @@ struct VideoSystemInfo
 struct AudioSystemInfo
 {
   boolean sound_available;
-  boolean music_available;
   boolean loops_available;
-  boolean mods_available;
-  boolean sound_enabled;
+  boolean music_available;
 
+  boolean sound_enabled;
   boolean sound_deactivated;	/* for temporarily disabling sound */
 
-  int soundserver_pipe[2];
-  int soundserver_pid;
+  int mixer_pipe[2];
+  int mixer_pid;
   char *device_name;
   int device_fd;
 
-  int channels;
+  int num_channels;
   int music_channel;
-  int music_nr;
+  int first_sound_channel;
 };
 
 struct GfxInfo
@@ -329,6 +333,9 @@ struct SetupInfo
   char *graphics_set;
   char *sounds_set;
   char *music_set;
+  boolean override_level_graphics;
+  boolean override_level_sounds;
+  boolean override_level_music;
 
   struct SetupShortcutInfo shortcut;
   struct SetupInputInfo input[MAX_PLAYERS];
@@ -377,6 +384,7 @@ struct TreeInfo
 
 typedef struct TreeInfo TreeInfo;
 typedef struct TreeInfo LevelDirTree;
+typedef struct TreeInfo ArtworkDirTree;
 typedef struct TreeInfo GraphicsDirTree;
 typedef struct TreeInfo SoundsDirTree;
 typedef struct TreeInfo MusicDirTree;
@@ -390,9 +398,9 @@ struct ArtworkInfo
   MusicDirTree *mus_first;
   MusicDirTree *mus_current;
 
-  char *graphics_set_current;
-  char *sounds_set_current;
-  char *music_set_current;
+  char *graphics_set_current_name;
+  char *sounds_set_current_name;
+  char *music_set_current_name;
 };