glm backwards compatibility

[blank.git] / src / shared / states.cpp

diff --git a/src/shared/states.cpp b/src/shared/states.cpp
index f98382e39d30b587bcce82a3722dbda9350f3394..fc422bbc17504d688b61584730ca59e39709ec2d 100644 (file)
--- a/src/shared/states.cpp
+++ b/src/shared/states.cpp
@@ -18,8 +18,8 @@ ChatState::ChatState(Environment &env, State &parent, Responder &responder)
 , input(env.assets.small_ui_font) {
        input.Position(glm::vec3(25.0f, -25.0f, -1.0f), Gravity::SOUTH_WEST, Gravity::SOUTH_WEST);
        input.Width(env.viewport.Width() - 50.0f);
-       input.Foreground(glm::vec4(1.0f));
-       input.Background(glm::vec4(0.5f));
+       input.Foreground(PrimitiveMesh::Color(255));
+       input.Background(PrimitiveMesh::Color(127));
 }
 
 void ChatState::Preset(const std::string &text) {
@@ -138,7 +138,7 @@ void MessageState::ClearMessage() {
 }
 
 void MessageState::Handle(const SDL_Event &e) {
-       if (e.type == SDL_KEYDOWN) {
+       if (e.type == SDL_QUIT || e.type == SDL_KEYDOWN) {
                env.state.Pop();
        }
 }