X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_laser.qc;h=5e2bb075aa5c7ff1a4fd6b258ac2cea9661954a7;hb=5abe7760e8867f0e6001991049795a3da07813a0;hp=5e034acb908f9bfe6b1b9a085b8c4dd10dd17a24;hpb=a1ef51d662c331da95d2aee51d03efff23079ff1;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/w_laser.qc b/qcsrc/server/w_laser.qc
index 5e034acb9..5e2bb075a 100644
--- a/qcsrc/server/w_laser.qc
+++ b/qcsrc/server/w_laser.qc
@@ -3,6 +3,7 @@ REGISTER_WEAPON(LASER, w_laser, 0, 1, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WE
 #else
 #ifdef SVQC
 void(float imp) W_SwitchWeapon;
+void() W_LastWeapon;
 
 void W_Laser_Touch (void)
 {
@@ -30,7 +31,7 @@ void W_Laser_Think()
 
 void W_Laser_Attack (float issecondary)
 {
-	local entity missile;
+	entity missile;
 	vector s_forward;
 	float a;
 	float nodamage;
@@ -74,6 +75,7 @@ void W_Laser_Attack (float issecondary)
 	missile.touch = W_Laser_Touch;
 
 	missile.flags = FL_PROJECTILE;
+	missile.missile_flags = MIF_SPLASH; 
 
 	missile.think = W_Laser_Think;
 	missile.nextthink = time + autocvar_g_balance_laser_primary_delay;
@@ -214,8 +216,8 @@ void spawnfunc_weapon_laser (void)
 
 float w_laser(float req)
 {
-	local float r1;
-	local float r2;
+	float r1;
+	float r2;
 	if (req == WR_AIM)
 	{
 		if(autocvar_g_balance_laser_secondary)
@@ -259,7 +261,7 @@ float w_laser(float req)
 			else
 			{
 				if(self.switchweapon == WEP_LASER) // don't do this if already switching
-					W_SwitchWeapon (self.cnt);
+					W_LastWeapon();
 			}
 		}
 	}
@@ -290,7 +292,7 @@ float w_laser(float req)
 		W_Reload(0, autocvar_g_balance_laser_reload_ammo, autocvar_g_balance_laser_reload_time, "weapons/reload.wav");
 	}
 	return TRUE;
-};
+}
 #endif
 #ifdef CSQC
 float w_laser(float req)