createTeam arguments fix (#3949)

* createTeam default arguments fix * Colors according to the previous code
multitheftauto · Jan 11, 2025 · e9ec7f1 · e9ec7f1
1 parent d94d559
commit e9ec7f1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaTeamDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaTeamDefs.cpp
@@ -65,15 +65,15 @@ void CLuaTeamDefs::AddClass(lua_State* luaVM)
     lua_registerclass(luaVM, "Team", "Element");
 }
 
-std::variant<CTeam*, bool> CLuaTeamDefs::CreateTeam(lua_State* lua, const std::string name, const std::uint8_t red, const std::uint8_t green, const std::uint8_t blue)
+std::variant<CTeam*, bool> CLuaTeamDefs::CreateTeam(lua_State* lua, const std::string name, const std::optional<std::uint8_t> red, const std::optional<std::uint8_t> green, const std::optional<std::uint8_t> blue)
 {
     CLuaMain& vm = lua_getownercluamain(lua);
     CResource* resource = vm.GetResource();
 
     if (!resource)
         return false;
 
-    CTeam* team = CStaticFunctionDefinitions::CreateTeam(resource, name.c_str(), red, green, blue);
+    CTeam* team = CStaticFunctionDefinitions::CreateTeam(resource, name.c_str(), red.value_or(235), green.value_or(221), blue.value_or(178));
 
     if (!team)
         return false;

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