- minor cleanup.

src/common/audio/music/i_music.h

@@ -58,12 +58,12 @@ EXTERN_CVAR(Float, snd_musicvolume)
 
 inline float AmplitudeTodB(float amplitude)
 {
-	return 20.0f * log10(amplitude);
+	return 20.0f * log10f(amplitude);
 }
 
 inline float dBToAmplitude(float dB)
 {
-	return pow(10.0f, dB / 20.0f);
+	return powf(10.0f, dB / 20.0f);
 }
 
 #endif //__I_MUSIC_H__

src/common/audio/music/music.cpp

@@ -51,8 +51,8 @@
 #include <zmusic.h>
 #include "md5.h"
 #include "gain_analysis.h"
-#include "gameconfigfile.h"
 #include "i_specialpaths.h"
+#include "configfile.h"
 
 // EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
 

src/common/console/c_console.cpp

@@ -70,7 +70,6 @@
 #define RIGHTMARGIN 8
 #define BOTTOMARGIN 12
 
-// todo: move these variables to a better place.
 extern bool AppActive;
 
 CUSTOM_CVAR(Int, con_buffersize, -1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)

src/common/engine/i_interface.cpp

@@ -1,6 +1,7 @@
 #include "i_interface.h"
 #include "st_start.h"
 #include "gamestate.h"
+#include "startupinfo.h"
 
 static_assert(sizeof(void*) == 8, "32 builds are not supported");
 
@@ -14,4 +15,6 @@ float menuBlurAmount;
 bool AppActive = true;
 int chatmodeon;
 gamestate_t 	gamestate = GS_STARTUP;
+bool ToggleFullscreen;
 
+FStartupInfo GameStartupInfo;

src/common/startscreen/startscreen.h

@@ -38,6 +38,7 @@
 #include <stdint.h>
 #include <functional>
 #include "bitmap.h"
+#include "zstring.h"
 
 class FGameTexture;
 

src/d_main.cpp

@@ -329,7 +329,6 @@ FTextureID Advisory;
 FTextureID Page;
 const char *Subtitle;
 bool nospriterename;
-FStartupInfo GameStartupInfo;
 FString lastIWAD;
 int restart = 0;
 extern bool AppActive;

src/doomstat.cpp

@@ -46,6 +46,4 @@ int NextSkill = -1;
 
 int SinglePlayerClass[MAXPLAYERS];
 
-bool ToggleFullscreen;
-
 FString LumpFilterIWAD;