From b48f7da43ed318e3e0833520654f9115adba25fa Mon Sep 17 00:00:00 2001 From: Major Cooke Date: Thu, 28 Feb 2019 11:45:32 -0600 Subject: [PATCH] Renamed to musplaying. --- src/s_sound.cpp | 2 +- wadsrc/static/zscript/base.zs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/s_sound.cpp b/src/s_sound.cpp index 61a038c17..abc11b255 100644 --- a/src/s_sound.cpp +++ b/src/s_sound.cpp @@ -143,7 +143,7 @@ static FString LastSong; // last music that was played static FPlayList *PlayList; static int RestartEvictionsAt; // do not restart evicted channels before this time -DEFINE_GLOBAL(mus_playing); +DEFINE_GLOBAL_NAMED(mus_playing, musplaying); DEFINE_FIELD_X(MusPlayingInfo, MusPlayingInfo, name); DEFINE_FIELD_X(MusPlayingInfo, MusPlayingInfo, baseorder); DEFINE_FIELD_X(MusPlayingInfo, MusPlayingInfo, loop); diff --git a/wadsrc/static/zscript/base.zs b/wadsrc/static/zscript/base.zs index 45936cb0a..e5619b0d7 100644 --- a/wadsrc/static/zscript/base.zs +++ b/wadsrc/static/zscript/base.zs @@ -42,7 +42,7 @@ struct _ native // These are the global variables, the struct is only here to av native readonly Weapon WP_NOCHANGE; deprecated("3.8") native readonly bool globalfreeze; native int LocalViewPitch; - native readonly @MusPlayingInfo mus_playing; + native readonly @MusPlayingInfo musplaying; // sandbox state in multi-level setups: