mirror of
https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
synced 2025-07-18 11:19:10 +00:00
Re-define nil as nullptr, cleaning up some potential issues along the way
This commit is contained in:
@ -172,7 +172,7 @@ bool plVolumeSensorConditionalObject::MsgReceive(plMessage* msg)
|
||||
if (plNetClientApp::GetInstance()->GetLocalPlayerKey() != pActivateMsg->fHitterObj)
|
||||
{
|
||||
plArmatureMod *am=const_cast<plArmatureMod*>( plArmatureMod::ConvertNoRef(pObj->GetModifier(i)));
|
||||
if((am->IsLocalAI())==nil)
|
||||
if (!am->IsLocalAI())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
@ -221,7 +221,7 @@ bool plVolumeSensorConditionalObject::MsgReceive(plMessage* msg)
|
||||
if (plNetClientApp::GetInstance()->GetLocalPlayerKey() != pActivateMsg->fHitterObj)
|
||||
{
|
||||
plArmatureMod *am=const_cast<plArmatureMod*>( plArmatureMod::ConvertNoRef(pObj->GetModifier(i)));
|
||||
if((am->IsLocalAI())==nil)
|
||||
if (!am->IsLocalAI())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
@ -332,7 +332,7 @@ bool plVolumeSensorConditionalObjectNoArbitration::MsgReceive(plMessage* msg)
|
||||
if (plNetClientApp::GetInstance()->GetLocalPlayerKey() != pActivateMsg->fHitterObj)
|
||||
{
|
||||
plArmatureMod *am=const_cast<plArmatureMod*>( plArmatureMod::ConvertNoRef(pObj->GetModifier(i)));
|
||||
if((am->IsLocalAI())==nil)
|
||||
if (!am->IsLocalAI())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
@ -382,7 +382,7 @@ bool plVolumeSensorConditionalObjectNoArbitration::MsgReceive(plMessage* msg)
|
||||
if (plNetClientApp::GetInstance()->GetLocalPlayerKey() != pActivateMsg->fHitterObj)
|
||||
{
|
||||
plArmatureMod *am=const_cast<plArmatureMod*>( plArmatureMod::ConvertNoRef(pObj->GetModifier(i)));
|
||||
if((am->IsLocalAI())==nil)
|
||||
if (!am->IsLocalAI())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
@ -844,7 +844,7 @@ void pfConsole::IHandleKey( plKeyEventMsg *msg )
|
||||
{
|
||||
fWorkingCursor = 0;
|
||||
}
|
||||
else if (msg->GetKeyChar() != nil)
|
||||
else if (msg->GetKeyChar())
|
||||
{
|
||||
key = msg->GetKeyChar();
|
||||
// do they want to go into help mode?
|
||||
|
@ -615,7 +615,7 @@ bool pfGameGUIMgr::IHandleKeyPress( wchar_t key, uint8_t modifiers )
|
||||
pfGUIDialogMod *dlg;
|
||||
|
||||
// Really... Don't handle any nil keypresses
|
||||
if (key == nil)
|
||||
if (!key)
|
||||
return false;
|
||||
|
||||
for( dlg = fActiveDialogs; dlg != nil; dlg = dlg->GetNext() )
|
||||
|
@ -103,7 +103,7 @@ PYTHON_INIT_DEFINITION(ptPlayer, args, keywords)
|
||||
PYTHON_RETURN_INIT_ERROR;
|
||||
}
|
||||
|
||||
self->fThis->Init(key, name.c_str(), pid, distSeq);
|
||||
self->fThis->Init(key->getKey(), name.c_str(), pid, distSeq);
|
||||
PYTHON_RETURN_INIT_OK;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user