mirror of
https://git.do.srb2.org/KartKrew/Kart-Public.git
synced 2024-12-26 04:11:18 +00:00
Merge remote-tracking branch 'next' into merge-srb2
This commit is contained in:
commit
e545a8ab7d
1 changed files with 3 additions and 4 deletions
|
@ -936,7 +936,6 @@ static void IdentifyVersion(void)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if !defined (HAVE_SDL) || defined (HAVE_MIXER)
|
#if !defined (HAVE_SDL) || defined (HAVE_MIXER)
|
||||||
{
|
|
||||||
#define MUSICTEST(str) \
|
#define MUSICTEST(str) \
|
||||||
{\
|
{\
|
||||||
const char *musicpath = va(pandf,srb2waddir,str);\
|
const char *musicpath = va(pandf,srb2waddir,str);\
|
||||||
|
@ -946,9 +945,9 @@ static void IdentifyVersion(void)
|
||||||
else if (ms == 0) \
|
else if (ms == 0) \
|
||||||
I_Error("File "str" has been modified with non-music/sound lumps"); \
|
I_Error("File "str" has been modified with non-music/sound lumps"); \
|
||||||
}
|
}
|
||||||
MUSICTEST("sounds.kart")
|
MUSICTEST("sounds.kart")
|
||||||
MUSICTEST("music.kart")
|
MUSICTEST("music.kart")
|
||||||
}
|
#undef MUSICTEST
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue