Skip to content
Snippets Groups Projects
Commit f291c846 authored by Vlad Doc's avatar Vlad Doc
Browse files

Merge branch SRB2:next into linux-customshader-compilation-fix

parents 064e2cb7 488e6d56
Branches
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
src/s_sound.c
+ 1
− 1
View file @ f291c846
...@@ -2256,9 +2256,9 @@ void S_ChangeMusicEx(const char *mmusic, UINT16 mflags, boolean looping, UINT32 ...@@ -2256,9 +2256,9 @@ void S_ChangeMusicEx(const char *mmusic, UINT16 mflags, boolean looping, UINT32
return; return;
strncpy(newmusic, mmusic, sizeof(newmusic)-1); strncpy(newmusic, mmusic, sizeof(newmusic)-1);
newmusic[6] = 0;
if (LUA_HookMusicChange(music_name, &hook_param)) if (LUA_HookMusicChange(music_name, &hook_param))
return; return;
newmusic[6] = 0;
// No Music (empty string) // No Music (empty string)
if (newmusic[0] == 0) if (newmusic[0] == 0)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment