TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

refactor secret level music code

Browse source
This commit is contained in:
ziplantil 2019-08-18 20:18:34 +03:00
parent 79e0e2fdea
commit 6588bd6626
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
similar/main/songs.cpp
View file

@ -80,7 +80,8 @@ void songs_set_volume(int volume)
#endif
}
namespace dsx {
namespace dcx {
static int is_valid_song_extension(const char* dot)
{
return (!d_stricmp(dot, SONG_EXT_HMP)
@ -94,6 +95,10 @@ static int is_valid_song_extension(const char* dot)
);
}
}
namespace dsx {
// Set up everything for our music
// NOTE: you might think this is done once per runtime but it's not! It's done for EACH song so that each mission can have it's own descent.sng structure. We COULD optimize that by only doing this once per mission.
static void songs_init()
@ -117,8 +122,6 @@ static void songs_init()
else
canUseExtensions = 1; // can use extensions ONLY if dxx-r.sng
Num_secret_bim_songs = 0;
if (!fp) // No descent.sng available. Define a default song-set
{
int predef=30; // define 30 songs - period
@ -152,11 +155,13 @@ static void songs_init()
{
if (canUseExtensions)
{
auto &secret_label = "!Rebirth.secret ";
constexpr auto secret_label_len = sizeof(secret_label) - 1;
// extension stuffs
if (!d_strnicmp(inputline, "!Rebirth.secret ", 16)) {
if (!strncmp(inputline, secret_label, secret_label_len)) {
BIMSecretSongs = reinterpret_cast<bim_song_info *>(d_realloc(BIMSecretSongs, sizeof(bim_song_info) * (Num_secret_bim_songs + 1)));
memset(BIMSecretSongs[Num_secret_bim_songs].filename, '\0', sizeof(BIMSecretSongs[Num_secret_bim_songs].filename));
sscanf( inputline + 16, "%15s", BIMSecretSongs[Num_secret_bim_songs].filename );
sscanf( inputline + secret_label_len, "%15s", BIMSecretSongs[Num_secret_bim_songs].filename );
const char *dot = strrchr(BIMSecretSongs[Num_secret_bim_songs].filename, '.');
if (dot)