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

More plFormat -- some may make minor changes to certain debug output

Browse Source 
(mostly regarding bools)
This commit is contained in:
Michael Hansen
2014-05-24 23:54:00 -07:00
parent 281f95638d
commit 48ca0fde19
6 changed files with 25 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Sources/Plasma/PubUtilLib/plSDL/plStateDataRecord.cpp
View File

@ -277,8 +277,8 @@ bool plStateDataRecord::Read(hsStream* s, float timeConvert, uint32_t readOption
catch(...)
{
hsAssert( false,
plString::Format("Something bad happened while reading simple var data, desc:%s",
fDescriptor ? fDescriptor->GetName().c_str("?") : "?").c_str());
plFormat("Something bad happened while reading simple var data, desc:{}",
fDescriptor ? fDescriptor->GetName() : "?").c_str());
return false;
}
@ -311,8 +311,8 @@ bool plStateDataRecord::Read(hsStream* s, float timeConvert, uint32_t readOption
catch(...)
{
hsAssert( false,
plString::Format("Something bad happened while reading nested var data, desc:%s",
fDescriptor ? fDescriptor->GetName().c_str("?") : "?").c_str());
plFormat("Something bad happened while reading nested var data, desc:{}",
fDescriptor ? fDescriptor->GetName() : "?").c_str());
return false;
}
@ -745,8 +745,8 @@ void plStateDataRecord::DumpToObjectDebugger(const char* msg, bool dirtyOnly, in
if (msg)
dbg->LogMsg(plFormat("{}{}", pad, msg).c_str());
dbg->LogMsg(plString::Format("%sSDR(%p), desc=%s, showDirty=%d, numVars=%d, vol=%d",
pad.c_str(), this, fDescriptor->GetName().c_str(), dirtyOnly, numVars+numSDVars, fFlags&kVolatile).c_str());
dbg->LogMsg(plFormat("{}SDR(0x{x}), desc={}, showDirty={}, numVars={}, vol={}",
pad, (uintptr_t)this, fDescriptor->GetName(), dirtyOnly, numVars+numSDVars, fFlags&kVolatile).c_str());
// dump simple vars
for (size_t i=0; i<fVarsList.size(); i++)
@ -783,8 +783,8 @@ void plStateDataRecord::DumpToStream(hsStream* stream, const char* msg, bool dir
stream->Write(logStr.GetSize(), logStr.c_str());
}
logStr = plString::Format("%sSDR(%p), desc=%s, showDirty=%d, numVars=%d, vol=%d",
pad.c_str(), this, fDescriptor->GetName().c_str(), dirtyOnly, numVars+numSDVars, fFlags&kVolatile);
logStr = plFormat("{}SDR(0x{x}), desc={}, showDirty={}, numVars={}, vol={}",
pad, (uintptr_t)this, fDescriptor->GetName(), dirtyOnly, numVars+numSDVars, fFlags&kVolatile);
stream->Write(logStr.GetSize(), logStr.c_str());
// dump simple vars

20
Sources/Plasma/PubUtilLib/plSDL/plStateVariable.cpp
View File

@ -209,8 +209,8 @@ void plSimpleStateVariable::IDeAlloc()
}
break;
default:
hsAssert(false, plString::Format("undefined atomic type:%d var:%s cnt:%d",
type, GetName().c_str("?"), GetCount()).c_str());
hsAssert(false, plFormat("undefined atomic type:{} var:{} cnt:{}",
type, GetName(), GetCount()).c_str());
break;
};
@ -2305,7 +2305,7 @@ void plSimpleStateVariable::DumpToObjectDebugger(bool dirtyOnly, int level) cons
}
if ( !dirtyOnly )
logMsg += plString::Format( " dirty:%d", IsDirty() );
logMsg += plFormat(" dirty:{}", IsDirty());
dbg->LogMsg(logMsg.c_str());
logMsg = "";
@ -2340,7 +2340,7 @@ void plSimpleStateVariable::DumpToStream(hsStream* stream, bool dirtyOnly, int l
}
if ( !dirtyOnly )
logMsg += plString::Format( " dirty:%d", IsDirty() );
logMsg += plFormat(" dirty:{}", IsDirty());
stream->WriteString(logMsg);
logMsg = "";
@ -2479,8 +2479,8 @@ void plSDStateVariable::CopyFrom(plSDStateVariable* other, uint32_t writeOptions
void plSDStateVariable::UpdateFrom(plSDStateVariable* other, uint32_t writeOptions/*=0*/)
{
hsAssert(!other->GetSDVarDescriptor()->GetName().CompareI(fVarDescriptor->GetName()),
plString::Format("var descriptor mismatch in UpdateFrom, name %s,%s ver %d,%d",
GetName().c_str(), other->GetName().c_str()).c_str());
plFormat("var descriptor mismatch in UpdateFrom, name {},{}",
GetName(), other->GetName()).c_str());
Resize(other->GetCount()); // make sure sizes match
bool dirtyOnly = (writeOptions & plSDL::kDirtyOnly);
@ -2673,8 +2673,8 @@ void plSDStateVariable::DumpToObjectDebugger(bool dirtyOnly, int level) const
plString pad = plString::Fill(level * 3, ' ');
int cnt = dirtyOnly ? GetDirtyCount() : GetUsedCount();
dbg->LogMsg(plString::Format( "%sSDVar, name:%s dirtyOnly:%d count:%d",
pad.c_str(), GetName().c_str(), dirtyOnly, cnt).c_str());
dbg->LogMsg(plFormat("{}SDVar, name:{} dirtyOnly:{} count:{}",
pad, GetName(), dirtyOnly, cnt).c_str());
for (size_t i=0; i<GetCount(); i++)
{
@ -2694,8 +2694,8 @@ void plSDStateVariable::DumpToStream(hsStream* stream, bool dirtyOnly, int level
pad += " ";
int cnt = dirtyOnly ? GetDirtyCount() : GetUsedCount();
stream->WriteString(plString::Format( "%sSDVar, name:%s dirtyOnly:%d count:%d",
pad.c_str(), GetName().c_str(), dirtyOnly, cnt));
stream->WriteString(plFormat("{}SDVar, name:{} dirtyOnly:{} count:{}",
pad, GetName(), dirtyOnly, cnt));
for(i=0;i<GetCount();i++)
{