Skip to content

Commit 43fac81

Browse files
committed
Reapplied partial SHA-1: 20164ce (Added some missing null pointer checks) due to merge problem somewhere
1 parent f56a1ab commit 43fac81

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

MTA10_Server/mods/deathmatch/logic/luadefs/CLuaPlayerDefs.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1357,7 +1357,7 @@ int CLuaPlayerDefs::SetPlayerAnnounceValue ( lua_State* luaVM )
13571357

13581358
int CLuaPlayerDefs::ResendPlayerModInfo ( lua_State* luaVM )
13591359
{
1360-
// bool getPlayerModInfo ( player thePlayer )
1360+
// bool resendPlayerModInfo ( player thePlayer )
13611361
CPlayer* pPlayer;
13621362

13631363
CScriptArgReader argStream ( luaVM );
@@ -1954,8 +1954,8 @@ int CLuaPlayerDefs::ShowCursor ( lua_State* luaVM )
19541954

19551955
if ( !argStream.HasErrors () )
19561956
{
1957-
CLuaMain * luaMain = m_pLuaManager->GetVirtualMachine ( luaVM );
1958-
if ( CStaticFunctionDefinitions::ShowCursor ( pPlayer, luaMain, bShow, bToggleControls ) )
1957+
CLuaMain* pLuaMain = m_pLuaManager->GetVirtualMachine ( luaVM );
1958+
if ( pLuaMain && CStaticFunctionDefinitions::ShowCursor ( pPlayer, pLuaMain, bShow, bToggleControls ) )
19591959
{
19601960
lua_pushboolean ( luaVM, true );
19611961
return 1;

0 commit comments

Comments
 (0)