X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmiscfunctions.qc;h=35b2d0cea8ed6445cbd92ade371474111faff072;hb=83f281637f0f29ef570789200116efc8149fecbd;hp=804165cd93b523f40994afebcafec03323038830;hpb=cf2c574ea97887fc98f0f8ff5efd11ece1f48b3b;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc index 804165cd9..35b2d0cea 100644 --- a/qcsrc/server/miscfunctions.qc +++ b/qcsrc/server/miscfunctions.qc @@ -243,7 +243,7 @@ string WeaponNameFromWeaponentity(entity this, .entity weaponentity) return wepent.m_weapon.m_name; else if(wepent.m_switchweapon != WEP_Null) return wepent.m_switchweapon.m_name; - return "none"; //Weapons_from(wepent.cnt).m_name; + return "none"; //REGISTRY_GET(Weapons, wepent.cnt).m_name; } string formatmessage(entity this, string msg) @@ -719,7 +719,7 @@ void readplayerstartcvars() for (int j = 0; j < t; ++j) { s = argv(j); - Weapon wep = Weapons_fromstr(s); + Weapon wep = Weapon_from_name(s); if(wep != WEP_Null) { g_weaponarena_weapons |= (wep.m_wepset);