projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20131212-1-src
[rocksndiamonds.git]
/
src
/
libgame
/
sound.c
diff --git
a/src/libgame/sound.c
b/src/libgame/sound.c
index fed5e3e9a2a3dd8546d0daa75ab91edc9aa15c73..2712fa4c92970aefb7a98a5da4cd7071c5b4fad3 100644
(file)
--- a/
src/libgame/sound.c
+++ b/
src/libgame/sound.c
@@
-1773,12
+1773,21
@@
static void *Load_MOD(char *filename)
static void *Load_WAV_or_MOD(char *filename)
{
static void *Load_WAV_or_MOD(char *filename)
{
+#if 1
+ if (FileIsMusic(filename))
+ return Load_MOD(filename);
+ else if (FileIsSound(filename))
+ return Load_WAV(filename);
+ else
+ return NULL;
+#else
if (FileIsSound(filename))
return Load_WAV(filename);
else if (FileIsMusic(filename))
return Load_MOD(filename);
else
return NULL;
if (FileIsSound(filename))
return Load_WAV(filename);
else if (FileIsMusic(filename))
return Load_MOD(filename);
else
return NULL;
+#endif
}
void LoadCustomMusic_NoConf(void)
}
void LoadCustomMusic_NoConf(void)