X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fstandalone%2FMasterState.cpp;h=81017f78603cea89bca967d440089e7c26876e05;hb=150d065f431d665326fd8028748c48a74ad956bb;hp=750e491141135ca52a14b534aab51ebbd4fdd46e;hpb=fcb9cdbbb01dbe4a86981e1529df451d7d5e8256;p=blank.git

diff --git a/src/standalone/MasterState.cpp b/src/standalone/MasterState.cpp
index 750e491..81017f7 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");
@@ -66,25 +67,43 @@ MasterState::~MasterState() {
 void MasterState::OnResume() {
 	if (spawn_index.MissingChunks() > 0) {
 		env.state.Push(&preload);
-	}
-	if (config.input.mouse) {
-		env.window.GrabMouse();
+		return;
 	}
 	if (spawn_player) {
 		// TODO: spawn
 		spawn_player = false;
 	}
+	hud.KeepMessages(false);
+	OnFocus();
 }
 
 void MasterState::OnPause() {
+	OnBlur();
+}
+
+void MasterState::OnFocus() {
+	if (config.input.mouse) {
+		env.window.GrabMouse();
+	}
+	interface.Unlock();
+}
+
+void MasterState::OnBlur() {
 	env.window.ReleaseMouse();
+	interface.Lock();
 }
 
 
 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);
@@ -110,7 +129,8 @@ void MasterState::Handle(const SDL_Event &event) {
 }
 
 void MasterState::Update(int dt) {
-	input.Update(dt);
+	spawner.Update(dt);
+	world.Update(dt);
 	if (input.BlockFocus()) {
 		hud.FocusBlock(input.BlockFocus().GetChunk(), input.BlockFocus().block);
 	} else if (input.EntityFocus()) {
@@ -120,8 +140,6 @@ void MasterState::Update(int dt) {
 	}
 	hud.Display(res.block_types[player.GetInventorySlot() + 1]);
 	hud.Update(dt);
-	spawner.Update(dt);
-	world.Update(dt);
 	chunk_loader.Update(dt);
 	chunk_renderer.Update(dt);
 
@@ -187,5 +205,11 @@ void MasterState::Exit() {
 	env.state.Switch(&unload);
 }
 
+void MasterState::OnLineSubmit(const std::string &line) {
+	if (!line.empty()) {
+		hud.PostMessage(line);
+	}
+}
+
 }
 }