X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fserver%2Fweapons%2Fspawning.qc;h=409dbfe07e09345d362075c4fe5036af0face583;hb=8d4ff7dfca74f10e0dee1f2be457f98b8c15a59a;hp=0e03013a3d4580eb3407f67207e2acf851195a30;hpb=4ba22a6082679d39d6cd63fcf3ffb76e0d9dad3e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/weapons/spawning.qc b/qcsrc/server/weapons/spawning.qc
index 0e03013a3..409dbfe07 100644
--- a/qcsrc/server/weapons/spawning.qc
+++ b/qcsrc/server/weapons/spawning.qc
@@ -1,21 +1,27 @@
 string W_Apply_Weaponreplace(string in)
 {
 	float n = tokenize_console(in);
-	string out = "", replacement = "";
+	string out = "", s, replacement;
 	float i, j;
+	entity e;
 	for(i = 0; i < n; ++i)
 	{
+		replacement = "";
+		s = argv(i);
+		
 		for(j = WEP_FIRST; j <= WEP_LAST; ++j)
 		{
 			e = get_weaponinfo(j);
-			if(e.netname == argv(i))
+			if(e.netname == s)
 			{
 				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)); }
+
+		if(replacement == "")
+			out = strcat(out, " ", s);
+		else if(replacement != "0")
+			out = strcat(out, " ", replacement);
 	}
 	return substring(out, 1, -1);
 }
@@ -125,9 +131,9 @@ void weapon_defaultspawnfunc(float wpn)
 			self.superweapons_finished = autocvar_g_balance_superweapons_time;
 
 	// if we don't already have ammo, give us some ammo
-	if(!self.(e.current_ammo))
+	if(!self.(e.ammo_field))
 	{
-		switch(e.current_ammo)
+		switch(e.ammo_field)
 		{
 			case ammo_shells:  self.ammo_shells  = cvar("g_pickup_shells_weapon");  break;
 			case ammo_nails:   self.ammo_nails   = cvar("g_pickup_nails_weapon");   break;
@@ -137,8 +143,6 @@ void weapon_defaultspawnfunc(float wpn)
 		}
 	}
 
-	print(sprintf("defaultspawnfunc: current ammo count: %f\n", self.(e.current_ammo)));
-
 	#if 0
 	if(e.items)
 	{
@@ -146,9 +150,9 @@ void weapon_defaultspawnfunc(float wpn)
 		{
 			if(e.items & j)
 			{
-				ammofield = Item_CounterField(j);
-				if(!self.ammofield)
-					self.ammofield = cvar(strcat("g_pickup_", Item_CounterFieldName(j), "_weapon"));
+				ammotype = Item_CounterField(j);
+				if(!self.ammotype)
+					self.ammotype = cvar(strcat("g_pickup_", Item_CounterFieldName(j), "_weapon"));
 			}
 		}
 	}