X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_weaponsystem.qc;h=402b692af1230fba959a89c1fce3aef5a999ab13;hb=339a61a69ee23557d28102aab85c2b0cda376e3f;hp=4f496e56ebb7f102ea22f58ea14d53944e49544a;hpb=e52c92b8ba22924be19d8458fb1dd0cb7cfe11c7;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/cl_weaponsystem.qc b/qcsrc/server/cl_weaponsystem.qc
index 4f496e56e..402b692af 100644
--- a/qcsrc/server/cl_weaponsystem.qc
+++ b/qcsrc/server/cl_weaponsystem.qc
@@ -69,6 +69,7 @@ vector W_HitPlotNormalizedUntransform(vector org, entity targ, vector screenforw
 
 	// x = 0..1 relative to hitbox; y = 0..1 relative to hitbox; z = distance
 
+	mi = ma = targ.origin + 0.5 * (targ.mins + targ.maxs);
 	for(i = 0; i < 2; ++i) for(j = 0; j < 2; ++j) for(k = 0; k < 2; ++k)
 	{
 		thisv = targ.origin;
@@ -557,7 +558,6 @@ void CL_Weaponentity_Think()
 
 	self.angles = '0 0 0';
 	float f;
-	f = 0;
 	if (self.state == WS_RAISE && !intermission_running)
 	{
 		f = (self.owner.weapon_nextthink - time) * g_weaponratefactor / autocvar_g_balance_weaponswitchdelay;
@@ -727,7 +727,7 @@ void Send_WeaponComplain (entity e, float wpn, string wpnname, float type)
 
 float client_hasweapon(entity cl, float wpn, float andammo, float complain)
 {
-	float weaponbit, f;
+	float f;
 	entity oldself;
 
 	if(time < self.hasweapon_complain_spam)
@@ -741,8 +741,7 @@ float client_hasweapon(entity cl, float wpn, float andammo, float complain)
 			sprint(self, "Invalid weapon\n");
 		return FALSE;
 	}
-	weaponbit = W_WeaponBit(wpn);
-	if (cl.weapons & weaponbit)
+	if (WEPSET_CONTAINS_EW(cl, wpn))
 	{
 		if (andammo)
 		{
@@ -783,7 +782,7 @@ float client_hasweapon(entity cl, float wpn, float andammo, float complain)
 	{
 		// DRESK - 3/16/07
 		// Report Proper Weapon Status / Modified Weapon Ownership Message
-		if(weaponsInMap & weaponbit)
+		if (WEPSET_CONTAINS_AW(weaponsInMap, wpn))
 		{
 			sprint(cl, strcat("You do not have the ^2", W_Name(wpn), "\n") );
 			Send_WeaponComplain (cl, wpn, W_Name(wpn), 1);
@@ -796,7 +795,7 @@ float client_hasweapon(entity cl, float wpn, float andammo, float complain)
 				e = get_weaponinfo(wpn);
 				s = e.model2;
 
-				for(e = world; (e = findfloat(e, weapons, weaponbit)); )
+				for(e = world; (e = findfloat(e, weapon, wpn)); )
 				{
 					if(e.classname == "droppedweapon")
 						continue;
@@ -867,10 +866,15 @@ void W_SwitchToOtherWeapon(entity pl)
 {
 	// hack to ensure it switches to an OTHER weapon (in case the other fire mode still has ammo, we want that anyway)
 	float w, ww;
-	w = W_WeaponBit(pl.weapon);
-	pl.weapons &~= w;
-	ww = w_getbestweapon(pl);
-	pl.weapons |= w;
+	w = pl.weapon;
+	if(WEPSET_CONTAINS_EW(pl, w))
+	{
+		WEPSET_ANDNOT_EW(pl, w);
+		ww = w_getbestweapon(pl);
+		WEPSET_OR_EW(pl, w);
+	}
+	else
+		ww = w_getbestweapon(pl);
 	if(ww)
 		W_SwitchWeapon_Force(pl, ww);
 }
@@ -1073,8 +1077,6 @@ vector W_CalculateProjectileVelocity(vector pvelocity, vector mvelocity, float f
 {
 	vector mdirection;
 	float mspeed;
-	float outspeed;
-	float nstyle;
 	vector outvelocity;
 
 	mvelocity = mvelocity * g_weaponspeedfactor;
@@ -1082,61 +1084,7 @@ vector W_CalculateProjectileVelocity(vector pvelocity, vector mvelocity, float f
 	mdirection = normalize(mvelocity);
 	mspeed = vlen(mvelocity);
 
-	nstyle = autocvar_g_projectiles_newton_style;
-	if(nstyle == 0 || forceAbsolute)
-	{
-		// absolute velocity
-		outvelocity = mvelocity;
-	}
-	else if(nstyle == 1)
-	{
-		// true Newtonian projectiles
-		outvelocity = pvelocity + mvelocity;
-	}
-	else if(nstyle == 2)
-	{
-		// true Newtonian projectiles with automatic aim adjustment
-		//
-		// solve: |outspeed * mdirection - pvelocity| = mspeed
-		// outspeed^2 - 2 * outspeed * (mdirection * pvelocity) + pvelocity^2 - mspeed^2 = 0
-		// outspeed = (mdirection * pvelocity) +- sqrt((mdirection * pvelocity)^2 - pvelocity^2 + mspeed^2)
-		// PLUS SIGN!
-		// not defined?
-		// then...
-		// pvelocity^2 - (mdirection * pvelocity)^2 > mspeed^2
-		// velocity without mdirection component > mspeed
-		// fire at smallest possible mspeed that works?
-		// |(mdirection * pvelocity) * pvelocity - pvelocity| = mspeed
-
-		vector solution;
-		solution = solve_quadratic(1, -2 * (mdirection * pvelocity), pvelocity * pvelocity - mspeed * mspeed);
-		if(solution_z)
-			outspeed = solution_y; // the larger one
-		else
-		{
-			//outspeed = 0; // slowest possible shot
-			outspeed = solution_x; // the real part (that is, the average!)
-			//dprint("impossible shot, adjusting\n");
-		}
-
-		outspeed = bound(mspeed * autocvar_g_projectiles_newton_style_2_minfactor, outspeed, mspeed * autocvar_g_projectiles_newton_style_2_maxfactor);
-		outvelocity = mdirection * outspeed;
-	}
-	else if(nstyle == 3)
-	{
-		// pseudo-Newtonian:
-		outspeed = mspeed + mdirection * pvelocity;
-		outspeed = bound(mspeed * 0.7, outspeed, mspeed * 5.0);
-		outvelocity = mdirection * outspeed;
-	}
-	else if(nstyle == 4)
-	{
-		// tZorkian:
-		outspeed = mspeed + vlen(pvelocity);
-		outvelocity = mdirection * outspeed;
-	}
-	else
-		error("g_projectiles_newton_style must be 0 (absolute), 1 (Newtonian), 2 (Newtonian + aimfix), 3 (pseudo Newtonian) or 4 (tZorkian)!");
+	outvelocity = get_shotvelocity(pvelocity, mdirection, mspeed, (forceAbsolute ? 0 : autocvar_g_projectiles_newton_style), autocvar_g_projectiles_newton_style_2_minfactor, autocvar_g_projectiles_newton_style_2_maxfactor);
 
 	return outvelocity;
 }