From 39c6c59fd6d39cd6fccb4c5b24c867f056870a2e Mon Sep 17 00:00:00 2001 From: TEDERIs Date: Sat, 11 Jan 2025 18:13:13 +0700 Subject: [PATCH 1/2] createTeam default arguments fix --- Server/mods/deathmatch/logic/luadefs/CLuaTeamDefs.cpp | 4 ++-- Server/mods/deathmatch/logic/luadefs/CLuaTeamDefs.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaTeamDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaTeamDefs.cpp index 008e9621558..4c000196c01 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaTeamDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaTeamDefs.cpp @@ -65,7 +65,7 @@ void CLuaTeamDefs::AddClass(lua_State* luaVM) lua_registerclass(luaVM, "Team", "Element"); } -std::variant 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 CLuaTeamDefs::CreateTeam(lua_State* lua, const std::string name, const std::optional red, const std::optional green, const std::optional blue) { CLuaMain& vm = lua_getownercluamain(lua); CResource* resource = vm.GetResource(); @@ -73,7 +73,7 @@ std::variant CLuaTeamDefs::CreateTeam(lua_State* lua, const std::s 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(0xFF), green.value_or(0xFF), blue.value_or(0xFF)); if (!team) return false; diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaTeamDefs.h b/Server/mods/deathmatch/logic/luadefs/CLuaTeamDefs.h index 3ebad22e0f5..7b6c6f21c2c 100644 --- 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 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 CreateTeam(lua_State* lua, const std::string name, const std::optional red, const std::optional green, const std::optional blue); // Team get funcs static std::variant GetTeamFromName(const std::string name); From a4620b750a13fc355c0b8c92c8ada6e0081fc7bc Mon Sep 17 00:00:00 2001 From: TEDERIs Date: Sat, 11 Jan 2025 18:17:07 +0700 Subject: [PATCH 2/2] Colors according to the previous code --- Server/mods/deathmatch/logic/luadefs/CLuaTeamDefs.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaTeamDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaTeamDefs.cpp index 4c000196c01..df445b5a2b7 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaTeamDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaTeamDefs.cpp @@ -73,7 +73,7 @@ std::variant CLuaTeamDefs::CreateTeam(lua_State* lua, const std::s if (!resource) return false; - CTeam* team = CStaticFunctionDefinitions::CreateTeam(resource, name.c_str(), red.value_or(0xFF), green.value_or(0xFF), blue.value_or(0xFF)); + CTeam* team = CStaticFunctionDefinitions::CreateTeam(resource, name.c_str(), red.value_or(235), green.value_or(221), blue.value_or(178)); if (!team) return false;