From 6588bd662635bc9f1d30751540271cd1c4fd2b06 Mon Sep 17 00:00:00 2001
From: ziplantil <magnoboost@gmail.com>
Date: Sun, 18 Aug 2019 20:18:34 +0300
Subject: [PATCH] refactor secret level music code

---
 similar/main/songs.cpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/similar/main/songs.cpp b/similar/main/songs.cpp
index 96d71f6a8..e2c12a543 100644
--- a/similar/main/songs.cpp
+++ b/similar/main/songs.cpp
@@ -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)