Some Fixes

TheBrokenRail · Jun 18, 2024 · 8ee49a8 · 8ee49a8
1 parent 7e1940a
commit 8ee49a8
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 20 deletions.
diff --git a/build-wasm.sh b/build-wasm.sh
@@ -31,7 +31,7 @@ mkdir -p build
 cd build
 
 # Configure Build
-emcmake cmake -GNinja "$@" ../../platforms/sdl
+emcmake cmake -GNinja "$@" ../../
 
 # Build
 cmake --build .

diff --git a/platforms/sdl/base/AppPlatform_sdl_base.cpp b/platforms/sdl/base/AppPlatform_sdl_base.cpp
@@ -20,6 +20,9 @@
 #include "SoundSystemAL.hpp"
 #define SOUND_SYSTEM SoundSystemAL
 #endif
+// Macros are cursed
+#define _STR(x) #x
+#define STR(x) _STR(x)
 
 void AppPlatform_sdl_base::_init(std::string storageDir, SDL_Window *window)
 {
@@ -36,7 +39,6 @@ void AppPlatform_sdl_base::_init(std::string storageDir, SDL_Window *window)
 
 	ensureDirectoryExists(_storageDir.c_str());
 
-	m_pLogger = new Logger;
 	m_pSoundSystem = nullptr;
 
 	// Default Touchscreen Mode
@@ -64,7 +66,7 @@ void AppPlatform_sdl_base::initSoundSystem()
 {
 	if (!m_pSoundSystem)
 	{
-		LOG_I("Initializing OpenAL SoundSystem...");
+		LOG_I("Initializing " STR(SOUND_SYSTEM) "...");
 		m_pSoundSystem = new SOUND_SYSTEM();
 	}
 	else
@@ -112,9 +114,6 @@ AppPlatform_sdl_base::~AppPlatform_sdl_base()
 	SAFE_DELETE(_iconTexture);
 
 	SAFE_DELETE(m_pSoundSystem);
-
-	// DELETE THIS LAST
-	SAFE_DELETE(m_pLogger);
 }
 
 SDL_Surface* AppPlatform_sdl_base::getSurfaceForTexture(const Texture* const texture)

diff --git a/platforms/sdl/base/AppPlatform_sdl_base.hpp b/platforms/sdl/base/AppPlatform_sdl_base.hpp
@@ -64,7 +64,6 @@ class AppPlatform_sdl_base : public AppPlatform
 
 	bool _mousegrabbed;
 
-	Logger* m_pLogger;
 	SoundSystem* m_pSoundSystem;
 
 	bool m_bIsTouchscreen;

diff --git a/platforms/sdl/main.cpp b/platforms/sdl/main.cpp
@@ -316,6 +316,10 @@ void CheckOptionalTextureAvailability()
 // Main
 int main(int argc, char *argv[])
 {
+	// Setup Logging
+	new Logger;
+
+	// Setup SDL
 	if (SDL_Init(SDL_INIT_VIDEO) < 0)
 	{
 		LOG_E("Unable To Initialize SDL: %s", SDL_GetError());

diff --git a/platforms/windows/AppPlatform_win32.cpp b/platforms/windows/AppPlatform_win32.cpp
@@ -14,7 +14,6 @@
 #include "GameMods.hpp"
 
 #include "AppPlatform_win32.hpp"
-#include "LoggerWin32.hpp"
 
 #include "thirdparty/GL/GL.hpp"
 
@@ -37,18 +36,12 @@ AppPlatform_win32::AppPlatform_win32()
 
 	m_MouseDiffX = 0, m_MouseDiffY = 0;
 
-	// This initializes the Logger singleton to use the Windows-specific variant
-	// If we didn't initialize it here, the Minecraft class would have our back
-	m_pLogger = new LoggerWin32();
 	m_pSoundSystem = nullptr;
 }
 
 AppPlatform_win32::~AppPlatform_win32()
 {
 	SAFE_DELETE(m_pSoundSystem);
-
-	// DELETE THIS LAST
-	SAFE_DELETE(m_pLogger);
 }
 
 void AppPlatform_win32::initSoundSystem()

diff --git a/platforms/windows/AppPlatform_win32.hpp b/platforms/windows/AppPlatform_win32.hpp
@@ -82,7 +82,6 @@ class AppPlatform_win32 : public AppPlatform
 
 	int m_MouseDiffX, m_MouseDiffY;
 
-	LoggerWin32 *m_pLogger;
 	SoundSystemDS* m_pSoundSystem;
 };
 
diff --git a/platforms/windows/main.cpp b/platforms/windows/main.cpp
@@ -18,6 +18,7 @@
 #include "client/player/input/Multitouch.hpp"
 
 #include "AppPlatform_win32.hpp"
+#include "LoggerWin32.hpp"
 
 LPCTSTR g_WindowClassName = TEXT("MCPEClass");
 
@@ -142,6 +143,10 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 
 	SetInstance(hInstance);
 
+	// This initializes the Logger singleton to use the Windows-specific variant
+	// If we didn't initialize it here, the Minecraft class would have our back
+	new LoggerWin32;
+
 	// register the window class:
 	WNDCLASS wc;
 	wc.style = CS_OWNDC;

diff --git a/source/client/app/Minecraft.cpp b/source/client/app/Minecraft.cpp
@@ -92,8 +92,6 @@ Minecraft::Minecraft() :
 	m_licenseID = -2;
 	m_fLastUpdated = 0;
 	m_fDeltaTime = 0;
-
-	m_Logger = new Logger();
 }
 
 int Minecraft::getLicenseId()
@@ -869,7 +867,6 @@ Minecraft::~Minecraft()
 	SAFE_DELETE(m_pUser);
 	SAFE_DELETE(m_pLevelStorageSource);
 	SAFE_DELETE(m_pInputHolder);
-	SAFE_DELETE(m_Logger);
 
 	//@BUG: potentially leaking a CThread instance if this is destroyed early?
 }

diff --git a/source/client/app/Minecraft.hpp b/source/client/app/Minecraft.hpp
@@ -97,7 +97,6 @@ class Minecraft : public App
 	static int customDebugId;
 
 private:
-	Logger *m_Logger;
 	Options *m_options;
 
 public:

diff --git a/source/common/Logger.cpp b/source/common/Logger.cpp
@@ -15,8 +15,11 @@ Logger* const Logger::singleton()
 Logger::Logger()
 {
     // Stick with the first output handle we get
-    if (!m_singleton)
+    if (!m_singleton) {
         m_singleton = this;
+    } else {
+        m_singleton->print(LOG_ERR, "Logging already setup!");
+    }
 }
 
 Logger::~Logger()