zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-14 08:30:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Exported MusPlayingInfo to ZScript.

Browse source 
- Allows grabbing the currently playing song, base order, and loop properties.
This commit is contained in:
Major Cooke 2019-02-27 12:53:30 -06:00 committed by Christoph Oelckers
parent fab8fed8df
commit 210af0d414
2 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/s_sound.cpp
View file

@ -143,6 +143,11 @@ static FString LastSong; // last music that was played
static FPlayList *PlayList; static FPlayList *PlayList;
static int RestartEvictionsAt; // do not restart evicted channels before this time static int RestartEvictionsAt; // do not restart evicted channels before this time
DEFINE_GLOBAL(mus_playing);
DEFINE_FIELD_X(MusPlayingInfo, MusPlayingInfo, name);
DEFINE_FIELD_X(MusPlayingInfo, MusPlayingInfo, baseorder);
DEFINE_FIELD_X(MusPlayingInfo, MusPlayingInfo, loop);
// PUBLIC DATA DEFINITIONS ------------------------------------------------- // PUBLIC DATA DEFINITIONS -------------------------------------------------
int sfx_empty; int sfx_empty;

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

@ -42,6 +42,7 @@ struct _ native // These are the global variables, the struct is only here to av
native readonly Weapon WP_NOCHANGE; native readonly Weapon WP_NOCHANGE;
deprecated("3.8") native readonly bool globalfreeze; deprecated("3.8") native readonly bool globalfreeze;
native int LocalViewPitch; native int LocalViewPitch;
native readonly @MusPlayingInfo mus_playing;
// sandbox state in multi-level setups: // sandbox state in multi-level setups:
@ -52,6 +53,13 @@ struct _ native // These are the global variables, the struct is only here to av
} }
struct MusPlayingInfo native
{
native String name;
native int baseorder;
native bool loop;
};
struct TexMan struct TexMan
{ {
enum EUseTypes enum EUseTypes