[external/gamekit] Updated. Client and server now have different name…

…s in the log.
Unarelith · May 31, 2020 · 0faeb1b · 0faeb1b
1 parent 98d9431
commit 0faeb1b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 1 deletion.
diff --git a/external/gamekit b/external/gamekit
diff --git a/source/client/core/ClientApplication.cpp b/source/client/core/ClientApplication.cpp
@@ -55,6 +55,8 @@ void ClientApplication::init() {
 	m_argumentParser.addArgument("working-dir", {"-w", "--working-dir", "Change the working direction to <dir>.", "dir"});
 	m_argumentParser.addArgument("texture-pack", {"-t", "--texture-pack", "Use texture pack <name>.", "name"});
 
+	m_loggerHandler.setName("client");
+
 	gk::CoreApplication::init();
 
 	m_window.addVertexAttribute(VertexAttribute::Coord3d, "coord3d", 4, GL_FLOAT, GL_FALSE, sizeof(Vertex), reinterpret_cast<GLvoid *>(offsetof(Vertex, coord3d)));

diff --git a/source/server/core/ServerApplication.cpp b/source/server/core/ServerApplication.cpp
@@ -60,6 +60,9 @@ ServerApplication::ServerApplication(gk::EventHandler &eventHandler) {
 void ServerApplication::init() {
 	std::srand(std::time(nullptr));
 
+	m_loggerHandler.setName("server");
+	gk::LoggerHandler::setInstance(m_loggerHandler);
+
 	BlockGeometry::initOrientation();
 
 	m_argumentParser.addArgument("port", {"-p", "--port", "Select the port to use.", "port"});

diff --git a/source/server/core/ServerApplication.hpp b/source/server/core/ServerApplication.hpp
@@ -64,6 +64,7 @@ class ServerApplication {
 		gk::ArgumentParser m_argumentParser;
 		gk::GameClock m_clock;
 		gk::EventHandler *m_eventHandler = nullptr;
+		gk::LoggerHandler m_loggerHandler;
 
 		Registry m_registry;
+2 −0		include/gk/core/CoreApplication.hpp
+5 −5		include/gk/core/Debug.hpp
+4 −2		include/gk/core/Logger.hpp
+58 −0		include/gk/core/LoggerHandler.hpp
+1 −0		source/CMakeLists.txt
+1 −0		source/core/CoreApplication.cpp
+4 −1		source/core/Logger.cpp
+46 −0		source/core/LoggerHandler.cpp