From 20ff8f71bf1017ea00eb43cdff66058b05782957 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Mon, 4 Dec 2023 21:20:50 +0300 Subject: [PATCH] Window title fix --- src/constants.h | 2 -- src/settings.h | 4 +++- src/window/Window.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/constants.h b/src/constants.h index fbbab472..a38b749f 100644 --- a/src/constants.h +++ b/src/constants.h @@ -6,8 +6,6 @@ const int ENGINE_VERSION_MAJOR = 0; const int ENGINE_VERSION_MINOR = 15; -#define TOSTR_MACRO(x) #x -#define ENGINE_VERSION TOSTR_MACRO(ENGINE_VERSION_MAJOR) "." TOSTR_MACRO(ENGINE_VERSION_MINOR); const int CHUNK_W = 16; const int CHUNK_H = 256; diff --git a/src/settings.h b/src/settings.h index daf2f7b2..59a0fcb7 100644 --- a/src/settings.h +++ b/src/settings.h @@ -18,7 +18,9 @@ struct DisplaySettings { /* GLFW swap interval value, 0 - unlimited fps, 1 - vsync*/ int swapInterval = 1; /* Window title */ - const char* title = "VoxelEngine-Cpp v" ENGINE_VERSION; + std::string title = "VoxelEngine-Cpp v" + + std::to_string(ENGINE_VERSION_MAJOR) + "." + + std::to_string(ENGINE_VERSION_MINOR); }; struct ChunksSettings { diff --git a/src/window/Window.cpp b/src/window/Window.cpp index 7209737d..8093f93d 100644 --- a/src/window/Window.cpp +++ b/src/window/Window.cpp @@ -128,7 +128,7 @@ int Window::initialize(DisplaySettings& settings){ glfwWindowHint(GLFW_RESIZABLE, GL_TRUE); glfwWindowHint(GLFW_SAMPLES, settings.samples); - window = glfwCreateWindow(width, height, settings.title, nullptr, nullptr); + window = glfwCreateWindow(width, height, settings.title.c_str(), nullptr, nullptr); if (window == nullptr){ cerr << "Failed to create GLFW Window" << endl; glfwTerminate();