projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20020510-8-src
[rocksndiamonds.git]
/
src
/
libgame
/
system.c
diff --git
a/src/libgame/system.c
b/src/libgame/system.c
index e1ac9ccc26659467c0490607596c87ed8e235ca2..432787c2bdf4a5c04123e97b379846709775ef97 100644
(file)
--- a/
src/libgame/system.c
+++ b/
src/libgame/system.c
@@
-669,7
+669,8
@@
Bitmap *LoadImage(char *filename)
new_bitmap = X11LoadImage(filename);
#endif
new_bitmap = X11LoadImage(filename);
#endif
- new_bitmap->source_filename = getStringCopy(filename);
+ if (new_bitmap)
+ new_bitmap->source_filename = getStringCopy(filename);
return new_bitmap;
}
return new_bitmap;
}
@@
-737,19
+738,18
@@
inline void OpenAudio(void)
audio.sound_available = FALSE;
audio.music_available = FALSE;
audio.loops_available = FALSE;
audio.sound_available = FALSE;
audio.music_available = FALSE;
audio.loops_available = FALSE;
- audio.mods_available = FALSE;
- audio.sound_enabled = FALSE;
+ audio.sound_enabled = FALSE;
audio.sound_deactivated = FALSE;
audio.sound_deactivated = FALSE;
- audio.
soundserver_pipe[0] = audio.soundserv
er_pipe[1] = 0;
- audio.
soundserv
er_pid = -1;
+ audio.
mixer_pipe[0] = audio.mix
er_pipe[1] = 0;
+ audio.
mix
er_pid = -1;
audio.device_name = NULL;
audio.device_name = NULL;
- audio.device_fd =
0
;
+ audio.device_fd =
-1
;
- audio.channels = 0;
+ audio.
num_
channels = 0;
audio.music_channel = 0;
audio.music_channel = 0;
- audio.
music_nr
= 0;
+ audio.
first_sound_channel
= 0;
#if defined(TARGET_SDL)
SDLOpenAudio();
#if defined(TARGET_SDL)
SDLOpenAudio();