diff --git a/Sources/Plasma/FeatureLib/pfPython/plPythonPack.cpp b/Sources/Plasma/FeatureLib/pfPython/plPythonPack.cpp index 42a85a43..025a9ff6 100644 --- a/Sources/Plasma/FeatureLib/pfPython/plPythonPack.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/plPythonPack.cpp @@ -227,7 +227,7 @@ PyObject* plPythonPack::OpenPacked(const plString& fileName) bool plPythonPack::IsPackedFile(const plString& fileName) { if (!Open()) - return nil; + return false; plString pythonName = fileName + ".py"; diff --git a/Sources/Plasma/PubUtilLib/plAudio/plAudioSystem.cpp b/Sources/Plasma/PubUtilLib/plAudio/plAudioSystem.cpp index 564bd825..630f8077 100644 --- a/Sources/Plasma/PubUtilLib/plAudio/plAudioSystem.cpp +++ b/Sources/Plasma/PubUtilLib/plAudio/plAudioSystem.cpp @@ -1247,7 +1247,7 @@ bool plgAudioSys::SupportsEAX(const char *deviceName) { return fSys->SupportsEAX(deviceName); } - return nil; + return false; } void plgAudioSys::RegisterSoftSound( const plKey soundKey ) diff --git a/Sources/Plasma/PubUtilLib/plResMgr/plResManager.cpp b/Sources/Plasma/PubUtilLib/plResMgr/plResManager.cpp index ac6d347f..e2a6ff4e 100644 --- a/Sources/Plasma/PubUtilLib/plResMgr/plResManager.cpp +++ b/Sources/Plasma/PubUtilLib/plResMgr/plResManager.cpp @@ -361,7 +361,7 @@ bool plResManager::IReadObject(plKeyImp* pKey, hsStream *stream) hsAssert(pKey, "Null Key"); if (pKey->GetUoid().GetLoadMask().DontLoad()) - return nil; + return false; hsAssert(pKey->GetStartPos() != uint32_t(-1), "Missing StartPos"); hsAssert(pKey->GetDataLen() != uint32_t(-1), "Missing Data Length"); diff --git a/Sources/Tools/plFontConverter/plFontFreeType.cpp b/Sources/Tools/plFontConverter/plFontFreeType.cpp index 686cb4ec..b2414779 100644 --- a/Sources/Tools/plFontConverter/plFontFreeType.cpp +++ b/Sources/Tools/plFontConverter/plFontFreeType.cpp @@ -221,7 +221,7 @@ bool plFontFreeType::ImportFreeType( const plFileName &fontPath, Options *opt if( ch->fBitmapOff > ( ( fWidth * ( fHeight - ftBitmap->bitmap.rows ) * fBPP ) >> 3 ) ) { hsAssert( false, "Invalid position found in IGetFreeCharData()" ); - return nil; + return false; } // Set these now, since setting them before would've changed the IGetFreeCharData results