X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_rocketlauncher.qc;h=969f54bdbe8a4cda2521280df35b303f02b8d5d3;hb=ac46eb66c927d1d4c0c61f1ada5efe7fc847ac63;hp=c29fda3a2af78575b5d18b9acfbe5db1ce57a425;hpb=22c0030471a750065e6c93eca404fdd19ad5d22f;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/w_rocketlauncher.qc b/qcsrc/server/w_rocketlauncher.qc
index c29fda3a2..969f54bdb 100644
--- a/qcsrc/server/w_rocketlauncher.qc
+++ b/qcsrc/server/w_rocketlauncher.qc
@@ -196,17 +196,6 @@ void W_Rocket_Think (void)
 			desiredorigin = WarpZone_RefSys_TransformOrigin(self.owner, self, self.owner.origin + self.owner.view_ofs);
 			olddir = normalize(self.velocity);
 
-#if 0
-			// disabled this code because it doesn't do what I want it to do :P
-			cosminang = cos(cvar("g_balance_rocketlauncher_guidefadeangle") * DEG2RAD);
-			cosmaxang = cos(cvar("g_balance_rocketlauncher_guidemaxangle") * DEG2RAD);
-			cosang = desireddir * normalize(self.origin - desiredorigin);
-			if(cosminang == cosmaxang)
-				f *= (cosang >= cosminang);
-			else
-				f *= bound(0, (cosang - cosmaxang) / (cosminang - cosmaxang), 1);
-#endif
-
 			// now it gets tricky... we want to move like some curve to approximate the target direction
 			// but we are limiting the rate at which we can turn!
 			goal = desiredorigin + ((self.origin - desiredorigin) * desireddir + cvar("g_balance_rocketlauncher_guidegoal")) * desireddir;
@@ -262,7 +251,7 @@ void W_Rocket_Attack (void)
 	if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
 		self.ammo_rockets = self.ammo_rockets - cvar("g_balance_rocketlauncher_ammo");
 
-	W_SetupShot_ProjectileSize (self, '-3 -3 -3', '3 3 3', FALSE, 5, "weapons/rocket_fire.wav", cvar("g_balance_rocketlauncher_damage"));
+	W_SetupShot_ProjectileSize (self, '-3 -3 -3', '3 3 3', FALSE, 5, "weapons/rocket_fire.wav", CHAN_WEAPON, cvar("g_balance_rocketlauncher_damage"));
 	pointparticles(particleeffectnum("rocketlauncher_muzzleflash"), w_shotorg, w_shotdir * 1000, 1);
 
 	missile = WarpZone_RefSys_SpawnSameRefSys(self);
@@ -360,9 +349,9 @@ float w_rlauncher(float req)
 			}
 			local float desirabledamage;
 			desirabledamage = enemydamage;
-			if (teamplay != 1 && time > self.invincible_finished && time > self.spawnshieldtime)
+			if (time > self.invincible_finished && time > self.spawnshieldtime)
 				desirabledamage = desirabledamage - selfdamage * cvar("g_balance_selfdamagepercent");
-			if (self.team && teamplay != 1)
+			if (teams_matter && self.team)
 				desirabledamage = desirabledamage - teamdamage;
 
 			missile = find(world, classname, "rocket");