X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fstandalone%2FMasterState.cpp;h=91ee4826682fbdaca890b76d3c1c8bb0c3ab4929;hb=ca90ec459ca0bd48c1483a45f30496aed61e9c21;hp=750e491141135ca52a14b534aab51ebbd4fdd46e;hpb=fcb9cdbbb01dbe4a86981e1529df451d7d5e8256;p=blank.git

diff --git a/src/standalone/MasterState.cpp b/src/standalone/MasterState.cpp
index 750e491..91ee482 100644
--- a/src/standalone/MasterState.cpp
+++ b/src/standalone/MasterState.cpp
@@ -37,7 +37,8 @@ MasterState::MasterState(
 , spawner(world, res.models, env.rng)
 , sky(env.loader.LoadCubeMap("skybox"))
 , preload(env, chunk_loader, chunk_renderer)
-, unload(env, world.Chunks(), save) {
+, unload(env, world.Chunks(), save)
+, chat(env, *this, *this) {
 	res.Load(env.loader, "default");
 	if (res.models.size() < 2) {
 		throw std::runtime_error("need at least two models to run");
@@ -74,6 +75,7 @@ void MasterState::OnResume() {
 		// TODO: spawn
 		spawn_player = false;
 	}
+	hud.KeepMessages(false);
 }
 
 void MasterState::OnPause() {
@@ -84,7 +86,13 @@ void MasterState::OnPause() {
 void MasterState::Handle(const SDL_Event &event) {
 	switch (event.type) {
 		case SDL_KEYDOWN:
-			interface.HandlePress(event.key);
+			// TODO: move to interface?
+			if (event.key.keysym.sym == SDLK_RETURN) {
+				env.state.Push(&chat);
+				hud.KeepMessages(true);
+			} else {
+				interface.HandlePress(event.key);
+			}
 			break;
 		case SDL_KEYUP:
 			interface.HandleRelease(event.key);
@@ -187,5 +195,9 @@ void MasterState::Exit() {
 	env.state.Switch(&unload);
 }
 
+void MasterState::OnLineSubmit(const std::string &line) {
+	hud.PostMessage(line);
+}
+
 }
 }