Commit ece0bc1

committed

Make requested changes

1 parent 25ea742 commit ece0bc1Copy full SHA for ece0bc1

File tree

2 files changed

+10

-13

lines changed

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

2 files changed

+10

-13

lines changed

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

Lines changed: 8 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@`
`11`	`11`	`#include "CLuaTeamDefs.h"`
`12`	`12`	`#include "CLuaGenericDefs.h"`
`13`	`13`	`#include "CStaticFunctionDefinitions.h"`
`14`		`-#include "CGame.h"`
`15`	`14`	`#include <lua/CLuaFunctionParser.h>`
`16`	`15`
`17`	`16`	`void CLuaTeamDefs::LoadFunctions()`
`@@ -68,17 +67,14 @@ void CLuaTeamDefs::AddClass(lua_State* luaVM)`
`68`	`67`
`69`	`68`	`std::variant<CTeam, bool> CLuaTeamDefs::CreateTeam(lua_State lua, const std::string_view name, const std::uint8_t red, const std::uint8_t green, const std::uint8_t blue) noexcept`
`70`	`69`	`{`
`71`		`- CLuaMain* vm = g_pGame->GetLuaManager()->GetVirtualMachine(lua);`
`72`		`-`
`73`		`- if (!vm)`
`74`		`- return false;`
`75`		`-`
`76`		`- CResource* resource = vm->GetResource();`
	`70`	`+ CLuaMain& vm = lua_getownercluamain(lua);`
	`71`	`+ CResource* resource = vm.GetResource();`
`77`	`72`
`78`	`73`	`if (!resource)`
`79`	`74`	`return false;`
`80`	`75`
`81`		`- CTeam* team = CStaticFunctionDefinitions::CreateTeam(resource, name.data(), red, green, blue);`
	`76`	`+ std::string string(name);`
	`77`	`+ CTeam* team = CStaticFunctionDefinitions::CreateTeam(resource, string.c_str(), red, green, blue);`
`82`	`78`
`83`	`79`	`if (!team)`
`84`	`80`	`return false;`
`@@ -93,15 +89,16 @@ std::variant<CTeam, bool> CLuaTeamDefs::CreateTeam(lua_State lua, const std::s`
`93`	`89`
`94`	`90`	`std::variant<CTeam*, bool> CLuaTeamDefs::GetTeamFromName(const std::string_view name) noexcept`
`95`	`91`	`{`
`96`		`- CTeam* team = m_pTeamManager->GetTeam(name.data());`
	`92`	`+ std::string string(name);`
	`93`	`+ CTeam* team = m_pTeamManager->GetTeam(string.c_str());`
`97`	`94`
`98`	`95`	`if (!team)`
`99`	`96`	`return false;`
`100`	`97`
`101`	`98`	`return team;`
`102`	`99`	`}`
`103`	`100`
`104`		`-std::string CLuaTeamDefs::GetTeamName(CTeam* team)noexcept`
	`101`	`+std::string CLuaTeamDefs::GetTeamName(CTeam* team)`
`105`	`102`	`{`
`106`	`103`	`return team->GetTeamName();`
`107`	`104`	`}`
`@@ -122,7 +119,7 @@ bool CLuaTeamDefs::GetTeamFriendlyFire(CTeam* team) noexcept`
`122`	`119`	`return team->GetFriendlyFire();`
`123`	`120`	`}`
`124`	`121`
`125`		`-std::vector<CPlayer> CLuaTeamDefs::GetPlayersInTeam(CTeam team)noexcept`
	`122`	`+std::vector<CPlayer> CLuaTeamDefs::GetPlayersInTeam(CTeam team)`
`126`	`123`	`{`
`127`	`124`	`return team->GetPlayers();`
`128`	`125`	`}`

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

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,10 +23,10 @@ class CLuaTeamDefs : public CLuaDefs`
`23`	`23`
`24`	`24`	`// Team get funcs`
`25`	`25`	`static std::variant<CTeam*, bool> GetTeamFromName(const std::string_view name) noexcept;`
`26`		`- static std::string GetTeamName(CTeam* team)noexcept;`
	`26`	`+ static std::string GetTeamName(CTeam* team);`
`27`	`27`	`static CLuaMultiReturn<std::uint8_t, std::uint8_t, std::uint8_t> GetTeamColor(CTeam* team) noexcept;`
`28`	`28`	`static bool GetTeamFriendlyFire(CTeam* team) noexcept;`
`29`		`- static std::vector<CPlayer> GetPlayersInTeam(CTeam team)noexcept;`
	`29`	`+ static std::vector<CPlayer> GetPlayersInTeam(CTeam team);`
`30`	`30`	`static std::uint32_t CountPlayersInTeam(CTeam* team) noexcept;`
`31`	`31`
`32`	`32`	`// Team set funcs`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit ece0bc1

File tree

2 files changed

2 files changed

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

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

0 commit comments