From 1a4227a580907191ed87c963af85716a57a9d682 Mon Sep 17 00:00:00 2001 From: Quentin Bazin Date: Tue, 7 Jul 2020 20:21:47 +0200 Subject: [PATCH] [gamekit] Updated. Menu background fixed. [Config] Now creating 'config' folder if it doesn't exist yet. --- external/gamekit | 2 +- resources/textures/menu_background.png | Bin 949 -> 1462 bytes source/client/core/Config.cpp | 9 ++++++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/external/gamekit b/external/gamekit index 57e64cd22..13fe38986 160000 --- a/external/gamekit +++ b/external/gamekit @@ -1 +1 @@ -Subproject commit 57e64cd227314a73912db8a96a2ac31b8a365895 +Subproject commit 13fe38986b55af6cbf772841279f47b4ca5f3ffc diff --git a/resources/textures/menu_background.png b/resources/textures/menu_background.png index 5c02f91807ed052a56588fca33fbcc8f343b4511..46474da5e78cff55e25fbee1b6a4a4a488b34f52 100644 GIT binary patch literal 1462 zcmds#+iy%!6vkIO(zK(~>ZIC6BdtW0v_fquRiR_1%m`K05RJ&RYP-ZO)TKx$bxR0J z=?WsjgTy5WqLENST(Xc7cMl>VJh(kbys&)x`~{vo*vXlbHGA)G{l0IV9o1D60{%XJ zA_~N!ks7>vxhL6&-+_bEr{Q&PK{#9;Ub&)a>0+Xs_BrwRn}^h6Qd(+iXLCVi=u4G9 zWA9XdYBay3^UB7A5%I?O&sBlQu%WY_1&Zt6-#MO@`?ff-F8Rb*Iv*X?@!)P^Lt*Ge zFn?8ZER?e6jIW_EJG13QMYj2txur*$@8y_^%N3)7ZM;J-yOXcKe>5+C z?&r;}uF)C&4h-MbQopX;xA|7z){gt*l9GN;PujZpU`E5yUpIcw%`C5NtDBk_{QhKh zfCj3vWlgp9gP zYsgx%OjgLMJIjXH5;L(7tGgXJA zt}QBSjb&rSSalTGWNVlWi(z$8I4jl&8xbQ4MqD*&jj~ZOimsrB7@$E3EbO5%v>^>G zTvlhu)mUt;SgXz-+M;5%ESA;T1qC*Rt%wzcdqCl=RkkWtVGnr#6Solu`~w0GK@BlL zgAzxoi) z5eJxH7!E-VF+k%cu)u-F(1x_S5xLXYMvbMI7=na9v_&PVZh+qS9fdbhH&1U!4$8~j zjn|9PF?#8^X?unpvgg4K-@|eayiSnD=YT08Jb3b2d0*l`|CzgXeP5ykYO1N428{o5 z{cWhZ_jn=BrYwujTtSp}%RLG0MQOSCb6qSFs?BL1Jf*ug^-EqJzBWI5%d z$;YxguGa4_t7-XB7XHz*^V5Ya&MR87`{L)G8}?~1*j)a#wR7aFcb6XI%vkDw=i8dU Uu;BE@yaCQftgZtj-i@GXnPPKuqsr1Gw#HP7rq(-1F~vV)`mzFO7lWs(pUXO@geCyrC{(Hd diff --git a/source/client/core/Config.cpp b/source/client/core/Config.cpp index 4465fb381..c96e1496b 100644 --- a/source/client/core/Config.cpp +++ b/source/client/core/Config.cpp @@ -31,8 +31,12 @@ #include +#include + #include "Config.hpp" +namespace fs = ghc::filesystem; + // Gameplay bool Config::isFlyModeEnabled = false; bool Config::isNoClipEnabled = false; @@ -65,7 +69,10 @@ std::string Config::defaultUsername = ""; std::string Config::defaultServerAddress = "localhost:4242"; void Config::loadConfigFromFile(const char *filename) { - if (gk::Filesystem::fileExists(filename)) { + if (!fs::exists("config")) + fs::create_directory("config"); + + if (fs::exists(filename)) { sol::state lua; try {