Commit e9ec7f1

authored

createTeam arguments fix (#3949)

* createTeam default arguments fix * Colors according to the previous code

1 parent d94d559 commit e9ec7f1Copy full SHA for e9ec7f1

File tree

-3

lines changed

-3

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -65,15 +65,15 @@ void CLuaTeamDefs::AddClass(lua_State* luaVM)`
`65`	`65`	`lua_registerclass(luaVM, "Team", "Element");`
`66`	`66`	`}`
`67`	`67`
`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)`
`69`	`69`	`{`
`70`	`70`	`CLuaMain& vm = lua_getownercluamain(lua);`
`71`	`71`	`CResource* resource = vm.GetResource();`
`72`	`72`
`73`	`73`	`if (!resource)`
`74`	`74`	`return false;`
`75`	`75`
`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));`
`77`	`77`
`78`	`78`	`if (!team)`
`79`	`79`	`return false;`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ class CLuaTeamDefs : public CLuaDefs`
`19`	`19`
`20`	`20`	`private:`
`21`	`21`	`// 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);`
`23`	`23`
`24`	`24`	`// Team get funcs`
`25`	`25`	`static std::variant<CTeam*, bool> GetTeamFromName(const std::string name);`

Comments

(0)