From c0872ef032af516354ea1aee5aa0fddbe1cc15d4 Mon Sep 17 00:00:00 2001 From: Mario Date: Fri, 14 Sep 2018 07:24:03 +1000 Subject: [PATCH] Use the proper typedef on Weapons_fromstr cases --- qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc | 2 +- qcsrc/server/miscfunctions.qc | 2 +- qcsrc/server/weapons/spawning.qc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc index 678578068f..8b6dd4b731 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 351fa43509..cf7266b483 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 37ef94c375..4ab5a43717 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(); -- 2.39.2