renamed laser to rifle.

2 files changed, 6 insertions, 5 deletions

diff --git a/src/game/client/gc_menu.cpp b/src/game/client/gc_menu.cpp
index fb39f85f..409edbe8 100644
--- a/src/game/client/gc_menu.cpp
+++ b/src/game/client/gc_menu.cpp
@@ -1300,6 +1300,7 @@ static void menu2_render_settings_controls(RECT main_view)
 		{ "Pistol:", &config.key_weapon2 },
 		{ "Shotgun:", &config.key_weapon3 },
 		{ "Grenade:", &config.key_weapon4 },
+		{ "Rifle:", &config.key_weapon5 },
 		{ "Next Weapon:", &config.key_next_weapon },
 		{ "Prev. Weapon:", &config.key_prev_weapon },
 		{ "Emoticon:", &config.key_emoticon },
diff --git a/src/game/server/gs_server.cpp b/src/game/server/gs_server.cpp
index 41dc18a3..b9f78996 100644
--- a/src/game/server/gs_server.cpp
+++ b/src/game/server/gs_server.cpp
@@ -482,7 +482,7 @@ bool laser::hit_player(vec2 from, vec2 to)
 	this->from = from;
 	pos = at;
 	energy = -1;		
-	hit->take_damage(vec2(0,0), tuning.laser_damage, owner->client_id, WEAPON_LASER);
+	hit->take_damage(vec2(0,0), tuning.laser_damage, owner->client_id, WEAPON_RIFLE);
 	return true;
 }
 
@@ -818,8 +818,8 @@ void player::try_respawn()
 	weapons[WEAPON_GUN].got = true;
 	weapons[WEAPON_GUN].ammo = data->weapons[WEAPON_GUN].maxammo;
 
-	weapons[WEAPON_LASER].got = true;
-	weapons[WEAPON_LASER].ammo = 100000; //data->weapons[WEAPON_LASER].maxammo;
+	weapons[WEAPON_RIFLE].got = true;
+	weapons[WEAPON_RIFLE].ammo = 100000; //data->weapons[WEAPON_LASER].maxammo;
 	
 	active_weapon = WEAPON_GUN;
 	last_weapon = WEAPON_HAMMER;
@@ -1078,10 +1078,10 @@ int player::handle_weapons()
 						break;
 					}
 					
-					case WEAPON_LASER:
+					case WEAPON_RIFLE:
 					{
 						new laser(pos, direction, tuning.laser_reach, this);
-						create_sound(pos, SOUND_LASER_FIRE);
+						create_sound(pos, SOUND_RIFLE_FIRE);
 						break;
 					}