zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2025-02-20 18:42:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Renamed to musplaying.

Browse source 
# Conflicts:
#	wadsrc/static/zscript/base.zs
This commit is contained in:
Major Cooke 2019-02-28 11:45:32 -06:00 committed by drfrag
parent 43eaa03654
commit d34108f0e9
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/s_sound.cpp
View file

@ -148,7 +148,7 @@ static FString LastSong; // last music that was played
static FPlayList *PlayList;
static int RestartEvictionsAt; // do not restart evicted channels before this level.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);

2
wadsrc/static/zscript/base.zs
View file

@ -45,7 +45,7 @@ struct _ native // These are the global variables, the struct is only here to av
native readonly Weapon WP_NOCHANGE;
native int LocalViewPitch;
deprecated("3.8") native readonly bool globalfreeze;
native readonly @MusPlayingInfo mus_playing;
native readonly @MusPlayingInfo musplaying;
}