OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-19 11:49:09 +00:00
Code Releases Activity

GCC 5.1 fix: nullptr != false

Browse Source
This commit is contained in:
Michael Hansen
2015-07-01 20:27:32 -07:00
parent 3b103dcb8d
commit 679f2323a1
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/Plasma/FeatureLib/pfPython/plPythonPack.cpp
View File

@ -227,7 +227,7 @@ PyObject* plPythonPack::OpenPacked(const plString& fileName)
bool plPythonPack::IsPackedFile(const plString& fileName) bool plPythonPack::IsPackedFile(const plString& fileName)
{ {
if (!Open()) if (!Open())
return nil; return false;
plString pythonName = fileName + ".py"; plString pythonName = fileName + ".py";

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

@ -1247,7 +1247,7 @@ bool plgAudioSys::SupportsEAX(const char *deviceName)
{ {
return fSys->SupportsEAX(deviceName); return fSys->SupportsEAX(deviceName);
} }
return nil; return false;
} }
void plgAudioSys::RegisterSoftSound( const plKey soundKey ) void plgAudioSys::RegisterSoftSound( const plKey soundKey )

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

@ -361,7 +361,7 @@ bool plResManager::IReadObject(plKeyImp* pKey, hsStream *stream)
hsAssert(pKey, "Null Key"); hsAssert(pKey, "Null Key");
if (pKey->GetUoid().GetLoadMask().DontLoad()) if (pKey->GetUoid().GetLoadMask().DontLoad())
return nil; return false;
hsAssert(pKey->GetStartPos() != uint32_t(-1), "Missing StartPos"); hsAssert(pKey->GetStartPos() != uint32_t(-1), "Missing StartPos");
hsAssert(pKey->GetDataLen() != uint32_t(-1), "Missing Data Length"); hsAssert(pKey->GetDataLen() != uint32_t(-1), "Missing Data Length");

2
Sources/Tools/plFontConverter/plFontFreeType.cpp
View File

@ -221,7 +221,7 @@ bool plFontFreeType::ImportFreeType( const plFileName &fontPath, Options *opt
if( ch->fBitmapOff > ( ( fWidth * ( fHeight - ftBitmap->bitmap.rows ) * fBPP ) >> 3 ) ) if( ch->fBitmapOff > ( ( fWidth * ( fHeight - ftBitmap->bitmap.rows ) * fBPP ) >> 3 ) )
{ {
hsAssert( false, "Invalid position found in IGetFreeCharData()" ); hsAssert( false, "Invalid position found in IGetFreeCharData()" );
return nil; return false;
} }
// Set these now, since setting them before would've changed the IGetFreeCharData results // Set these now, since setting them before would've changed the IGetFreeCharData results