summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/core/version.cc6
-rw-r--r--src/game/client/game.cc2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/core/version.cc b/src/core/version.cc
index b03fc2a..74c67c4 100644
--- a/src/core/version.cc
+++ b/src/core/version.cc
@@ -8,8 +8,8 @@ const unsigned short version::minor = 0;
const unsigned short version::patch = 1;
// clang-format on
-const std::string_view version::commit = "e5f6887e";
-const std::string_view version::branch = "restor";
+const std::string_view version::commit = "33eb183a";
+const std::string_view version::branch = "devel";
const std::string_view version::triplet = "16.0.1";
-const std::string_view version::full = "16.0.1-e5f6887e";
+const std::string_view version::full = "16.0.1-33eb183a";
diff --git a/src/game/client/game.cc b/src/game/client/game.cc
index 5a67b59..1681c01 100644
--- a/src/game/client/game.cc
+++ b/src/game/client/game.cc
@@ -545,7 +545,7 @@ void client_game::update(void)
auto& io = ImGui::GetIO();
io.FontGlobalScale = scale_min;
- globals::gui_scale = scale_min;
+ globals::gui_scale = static_cast<unsigned int>(scale_min);
}
void client_game::update_late(void)