Quent42340/OpenMiner
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[external/gamekit] Updated. Client and server now have different names in the log.

Browse Source
This commit is contained in:
Quentin Bazin 2020-06-01 01:33:17 +02:00
parent 98d9431c97
commit 0faeb1b5db
4 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
external/gamekit vendored

@ -1 +1 @@
Subproject commit 4adcb6eaf6e0a578cd230ec606d37a3fa146c487
Subproject commit 9597bc8dfa840039447b218fb43de2891a48b82b

2
source/client/core/ClientApplication.cpp
View File

@ -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)));

3
source/server/core/ServerApplication.cpp
View File

@ -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"});

1
source/server/core/ServerApplication.hpp
View File

@ -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;