X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.c;h=5217460d47f80ed11a9dc3dcb4b14b7de09790cf;hb=c4e1a476135ce36417cdd797481feeaaff4301af;hp=341da455c5f8f7487613279510d42362bf7e30e9;hpb=d2098db6b7b0cee3b43e341c012beec5bc6ef6bd;p=rocksndiamonds.git

diff --git a/src/libgame/system.c b/src/libgame/system.c
index 341da455..5217460d 100644
--- a/src/libgame/system.c
+++ b/src/libgame/system.c
@@ -87,6 +87,7 @@ void InitPlatformDependantStuff(void)
 #endif
 
 #if !defined(PLATFORM_UNIX)
+  program.userdata_directory = "userdata";
   initErrorFile();
 #endif
 
@@ -554,10 +555,8 @@ inline boolean ChangeVideoModeIfNeeded(boolean fullscreen)
 Bitmap *LoadImage(char *basename)
 {
   Bitmap *new_bitmap;
-  char filename[256];
-
-  sprintf(filename, "%s/%s/%s",
-	  options.ro_base_directory, GRAPHICS_DIRECTORY, basename);
+  char *filename = getPath3(options.ro_base_directory, GRAPHICS_DIRECTORY,
+			    basename);
 
 #if defined(TARGET_SDL)
   new_bitmap = SDLLoadImage(filename);
@@ -565,6 +564,8 @@ Bitmap *LoadImage(char *basename)
   new_bitmap = X11LoadImage(filename);
 #endif
 
+  free(filename);
+
   return new_bitmap;
 }
 
@@ -573,50 +574,44 @@ Bitmap *LoadImage(char *basename)
 /* audio functions                                                           */
 /* ========================================================================= */
 
-inline boolean OpenAudio(struct AudioSystemInfo *audio)
+inline void OpenAudio(void)
 {
-  audio->sound_available = FALSE;
-  audio->loops_available = FALSE;
-  audio->sound_enabled = FALSE;
-  audio->soundserver_pipe[0] = audio->soundserver_pipe[1] = 0;
-  audio->soundserver_pid = 0;
-  audio->device_name = NULL;
-  audio->device_fd = 0;
+  /* always start with reliable default values */
+  audio.sound_available = FALSE;
+  audio.music_available = FALSE;
+  audio.loops_available = FALSE;
+  audio.mods_available = FALSE;
+  audio.sound_enabled = FALSE;
+
+  audio.soundserver_pipe[0] = audio.soundserver_pipe[1] = 0;
+  audio.soundserver_pid = 0;
+  audio.device_name = NULL;
+  audio.device_fd = 0;
+
+  audio.channels = 0;
+  audio.music_channel = 0;
+  audio.music_nr = 0;
 
 #if defined(TARGET_SDL)
-  if (SDLOpenAudio())
-  {
-    audio->sound_available = TRUE;
-    audio->loops_available = TRUE;
-    audio->sound_enabled = TRUE;
-  }
+  SDLOpenAudio();
 #elif defined(PLATFORM_MSDOS)
-  if (MSDOSOpenAudio())
-  {
-    audio->sound_available = TRUE;
-    audio->loops_available = TRUE;
-    audio->sound_enabled = TRUE;
-  }
+  MSDOSOpenAudio();
 #elif defined(PLATFORM_UNIX)
-  UnixOpenAudio(audio);
+  UnixOpenAudio();
 #endif
-
-  return audio->sound_available;
 }
 
-inline void CloseAudio(struct AudioSystemInfo *audio)
+inline void CloseAudio(void)
 {
 #if defined(TARGET_SDL)
   SDLCloseAudio();
 #elif defined(PLATFORM_MSDOS)
   MSDOSCloseAudio();
 #elif defined(PLATFORM_UNIX)
-  UnixCloseAudio(audio);
+  UnixCloseAudio();
 #endif
 
-  audio->sound_available = FALSE;
-  audio->loops_available = FALSE;
-  audio->sound_enabled = FALSE;
+  audio.sound_enabled = FALSE;
 }
 
 inline void SetAudioMode(boolean enabled)