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:19:04 +0000
committerJakob Fries <jakob.fries@gmail.com>2007-06-10 15:19:04 +0000
commit7ad13ccb127edf520dead3f20570dd5f772cc61d (patch)
tree4984ef63f6655bf2ba14ad837d5624e69369c105 /src/game/client/game_client.cpp
parent6523310be6401ca8e2a3974214a97495c63b2523 (diff)
downloadzcatch-7ad13ccb127edf520dead3f20570dd5f772cc61d.tar.gz
zcatch-7ad13ccb127edf520dead3f20570dd5f772cc61d.zip
new input thingies
Diffstat (limited to 'src/game/client/game_client.cpp')
-rw-r--r--src/game/client/game_client.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/game/client/game_client.cpp b/src/game/client/game_client.cpp
index bab7a496..932585cf 100644
--- a/src/game/client/game_client.cpp
+++ b/src/game/client/game_client.cpp
@@ -1742,10 +1742,10 @@ void modc_render()
 		input.angle = (int)(a*256.0f);
 		input.jump = inp_key_pressed(config.key_jump);
 		
-		input.fire = inp_mouse_button_pressed(0);// | (oldinput.fire << 16);
+		input.fire = inp_key_pressed(input::mouse_1);// | (oldinput.fire << 16);
 		//oldinput.fire = input.fire & 0x0000ffff;
 		
-		input.hook = inp_mouse_button_pressed(1) || inp_key_pressed(baselib::keys::lctrl); // be nice to mac users O.o
+		input.hook = inp_key_pressed(input::mouse_2) || inp_key_pressed(baselib::input::lctrl); // be nice to mac users O.o
 		input.blink = inp_key_pressed('S');
 		
 		// Weapon switching
@@ -1965,7 +1965,7 @@ void modc_render()
 	// render gui stuff
 	gfx_mapscreen(0,0,400,300);
 	// render score board
-	if(inp_key_pressed(baselib::keys::tab))
+	if(inp_key_pressed(baselib::input::tab))
 	{
 		gfx_texture_set(font_texture);
 		gfx_quads_text(10, 50, 8, "Score Board");