From c596095fe0e844028f5434ea4ae5e2f92a6b549a Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Sun, 2 Oct 2022 14:32:21 +0200
Subject: [PATCH] - minor cleanup.

---
 src/common/audio/music/i_music.h     | 4 ++--
 src/common/audio/music/music.cpp     | 2 +-
 src/common/console/c_console.cpp     | 1 -
 src/common/engine/i_interface.cpp    | 3 +++
 src/common/startscreen/startscreen.h | 1 +
 src/d_main.cpp                       | 1 -
 src/doomstat.cpp                     | 2 --
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/common/audio/music/i_music.h b/src/common/audio/music/i_music.h
index 85be1dea2..a6609eadb 100644
--- a/src/common/audio/music/i_music.h
+++ b/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__
diff --git a/src/common/audio/music/music.cpp b/src/common/audio/music/music.cpp
index d125bf36d..ffc0b5ad8 100644
--- a/src/common/audio/music/music.cpp
+++ b/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 --------------------------------------------
 
diff --git a/src/common/console/c_console.cpp b/src/common/console/c_console.cpp
index 26c0b0819..c436ddd56 100644
--- a/src/common/console/c_console.cpp
+++ b/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)
diff --git a/src/common/engine/i_interface.cpp b/src/common/engine/i_interface.cpp
index f2e2e5e2b..5460d8dd3 100644
--- a/src/common/engine/i_interface.cpp
+++ b/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;
diff --git a/src/common/startscreen/startscreen.h b/src/common/startscreen/startscreen.h
index 2b81a9cfb..75ccf97a0 100644
--- a/src/common/startscreen/startscreen.h
+++ b/src/common/startscreen/startscreen.h
@@ -38,6 +38,7 @@
 #include <stdint.h>
 #include <functional>
 #include "bitmap.h"
+#include "zstring.h"
 
 class FGameTexture;
 
diff --git a/src/d_main.cpp b/src/d_main.cpp
index ec4d3dd12..7505fc125 100644
--- a/src/d_main.cpp
+++ b/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;
diff --git a/src/doomstat.cpp b/src/doomstat.cpp
index a2e4a38ce..ef681fb85 100644
--- a/src/doomstat.cpp
+++ b/src/doomstat.cpp
@@ -46,6 +46,4 @@ int NextSkill = -1;
 
 int SinglePlayerClass[MAXPLAYERS];
 
-bool ToggleFullscreen;
-
 FString LumpFilterIWAD;