eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-21 12:29:18 +02:00
Code Issues 123 Wiki Activity

Merge branch 'milek-dev' into gfx-work

Browse Source
This commit is contained in:
milek7
2018-10-11 16:02:01 +02:00
parent 2357026146 c0d3cfdad4
commit 5bd7421c5a
6 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
uilayer.cpp
View File

@@ -128,7 +128,7 @@ bool ui_layer::init(GLFWwindow *Window)
0,
};
m_imguiio->Fonts->AddFontFromFileTTF("DejaVuSansMono.ttf", 13.0f, nullptr, &ranges[0]);
m_imguiio->Fonts->AddFontFromFileTTF("fonts/dejavusansmono.ttf", 13.0f, nullptr, &ranges[0]);
if (Global.map_enabled)
m_map = std::make_unique<map>();