diff --git a/other/build.nr b/other/build.nr index 5bc0067..54ece5b 100644 --- a/other/build.nr +++ b/other/build.nr @@ -1 +1 @@ -1972 +1974 diff --git a/src/ogfx/PixelRenderer.hpp b/src/ogfx/PixelRenderer.hpp index f85ae73..62f7a5c 100644 --- a/src/ogfx/PixelRenderer.hpp +++ b/src/ogfx/PixelRenderer.hpp @@ -1,7 +1,7 @@ #pragma once -#include "IOHandlers.hpp" -#include "String.hpp" +#include +#include #include #include #include @@ -40,6 +40,10 @@ namespace ogfx public: inline Font(void) { } inline Font(const ostd::String& fontPath) + { + init(fontPath); + } + inline void init(const ostd::String& fontPath) { ostd::ConsoleOutputHandler out; m_fontSurface = SDL_LoadBMP(fontPath.c_str()); diff --git a/src/ogfx/WindowBase.cpp b/src/ogfx/WindowBase.cpp index b3b255b..f5e26ce 100644 --- a/src/ogfx/WindowBase.cpp +++ b/src/ogfx/WindowBase.cpp @@ -65,9 +65,9 @@ namespace ogfx void WindowBase::close(void) { - m_running = false; - onClose(); - ostd::SignalHandler::emitSignal(ostd::tBuiltinSignals::WindowClosed, ostd::tSignalPriority::RealTime, *this); + m_running = false; + onClose(); + ostd::SignalHandler::emitSignal(ostd::tBuiltinSignals::WindowClosed, ostd::tSignalPriority::RealTime, *this); } void WindowBase::update(void)