Skip to content

Commit e9ec7f1

Browse files
authored
createTeam arguments fix (#3949)
* createTeam default arguments fix * Colors according to the previous code
1 parent d94d559 commit e9ec7f1

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,15 @@ void CLuaTeamDefs::AddClass(lua_State* luaVM)
6565
lua_registerclass(luaVM, "Team", "Element");
6666
}
6767

68-
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)
68+
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)
6969
{
7070
CLuaMain& vm = lua_getownercluamain(lua);
7171
CResource* resource = vm.GetResource();
7272

7373
if (!resource)
7474
return false;
7575

76-
CTeam* team = CStaticFunctionDefinitions::CreateTeam(resource, name.c_str(), red, green, blue);
76+
CTeam* team = CStaticFunctionDefinitions::CreateTeam(resource, name.c_str(), red.value_or(235), green.value_or(221), blue.value_or(178));
7777

7878
if (!team)
7979
return false;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class CLuaTeamDefs : public CLuaDefs
1919

2020
private:
2121
// Team create/destroy functions
22-
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);
22+
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);
2323

2424
// Team get funcs
2525
static std::variant<CTeam*, bool> GetTeamFromName(const std::string name);

0 commit comments

Comments
 (0)