From: Mario <zacjardine@y7mail.com>
Date: Thu, 13 Sep 2018 21:24:03 +0000 (+1000)
Subject: Use the proper typedef on Weapons_fromstr cases
X-Git-Tag: xonotic-v0.8.5~1869
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c0872ef032af516354ea1aee5aa0fddbe1cc15d4;p=xonotic%2Fxonotic-data.pk3dir.git

Use the proper typedef on Weapons_fromstr cases
---

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc
index 678578068..8b6dd4b73 100644
--- a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc
@@ -37,7 +37,7 @@ string WeaponArenaString()
 	s = "";
 	for(int j = 0; j < n; ++j)
 	{
-		entity wep = Weapons_fromstr(argv(j));
+		Weapon wep = Weapons_fromstr(argv(j));
 		if(wep != WEP_Null)
 		{
 			s = cons_mid(s, " & ", wep.m_name);
diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index 351fa4350..cf7266b48 100644
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -600,7 +600,7 @@ void readplayerstartcvars()
 		for (i = 0; i < t; ++i)
 		{
 			s = argv(i);
-			entity wep = Weapons_fromstr(s);
+			Weapon wep = Weapons_fromstr(s);
 			if(wep != WEP_Null)
 			{
 				g_weaponarena_weapons |= (wep.m_wepset);
diff --git a/qcsrc/server/weapons/spawning.qc b/qcsrc/server/weapons/spawning.qc
index 37ef94c37..4ab5a4371 100644
--- a/qcsrc/server/weapons/spawning.qc
+++ b/qcsrc/server/weapons/spawning.qc
@@ -56,7 +56,7 @@ void weapon_defaultspawnfunc(entity this, Weapon e)
 			for (int i = 1; i < t; ++i)
 			{
 				s = argv(i);
-				entity wep = Weapons_fromstr(s);
+				Weapon wep = Weapons_fromstr(s);
 				if(wep != WEP_Null)
 				{
 					entity replacement = spawn();