X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fweapons%2Fall.qc;h=70937716490921edcd0e01e07b889bf97ab565e0;hb=133cba402a7d11565c47dc42412b2ac0b9b8f121;hp=11ac0641a2c18be823715cd6c17df3d8f975bbb3;hpb=bb4d4ccf443c2aa9a1db059874b669810f70593f;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/weapons/all.qc b/qcsrc/common/weapons/all.qc
index 11ac0641a..709377164 100644
--- a/qcsrc/common/weapons/all.qc
+++ b/qcsrc/common/weapons/all.qc
@@ -61,11 +61,11 @@ WepSet _WepSet_FromWeapon(int a)
 				if (a >= 24)
 				{
 					a -= 24;
-					return '0 0 1' * (2 ** a);
+					return '0 0 1' * BIT(a);
 				}
-			return '0 1 0' * (2 ** a);
+			return '0 1 0' * BIT(a);
 		}
-	return '1 0 0' * (2 ** a);
+	return '1 0 0' * BIT(a);
 }
 #ifdef SVQC
 	void WriteWepSet(float dst, WepSet w)
@@ -107,21 +107,6 @@ string W_NameWeaponOrder_MapFunc(string s)
 	return s;
 }
 
-string W_UndeprecateName(string s)
-{
-	switch (s)
-	{
-		case "nex": return "vortex";
-		case "rocketlauncher": return "devastator";
-		case "laser": return "blaster";
-		case "minstanex": return "vaporizer";
-		case "grenadelauncher": return "mortar";
-		case "uzi": return "machinegun";
-		case "hmg": return "okhmg";
-		case "rpc": return "okrpc";
-		default: return s;
-	}
-}
 string W_NameWeaponOrder(string order)
 {
 	return mapPriorityList(order, W_NameWeaponOrder_MapFunc);
@@ -129,8 +114,7 @@ string W_NameWeaponOrder(string order)
 string W_NumberWeaponOrder_MapFunc(string s)
 {
 	if (s == "0" || stof(s)) return s;
-	s = W_UndeprecateName(s);
-	FOREACH(Weapons, it != WEP_Null && it.netname == s, return ftos(i));
+	FOREACH(Weapons, it != WEP_Null && (it.netname == s || it.m_deprecated_netname == s), return ftos(i));
 	return s;
 }
 string W_NumberWeaponOrder(string order)
@@ -202,7 +186,8 @@ WepSet W_RandomWeapons(entity e, WepSet remaining, int n)
 	return result;
 }
 
-string GetAmmoPicture(int ammotype)
+// TODO: registry handles for below functions
+string GetAmmoPicture(Resource ammotype)
 {
 	switch (ammotype)
 	{
@@ -216,7 +201,7 @@ string GetAmmoPicture(int ammotype)
 	}
 }
 
-string GetAmmoName(int ammotype)
+string GetAmmoName(Resource ammotype)
 {
 	switch (ammotype)
 	{
@@ -230,8 +215,25 @@ string GetAmmoName(int ammotype)
 	}
 }
 
+entity GetAmmoItem(Resource ammotype)
+{
+	switch (ammotype)
+	{
+		case RES_SHELLS:  return ITEM_Shells;
+		case RES_BULLETS: return ITEM_Bullets;
+		case RES_ROCKETS: return ITEM_Rockets;
+		case RES_CELLS:   return ITEM_Cells;
+		case RES_PLASMA:  return ITEM_Plasma;
+		case RES_FUEL:    return ITEM_JetpackFuel;
+	}
+	LOG_WARNF("Invalid ammo type %d ", ammotype.m_id);
+	return NULL;
+	// WEAPONTODO: use this generic func to reduce duplication ?
+	// GetAmmoPicture  GetAmmoName  notif_arg_item_wepammo  ammo_pickupevalfunc ?
+}
+
 #ifdef CSQC
-int GetAmmoTypeFromNum(int i)
+Resource GetAmmoTypeFromNum(int i)
 {
 	switch (i)
 	{
@@ -245,7 +247,7 @@ int GetAmmoTypeFromNum(int i)
 	}
 }
 
-int GetAmmoStat(int ammotype)
+int GetAmmoStat(Resource ammotype)
 {
 	switch (ammotype)
 	{
@@ -376,6 +378,7 @@ vector shotorg_adjust_values(vector vecs, bool y_is_right, bool visual, int algn
  *   this.origin, this.angles
  *   this.weaponchild
  *   this.movedir, this.view_ofs, this.movedir_aligned
+ *   this.spawnorigin (SVQC only)
  *   attachment stuff
  *   anim stuff
  * to free:
@@ -392,7 +395,9 @@ void CL_WeaponEntity_SetModel(entity this, string name, bool _anim)
 		if (this.weaponchild) delete(this.weaponchild);
 		this.weaponchild = NULL;
 		this.movedir = '0 0 0';
+#ifdef SVQC
 		this.spawnorigin = '0 0 0';
+#endif
 		this.oldorigin = '0 0 0';
 		this.anim_fire1  = '0 1 0.01';
 		this.anim_fire2  = '0 1 0.01';
@@ -464,6 +469,7 @@ void CL_WeaponEntity_SetModel(entity this, string name, bool _anim)
 				this.movedir = '0 0 0';
 			}
 		}
+#ifdef SVQC
 		{
 			int idx = 0;
 			// v_ model attached to invisible h_ model
@@ -483,6 +489,7 @@ void CL_WeaponEntity_SetModel(entity this, string name, bool _anim)
 				this.spawnorigin = this.movedir;
 			}
 		}
+#endif
 		if (v_shot_idx)
 		{
 			this.oldorigin = '0 0 0';  // use regular attachment
@@ -529,7 +536,7 @@ void CL_WeaponEntity_SetModel(entity this, string name, bool _anim)
 		vector v = this.movedir;
 		this.movedir = shotorg_adjust(v, false, false, algn);
 		this.movedir_aligned = shotorg_adjust(v, false, true, algn);
-		this.view_ofs = shotorg_adjust(v, false, true, algn) - v;
+		this.view_ofs = this.movedir_aligned - v;
 	}
 	int compressed_shotorg = compressShotOrigin(this.movedir);
 	// make them match perfectly
@@ -539,7 +546,9 @@ void CL_WeaponEntity_SetModel(entity this, string name, bool _anim)
 #endif
 	this.movedir = decompressShotOrigin(compressed_shotorg);
 
+#ifdef SVQC
 	this.spawnorigin += this.view_ofs;  // offset the casings origin by the same amount
+#endif
 
 	// check if an instant weapon switch occurred
 	setorigin(this, this.view_ofs);
@@ -809,3 +818,35 @@ NET_HANDLE(w_muzzleflash, bool isNew)
 #endif
 
 #endif
+
+#ifdef SVQC
+string W_FixWeaponOrder_ForceComplete_AndBuildImpulseList(entity this, string wo)
+{
+	string o = W_FixWeaponOrder_ForceComplete(wo);
+	strcpy(CS_CVAR(this).weaponorder_byimpulse, W_FixWeaponOrder_BuildImpulseList(o));
+	return o;
+}
+#endif
+
+#ifdef CSQC
+REPLICATE(cvar_cl_accuracy_data_share, bool, "cl_accuracy_data_share");
+REPLICATE(cvar_cl_accuracy_data_receive, bool, "cl_accuracy_data_receive");
+#endif
+
+#ifdef GAMEQC
+REPLICATE(cvar_cl_gunalign, int, "cl_gunalign");
+REPLICATE(cvar_cl_weapon_switch_reload, bool, "cl_weapon_switch_reload");
+REPLICATE(cvar_cl_weapon_switch_fallback_to_impulse, bool, "cl_weapon_switch_fallback_to_impulse");
+REPLICATE(cvar_cl_weaponimpulsemode, int, "cl_weaponimpulsemode");
+REPLICATE(cvar_cl_weaponpriority, string, "cl_weaponpriority", W_FixWeaponOrder_ForceComplete_AndBuildImpulseList);
+REPLICATE(cvar_cl_weaponpriorities[0], string, "cl_weaponpriority0", W_FixWeaponOrder_AllowIncomplete);
+REPLICATE(cvar_cl_weaponpriorities[1], string, "cl_weaponpriority1", W_FixWeaponOrder_AllowIncomplete);
+REPLICATE(cvar_cl_weaponpriorities[2], string, "cl_weaponpriority2", W_FixWeaponOrder_AllowIncomplete);
+REPLICATE(cvar_cl_weaponpriorities[3], string, "cl_weaponpriority3", W_FixWeaponOrder_AllowIncomplete);
+REPLICATE(cvar_cl_weaponpriorities[4], string, "cl_weaponpriority4", W_FixWeaponOrder_AllowIncomplete);
+REPLICATE(cvar_cl_weaponpriorities[5], string, "cl_weaponpriority5", W_FixWeaponOrder_AllowIncomplete);
+REPLICATE(cvar_cl_weaponpriorities[6], string, "cl_weaponpriority6", W_FixWeaponOrder_AllowIncomplete);
+REPLICATE(cvar_cl_weaponpriorities[7], string, "cl_weaponpriority7", W_FixWeaponOrder_AllowIncomplete);
+REPLICATE(cvar_cl_weaponpriorities[8], string, "cl_weaponpriority8", W_FixWeaponOrder_AllowIncomplete);
+REPLICATE(cvar_cl_weaponpriorities[9], string, "cl_weaponpriority9", W_FixWeaponOrder_AllowIncomplete);
+#endif