about summary refs log tree commit diff
path: root/src/game/client/components/controls.cpp
diff options
context:
space:
mode:
authorAlfred Eriksson <somerunce@gmail.com>2008-11-16 15:39:22 +0000
committerAlfred Eriksson <somerunce@gmail.com>2008-11-16 15:39:22 +0000
commit00794899d6b00243b562dad75c717cf210230c11 (patch)
tree72582d07666832d8ae334f0864de63d6fc2f2537 /src/game/client/components/controls.cpp
parentb6f6f4799747636acb1e2da029f44a2d3d155f62 (diff)
downloadzcatch-00794899d6b00243b562dad75c717cf210230c11.tar.gz
zcatch-00794899d6b00243b562dad75c717cf210230c11.zip
paused the aiming when game is paused
Diffstat (limited to 'src/game/client/components/controls.cpp')
-rw-r--r--src/game/client/components/controls.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/game/client/components/controls.cpp b/src/game/client/components/controls.cpp
index 8043e451..12eabdd0 100644
--- a/src/game/client/components/controls.cpp
+++ b/src/game/client/components/controls.cpp
@@ -158,11 +158,14 @@ int CONTROLS::snapinput(int *data)
 void CONTROLS::on_render()
 {
 	// update target pos
-	target_pos = gameclient.local_character_pos + mouse_pos;
+	if(!(gameclient.snap.gameobj && gameclient.snap.gameobj->paused))
+		target_pos = gameclient.local_character_pos + mouse_pos;
 }
 
 bool CONTROLS::on_mousemove(float x, float y)
 {
+	if(gameclient.snap.gameobj && gameclient.snap.gameobj->paused)
+		return false;
 	mouse_pos += vec2(x, y); // TODO: ugly
 
 	//