X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2FPreloadState.cpp;h=aca2502eaeacc92e2417204fec3f618739c95eb7;hb=045a6ec084bf1fb4df3c6ade4a88932cf61bed23;hp=32d0b3a7fb86b8f630753fdfa854f29250bd6af5;hpb=376fc1fca87fcdd22dabadf6d01d245ef8c3cedd;p=blank.git diff --git a/src/app/PreloadState.cpp b/src/app/PreloadState.cpp index 32d0b3a..aca2502 100644 --- a/src/app/PreloadState.cpp +++ b/src/app/PreloadState.cpp @@ -3,16 +3,13 @@ #include "Environment.hpp" #include "../world/ChunkLoader.hpp" -#include - namespace blank { PreloadState::PreloadState(Environment &env, ChunkLoader &loader) : env(env) , loader(loader) -, font(env.assets.LoadFont("DejaVuSans", 24)) -, progress(font) +, progress(env.assets.large_ui_font) , total(loader.ToLoad()) , per_update(64) { progress.Position(glm::vec3(0.0f), Gravity::CENTER); @@ -20,7 +17,10 @@ PreloadState::PreloadState(Environment &env, ChunkLoader &loader) } -void PreloadState::Handle(const SDL_Event &) { +void PreloadState::Handle(const SDL_Event &e) { + if (e.type == SDL_QUIT) { + env.state.PopAll(); + } } void PreloadState::Update(int dt) {