Merge branch 'martin-t/weapon_switch' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / weapons / spawning.qc

diff --git a/qcsrc/server/weapons/spawning.qc b/qcsrc/server/weapons/spawning.qc
index 37ef94c375946e0f2f058644a078adf9203a6781..4ab5a43717c14e472bc30f0e5cdf6ab98d6bbbb7 100644 (file)
--- 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();