Make requested changes

Author: Nico8340

Server/mods/deathmatch/logic/luadefs/CLuaTeamDefs.cpp

@@ -66,7 +66,7 @@ void CLuaTeamDefs::AddClass(lua_State* luaVM)
     lua_registerclass(luaVM, "Team", "Element");
 }
 
-std::variant<CTeam*, bool> CLuaTeamDefs::CreateTeam(lua_State* lua, std::string name, std::uint8_t red, std::uint8_t green, std::uint8_t blue) noexcept
+std::variant<CTeam*, bool> CLuaTeamDefs::CreateTeam(lua_State* lua, const std::string_view name, const std::uint8_t red, const std::uint8_t green, const std::uint8_t blue) noexcept
 {
     CLuaMain* vm = g_pGame->GetLuaManager()->GetVirtualMachine(lua);
 
@@ -78,7 +78,7 @@ std::variant<CTeam*, bool> CLuaTeamDefs::CreateTeam(lua_State* lua, std::string
     if (!resource)
         return false;
 
-    CTeam* team = CStaticFunctionDefinitions::CreateTeam(resource, name.c_str(), red, green, blue);
+    CTeam* team = CStaticFunctionDefinitions::CreateTeam(resource, name.data(), red, green, blue);
 
     if (!team)
         return false;
@@ -91,9 +91,9 @@ std::variant<CTeam*, bool> CLuaTeamDefs::CreateTeam(lua_State* lua, std::string
     return team;
 }
 
-std::variant<CTeam*, bool> CLuaTeamDefs::GetTeamFromName(const std::string name) noexcept
+std::variant<CTeam*, bool> CLuaTeamDefs::GetTeamFromName(const std::string_view name) noexcept
 {
-    CTeam* team = m_pTeamManager->GetTeam(name.c_str());
+    CTeam* team = m_pTeamManager->GetTeam(name.data());
 
     if (!team)
         return false;
@@ -137,17 +137,17 @@ bool CLuaTeamDefs::SetPlayerTeam(CPlayer* player, CTeam* team) noexcept
     return CStaticFunctionDefinitions::SetPlayerTeam(player, team);
 }
 
-bool CLuaTeamDefs::SetTeamName(CTeam* team, std::string name) noexcept
+bool CLuaTeamDefs::SetTeamName(CTeam* team, const std::string_view name) noexcept
 {
-    return CStaticFunctionDefinitions::SetTeamName(team, name.c_str());
+    return CStaticFunctionDefinitions::SetTeamName(team, name.data());
 }
 
-bool CLuaTeamDefs::SetTeamColor(CTeam* team, std::uint8_t red, std::uint8_t green, std::uint8_t blue) noexcept
+bool CLuaTeamDefs::SetTeamColor(CTeam* team, const std::uint8_t red, const std::uint8_t green, const std::uint8_t blue) noexcept
 {
     return CStaticFunctionDefinitions::SetTeamColor(team, red, green, blue);
 }
 
-bool CLuaTeamDefs::SetTeamFriendlyFire(CTeam* team, bool state) noexcept
+bool CLuaTeamDefs::SetTeamFriendlyFire(CTeam* team, const bool state) noexcept
 {
     return CStaticFunctionDefinitions::SetTeamFriendlyFire(team, state);
 }

Server/mods/deathmatch/logic/luadefs/CLuaTeamDefs.h

@@ -19,10 +19,10 @@ class CLuaTeamDefs : public CLuaDefs
 
 private:
     // Team create/destroy functions
-    static std::variant<CTeam*, bool> CreateTeam(lua_State* lua, std::string name, std::uint8_t red, std::uint8_t green, std::uint8_t blue) noexcept;
+    static std::variant<CTeam*, bool> CreateTeam(lua_State* lua, const std::string_view name, const std::uint8_t red, const std::uint8_t green, const std::uint8_t blue) noexcept;
 
     // Team get funcs
-    static std::variant<CTeam*, bool> GetTeamFromName(const std::string name) noexcept;
+    static std::variant<CTeam*, bool> GetTeamFromName(const std::string_view name) noexcept;
     static std::string GetTeamName(CTeam* team) noexcept;
     static CLuaMultiReturn<std::uint8_t, std::uint8_t, std::uint8_t> GetTeamColor(CTeam* team) noexcept;
     static bool GetTeamFriendlyFire(CTeam* team) noexcept;
@@ -31,7 +31,7 @@ class CLuaTeamDefs : public CLuaDefs
 
     // Team set funcs
     static bool SetPlayerTeam(CPlayer* player, CTeam* team) noexcept;
-    static bool SetTeamName(CTeam* team, std::string name) noexcept;
-    static bool SetTeamColor(CTeam* team, std::uint8_t red, std::uint8_t green, std::uint8_t blue) noexcept;
-    static bool SetTeamFriendlyFire(CTeam* team, bool state) noexcept;
+    static bool SetTeamName(CTeam* team, const std::string_view name) noexcept;
+    static bool SetTeamColor(CTeam* team, const std::uint8_t red, const std::uint8_t green, const std::uint8_t blue) noexcept;
+    static bool SetTeamFriendlyFire(CTeam* team, const bool state) noexcept;
 };