X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fweapons%2Fall.qc;h=01214331ced4567b9d8cb08eeb80b5e325dea451;hb=70b84d37e2cf1d5336c327cb43593024de2a2c6c;hp=4dcb2d6e7c2446b006a960c862c7cfaa52421c9d;hpb=ad367d1bb35b86b0ffc009d14a09e74610cb506c;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/weapons/all.qc b/qcsrc/common/weapons/all.qc
index 4dcb2d6e7..01214331c 100644
--- a/qcsrc/common/weapons/all.qc
+++ b/qcsrc/common/weapons/all.qc
@@ -4,16 +4,14 @@
 #include "all.qh"
 
 #if defined(CSQC)
-	#include "../../dpdefs/csprogsdefs.qh"
 	#include "../../client/defs.qh"
 	#include "../constants.qh"
 	#include "../stats.qh"
 	#include "../../warpzonelib/anglestransform.qh"
-	#include "../../warpzonelib/mathlib.qh"
 	#include "../../warpzonelib/common.qh"
 	#include "../../warpzonelib/client.qh"
 	#include "../util.qh"
-	#include "../buffs.qh"
+	#include "../buffs/all.qh"
 	#include "../../client/autocvars.qh"
 	#include "../deathtypes.qh"
 	#include "../../csqcmodellib/interpolate.qh"
@@ -22,10 +20,7 @@
 	#include "../../csqcmodellib/cl_model.qh"
 #elif defined(MENUQC)
 #elif defined(SVQC)
-	#include "../../dpdefs/progsdefs.qh"
-    #include "../../dpdefs/dpextensions.qh"
     #include "../../warpzonelib/anglestransform.qh"
-    #include "../../warpzonelib/mathlib.qh"
     #include "../../warpzonelib/common.qh"
     #include "../../warpzonelib/util_server.qh"
     #include "../../warpzonelib/server.qh"
@@ -33,7 +28,7 @@
     #include "../stats.qh"
     #include "../teams.qh"
     #include "../util.qh"
-    #include "../buffs.qh"
+    #include "../buffs/all.qh"
     #include "../monsters/all.qh"
     #include "config.qh"
     #include "../../server/weapons/csqcprojectile.qh"
@@ -60,56 +55,45 @@
 
 // WEAPON PLUGIN SYSTEM
 
-#if WEP_MAXCOUNT > 72
-# error Kein Weltraum links auf dem Gerät
-#endif
-
 WepSet WepSet_FromWeapon(int a) {
 	a -= WEP_FIRST;
-#if WEP_MAXCOUNT > 24
-	if(a >= 24) {
+	if (Weapons_MAX > 24)
+	if (a >= 24) {
 		a -= 24;
-#if WEP_MAXCOUNT > 48
-		if(a >= 24) {
+		if (Weapons_MAX > 48)
+		if (a >= 24) {
 			a -= 24;
 			return '0 0 1' * power2of(a);
 		}
-#endif
 		return '0 1 0' * power2of(a);
 	}
-#endif
 	return '1 0 0' * power2of(a);
 }
 #ifdef SVQC
 void WepSet_AddStat()
 {
 	addstat(STAT_WEAPONS, AS_INT, weapons_x);
-#if WEP_MAXCOUNT > 24
+	if (Weapons_MAX > 24)
 	addstat(STAT_WEAPONS2, AS_INT, weapons_y);
-#if WEP_MAXCOUNT > 48
+	if (Weapons_MAX > 48)
 	addstat(STAT_WEAPONS3, AS_INT, weapons_z);
-#endif
-#endif
 }
 void WepSet_AddStat_InMap()
 {
 	addstat(STAT_WEAPONSINMAP, AS_INT, weaponsinmap_x);
-#if WEP_MAXCOUNT > 24
+	if (Weapons_MAX > 24)
 	addstat(STAT_WEAPONSINMAP2, AS_INT, weaponsinmap_y);
-#if WEP_MAXCOUNT > 48
+	if (Weapons_MAX > 48)
 	addstat(STAT_WEAPONSINMAP3, AS_INT, weaponsinmap_z);
-#endif
-#endif
 }
 void WriteWepSet(float dst, WepSet w)
 {
-#if WEP_MAXCOUNT > 48
+	if (Weapons_MAX > 48)
 	WriteInt72_t(dst, w);
-#elif WEP_MAXCOUNT > 24
+	else if (Weapons_MAX > 24)
 	WriteInt48_t(dst, w);
-#else
+	else
 	WriteInt24_t(dst, w.x);
-#endif
 }
 #endif
 #ifdef CSQC
@@ -117,61 +101,35 @@ WepSet WepSet_GetFromStat()
 {
 	WepSet w = '0 0 0';
 	w.x = getstati(STAT_WEAPONS);
-#if WEP_MAXCOUNT > 24
+	if (Weapons_MAX > 24)
 	w.y = getstati(STAT_WEAPONS2);
-#if WEP_MAXCOUNT > 48
+	if (Weapons_MAX > 48)
 	w.z = getstati(STAT_WEAPONS3);
-#endif
-#endif
 	return w;
 }
 WepSet WepSet_GetFromStat_InMap()
 {
 	WepSet w = '0 0 0';
 	w_x = getstati(STAT_WEAPONSINMAP);
-#if WEP_MAXCOUNT > 24
+	if (Weapons_MAX > 24)
 	w_y = getstati(STAT_WEAPONSINMAP2);
-#if WEP_MAXCOUNT > 48
+	if (Weapons_MAX > 48)
 	w_z = getstati(STAT_WEAPONSINMAP3);
-#endif
-#endif
 	return w;
 }
 WepSet ReadWepSet()
 {
-#if WEP_MAXCOUNT > 48
+	if (Weapons_MAX > 48)
 	return ReadInt72_t();
-#elif WEP_MAXCOUNT > 24
+	if (Weapons_MAX > 24)
 	return ReadInt48_t();
-#else
 	return ReadInt24_t() * '1 0 0';
-#endif
 }
 #endif
 
-void register_weapons_done()
-{
-	dummy_weapon_info = NEW(Weapon);
-
-	weaponorder_byid = "";
-	for (int i = WEP_MAXCOUNT - 1; i >= 0; --i)
-		if (weapon_info[i])
-			weaponorder_byid = strcat(weaponorder_byid, " ", ftos(i));
-	weaponorder_byid = strzone(substring(weaponorder_byid, 1, strlen(weaponorder_byid) - 1));
-}
-entity get_weaponinfo(int id)
-{
-	entity w;
-	if(id < WEP_FIRST || id > WEP_LAST)
-		return dummy_weapon_info;
-	w = weapon_info[id - 1];
-	if(w)
-		return w;
-	return dummy_weapon_info;
-}
 string W_FixWeaponOrder(string order, float complete)
 {
-	return fixPriorityList(order, WEP_FIRST, WEP_LAST, 230 - WEP_FIRST, complete);
+	return fixPriorityList(order, WEP_FIRST, WEP_LAST, WEP_IMPULSE_BEGIN - WEP_FIRST, complete);
 }
 string W_NameWeaponOrder_MapFunc(string s)
 {
@@ -179,7 +137,7 @@ string W_NameWeaponOrder_MapFunc(string s)
 	if(s == "0" || stof(s))
 	{
 		wi = get_weaponinfo(stof(s));
-		if(wi != dummy_weapon_info)
+		if(wi != WEP_Null)
 			return wi.netname;
 	}
 	return s;
@@ -218,7 +176,7 @@ string W_NumberWeaponOrder(string order)
 	return mapPriorityList(order, W_NumberWeaponOrder_MapFunc);
 }
 
-float W_FixWeaponOrder_BuildImpulseList_buf[WEP_MAXCOUNT];
+float W_FixWeaponOrder_BuildImpulseList_buf[Weapons_MAX];
 string W_FixWeaponOrder_BuildImpulseList_order;
 void W_FixWeaponOrder_BuildImpulseList_swap(int i, int j, entity pass)
 {
@@ -331,20 +289,35 @@ int GetAmmoStat(.int ammotype)
 }
 #endif
 
-#ifdef SVQC
 string W_Sound(string w_snd)
 {
-	string output = strcat("weapons/", w_snd, ".wav");
+	#define extensions(X) X(wav) X(ogg)
+	#define tryext(ext) { if (fexists(strcat("sound/", output = strcat("weapons/", w_snd, "."#ext)))) break; }
+	string output;
+	do {
+		extensions(tryext);
+		#undef tryext
+		#undef extensions
+		output = strcat("weapons/", w_snd);
+	} while (0);
+
+#ifdef SVQC
 	MUTATOR_CALLHOOK(WeaponSound, w_snd, output);
+	return weapon_sound_output;
+#else
 	return output;
+#endif
 }
 
 string W_Model(string w_mdl)
 {
 	string output = strcat("models/weapons/", w_mdl);
+#ifdef SVQC
 	MUTATOR_CALLHOOK(WeaponModel, w_mdl, output);
+	return weapon_model_output;
+#else
 	return output;
-}
 #endif
+}
 
 #endif