added mousewheel support. added next/prev weapon support

9 files changed, 102 insertions, 82 deletions

diff --git a/datasrc/teewars.ds b/datasrc/teewars.ds
index 2212d464..00870077 100644
--- a/datasrc/teewars.ds
+++ b/datasrc/teewars.ds
@@ -324,6 +324,32 @@ projectileparticles {
 }
 
 weapons {
+	hammer {
+		sprite_body sprites.game.weapon_hammer_body
+		sprite_cursor sprites.game.weapon_hammer_cursor
+		sprite_proj sprites.game.weapon_hammer_proj
+		sprite_muzzles {
+		}
+		
+		nummuzzlesprites 0
+		muzzleoffsetx 0.0
+		muzzleoffsety 0.0
+		maxammo 10
+		costammo 0
+		recoil 10
+		firedelay 150
+		muzzleduration 0
+		visual_size 96
+		offsetx 4.0
+		offsety -20.0
+		meleedamage 4
+		meleereach 40
+		ammoregentime 0
+		duration -1
+		movetime 0
+		velocity 0
+	}
+	
 	gun {
 		sprite_body sprites.game.weapon_gun_body
 		sprite_cursor sprites.game.weapon_gun_cursor
@@ -353,32 +379,6 @@ weapons {
 		velocity 0
 	}
 	
-	rocket {
-		sprite_body sprites.game.weapon_rocket_body
-		sprite_cursor sprites.game.weapon_rocket_cursor
-		sprite_proj sprites.game.weapon_rocket_proj
-		sprite_muzzles {
-		}
-		
-		nummuzzlesprites 0
-		muzzleoffsetx 0.0
-		muzzleoffsety 0.0
-		maxammo 10
-		costammo 1
-		recoil 10
-		firedelay 600
-		muzzleduration 0
-		visual_size 96
-		offsetx 24.0
-		offsety -2.0
-		meleedamage 0
-		meleereach 0
-		ammoregentime 0
-		duration -1
-		movetime 0
-		velocity 0
-	}
-	
 	shotgun {
 		sprite_body sprites.game.weapon_shotgun_body
 		sprite_cursor sprites.game.weapon_shotgun_cursor
@@ -407,11 +407,11 @@ weapons {
 		movetime 0
 		velocity 0
 	}
-	
-	hammer {
-		sprite_body sprites.game.weapon_hammer_body
-		sprite_cursor sprites.game.weapon_hammer_cursor
-		sprite_proj sprites.game.weapon_hammer_proj
+
+	rocket {
+		sprite_body sprites.game.weapon_rocket_body
+		sprite_cursor sprites.game.weapon_rocket_cursor
+		sprite_proj sprites.game.weapon_rocket_proj
 		sprite_muzzles {
 		}
 		
@@ -419,45 +419,21 @@ weapons {
 		muzzleoffsetx 0.0
 		muzzleoffsety 0.0
 		maxammo 10
-		costammo 0
+		costammo 1
 		recoil 10
-		firedelay 150
+		firedelay 600
 		muzzleduration 0
 		visual_size 96
-		offsetx 4.0
-		offsety -20.0
-		meleedamage 4
-		meleereach 40
+		offsetx 24.0
+		offsety -2.0
+		meleedamage 0
+		meleereach 0
 		ammoregentime 0
 		duration -1
 		movetime 0
 		velocity 0
 	}
-	rocket_backpack {
-		sprite_body sprites.game.weapon_hammer_body
-		sprite_cursor sprites.game.weapon_hammer_cursor
-		sprite_proj sprites.game.weapon_hammer_proj
-		sprite_muzzles {
-		}
 		
-		nummuzzlesprites 0
-		muzzleoffsetx 0.0
-		muzzleoffsety 0.0
-		maxammo 10
-		costammo 1
-		recoil 10
-		firedelay 100
-		muzzleduration 0
-		visual_size 64
-		offsetx 4.0
-		offsety -20.0
-		meleedamage 1
-		meleereach 25
-		ammoregentime 0
-		duration -1
-		movetime 0
-		velocity 0
-	}
 	ninja {
 		sprite_body sprites.game.weapon_ninja_body
 		sprite_cursor sprites.game.weapon_ninja_cursor
diff --git a/scripts/gen_keys.py b/scripts/gen_keys.py
index 83f58375..42fa69ac 100644
--- a/scripts/gen_keys.py
+++ b/scripts/gen_keys.py
@@ -9,6 +9,8 @@ f = file("src/engine/keys.h", "w")
 
 keynames = {}
 KEY_MOUSE_FIRST = 256+128
+KEY_MOUSE_WHEEL_DOWN = KEY_MOUSE_FIRST-2
+KEY_MOUSE_WHEEL_UP = KEY_MOUSE_FIRST-1
 
 print >>f, "#ifndef ENGINE_KEYS_H"
 print >>f, "#define ENGINE_KEYS_H"
@@ -31,11 +33,16 @@ for line in lines:
 		# print to file					
 		print >>f, "\t%s = %s," % (key.upper(), value)
 		
-			# add to keynames
+		# add to keynames
 		exec("%s = %s" % (key, value))
 		exec("keynames[%s] = '%s'" % (value, key))
 
 # do mouse buttons
+print >>f, "\tKEY_MOUSE_WHEEL_DOWN = %d," % (KEY_MOUSE_WHEEL_DOWN)
+print >>f, "\tKEY_MOUSE_WHEEL_UP = %d," % (KEY_MOUSE_WHEEL_UP)
+keynames[KEY_MOUSE_WHEEL_DOWN] = 'KEY_MOUSE_WHEEL_DOWN'
+keynames[KEY_MOUSE_WHEEL_UP] = 'KEY_MOUSE_WHEEL_UP'
+
 print >>f, "\tKEY_MOUSE_FIRST = %d," % KEY_MOUSE_FIRST
 for line in lines:
 	if "GLFW_MOUSE" in line and not "CURSOR" in line:
diff --git a/src/engine/client/inp.c b/src/engine/client/inp.c
index 6583c53f..55cebbfe 100644
--- a/src/engine/client/inp.c
+++ b/src/engine/client/inp.c
@@ -80,7 +80,7 @@ void inp_update()
         keyboard_first = 0;
         inp_update();
     }
-
+    
     keyboard_current = keyboard_current^1;
     int i, v;
     for(i = 0; i < KEY_LAST; i++)
@@ -92,4 +92,14 @@ void inp_update()
         keyboard_state[keyboard_current][i] = v;
     }
 
+	// handle mouse wheel
+    i = glfwGetMouseWheel();
+    keyboard_state[keyboard_current][KEY_MOUSE_WHEEL_UP] = 0;
+    keyboard_state[keyboard_current][KEY_MOUSE_WHEEL_DOWN] = 0;
+    if(i > 0)
+    	keyboard_state[keyboard_current][KEY_MOUSE_WHEEL_UP] = 1;
+    if(i < 0)
+    	keyboard_state[keyboard_current][KEY_MOUSE_WHEEL_DOWN] = 1;
+    glfwSetMouseWheel(0);
+
 }
diff --git a/src/engine/keynames.c b/src/engine/keynames.c
index 326e2a38..43cea52c 100644
--- a/src/engine/keynames.c
+++ b/src/engine/keynames.c
@@ -386,8 +386,8 @@ static const char key_strings[512][16] =
 	"#379",
 	"#380",
 	"#381",
-	"#382",
-	"#383",
+	"mousewheeldown",
+	"mousewheelup",
 	"mouse1",
 	"mouse2",
 	"mouse3",
diff --git a/src/engine/keys.h b/src/engine/keys.h
index fd8d9cbf..9670f1a0 100644
--- a/src/engine/keys.h
+++ b/src/engine/keys.h
@@ -70,6 +70,8 @@ enum
 	KEY_KP_EQUAL = (KEY_SPECIAL+61),
 	KEY_KP_ENTER = (KEY_SPECIAL+62),
 	KEY_REPEAT = 0x00030005,
+	KEY_MOUSE_WHEEL_DOWN = 382,
+	KEY_MOUSE_WHEEL_UP = 383,
 	KEY_MOUSE_FIRST = 384,
 	KEY_MOUSE_1 = KEY_MOUSE_FIRST+0,
 	KEY_MOUSE_2 = KEY_MOUSE_FIRST+1,
diff --git a/src/game/client/game_client.cpp b/src/game/client/game_client.cpp
index dfb8e698..80a71114 100644
--- a/src/game/client/game_client.cpp
+++ b/src/game/client/game_client.cpp
@@ -1780,7 +1780,7 @@ void render_game()
 			
 		input.target_x = (int)mouse_pos.x;
 		input.target_y = (int)mouse_pos.y;
-		input.activeweapon = -1;
+		input.activeweapon = 0;
 	
 		if(chat_mode != CHATMODE_NONE)
 			input.state = STATE_CHATTING;
@@ -1795,13 +1795,14 @@ void render_game()
 			// TODO: this is not very well done. it should check this some other way
 			input.fire = emoticon_selector_active ? 0 : inp_key_pressed(config.key_fire);
 			input.hook = inp_key_pressed(config.key_hook);
-
-			//input.blink = inp_key_pressed('S');
+			
 			// Weapon switching
-			if(inp_key_pressed(config.key_weapon1)) input.activeweapon = 0;
-			if(inp_key_pressed(config.key_weapon2)) input.activeweapon = 1;
-			if(inp_key_pressed(config.key_weapon3)) input.activeweapon = 2;
-			if(inp_key_pressed(config.key_weapon4)) input.activeweapon = 3;
+			if(inp_key_pressed(config.key_next_weapon)) input.activeweapon = -1;
+			if(inp_key_pressed(config.key_prev_weapon)) input.activeweapon = -2;
+			if(inp_key_pressed(config.key_weapon1)) input.activeweapon = 1;
+			if(inp_key_pressed(config.key_weapon2)) input.activeweapon = 2;
+			if(inp_key_pressed(config.key_weapon3)) input.activeweapon = 3;
+			if(inp_key_pressed(config.key_weapon4)) input.activeweapon = 4;
 		}
 		
 		// stress testing
diff --git a/src/game/client/menu.cpp b/src/game/client/menu.cpp
index e781fcdf..ad418615 100644
--- a/src/game/client/menu.cpp
+++ b/src/game/client/menu.cpp
@@ -807,10 +807,12 @@ static int settings_controls_render()
 		{ "Jump:", &config_copy.key_jump, config_set_key_jump },
 		{ "Fire:", &config_copy.key_fire, config_set_key_fire },
 		{ "Hook:", &config_copy.key_hook, config_set_key_hook },
-		{ "Pistol:", &config_copy.key_weapon1, config_set_key_weapon1 },
-		{ "Grenade:", &config_copy.key_weapon2, config_set_key_weapon2 },
+		{ "Hammer:", &config_copy.key_weapon1, config_set_key_weapon1 },
+		{ "Pistol:", &config_copy.key_weapon2, config_set_key_weapon2 },
 		{ "Shotgun:", &config_copy.key_weapon3, config_set_key_weapon3 },
-		{ "Hammer:", &config_copy.key_weapon4, config_set_key_weapon4 },
+		{ "Grenade:", &config_copy.key_weapon4, config_set_key_weapon4 },
+		{ "Next Weapon:", &config_copy.key_next_weapon, config_set_key_next_weapon },
+		{ "Prev. Weapon:", &config_copy.key_prev_weapon, config_set_key_prev_weapon },
 		{ "Emoticon:", &config_copy.key_emoticon, config_set_key_emoticon },
 		{ "Screenshot:", &config_copy.key_screenshot, config_set_key_screenshot },
 	};
diff --git a/src/game/game_variables.h b/src/game/game_variables.h
index 464f30a9..889b8786 100644
--- a/src/game/game_variables.h
+++ b/src/game/game_variables.h
@@ -7,6 +7,10 @@ MACRO_CONFIG_INT(key_weapon1, '1', 32, 512)
 MACRO_CONFIG_INT(key_weapon2, '2', 32, 512)
 MACRO_CONFIG_INT(key_weapon3, '3', 32, 512)
 MACRO_CONFIG_INT(key_weapon4, '4', 32, 512)
+
+MACRO_CONFIG_INT(key_next_weapon, 382, 32, 512)
+MACRO_CONFIG_INT(key_prev_weapon, 383, 32, 512)
+
 MACRO_CONFIG_INT(key_emoticon, 'E', 32, 512)
 
 MACRO_CONFIG_INT(key_chat, 'T', 32, 512)
diff --git a/src/game/server/game_server.cpp b/src/game/server/game_server.cpp
index cf4be747..95b01967 100644
--- a/src/game/server/game_server.cpp
+++ b/src/game/server/game_server.cpp
@@ -725,16 +725,34 @@ int player::handle_weapons()
 	}
 
 	// switch weapon if wanted		
-	if(input.activeweapon >= 0 && input.activeweapon < NUM_WEAPONS && weapons[input.activeweapon].got && 
-		data->weapons[active_weapon].duration <= 0)
+	if(input.activeweapon && data->weapons[active_weapon].duration <= 0)
 	{
-		if (active_weapon != input.activeweapon)
-			create_sound(pos, SOUND_WEAPON_SWITCH);
+		int new_weapon = active_weapon;
+		if(input.activeweapon > 0) // straight selection
+			new_weapon = input.activeweapon-1;
+		else if(input.activeweapon == -1 && !previnput.activeweapon) // next weapon
+		{
+			do
+				new_weapon = (new_weapon+1)%NUM_WEAPONS;
+			while(!weapons[new_weapon].got);
+		}
+		else if(input.activeweapon == -2 && !previnput.activeweapon)
+		{
+			do
+				new_weapon = (new_weapon-1)<0?NUM_WEAPONS-1:new_weapon-1;
+			while(!weapons[new_weapon].got);
+		}
+			
+		if(new_weapon >= 0 && new_weapon < NUM_WEAPONS && weapons[new_weapon].got)
+		{
+			if(active_weapon != new_weapon)
+				create_sound(pos, SOUND_WEAPON_SWITCH);
 
-		last_weapon = active_weapon;
-		active_weapon = input.activeweapon;
+			last_weapon = active_weapon;
+			active_weapon = new_weapon;
+		}
 	}
-
+	
 	if(!previnput.fire && input.fire)
 	{
 		if(reload_timer == 0)