From: Samual Lenks <samual@xonotic.org>
Date: Tue, 10 Dec 2013 20:19:31 +0000 (-0500)
Subject: Support weaponreplace with new properties system
X-Git-Tag: xonotic-v0.8.0~152^2~258
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4ba22a6082679d39d6cd63fcf3ffb76e0d9dad3e;p=xonotic%2Fxonotic-data.pk3dir.git

Support weaponreplace with new properties system
---

diff --git a/qcsrc/server/weapons/spawning.qc b/qcsrc/server/weapons/spawning.qc
index 36ac23c96..0e03013a3 100644
--- a/qcsrc/server/weapons/spawning.qc
+++ b/qcsrc/server/weapons/spawning.qc
@@ -1,16 +1,21 @@
 string W_Apply_Weaponreplace(string in)
 {
 	float n = tokenize_console(in);
-	string out = "";
-	float i;
+	string out = "", replacement = "";
+	float i, j;
 	for(i = 0; i < n; ++i)
 	{
-		string s = argv(i);
-		string r = cvar_string(strcat("g_weaponreplace_", s));
-		if(r == "")
-			out = strcat(out, " ", s);
-		else if(r != "0")
-			out = strcat(out, " ", r);
+		for(j = WEP_FIRST; j <= WEP_LAST; ++j)
+		{
+			e = get_weaponinfo(j);
+			if(e.netname == argv(i))
+			{
+				replacement = e.weaponreplace;
+			}
+		}
+		if(replacement != "") { out = sprintf("%s %s", out, replacement); }
+		else if(replacement != "0") { out = sprintf("%s %s", out, replacement); }
+		else { out = sprintf("%s %s", out, argv(i)); }
 	}
 	return substring(out, 1, -1);
 }