Make requested changes multitheftauto#2

Nico8340 · Jan 10, 2025 · 8445627 · 8445627
1 parent 8cbca0a
commit 8445627
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaTeamDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaTeamDefs.cpp
@@ -66,22 +66,22 @@ void CLuaTeamDefs::AddClass(lua_State* luaVM)
     lua_registerclass(luaVM, "Team", "Element");
 }
 
-CTeam* 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, std::string name, std::uint8_t red, std::uint8_t green, std::uint8_t blue) noexcept
 {
     CLuaMain* vm = g_pGame->GetLuaManager()->GetVirtualMachine(lua);
 
     if (!vm)
-        return nullptr;
+        return false;
 
     CResource* resource = vm->GetResource();
 
     if (!resource)
-        return nullptr;
+        return false;
 
     CTeam* team = CStaticFunctionDefinitions::CreateTeam(resource, name.c_str(), red, green, blue);
 
     if (!team)
-        return nullptr;
+        return false;
 
     CElementGroup* group = resource->GetElementGroup();
 
@@ -91,9 +91,14 @@ CTeam* CLuaTeamDefs::CreateTeam(lua_State* lua, std::string name, std::uint8_t r
     return team;
 }
 
-CTeam* CLuaTeamDefs::GetTeamFromName(const std::string name) noexcept
+std::variant<CTeam*, bool> CLuaTeamDefs::GetTeamFromName(const std::string name) noexcept
 {
-    return m_pTeamManager->GetTeam(name.c_str());
+    CTeam* team = m_pTeamManager->GetTeam(name.c_str());
+
+    if (!team)
+        return false;
+
+    return team;
 }
 
 std::string CLuaTeamDefs::GetTeamName(CTeam* team) noexcept

diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaTeamDefs.h b/Server/mods/deathmatch/logic/luadefs/CLuaTeamDefs.h
@@ -19,10 +19,10 @@ class CLuaTeamDefs : public CLuaDefs
 
 private:
     // Team create/destroy functions
-    static CTeam* 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, std::string name, std::uint8_t red, std::uint8_t green, std::uint8_t blue) noexcept;
 
     // Team get funcs
-    static CTeam* GetTeamFromName(const std::string name) noexcept;
+    static std::variant<CTeam*, bool> GetTeamFromName(const std::string 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;