stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-20 00:11:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add S_MusicName back as a convenience function

Browse source 
* Move MUSICRATE to doomdef.h
This commit is contained in:
mazmazz 2018-08-25 08:03:05 -04:00
parent ec2bc29bb1
commit 838d47acd3
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/doomdef.h
View file

@ -356,6 +356,8 @@ typedef enum
#define NEWTICRATERATIO 1 // try 4 for 140 fps :)
#define NEWTICRATE (TICRATE*NEWTICRATERATIO)
#define MUSICRATE 1000 // sound timing is calculated by milliseconds
#define RING_DIST 512*FRACUNIT // how close you need to be to a ring to attract it
#define PUSHACCEL (2*FRACUNIT) // Acceleration for MF2_SLIDEPUSH items.

5
src/s_sound.c
View file

@ -1394,6 +1394,11 @@ musictype_t S_MusicType(void)
return I_SongType();
}
const char *S_MusicName(void)
{
return music_name;
}
boolean S_MusicInfo(char *mname, UINT16 *mflags, boolean *looping)
{
if (!I_SongPlaying())

4
src/s_sound.h
View file

@ -20,9 +20,6 @@
#include "command.h"
#include "tables.h" // angle_t
// sound timing is calculated by milliseconds
#define MUSICRATE 1000
// mask used to indicate sound origin is player item pickup
#define PICKUP_SOUND 0x8000
@ -139,6 +136,7 @@ boolean S_MusicDisabled(void);
boolean S_MusicPlaying(void);
boolean S_MusicPaused(void);
musictype_t S_MusicType(void);
const char *S_MusicName(void);
boolean S_MusicInfo(char *mname, UINT16 *mflags, boolean *looping);
boolean S_MusicExists(const char *mname, boolean checkMIDI, boolean checkDigi);
#define S_DigExists(a) S_MusicExists(a, false, true)