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

Add more temporary hack macros to help speed up conversion and testing

Browse Source
This commit is contained in:
Michael Hansen
2012-01-25 22:43:18 -08:00
parent a1852ad385
commit 442a733fbb
27 changed files with 130 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -143,12 +143,9 @@ void hsKeyedObject::UnRegisterAsManual(plUoid& inUoid)
if (!(inUoid == myUoid))
{
#if !HS_BUILD_FOR_UNIX // disable for unix servers
char inStr[255], myStr[255];
inUoid.StringIze(inStr);
myUoid.StringIze(myStr);
hsAssert(false,
xtl::format("Request to Unregister wrong FixedKey, keyName=%s, inUoid=%s, myUoid=%s",
fpKey->GetName() ? fpKey->GetName() : "?", inStr, myStr).c_str());
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());
#endif
}
((plKeyImp*)fpKey)->UnRegister();

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

@ -118,10 +118,9 @@ hsBool plLocation::IsVirtual() const
}
// THIS SHOULD BE FOR DEBUGGING ONLY <hint hint>
char* plLocation::StringIze(char* str) const // Format to displayable string
plString plLocation::StringIze() const // Format to displayable string
{
sprintf(str, "S0x%xF0x%x", fSequenceNumber, int(fFlags));
return str;
return plString::Format("S0x%xF0x%x", fSequenceNumber, int(fFlags));
}
plLocation plLocation::MakeReserved(UInt32 number)
@ -272,13 +271,12 @@ plUoid& plUoid::operator=(const plUoid& rhs)
}
// THIS SHOULD BE FOR DEBUGGING ONLY <hint hint>
char* plUoid::StringIze(char* str) const // Format to displayable string
plString plUoid::StringIze() const // Format to displayable string
{
sprintf(str, "(0x%x:0x%x:%s:C:[%u,%u])",
return plString::Format("(0x%x:0x%x:%s:C:[%u,%u])",
fLocation.GetSequenceNumber(),
int(fLocation.GetFlags()),
fObjectName,
GetClonePlayerID(),
GetCloneID());
return str;
}

5
Sources/Plasma/NucleusLib/pnKeyedObject/plUoid.h
View File

@ -59,6 +59,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plLoadMask.h"
class hsStream;
class plString;
//// plLocation //////////////////////////////////////////////////////////////
@ -124,7 +125,7 @@ public:
bool operator<(const plLocation& loc ) const { return fSequenceNumber < loc.fSequenceNumber; }
// THIS SHOULD BE FOR DEBUGGING ONLY <hint hint>
char* StringIze(char* str) const; // Format to displayable string. Returns the same string for convenience
plString StringIze() const; // Format to displayable string.
static plLocation MakeReserved(UInt32 number);
static plLocation MakeNormal(UInt32 number);
@ -174,7 +175,7 @@ public:
void SetObjectID(UInt32 id) { fObjectID = id; }
// THIS SHOULD BE FOR DEBUGGING ONLY <hint hint>
char* StringIze(char* str) const; // Format to displayable string
plString StringIze() const; // Format to displayable string
protected:
enum ContentsFlags // for read/write functions