OU
/
CWE-ou-minkata
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
2
1
Fork 0
Code Releases Activity
Browse Source

Merge pull request #270 from zrax/nullptr 

Re-define nil as nullptr, cleaning up some potential issues along the way
Adam Johnson 12 years ago
parent
31d6a24375 f86b549293
commit
85abe53904
36 changed files with 123 additions and 130 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      Sources/Plasma/CoreLib/HeadSpin.h
  2. 4
      Sources/Plasma/CoreLib/hsTemplates.h
  3. 16
      Sources/Plasma/CoreLib/plString.cpp
  4. 9
      Sources/Plasma/CoreLib/plString.h
  5. 8
      Sources/Plasma/FeatureLib/pfConditional/plObjectInBoxConditionalObject.cpp
  6. 2
      Sources/Plasma/FeatureLib/pfConsole/pfConsole.cpp
  7. 2
      Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGameGUIMgr.cpp
  8. 2
      Sources/Plasma/FeatureLib/pfPython/pyPlayerGlue.cpp
  9. 2
      Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Nt/pnAceNtSocket.cpp
  10. 6
      Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Win32/pnAceW32Dns.cpp
  11. 2
      Sources/Plasma/NucleusLib/pnFactory/plFactory.cpp
  12. 13
      Sources/Plasma/NucleusLib/pnKeyedObject/plKey.cpp
  13. 8
      Sources/Plasma/NucleusLib/pnKeyedObject/plKey.h
  14. 4
      Sources/Plasma/NucleusLib/pnMessage/plCameraMsg.cpp
  15. 2
      Sources/Plasma/NucleusLib/pnSceneObject/plCoordinateInterface.cpp
  16. 2
      Sources/Plasma/PubUtilLib/plAudio/plAudioSystem.cpp
  17. 10
      Sources/Plasma/PubUtilLib/plAudio/plDSoundBuffer.cpp
  18. 6
      Sources/Plasma/PubUtilLib/plAudio/plWinMicLevel.cpp
  19. 2
      Sources/Plasma/PubUtilLib/plAvatar/plArmatureMod.cpp
  20. 12
      Sources/Plasma/PubUtilLib/plAvatar/plAvatarTasks.cpp
  21. 4
      Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.h
  22. 4
      Sources/Plasma/PubUtilLib/plModifier/plAxisAnimModifier.cpp
  23. 2
      Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.cpp
  24. 4
      Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgHandler.cpp
  25. 9
      Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.cpp
  26. 3
      Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglGame.cpp
  27. 9
      Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglGateKeeper.cpp
  28. 6
      Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp
  29. 2
      Sources/Plasma/PubUtilLib/plPipeline/plDXTextFont.cpp
  30. 4
      Sources/Plasma/PubUtilLib/plResMgr/plPageInfo.cpp
  31. 2
      Sources/Plasma/PubUtilLib/plResMgr/plResManager.cpp
  32. 2
      Sources/Plasma/PubUtilLib/plSDL/plSDLParser.cpp
  33. 4
      Sources/Tools/MaxComponent/plClimbComponent.cpp
  34. 76
      Sources/Tools/MaxMain/plMaxNodeBase.cpp
  35. 6
      Sources/Tools/plFontConverter/plFontConverterProc.cpp
  36. 2
      Sources/Tools/plResBrowser/plResBrowserWndProc.cpp

2
Sources/Plasma/CoreLib/HeadSpin.h
Unescape View File

@ -116,7 +116,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#endif #endif
#ifndef nil #ifndef nil
# define nil (0) # define nil (nullptr)
#endif #endif
typedef int32_t hsError; typedef int32_t hsError;

4
Sources/Plasma/CoreLib/hsTemplates.h
Unescape View File

@ -734,7 +734,7 @@ template <class T> void hsTArray<T>::SetCountAndZero(int count)
} }
int i; int i;
for( i = 0; i < fTotalCount; i++ ) for( i = 0; i < fTotalCount; i++ )
fArray[i] = nil; fArray[i] = 0;
fUseCount = count; fUseCount = count;
} }
@ -746,7 +746,7 @@ template <class T> void hsTArray<T>::ExpandAndZero(int count)
Expand(count); Expand(count);
int i; int i;
for( i = n; i < count; i++ ) for( i = n; i < count; i++ )
fArray[i] = nil; fArray[i] = 0;
} }
if( fUseCount < count ) if( fUseCount < count )
fUseCount = count; fUseCount = count;

16
Sources/Plasma/CoreLib/plString.cpp
Unescape View File

@ -88,7 +88,7 @@ size_t wcsnlen(const wchar_t *s, size_t maxlen)
void plString::IConvertFromUtf8(const char *utf8, size_t size) void plString::IConvertFromUtf8(const char *utf8, size_t size)
{ {
if (utf8 == nil) { if (!utf8) {
fUtf8Buffer = plStringBuffer<char>(); fUtf8Buffer = plStringBuffer<char>();
return; return;
} }
@ -134,7 +134,7 @@ plString &plString::operator=(const plStringBuffer<char> &init)
void plString::IConvertFromUtf16(const uint16_t *utf16, size_t size) void plString::IConvertFromUtf16(const uint16_t *utf16, size_t size)
{ {
fUtf8Buffer = plStringBuffer<char>(); fUtf8Buffer = plStringBuffer<char>();
if (utf16 == nil) if (!utf16)
return; return;
if ((int32_t)size < 0) if ((int32_t)size < 0)
@ -213,7 +213,7 @@ void plString::IConvertFromWchar(const wchar_t *wstr, size_t size)
void plString::IConvertFromUtf32(const UniChar *ustr, size_t size) void plString::IConvertFromUtf32(const UniChar *ustr, size_t size)
{ {
fUtf8Buffer = plStringBuffer<char>(); fUtf8Buffer = plStringBuffer<char>();
if (ustr == nil) if (!ustr)
return; return;
if ((int32_t)size < 0) if ((int32_t)size < 0)
@ -271,7 +271,7 @@ void plString::IConvertFromUtf32(const UniChar *ustr, size_t size)
void plString::IConvertFromIso8859_1(const char *astr, size_t size) void plString::IConvertFromIso8859_1(const char *astr, size_t size)
{ {
fUtf8Buffer = plStringBuffer<char>(); fUtf8Buffer = plStringBuffer<char>();
if (astr == nil) if (!astr)
return; return;
if ((int32_t)size < 0) if ((int32_t)size < 0)
@ -477,23 +477,23 @@ plUnicodeBuffer plString::GetUnicodeArray() const
int plString::ToInt(int base) const int plString::ToInt(int base) const
{ {
return static_cast<int>(strtol(c_str(), nil, base)); return static_cast<int>(strtol(c_str(), nullptr, base));
} }
unsigned int plString::ToUInt(int base) const unsigned int plString::ToUInt(int base) const
{ {
return static_cast<unsigned int>(strtoul(c_str(), nil, base)); return static_cast<unsigned int>(strtoul(c_str(), nullptr, base));
} }
float plString::ToFloat() const float plString::ToFloat() const
{ {
// strtof is C99, which MS doesn't support... // strtof is C99, which MS doesn't support...
return (float)strtod(c_str(), nil); return (float)strtod(c_str(), nullptr);
} }
double plString::ToDouble() const double plString::ToDouble() const
{ {
return strtod(c_str(), nil); return strtod(c_str(), nullptr);
} }
// Microsoft doesn't provide this for us // Microsoft doesn't provide this for us

9
Sources/Plasma/CoreLib/plString.h
Unescape View File

@ -215,6 +215,15 @@ private:
void IConvertFromUtf32(const UniChar *ustr, size_t size); void IConvertFromUtf32(const UniChar *ustr, size_t size);
void IConvertFromIso8859_1(const char *astr, size_t size); void IConvertFromIso8859_1(const char *astr, size_t size);
// Constructing and comparing with nil or nullptr won't break plString,
// but it's preferred not to do so with the constants. That is to say,
// you can construct with a const char * which points to null, but
// don't actually write `plString foo = nil;`
plString(std::nullptr_t) { }
void operator=(std::nullptr_t) { }
void operator==(std::nullptr_t) const { }
void operator!=(std::nullptr_t) const { }
public: public:
/** Construct a valid, empty string. */ /** Construct a valid, empty string. */
plString() { } plString() { }

8
Sources/Plasma/FeatureLib/pfConditional/plObjectInBoxConditionalObject.cpp
Unescape View File

@ -172,7 +172,7 @@ bool plVolumeSensorConditionalObject::MsgReceive(plMessage* msg)
if (plNetClientApp::GetInstance()->GetLocalPlayerKey() != pActivateMsg->fHitterObj) if (plNetClientApp::GetInstance()->GetLocalPlayerKey() != pActivateMsg->fHitterObj)
{ {
plArmatureMod *am=const_cast<plArmatureMod*>( plArmatureMod::ConvertNoRef(pObj->GetModifier(i))); plArmatureMod *am=const_cast<plArmatureMod*>( plArmatureMod::ConvertNoRef(pObj->GetModifier(i)));
if((am->IsLocalAI())==nil) if (!am->IsLocalAI())
{ {
return false; return false;
} }
@ -221,7 +221,7 @@ bool plVolumeSensorConditionalObject::MsgReceive(plMessage* msg)
if (plNetClientApp::GetInstance()->GetLocalPlayerKey() != pActivateMsg->fHitterObj) if (plNetClientApp::GetInstance()->GetLocalPlayerKey() != pActivateMsg->fHitterObj)
{ {
plArmatureMod *am=const_cast<plArmatureMod*>( plArmatureMod::ConvertNoRef(pObj->GetModifier(i))); plArmatureMod *am=const_cast<plArmatureMod*>( plArmatureMod::ConvertNoRef(pObj->GetModifier(i)));
if((am->IsLocalAI())==nil) if (!am->IsLocalAI())
{ {
return false; return false;
} }
@ -332,7 +332,7 @@ bool plVolumeSensorConditionalObjectNoArbitration::MsgReceive(plMessage* msg)
if (plNetClientApp::GetInstance()->GetLocalPlayerKey() != pActivateMsg->fHitterObj) if (plNetClientApp::GetInstance()->GetLocalPlayerKey() != pActivateMsg->fHitterObj)
{ {
plArmatureMod *am=const_cast<plArmatureMod*>( plArmatureMod::ConvertNoRef(pObj->GetModifier(i))); plArmatureMod *am=const_cast<plArmatureMod*>( plArmatureMod::ConvertNoRef(pObj->GetModifier(i)));
if((am->IsLocalAI())==nil) if (!am->IsLocalAI())
{ {
return false; return false;
} }
@ -382,7 +382,7 @@ bool plVolumeSensorConditionalObjectNoArbitration::MsgReceive(plMessage* msg)
if (plNetClientApp::GetInstance()->GetLocalPlayerKey() != pActivateMsg->fHitterObj) if (plNetClientApp::GetInstance()->GetLocalPlayerKey() != pActivateMsg->fHitterObj)
{ {
plArmatureMod *am=const_cast<plArmatureMod*>( plArmatureMod::ConvertNoRef(pObj->GetModifier(i))); plArmatureMod *am=const_cast<plArmatureMod*>( plArmatureMod::ConvertNoRef(pObj->GetModifier(i)));
if((am->IsLocalAI())==nil) if (!am->IsLocalAI())
{ {
return false; return false;
} }

2
Sources/Plasma/FeatureLib/pfConsole/pfConsole.cpp
Unescape View File

@ -844,7 +844,7 @@ void pfConsole::IHandleKey( plKeyEventMsg *msg )
{ {
fWorkingCursor = 0; fWorkingCursor = 0;
} }
else if (msg->GetKeyChar() != nil) else if (msg->GetKeyChar())
{ {
key = msg->GetKeyChar(); key = msg->GetKeyChar();
// do they want to go into help mode? // do they want to go into help mode?

2
Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGameGUIMgr.cpp
Unescape View File

@ -615,7 +615,7 @@ bool pfGameGUIMgr::IHandleKeyPress( wchar_t key, uint8_t modifiers )
pfGUIDialogMod *dlg; pfGUIDialogMod *dlg;
// Really... Don't handle any nil keypresses // Really... Don't handle any nil keypresses
if (key == nil) if (!key)
return false; return false;
for( dlg = fActiveDialogs; dlg != nil; dlg = dlg->GetNext() ) for( dlg = fActiveDialogs; dlg != nil; dlg = dlg->GetNext() )

2
Sources/Plasma/FeatureLib/pfPython/pyPlayerGlue.cpp
Unescape View File

@ -103,7 +103,7 @@ PYTHON_INIT_DEFINITION(ptPlayer, args, keywords)
PYTHON_RETURN_INIT_ERROR; 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; PYTHON_RETURN_INIT_OK;
} }

2
Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Nt/pnAceNtSocket.cpp
Unescape View File

@ -770,7 +770,7 @@ static unsigned THREADCALL ListenThreadProc (AsyncThread *) {
for (NtOpConnAttempt * op; (op = s_connectList.Head()) != nil; s_connectList.Unlink(op)) { for (NtOpConnAttempt * op; (op = s_connectList.Head()) != nil; s_connectList.Unlink(op)) {
if (op->hSocket != INVALID_SOCKET) { if (op->hSocket != INVALID_SOCKET) {
closesocket(op->hSocket); closesocket(op->hSocket);
op->hSocket = nil; op->hSocket = 0;
} }
INtConnPostOperation(nil, op, 0); INtConnPostOperation(nil, op, 0);
} }

6
Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Win32/pnAceW32Dns.cpp
Unescape View File

@ -306,7 +306,7 @@ void AsyncAddressLookupName (
sizeof(lookup->buffer) sizeof(lookup->buffer)
); );
if (!lookup->cancelHandle) { if (!lookup->cancelHandle) {
PostMessage(s_lookupWindow, WM_LOOKUP_FOUND_HOST, nil, (unsigned) -1); PostMessage(s_lookupWindow, WM_LOOKUP_FOUND_HOST, 0, (unsigned) -1);
} }
} }
s_critsect.Leave(); s_critsect.Leave();
@ -356,7 +356,7 @@ void AsyncAddressLookupAddr (
sizeof(lookup->buffer) sizeof(lookup->buffer)
); );
if (!lookup->cancelHandle) { if (!lookup->cancelHandle) {
PostMessage(s_lookupWindow, WM_LOOKUP_FOUND_HOST, nil, (unsigned) -1); PostMessage(s_lookupWindow, WM_LOOKUP_FOUND_HOST, 0, (unsigned) -1);
} }
} }
s_critsect.Leave(); s_critsect.Leave();
@ -381,7 +381,7 @@ void AsyncAddressLookupCancel (
lookup->cancelHandle = nil; lookup->cancelHandle = nil;
// initiate user callback // initiate user callback
PostMessage(s_lookupWindow, WM_LOOKUP_FOUND_HOST, nil, (unsigned) -1); PostMessage(s_lookupWindow, WM_LOOKUP_FOUND_HOST, 0, (unsigned) -1);
} }
s_critsect.Leave(); s_critsect.Leave();
} }

2
Sources/Plasma/NucleusLib/pnFactory/plFactory.cpp
Unescape View File

@ -154,7 +154,7 @@ void plFactory::IUnRegister(uint16_t hClass)
uint16_t plFactory::Register(uint16_t hClass, plCreator* worker) uint16_t plFactory::Register(uint16_t hClass, plCreator* worker)
{ {
if( !theFactory && !ICreateTheFactory() ) if( !theFactory && !ICreateTheFactory() )
return nil; return 0;
hsRefCnt_SafeRef(theFactory); hsRefCnt_SafeRef(theFactory);
return theFactory->IRegister(hClass, worker); return theFactory->IRegister(hClass, worker);

13
Sources/Plasma/NucleusLib/pnKeyedObject/plKey.cpp
Unescape View File

@ -120,15 +120,6 @@ static const char* CloneString(const plKeyData* keyData)
#endif #endif
plKey::plKey() : fKeyData(nil)
{
}
plKey::plKey(void* ptr) : fKeyData(nil)
{
hsAssert(!ptr, "Attempting to publically construct a non-nil key");
}
plKey::plKey(const plKey& rhs) : fKeyData(rhs.fKeyData) plKey::plKey(const plKey& rhs) : fKeyData(rhs.fKeyData)
{ {
#if TRACK_REFS // FOR DEBUGGING ONLY #if TRACK_REFS // FOR DEBUGGING ONLY
@ -143,13 +134,13 @@ plKey::plKey(const plKey& rhs) : fKeyData(rhs.fKeyData)
IIncRef(); IIncRef();
} }
plKey::plKey(plKeyData* data, bool ignore) : fKeyData(data) plKey::plKey(plKeyData* data) : fKeyData(data)
{ {
#if TRACK_REFS // FOR DEBUGGING ONLY #if TRACK_REFS // FOR DEBUGGING ONLY
if( IsTracked(fKeyData) ) if( IsTracked(fKeyData) )
{ {
char msg[ 512 ]; char msg[ 512 ];
sprintf( msg, "C: Key %s %s is being constructed using the plKey(plKeyData*, bool) constructor", keyNameToLookFor, CloneString(fKeyData) ); sprintf( msg, "C: Key %s %s is being constructed using the plKey(plKeyData*) constructor", keyNameToLookFor, CloneString(fKeyData) );
//hsAssert( false, msg ); //hsAssert( false, msg );
hsStatusMessageF(msg); hsStatusMessageF(msg);
} }

8
Sources/Plasma/NucleusLib/pnKeyedObject/plKey.h
Unescape View File

@ -61,9 +61,9 @@ class plKey
{ {
public: public:
// Constructors and destructors and copy stuff // Constructors and destructors and copy stuff
plKey(); plKey() : fKeyData(nullptr) { }
plKey(std::nullptr_t) : fKeyData(nullptr) { }
plKey(const plKey& rhs); plKey(const plKey& rhs);
plKey(void* ptr); // For constructing a nil key
~plKey(); ~plKey();
plKey& operator=(const plKey& rhs); plKey& operator=(const plKey& rhs);
@ -77,7 +77,7 @@ public:
operator plKeyImp*() const { return (plKeyImp*)fKeyData; } operator plKeyImp*() const { return (plKeyImp*)fKeyData; }
static plKey Make(plKeyData* data) { return plKey(data, false); } static plKey Make(plKeyData* data) { return plKey(data); }
protected: protected:
// Pointer to our real key // Pointer to our real key
@ -86,7 +86,7 @@ protected:
void IDecRef(); void IDecRef();
// Internal constructor, extra param is to distinguish it from the void* constructor // Internal constructor, extra param is to distinguish it from the void* constructor
plKey(plKeyData* data, bool ignore); plKey(plKeyData* data);
}; };
//// plKeyData /////////////////////////////////////////////////////////////// //// plKeyData ///////////////////////////////////////////////////////////////

4
Sources/Plasma/NucleusLib/pnMessage/plCameraMsg.cpp
Unescape View File

@ -53,13 +53,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
// //
// //
plCameraMsg::plCameraMsg() : plCameraMsg::plCameraMsg() :
fNewCam(nil), fNewCam(nil),
fTriggerer(nil), fTriggerer(nil),
fTransTime(0), fTransTime(0),
fSubject(nil), fSubject(nil),
fPipe(nil), fPipe(nil),
fConfig(nil),
fActivated(false) fActivated(false)
{ {
} }
@ -70,7 +69,6 @@ fTriggerer(nil),
fTransTime(0), fTransTime(0),
fSubject(nil), fSubject(nil),
fPipe(nil), fPipe(nil),
fConfig(nil),
fActivated(false), fActivated(false),
plMessage(s, r, t) plMessage(s, r, t)
{ {

2
Sources/Plasma/NucleusLib/pnSceneObject/plCoordinateInterface.cpp
Unescape View File

@ -333,7 +333,7 @@ uint16_t plCoordinateInterface::GetReasons()
void plCoordinateInterface::ClearReasons() void plCoordinateInterface::ClearReasons()
{ {
fReason = nil; fReason = 0;
} }
void plCoordinateInterface::SetLocalToParent(const hsMatrix44& l2p, const hsMatrix44& p2l) void plCoordinateInterface::SetLocalToParent(const hsMatrix44& l2p, const hsMatrix44& p2l)

2
Sources/Plasma/PubUtilLib/plAudio/plAudioSystem.cpp
Unescape View File

@ -198,7 +198,7 @@ void plAudioSystem::IEnumerateDevices()
char *devices = (char *)alcGetString(nil, ALC_DEVICE_SPECIFIER); char *devices = (char *)alcGetString(nil, ALC_DEVICE_SPECIFIER);
int major, minor; int major, minor;
while(*devices != nil) while (*devices)
{ {
ALCdevice *device = alcOpenDevice(devices); ALCdevice *device = alcOpenDevice(devices);
if (device) if (device)

10
Sources/Plasma/PubUtilLib/plAudio/plDSoundBuffer.cpp
Unescape View File

@ -125,7 +125,7 @@ void plDSoundBuffer::IRelease( void )
// Release stuff // Release stuff
fEAXSource.Release(); fEAXSource.Release();
alSourcei(source, AL_BUFFER, nil); alSourcei(source, AL_BUFFER, 0);
alDeleteSources(1, &source); alDeleteSources(1, &source);
if(buffer) if(buffer)
alDeleteBuffers( 1, &buffer ); alDeleteBuffers( 1, &buffer );
@ -173,7 +173,7 @@ bool plDSoundBuffer::FillBuffer(void *data, unsigned bytes, plWAVHeader *header)
{ {
if(source) if(source)
{ {
alSourcei(source, AL_BUFFER, nil); alSourcei(source, AL_BUFFER, 0);
alDeleteSources(1, &source); alDeleteSources(1, &source);
} }
if(buffer) if(buffer)
@ -278,7 +278,7 @@ bool plDSoundBuffer::SetupStreamingSource(plAudioFileReader *stream)
plStatusLog::AddLineS("audio.log", "Failed to create audio source %d %d", error, source); plStatusLog::AddLineS("audio.log", "Failed to create audio source %d %d", error, source);
return false; return false;
} }
alSourcei(source, AL_BUFFER, nil); alSourcei(source, AL_BUFFER, 0);
SetScalarVolume(0); SetScalarVolume(0);
@ -344,7 +344,7 @@ bool plDSoundBuffer::SetupStreamingSource(void *data, unsigned bytes)
plStatusLog::AddLineS("audio.log", "Failed to create audio source %d %d", error, source); plStatusLog::AddLineS("audio.log", "Failed to create audio source %d %d", error, source);
return false; return false;
} }
alSourcei(source, AL_BUFFER, nil); alSourcei(source, AL_BUFFER, 0);
SetScalarVolume(0); SetScalarVolume(0);
alSourcef(source, AL_ROLLOFF_FACTOR, 0.3048); alSourcef(source, AL_ROLLOFF_FACTOR, 0.3048);
@ -512,7 +512,7 @@ bool plDSoundBuffer::SetupVoiceSource()
{ {
return false; return false;
} }
alSourcei(source, AL_BUFFER, nil); alSourcei(source, AL_BUFFER, 0);
alGetError(); alGetError();
//alSourcei(source, AL_PITCH, 0); //alSourcei(source, AL_PITCH, 0);

6
Sources/Plasma/PubUtilLib/plAudio/plWinMicLevel.cpp
Unescape View File

@ -149,9 +149,9 @@ plWinMicLevel::plWinMicLevel()
if( sNumMixers == 0 ) if( sNumMixers == 0 )
return; return;
if( ::mixerOpen( &sMixerHandle, 0, if( ::mixerOpen( &sMixerHandle, 0,
nil, // Window handle to receive callback messages 0, // Window handle to receive callback messages
nil, MIXER_OBJECTF_MIXER ) != MMSYSERR_NOERROR ) 0, MIXER_OBJECTF_MIXER ) != MMSYSERR_NOERROR )
{ {
sMixerHandle = nil; // Just to be sure sMixerHandle = nil; // Just to be sure
return; return;

2
Sources/Plasma/PubUtilLib/plAvatar/plArmatureMod.cpp
Unescape View File

@ -1339,7 +1339,7 @@ bool plArmatureMod::MsgReceive(plMessage* msg)
} }
else else
{ {
if (cloneMsg->GetCloneKey() == GetFollowerParticleSystemSO()) if (cloneMsg->GetCloneKey() == GetFollowerParticleSystemSO()->GetKey())
{ {
SetFollowerParticleSystemSO(nil); SetFollowerParticleSystemSO(nil);
return true; return true;

12
Sources/Plasma/PubUtilLib/plAvatar/plAvatarTasks.cpp
Unescape View File

@ -159,10 +159,10 @@ void plAvTask::IUndoLimitPlayersInput(plArmatureMod *avatar)
plAvSeekTask::plAvSeekTask() plAvSeekTask::plAvSeekTask()
: fAnimName(nil), : fAnimName(nil),
fAlign(kAlignHandle), fAlign(kAlignHandle),
fDuration(0.25f), fDuration(0.25),
fTarget(nil), fTarget(nil),
fAnimInstance(nil), fAnimInstance(nil),
fTargetTime(nil), fTargetTime(0),
fPhysicalAtStart(false), fPhysicalAtStart(false),
fCleanup(false) fCleanup(false)
{ {
@ -171,10 +171,10 @@ plAvSeekTask::plAvSeekTask()
// CTOR target, align, animName // CTOR target, align, animName
plAvSeekTask::plAvSeekTask(plKey target, plAvAlignment align, const char *animName) plAvSeekTask::plAvSeekTask(plKey target, plAvAlignment align, const char *animName)
: fAlign(align), : fAlign(align),
fDuration(0.25f), fDuration(0.25),
fTarget(target), fTarget(target),
fAnimInstance(nil), fAnimInstance(nil),
fTargetTime(nil), fTargetTime(0),
fPhysicalAtStart(false), fPhysicalAtStart(false),
fCleanup(false) fCleanup(false)
{ {
@ -185,10 +185,10 @@ plAvSeekTask::plAvSeekTask(plKey target, plAvAlignment align, const char *animNa
plAvSeekTask::plAvSeekTask(plKey target) plAvSeekTask::plAvSeekTask(plKey target)
: fAnimName(nil), : fAnimName(nil),
fAlign(kAlignHandle), fAlign(kAlignHandle),
fDuration(0.25f), fDuration(0.25),
fTarget(target), fTarget(target),
fAnimInstance(nil), fAnimInstance(nil),
fTargetTime(nil), fTargetTime(0),
fPhysicalAtStart(false), fPhysicalAtStart(false),
fCleanup(false) fCleanup(false)
{ {

4
Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.h
Unescape View File

@ -74,7 +74,7 @@ public:
uint32_t GetFlags() { return fFlags; } uint32_t GetFlags() { return fFlags; }
void SetFlags(uint32_t f) { fFlags = f; } void SetFlags(uint32_t f) { fFlags = f; }
virtual void HandleKeyEvent(plOSMsg message, plKeyDef key, bool bKeyDown, bool bKeyRepeat, wchar_t c = nil) {;} virtual void HandleKeyEvent(plOSMsg message, plKeyDef key, bool bKeyDown, bool bKeyRepeat, wchar_t c = 0) {;}
virtual void HandleMouseEvent(plOSMsg message, plMouseState state) {;} virtual void HandleMouseEvent(plOSMsg message, plMouseState state) {;}
virtual void HandleWindowActivate(bool bActive, hsWindowHndl hWnd) {;} virtual void HandleWindowActivate(bool bActive, hsWindowHndl hWnd) {;}
virtual bool MsgReceive(plMessage* msg) {return false;} virtual bool MsgReceive(plMessage* msg) {return false;}
@ -116,7 +116,7 @@ public:
void SetControlMode(int i) { fControlMode = i; } void SetControlMode(int i) { fControlMode = i; }
const char* GetInputName() { return "keyboard"; } const char* GetInputName() { return "keyboard"; }
void HandleKeyEvent(plOSMsg message, plKeyDef key, bool bKeyDown, bool bKeyRepeat, wchar_t c = nil); void HandleKeyEvent(plOSMsg message, plKeyDef key, bool bKeyDown, bool bKeyRepeat, wchar_t c = 0);
virtual void HandleWindowActivate(bool bActive, hsWindowHndl hWnd); virtual void HandleWindowActivate(bool bActive, hsWindowHndl hWnd);
virtual bool IsCapsLockKeyOn(); virtual bool IsCapsLockKeyOn();
virtual void Shutdown(); virtual void Shutdown();

4
Sources/Plasma/PubUtilLib/plModifier/plAxisAnimModifier.cpp
Unescape View File

@ -335,12 +335,12 @@ bool plAxisAnimModifier::MsgReceive(plMessage* msg)
hsRefCnt_SafeUnRef( pCall1 ); hsRefCnt_SafeUnRef( pCall1 );
hsRefCnt_SafeUnRef( pCall2 ); hsRefCnt_SafeUnRef( pCall2 );
plgDispatch::MsgSend(pMsg); plgDispatch::MsgSend(pMsg);
} }
else else
if (pRefMsg->fType == kTypeLogic) if (pRefMsg->fType == kTypeLogic)
{ {
SetNotificationKey(pRefMsg->GetRef()); SetNotificationKey(pRefMsg->GetRef()->GetKey());
} }
} }
else else

2
Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.cpp
Unescape View File

@ -279,7 +279,7 @@ const char* ProcessTab(const char* fmt)
// //
bool plNetClientMgr::Log(const char* str) const bool plNetClientMgr::Log(const char* str) const
{ {
if (strlen(str)==nil) if (strlen(str) == 0)
return true; return true;
// prepend raw time // prepend raw time

4
Sources/Plasma/PubUtilLib/plNetClient/plNetClientMsgHandler.cpp
Unescape View File

@ -403,12 +403,10 @@ MSG_HANDLER_DEFN(plNetClientMsgHandler,plNetMsgVoice)
const char* buf = m->GetVoiceData(); const char* buf = m->GetVoiceData();
uint8_t flags = m->GetFlags(); uint8_t flags = m->GetFlags();
uint8_t numFrames = m->GetNumFrames(); uint8_t numFrames = m->GetNumFrames();
plKey key = NULL; plKey key;
// plKey key=hsgResMgr::ResMgr()->FindKey(m->ObjectInfo()->GetUoid()); // plKey key=hsgResMgr::ResMgr()->FindKey(m->ObjectInfo()->GetUoid());
// Filter ignored sender // Filter ignored sender
if ( VaultAmIgnoringPlayer( m->GetPlayerID() ) ) if ( VaultAmIgnoringPlayer( m->GetPlayerID() ) )
{ {

9
Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.cpp
Unescape View File

@ -1719,15 +1719,15 @@ void CliAuConn::StopAutoPing () {
void CliAuConn::TimerPing () { void CliAuConn::TimerPing () {
// Send a ping request // Send a ping request
pingSendTimeMs = GetNonZeroTimeMs(); pingSendTimeMs = GetNonZeroTimeMs();
const uintptr_t msg[] = { const uintptr_t msg[] = {
kCli2Auth_PingRequest, kCli2Auth_PingRequest,
pingSendTimeMs, pingSendTimeMs,
0, // not a transaction 0, // not a transaction
0, // no payload 0, // no payload
nil reinterpret_cast<uintptr_t>(nullptr)
}; };
Send(msg, arrsize(msg)); Send(msg, arrsize(msg));
} }
@ -5093,8 +5093,7 @@ bool AuthQueryConnected () {
bool result; bool result;
s_critsect.Enter(); s_critsect.Enter();
{ {
if (nil != (result = s_active)) result = (s_active && s_active->cli);
result &= (nil != s_active->cli);
} }
s_critsect.Leave(); s_critsect.Leave();
return result; return result;

3
Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglGame.cpp
Unescape View File

@ -756,8 +756,7 @@ bool GameQueryConnected () {
bool result; bool result;
s_critsect.Enter(); s_critsect.Enter();
{ {
if (nil != (result = s_active)) result = (s_active && s_active->cli);
result &= (nil != s_active->cli);
} }
s_critsect.Leave(); s_critsect.Leave();
return result; return result;

9
Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglGateKeeper.cpp
Unescape View File

@ -655,15 +655,15 @@ void CliGkConn::StopAutoPing () {
void CliGkConn::TimerPing () { void CliGkConn::TimerPing () {
// Send a ping request // Send a ping request
pingSendTimeMs = GetNonZeroTimeMs(); pingSendTimeMs = GetNonZeroTimeMs();
const uintptr_t msg[] = { const uintptr_t msg[] = {
kCli2GateKeeper_PingRequest, kCli2GateKeeper_PingRequest,
pingSendTimeMs, pingSendTimeMs,
0, // not a transaction 0, // not a transaction
0, // no payload 0, // no payload
nil reinterpret_cast<uintptr_t>(nullptr)
}; };
Send(msg, arrsize(msg)); Send(msg, arrsize(msg));
} }
@ -1032,8 +1032,7 @@ bool GateKeeperQueryConnected () {
bool result; bool result;
s_critsect.Enter(); s_critsect.Enter();
{ {
if (nil != (result = s_active)) result = (s_active && s_active->cli);
result &= (nil != s_active->cli);
} }
s_critsect.Leave(); s_critsect.Leave();
return result; return result;

6
Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp
Unescape View File

@ -752,7 +752,7 @@ void plDXPipeline::IClearMembers()
fULutTextureRef = nil; fULutTextureRef = nil;
for( i = 0; i < kMaxRenderTargetNext; i++ ) for( i = 0; i < kMaxRenderTargetNext; i++ )
fBlurVBuffers[i] = nil; fBlurVBuffers[i] = nil;
fBlurVSHandle = nil; fBlurVSHandle = 0;
fD3DObject = nil; fD3DObject = nil;
fD3DDevice = nil; fD3DDevice = nil;
@ -4352,7 +4352,7 @@ bool plDXPipeline::CaptureScreen( plMipmap *dest, bool flipVertical, uint16_t d
surface->UnlockRect(); surface->UnlockRect();
ReleaseObject( surface ); ReleaseObject( surface );
if( desiredWidth != 0 && desiredHeight != nil ) if( desiredWidth != 0 && desiredHeight != 0 )
{ {
// Rescale to the right size // Rescale to the right size
dest->ResizeNicely( desiredWidth, desiredHeight, plMipmap::kDefaultFilter ); dest->ResizeNicely( desiredWidth, desiredHeight, plMipmap::kDefaultFilter );
@ -11889,7 +11889,7 @@ void plDXPipeline::ISetErrorMessage( char *errStr )
plStatusLog::AddLineS("pipeline.log", fSettings.fErrorStr); plStatusLog::AddLineS("pipeline.log", fSettings.fErrorStr);
} }
else else
fSettings.fErrorStr[ 0 ] = nil; fSettings.fErrorStr[ 0 ] = 0;
} }
// IGetD3DError ///////////////////////////////////////////////////////////////// // IGetD3DError /////////////////////////////////////////////////////////////////

2
Sources/Plasma/PubUtilLib/plPipeline/plDXTextFont.cpp
Unescape View File

@ -120,7 +120,7 @@ void plDXTextFont::ICreateTexture( uint16_t *data )
// Lock the texture and write our values out // Lock the texture and write our values out
fD3DTexture->LockRect( 0, &lockInfo, 0, 0 ); fD3DTexture->LockRect( 0, &lockInfo, 0, 0 );
memcpy( lockInfo.pBits, data, fTextureWidth * fTextureHeight * sizeof( uint16_t ) ); memcpy( lockInfo.pBits, data, fTextureWidth * fTextureHeight * sizeof( uint16_t ) );
fD3DTexture->UnlockRect( nil ); fD3DTexture->UnlockRect( 0 );
} }
void plDXTextFont::CreateShared(IDirect3DDevice9* device) void plDXTextFont::CreateShared(IDirect3DDevice9* device)

4
Sources/Plasma/PubUtilLib/plResMgr/plPageInfo.cpp
Unescape View File

@ -61,7 +61,7 @@ plPageInfo::plPageInfo( const plLocation &loc )
void plPageInfo::IInit() void plPageInfo::IInit()
{ {
fAge = fPage = nil; fAge = fPage = "";
fLocation.Invalidate(); fLocation.Invalidate();
SetMajorVersion(plVersion::GetMajorVersion()); SetMajorVersion(plVersion::GetMajorVersion());
fClassVersions.clear(); fClassVersions.clear();
@ -71,7 +71,7 @@ void plPageInfo::IInit()
plPageInfo::~plPageInfo() plPageInfo::~plPageInfo()
{ {
SetStrings( nil, nil ); SetStrings("", "");
} }
plPageInfo::plPageInfo( const plPageInfo &src ) plPageInfo::plPageInfo( const plPageInfo &src )

2
Sources/Plasma/PubUtilLib/plResMgr/plResManager.cpp
Unescape View File

@ -1715,7 +1715,7 @@ public:
bool plResManager::IterateKeys(plRegistryKeyIterator* iterator) bool plResManager::IterateKeys(plRegistryKeyIterator* iterator)
{ {
plKeyIterEater myEater(iterator); plKeyIterEater myEater(iterator);
return IteratePages(&myEater, nil); return IteratePages(&myEater);
} }
bool plResManager::IterateKeys(plRegistryKeyIterator* iterator, const plLocation& pageToRestrictTo) bool plResManager::IterateKeys(plRegistryKeyIterator* iterator, const plLocation& pageToRestrictTo)

2
Sources/Plasma/PubUtilLib/plSDL/plSDLParser.cpp
Unescape View File

@ -67,7 +67,7 @@ void plSDLParser::DebugMsg(const char* fmt, ...) const
void plSDLParser::DebugMsgV(const char* fmt, va_list args) const void plSDLParser::DebugMsgV(const char* fmt, va_list args) const
{ {
if (strlen(fmt)==nil) if (strlen(fmt) == 0)
return; return;
hsStatusMessage(plString::IFormat(fmt,args).c_str()); hsStatusMessage(plString::IFormat(fmt,args).c_str());
} }

4
Sources/Tools/MaxComponent/plClimbComponent.cpp
Unescape View File

@ -243,7 +243,7 @@ bool plClimbTriggerComponent::Convert(plMaxNode *node, plErrorMsg *pErrMsg)
plKey nilKey = nil; plKey nilKey = nil;
plKey target = node->GetSceneObject()->GetKey(); plKey target = node->GetSceneObject()->GetKey();
plClimbMsg *enterMsg = nil; plClimbMsg *enterMsg = nil;
if(enterCommand != plClimbMsg::kNoCommand) if (enterCommand != plClimbMsg::kNoCommand)
{ {
enterMsg = new plClimbMsg(nilKey, nilKey, enterCommand, direction, enterStatus, target); enterMsg = new plClimbMsg(nilKey, nilKey, enterCommand, direction, enterStatus, target);
enterMsg->SetBCastFlag(plMessage::kPropagateToModifiers); enterMsg->SetBCastFlag(plMessage::kPropagateToModifiers);
@ -252,7 +252,7 @@ bool plClimbTriggerComponent::Convert(plMaxNode *node, plErrorMsg *pErrMsg)
} }
plClimbMsg *exitMsg = nil; plClimbMsg *exitMsg = nil;
if(exitCommand != nil) if (exitCommand != plClimbMsg::kNoCommand)
{ {
exitMsg = new plClimbMsg(nilKey, nilKey, exitCommand, direction, exitStatus, target); exitMsg = new plClimbMsg(nilKey, nilKey, exitCommand, direction, exitStatus, target);
exitMsg->SetBCastFlag(plMessage::kPropagateToModifiers); exitMsg->SetBCastFlag(plMessage::kPropagateToModifiers);

76
Sources/Tools/MaxMain/plMaxNodeBase.cpp
Unescape View File

@ -130,45 +130,45 @@ plMaxNodeData *plMaxNodeBase::GetMaxNodeData()
plKey plMaxNodeBase::GetKey() { GetMD; return (pMD) ? pMD->GetKey() : nil; } plKey plMaxNodeBase::GetKey() { GetMD; return (pMD) ? pMD->GetKey() : nil; }
plSceneObject* plMaxNodeBase::GetSceneObject() { GetMD; return (pMD) ? pMD->GetSceneObject() : nil;} plSceneObject* plMaxNodeBase::GetSceneObject() { GetMD; return (pMD) ? pMD->GetSceneObject() : nil;}
bool plMaxNodeBase::GetForceLocal() { GetMD; return (pMD) ? pMD->GetForceLocal() : nil; } bool plMaxNodeBase::GetForceLocal() { GetMD; return (pMD) ? pMD->GetForceLocal() : false; }
bool plMaxNodeBase::GetReverseSort() { GetMD; return (pMD) ? pMD->GetReverseSort() : nil;} bool plMaxNodeBase::GetReverseSort() { GetMD; return (pMD) ? pMD->GetReverseSort() : false;}
bool plMaxNodeBase::GetSortAsOpaque() { GetMD; return (pMD) ? pMD->GetSortAsOpaque() : nil;} bool plMaxNodeBase::GetSortAsOpaque() { GetMD; return (pMD) ? pMD->GetSortAsOpaque() : false;}
bool plMaxNodeBase::GetVS() { GetMD; return (pMD) ? pMD->GetVS() : nil;} bool plMaxNodeBase::GetVS() { GetMD; return (pMD) ? pMD->GetVS() : false;}
bool plMaxNodeBase::GetHasWaterHeight() { GetMD; return (pMD) ? pMD->GetHasWaterHeight() : nil; } bool plMaxNodeBase::GetHasWaterHeight() { GetMD; return (pMD) ? pMD->GetHasWaterHeight() : false; }
float plMaxNodeBase::GetWaterHeight() { GetMD; return (pMD) ? pMD->GetWaterHeight() : nil; } float plMaxNodeBase::GetWaterHeight() { GetMD; return (pMD) ? pMD->GetWaterHeight() : 0; }
bool plMaxNodeBase::GetSmoothAll() { GetMD; return (pMD) ? pMD->GetSmoothAll() : nil;} bool plMaxNodeBase::GetSmoothAll() { GetMD; return (pMD) ? pMD->GetSmoothAll() : false;}
bool plMaxNodeBase::GetForceSortable() { GetMD; return (pMD) ? pMD->GetForceSortable() : nil;} bool plMaxNodeBase::GetForceSortable() { GetMD; return (pMD) ? pMD->GetForceSortable() : false;}
bool plMaxNodeBase::GetConcave() { GetMD; return (pMD) ? pMD->GetConcave() : nil;} bool plMaxNodeBase::GetConcave() { GetMD; return (pMD) ? pMD->GetConcave() : false;}
bool plMaxNodeBase::GetCalcEdgeLens() { GetMD; return (pMD) ? pMD->GetCalcEdgeLens() : nil;} bool plMaxNodeBase::GetCalcEdgeLens() { GetMD; return (pMD) ? pMD->GetCalcEdgeLens() : false;}
bool plMaxNodeBase::GetRunTimeLight() { GetMD; return (pMD) ? pMD->GetRunTimeLight() : nil;} bool plMaxNodeBase::GetRunTimeLight() { GetMD; return (pMD) ? pMD->GetRunTimeLight() : false;}
bool plMaxNodeBase::GetForceMatShade() { GetMD; return (pMD) ? pMD->GetForceMatShade() : nil;} bool plMaxNodeBase::GetForceMatShade() { GetMD; return (pMD) ? pMD->GetForceMatShade() : false;}
bool plMaxNodeBase::GetForceVisLOS() { GetMD; return (pMD) ? pMD->GetForceVisLOS() : nil;} bool plMaxNodeBase::GetForceVisLOS() { GetMD; return (pMD) ? pMD->GetForceVisLOS() : false;}
bool plMaxNodeBase::GetEnviron() { GetMD; return (pMD) ? pMD->GetEnviron() : nil;} bool plMaxNodeBase::GetEnviron() { GetMD; return (pMD) ? pMD->GetEnviron() : false;}
bool plMaxNodeBase::GetEnvironOnly() { GetMD; return (pMD) ? pMD->GetEnvironOnly() : nil;} bool plMaxNodeBase::GetEnvironOnly() { GetMD; return (pMD) ? pMD->GetEnvironOnly() : false;}
bool plMaxNodeBase::GetWaterDecEnv() { GetMD; return (pMD) ? pMD->GetWaterDecEnv() : nil; } bool plMaxNodeBase::GetWaterDecEnv() { GetMD; return (pMD) ? pMD->GetWaterDecEnv() : false; }
bool plMaxNodeBase::GetNoPreShade() { GetMD; return (pMD) ? pMD->GetNoPreShade() && !pMD->GetForcePreShade() : nil;} bool plMaxNodeBase::GetNoPreShade() { GetMD; return (pMD) ? pMD->GetNoPreShade() && !pMD->GetForcePreShade() : false;}
bool plMaxNodeBase::GetForcePreShade() { GetMD; return (pMD) ? pMD->GetForcePreShade() : nil;} bool plMaxNodeBase::GetForcePreShade() { GetMD; return (pMD) ? pMD->GetForcePreShade() : false;}
plKey plMaxNodeBase::GetRoomKey() { GetMD; return (pMD) ? pMD->GetRoomKey() : nil; } plKey plMaxNodeBase::GetRoomKey() { GetMD; return (pMD) ? pMD->GetRoomKey() : nil; }
bool plMaxNodeBase::GetDrawable() { GetMD; return (pMD) ? pMD->GetDrawable() : nil; } bool plMaxNodeBase::GetDrawable() { GetMD; return (pMD) ? pMD->GetDrawable() : false; }
bool plMaxNodeBase::GetPhysical() { GetMD; return (pMD) ? pMD->GetPhysical() : nil; } bool plMaxNodeBase::GetPhysical() { GetMD; return (pMD) ? pMD->GetPhysical() : false; }
bool plMaxNodeBase::GetItinerant() { GetMD; return (pMD) ? pMD->GetItinerant() : nil; } bool plMaxNodeBase::GetItinerant() { GetMD; return (pMD) ? pMD->GetItinerant() : false; }
bool plMaxNodeBase::GetUnBounded() { GetMD; return (pMD) ? pMD->GetUnBounded() : nil; } bool plMaxNodeBase::GetUnBounded() { GetMD; return (pMD) ? pMD->GetUnBounded() : false; }
bool plMaxNodeBase::GetDisableNormal() { GetMD; return (pMD) ? pMD->GetDisableNormal() : nil; } bool plMaxNodeBase::GetDisableNormal() { GetMD; return (pMD) ? pMD->GetDisableNormal() : false; }
uint32_t plMaxNodeBase::GetDecalLevel() { GetMD; return (pMD) ? pMD->GetDecalLevel() : nil; } uint32_t plMaxNodeBase::GetDecalLevel() { GetMD; return (pMD) ? pMD->GetDecalLevel() : 0; }
bool plMaxNodeBase::GetMovable() { GetMD; return (pMD) ? pMD->GetMovable() : nil; } bool plMaxNodeBase::GetMovable() { GetMD; return (pMD) ? pMD->GetMovable() : false; }
bool plMaxNodeBase::GetIsBarney() { GetMD; return (pMD) ? pMD->GetIsBarney() : nil; } bool plMaxNodeBase::GetIsBarney() { GetMD; return (pMD) ? pMD->GetIsBarney() : false; }
bool plMaxNodeBase::GetForceShadow() { GetMD; return (pMD) ? pMD->GetForceShadow() : nil; } bool plMaxNodeBase::GetForceShadow() { GetMD; return (pMD) ? pMD->GetForceShadow() : false; }
bool plMaxNodeBase::GetAlphaTestHigh() { GetMD; return (pMD) ? pMD->GetAlphaTestHigh() : nil; } bool plMaxNodeBase::GetAlphaTestHigh() { GetMD; return (pMD) ? pMD->GetAlphaTestHigh() : false; }
bool plMaxNodeBase::GetFilterInherit() { GetMD; return (pMD) ? pMD->GetFilterInherit() : nil; } bool plMaxNodeBase::GetFilterInherit() { GetMD; return (pMD) ? pMD->GetFilterInherit() : false; }
bool plMaxNodeBase::GetNoShadow() { GetMD; return (pMD) ? pMD->GetNoShadow() : nil; } bool plMaxNodeBase::GetNoShadow() { GetMD; return (pMD) ? pMD->GetNoShadow() : false; }
bool plMaxNodeBase::GetNoSpanSort() { GetMD; return (pMD) ? pMD->GetNoSpanSort() : nil; } bool plMaxNodeBase::GetNoSpanSort() { GetMD; return (pMD) ? pMD->GetNoSpanSort() : false; }
bool plMaxNodeBase::GetNoSpanReSort() { GetMD; return (pMD) ? pMD->GetNoSpanReSort() : nil; } bool plMaxNodeBase::GetNoSpanReSort() { GetMD; return (pMD) ? pMD->GetNoSpanReSort() : false; }
bool plMaxNodeBase::GetNoFaceSort() { GetMD; return (pMD) ? pMD->GetNoFaceSort() : nil; } bool plMaxNodeBase::GetNoFaceSort() { GetMD; return (pMD) ? pMD->GetNoFaceSort() : false; }
bool plMaxNodeBase::GetNoDeferDraw() { GetMD; return (pMD) ? pMD->GetNoDeferDraw() : nil; } bool plMaxNodeBase::GetNoDeferDraw() { GetMD; return (pMD) ? pMD->GetNoDeferDraw() : false; }
bool plMaxNodeBase::GetBlendToFB() { GetMD; return (pMD) ? pMD->GetBlendToFB() : nil; } bool plMaxNodeBase::GetBlendToFB() { GetMD; return (pMD) ? pMD->GetBlendToFB() : false; }
bool plMaxNodeBase::GetForceMaterialCopy() { GetMD; return (pMD) ? pMD->GetForceMaterialCopy() : nil; } bool plMaxNodeBase::GetForceMaterialCopy() { GetMD; return (pMD) ? pMD->GetForceMaterialCopy() : false; }
bool plMaxNodeBase::GetInstanced() { GetMD; return (pMD) ? pMD->GetInstanced() : nil; } bool plMaxNodeBase::GetInstanced() { GetMD; return (pMD) ? pMD->GetInstanced() : false; }
bool plMaxNodeBase::GetParticleRelated() { GetMD; return (pMD) ? pMD->GetParticleRelated() : nil; } bool plMaxNodeBase::GetParticleRelated() { GetMD; return (pMD) ? pMD->GetParticleRelated() : false; }
uint32_t plMaxNodeBase::GetSoundIdxCounter() { GetMD; return (pMD) ? pMD->GetSoundIdxCounter() : 0; } uint32_t plMaxNodeBase::GetSoundIdxCounter() { GetMD; return (pMD) ? pMD->GetSoundIdxCounter() : 0; }
plSceneObject* plMaxNodeBase::GetAvatarSO() { GetMD; return (pMD) ? pMD->GetAvatarSO() : nil; } plSceneObject* plMaxNodeBase::GetAvatarSO() { GetMD; return (pMD) ? pMD->GetAvatarSO() : nil; }
BOOL plMaxNodeBase::HasFade() { GetMD; return (pMD) ? pMD->HasFade() : false; } BOOL plMaxNodeBase::HasFade() { GetMD; return (pMD) ? pMD->HasFade() : false; }

6
Sources/Tools/plFontConverter/plFontConverterProc.cpp
Unescape View File

@ -344,12 +344,12 @@ BOOL CALLBACK ResListWndProc( HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa
case WM_COMMAND: case WM_COMMAND:
if( wParam == IDCANCEL ) if( wParam == IDCANCEL )
EndDialog( hWnd, nil ); EndDialog( hWnd, 0 );
else else
{ {
int idx = SendDlgItemMessage( hWnd, IDC_RESLIST, LB_GETCURSEL, 0, 0 ); int idx = SendDlgItemMessage( hWnd, IDC_RESLIST, LB_GETCURSEL, 0, 0 );
if( idx == LB_ERR ) if( idx == LB_ERR )
EndDialog( hWnd, nil ); EndDialog( hWnd, 0 );
else else
{ {
ResRecord *rec = (ResRecord *)SendDlgItemMessage( hWnd, IDC_RESLIST, LB_GETITEMDATA, idx, 0 ); ResRecord *rec = (ResRecord *)SendDlgItemMessage( hWnd, IDC_RESLIST, LB_GETITEMDATA, idx, 0 );
@ -719,7 +719,7 @@ BOOL CALLBACK WndProc( HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam )
case WM_DROPFILES: case WM_DROPFILES:
{ {
int i, fileCount = DragQueryFile( (HDROP)wParam, -1, nil, nil ); int i, fileCount = DragQueryFile( (HDROP)wParam, -1, nil, 0 );
char path[ MAX_PATH ]; char path[ MAX_PATH ];

2
Sources/Tools/plResBrowser/plResBrowserWndProc.cpp
Unescape View File

@ -375,7 +375,7 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam
case WM_DROPFILES: case WM_DROPFILES:
{ {
int i, j, fileCount = DragQueryFile( (HDROP)wParam, -1, nil, nil ); int i, j, fileCount = DragQueryFile( (HDROP)wParam, -1, nil, 0 );
char path[ MAX_PATH ]; char path[ MAX_PATH ];
plWaitCursor myWaitCursor; plWaitCursor myWaitCursor;

Write Preview
Loading…
Cancel
Save