about summary refs log tree commit diff
path: root/src/game/client/game_client.cpp
diff options
context:
space:
mode:
authorJakob Fries <jakob.fries@gmail.com>2007-06-10 15:42:19 +0000
committerJakob Fries <jakob.fries@gmail.com>2007-06-10 15:42:19 +0000
commit7e159502a1ee68a790a825147974b62dd599f490 (patch)
treede637f076443c1ab8db8cd692441dfd6bf6704db /src/game/client/game_client.cpp
parent7ad13ccb127edf520dead3f20570dd5f772cc61d (diff)
downloadzcatch-7e159502a1ee68a790a825147974b62dd599f490.tar.gz
zcatch-7e159502a1ee68a790a825147974b62dd599f490.zip
input things
Diffstat (limited to 'src/game/client/game_client.cpp')
-rw-r--r--src/game/client/game_client.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/game/client/game_client.cpp b/src/game/client/game_client.cpp
index 932585cf..2e95f187 100644
--- a/src/game/client/game_client.cpp
+++ b/src/game/client/game_client.cpp
@@ -1742,10 +1742,11 @@ void modc_render()
 		input.angle = (int)(a*256.0f);
 		input.jump = inp_key_pressed(config.key_jump);
 		
-		input.fire = inp_key_pressed(input::mouse_1);// | (oldinput.fire << 16);
+		input.fire = inp_key_pressed(config.key_fire);// | (oldinput.fire << 16);
 		//oldinput.fire = input.fire & 0x0000ffff;
 		
-		input.hook = inp_key_pressed(input::mouse_2) || inp_key_pressed(baselib::input::lctrl); // be nice to mac users O.o
+		input.hook = inp_key_pressed(config.key_hook);
+
 		input.blink = inp_key_pressed('S');
 		
 		// Weapon switching