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

Fix some things which got missed from debug builds

Browse Source
This commit is contained in:
Michael Hansen
2012-01-29 17:00:13 -08:00
parent 77a31686da
commit bb0ed04a52
15 changed files with 36 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/Plasma/NucleusLib/pnKeyedObject/hsKeyedObject.cpp
View File

@ -145,7 +145,7 @@ void hsKeyedObject::UnRegisterAsManual(plUoid& inUoid)
#if !HS_BUILD_FOR_UNIX // disable for unix servers
hsAssert(false,
plString::Format("Request to Unregister wrong FixedKey, keyName=%s, inUoid=%s, myUoid=%s",
fpKey->GetName() ? fpKey->GetName() : "?", inUoid.StringIze().c_str(), myUoid.StringIze().c_str()).c_str());
fpKey->GetName().s_str("?"), inUoid.StringIze().c_str(), myUoid.StringIze().c_str()).c_str());
#endif
}
((plKeyImp*)fpKey)->UnRegister();

4
Sources/Plasma/NucleusLib/pnKeyedObject/plKey.h
View File

@ -44,6 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "HeadSpin.h"
#include "plRefFlags.h"
#include "plString.h"
class hsKeyedObject;
class plRefMsg;
@ -55,7 +56,6 @@ class hsBitVector;
class plKeyData;
class plKeyImp;
class plString;
class plKey
{
@ -131,7 +131,7 @@ protected:
#ifdef HS_DEBUGGING
// Debugging info fields
const char* fIDName;
plString fIDName;
const char* fClassType;
#endif

1
Sources/Plasma/NucleusLib/pnKeyedObject/plKeyImp.cpp
View File

@ -81,7 +81,6 @@ plKeyImp::plKeyImp() :
fCloneOwner(nil)
{
#ifdef HS_DEBUGGING
fIDName = nil;
fClassType = nil;
#endif
}

2
Sources/Plasma/NucleusLib/pnKeyedObject/plUoid.cpp
View File

@ -159,7 +159,7 @@ plUoid::~plUoid()
void plUoid::Read(hsStream* s)
{
hsAssert(fObjectName == nil, "Reading over an old uoid? You're just asking for trouble, aren't you?");
hsAssert(fObjectName.IsNull(), "Reading over an old uoid? You're just asking for trouble, aren't you?");
// first read contents flags
uint8_t contents = s->ReadByte();