Skip to content

#304: Fixed inconsistencies in Player 'get' functions #308

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 10, 2018
Merged

#304: Fixed inconsistencies in Player 'get' functions #308

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 36 additions & 21 deletions Server/mods/deathmatch/logic/luadefs/CLuaPlayerDefs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,21 +223,26 @@ int CLuaPlayerDefs::CanPlayerUseFunction(lua_State* luaVM)
int CLuaPlayerDefs::GetPlayerName(lua_State* luaVM)
{
// string getPlayerName ( player thePlayer )
CElement* pElement;
CElement* pElement; // player or console

CScriptArgReader argStream(luaVM);
argStream.ReadUserData(pElement);

if (!argStream.HasErrors())
{
SString strNick;
if (CStaticFunctionDefinitions::GetPlayerName(pElement, strNick))
if (IS_PLAYER(pElement) || IS_CONSOLE(pElement))
{
lua_pushstring(luaVM, strNick);
return 1;
SString strNick;
if (CStaticFunctionDefinitions::GetPlayerName(pElement, strNick))
{
lua_pushstring(luaVM, strNick);
return 1;
}
}
else
argStream.SetTypeError("player or console", 1);
}
else
if (argStream.HasErrors())
m_pScriptDebugging->LogCustom(luaVM, argStream.GetFullErrorMessage());

lua_pushboolean(luaVM, false);
Expand All @@ -247,21 +252,26 @@ int CLuaPlayerDefs::GetPlayerName(lua_State* luaVM)
int CLuaPlayerDefs::GetPlayerIP(lua_State* luaVM)
{
// string getPlayerIP ( player thePlayer )
CElement* pElement;
CElement* pElement; // player or console

CScriptArgReader argStream(luaVM);
argStream.ReadUserData(pElement);

if (!argStream.HasErrors())
{
SString strIP;
if (CStaticFunctionDefinitions::GetPlayerIP(pElement, strIP))
if (IS_PLAYER(pElement) || IS_CONSOLE(pElement))
{
lua_pushstring(luaVM, strIP);
return 1;
SString strIP;
if (CStaticFunctionDefinitions::GetPlayerIP(pElement, strIP))
{
lua_pushstring(luaVM, strIP);
return 1;
}
}
else
argStream.SetTypeError("player or console", 1);
}
else
if (argStream.HasErrors())
m_pScriptDebugging->LogCustom(luaVM, argStream.GetFullErrorMessage());

lua_pushboolean(luaVM, false);
Expand Down Expand Up @@ -292,21 +302,26 @@ int CLuaPlayerDefs::GetPlayerVersion(lua_State* luaVM)
int CLuaPlayerDefs::GetPlayerAccount(lua_State* luaVM)
{
// account getPlayerAccount ( player thePlayer )
CElement* pElement;
CElement* pElement; // player or console

CScriptArgReader argStream(luaVM);
argStream.ReadUserData(pElement);

if (!argStream.HasErrors())
{
CAccount* pAccount = CStaticFunctionDefinitions::GetPlayerAccount(pElement);
if (pAccount)
if (IS_PLAYER(pElement) || IS_CONSOLE(pElement))
{
lua_pushaccount(luaVM, pAccount);
return 1;
CAccount* pAccount = CStaticFunctionDefinitions::GetPlayerAccount(pElement);
if (pAccount)
{
lua_pushaccount(luaVM, pAccount);
return 1;
}
}
else
argStream.SetTypeError("player or console", 1);
}
else
if (argStream.HasErrors())
m_pScriptDebugging->LogCustom(luaVM, argStream.GetFullErrorMessage());

lua_pushboolean(luaVM, false);
Expand All @@ -316,8 +331,8 @@ int CLuaPlayerDefs::GetPlayerAccount(lua_State* luaVM)
int CLuaPlayerDefs::SetPlayerName(lua_State* luaVM)
{
// bool setPlayerName ( player thePlayer, string newName )
CElement* pElement;
SString strName;
CPlayer* pElement;
SString strName;

CScriptArgReader argStream(luaVM);
argStream.ReadUserData(pElement);
Expand Down Expand Up @@ -1118,7 +1133,7 @@ int CLuaPlayerDefs::SetPlayerBlurLevel(lua_State* luaVM)

int CLuaPlayerDefs::RedirectPlayer(lua_State* luaVM)
{
CElement* pElement;
CPlayer* pElement;
SString strHost;
unsigned short usPort;
SString strPassword;
Expand Down