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

diff --git a/src/libgame/system.h b/src/libgame/system.h
index 4d8940d1..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
@@ -236,16 +241,14 @@ struct AudioSystemInfo
   boolean sound_enabled;
   boolean sound_deactivated;	/* for temporarily disabling sound */
 
-  void (*func_reload_sounds)(void);
-  void (*func_reload_music)(void);
-
-  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 first_sound_channel;
 };
 
 struct GfxInfo
@@ -330,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];
@@ -378,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;
@@ -391,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;
 };
 
 
@@ -480,8 +487,6 @@ void ReloadCustomImage(Bitmap *, char *);
 inline void OpenAudio(void);
 inline void CloseAudio(void);
 inline void SetAudioMode(boolean);
-inline void SetAudioReloadFunctions(void (*func_reload_sounds)(void),
-				    void (*func_reload_music)(void));
 
 inline void InitEventFilter(EventFilter);
 inline boolean PendingEvent(void);