about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlfred Eriksson <somerunce@gmail.com>2008-11-01 16:49:05 +0000
committerAlfred Eriksson <somerunce@gmail.com>2008-11-01 16:49:05 +0000
commitbb6a0504dca85badd054a3b40300c4e317662dcc (patch)
treef12450c1618642b3b528d932c9dec2163aabc86b
parenteee784f155775d4d1c05bf3726c441d2526be094 (diff)
downloadzcatch-bb6a0504dca85badd054a3b40300c4e317662dcc.tar.gz
zcatch-bb6a0504dca85badd054a3b40300c4e317662dcc.zip
editor now works correctly when console is toggled (focus problem)
-rw-r--r--src/engine/client/ec_client.c1
-rw-r--r--src/game/client/components/console.cpp5
2 files changed, 5 insertions, 1 deletions
diff --git a/src/engine/client/ec_client.c b/src/engine/client/ec_client.c
index 0b148f45..11ed9594 100644
--- a/src/engine/client/ec_client.c
+++ b/src/engine/client/ec_client.c
@@ -1614,6 +1614,7 @@ static void client_run()
 		if(config.cl_editor)
 		{
 			client_update();
+			inp_mouse_mode_relative();
 			editor_update_and_render();
 			gfx_swap();
 		}
diff --git a/src/game/client/components/console.cpp b/src/game/client/components/console.cpp
index 9efebd92..41f28a19 100644
--- a/src/game/client/components/console.cpp
+++ b/src/game/client/components/console.cpp
@@ -178,8 +178,11 @@ void CONSOLE::on_render()
 		progress = 1.0f;
 	}
 	
-	if (console_state == CONSOLE_CLOSED)
+	if (console_state == CONSOLE_CLOSED || config.cl_editor)
 		return;
+		
+	if (console_state == CONSOLE_OPEN)
+		inp_mouse_mode_absolute();
 
 	float console_height_scale;