X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fweapons%2Fw_mortar.qc;h=712944ec0c1630ae4a6ce613efda91cd56f0ea47;hb=3c7ef5b449d479f9a2e24fdddf767f87208c9be6;hp=9fcefa174a4260ad117a0fdaad7fbae095e5468d;hpb=3eb95a9dc9b10b42d6f8081d5e5e4f1dfc6fbd75;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/weapons/w_mortar.qc b/qcsrc/common/weapons/w_mortar.qc
index 9fcefa174..712944ec0 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
@@ -386,17 +402,11 @@ float w_glauncher(float req)
 			precache_sound ("weapons/grenade_bounce6.wav");
 			precache_sound ("weapons/grenade_stick.wav");
 			precache_sound ("weapons/grenade_fire.wav");
-
-			#define WEP_ADD_CVAR(weapon,mode,name) /*nothing*/
-			#define WEP_ADD_PROP(weapon,prop,name) WEP_SET_PROP(WEP_GRENADE_LAUNCHER,weapon,prop,name)
-			MORTAR_SETTINGS(mortar)
-			#undef WEP_ADD_CVAR
-			#undef WEP_ADD_PROP
+			WEP_SET_PROPS(MORTAR_SETTINGS(mortar), WEP_GRENADE_LAUNCHER)
 			return TRUE;
 		}
 		case WR_SETUP:
 		{
-			weapon_setup(WEP_GRENADE_LAUNCHER);
 			self.current_ammo = ammo_rockets;
 			return TRUE;
 		}
@@ -414,16 +424,12 @@ float w_glauncher(float req)
 		}
 		case WR_CONFIG:
 		{
-			#define WEP_ADD_CVAR(weapon,mode,name) WEP_CONFIG_WRITE_CVARS(weapon,mode,name)
-			#define WEP_ADD_PROP(weapon,prop,name) WEP_CONFIG_WRITE_PROPS(weapon,prop,name)
-			MORTAR_SETTINGS(mortar)
-			#undef WEP_ADD_CVAR
-			#undef WEP_ADD_PROP
+			WEP_CONFIG_SETTINGS(MORTAR_SETTINGS(mortar))
 			return TRUE;
 		}
 		case WR_RELOAD:
 		{
-			W_Reload(min(WEP_CVAR_PRI(mortar, ammo), WEP_CVAR_SEC(mortar, ammo)), autocvar_g_balance_mortar_reload_ammo, autocvar_g_balance_mortar_reload_time, "weapons/reload.wav"); // WEAPONTODO
+			W_Reload(min(WEP_CVAR_PRI(mortar, ammo), WEP_CVAR_SEC(mortar, ammo)), "weapons/reload.wav"); // WEAPONTODO
 			return TRUE;
 		}
 		case WR_SUICIDEMESSAGE: