From: Samual Lenks <samual@xonotic.org>
Date: Wed, 14 Aug 2013 17:52:06 +0000 (-0400)
Subject: Start working on a new system which calculates weapon values for external
X-Git-Tag: xonotic-v0.8.0~152^2~332
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=64e35be3ebb08e19997229b893fcd448d05e8ad3;p=xonotic%2Fxonotic-data.pk3dir.git

Start working on a new system which calculates weapon values for external
usage
---

diff --git a/qcsrc/common/weapons/w_mortar.qc b/qcsrc/common/weapons/w_mortar.qc
index ef6a36be2..fa9aae390 100644
--- a/qcsrc/common/weapons/w_mortar.qc
+++ b/qcsrc/common/weapons/w_mortar.qc
@@ -336,6 +336,22 @@ float w_glauncher(float req)
 			
 			return TRUE;
 		}
+		/*case WR_CALCINFO:
+		{
+			wepinfo_pri_refire = max3(sys_frametime, WEP_CVAR_PRI(mortar, refire), WEP_CVAR_PRI(mortar, animtime));
+			wepinfo_pri_dps = (WEP_CVAR_PRI(mortar, damage) * (1 / wepinfo_pri_refire));
+			wepinfo_pri_speed = (1 / max(1, (10000 / max(1, WEP_CVAR_PRI(mortar, speed)))));
+
+			// for the range calculation, closer to 1 is better
+			wepinfo_pri_range_max = 2000 * wepinfo_pri_speed;
+			wepinfo_pri_range = wepinfo_pri_speed * WEP_CVAR_PRI(mortar, 
+			
+			wepinfo_sec_refire = max3(sys_frametime, WEP_CVAR_SEC(mortar, refire), WEP_CVAR_SEC(mortar, animtime));
+			wepinfo_sec_dps = (WEP_CVAR_SEC(mortar, damage) * (1 / wepinfo_sec_refire));
+			
+			wepinfo_sec_dps = (WEP_CVAR_SEC(mortar, damage) * (1 / max3(sys_frametime, WEP_CVAR_SEC(mortar, refire), WEP_CVAR_SEC(mortar, animtime))));
+			wepinfo_ter_dps = 0;
+			*/
 		case WR_THINK:
 		{
 			if(autocvar_g_balance_mortar_reload_ammo && self.clip_load < min(WEP_CVAR_PRI(mortar, ammo), WEP_CVAR_SEC(mortar, ammo))) // forced reload
diff --git a/qcsrc/server/weapons/tracing.qc b/qcsrc/server/weapons/tracing.qc
index 50dcd532f..dd215ba14 100644
--- a/qcsrc/server/weapons/tracing.qc
+++ b/qcsrc/server/weapons/tracing.qc
@@ -104,7 +104,7 @@ void W_SetupShot_Dir_ProjectileSize_Range(entity ent, vector s_forward, vector m
 
 	ent.dphitcontentsmask = oldsolid; // restore solid type (generally SOLID_SLIDEBOX)
 
-	if (!g_norecoil)
+	if (!autocvar_g_norecoil)
 		ent.punchangle_x = recoil * -1;
 
 	if (snd != "")