diff --git a/Sources/Plasma/NucleusLib/pnKeyedObject/hsKeyedObject.cpp b/Sources/Plasma/NucleusLib/pnKeyedObject/hsKeyedObject.cpp index 5ee68acb..cfdba773 100644 --- a/Sources/Plasma/NucleusLib/pnKeyedObject/hsKeyedObject.cpp +++ b/Sources/Plasma/NucleusLib/pnKeyedObject/hsKeyedObject.cpp @@ -148,8 +148,8 @@ 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().c_str("?"), inUoid.StringIze().c_str(), myUoid.StringIze().c_str()).c_str()); + plFormat("Request to Unregister wrong FixedKey, keyName={}, inUoid={}, myUoid={}", + fpKey->GetName(), inUoid, myUoid).c_str()); #endif } ((plKeyImp*)fpKey)->UnRegister(); diff --git a/Sources/Plasma/PubUtilLib/plModifier/plSDLModifier.cpp b/Sources/Plasma/PubUtilLib/plModifier/plSDLModifier.cpp index 1814273b..ba65e3a0 100644 --- a/Sources/Plasma/PubUtilLib/plModifier/plSDLModifier.cpp +++ b/Sources/Plasma/PubUtilLib/plModifier/plSDLModifier.cpp @@ -178,8 +178,8 @@ void plSDLModifier::SendState(uint32_t sendFlags) { gMooseDump=true; plNetObjectDebugger::GetInstance()->SetDebugging(true); - curState->DumpToObjectDebugger(plString::Format("Object %s SENDS SDL state", - GetStateOwnerKey()->GetName().c_str(), dirtyOnly).c_str()); + curState->DumpToObjectDebugger(plFormat("Object {} SENDS SDL state", + GetStateOwnerKey()->GetName()).c_str(), dirtyOnly); gMooseDump=false; } diff --git a/Sources/Plasma/PubUtilLib/plNetCommon/plSpawnPointInfo.cpp b/Sources/Plasma/PubUtilLib/plNetCommon/plSpawnPointInfo.cpp index 49a0f83a..0bb3f1e0 100644 --- a/Sources/Plasma/PubUtilLib/plNetCommon/plSpawnPointInfo.cpp +++ b/Sources/Plasma/PubUtilLib/plNetCommon/plSpawnPointInfo.cpp @@ -122,8 +122,5 @@ void plSpawnPointInfo::Reset() plString plSpawnPointInfo::AsString() const { - return plString::Format( "t:%s,n:%s,c:%s", - fTitle.c_str("(nil)"), - fSpawnPt.c_str("(nil)"), - fCameraStack.c_str("(nil)") ); + return plFormat("t:{},n:{},c:{}", fTitle, fSpawnPt, fCameraStack); } diff --git a/Sources/Plasma/PubUtilLib/plNetMessage/plNetMessage.cpp b/Sources/Plasma/PubUtilLib/plNetMessage/plNetMessage.cpp index 2d1fd553..27c11713 100644 --- a/Sources/Plasma/PubUtilLib/plNetMessage/plNetMessage.cpp +++ b/Sources/Plasma/PubUtilLib/plNetMessage/plNetMessage.cpp @@ -704,8 +704,8 @@ plString plNetMsgSDLState::AsString() const { ISetDescName(); // set desc name for debug if necessary - return plString::Format("object:%s, initial:%d, %s", - ObjectInfo()->GetObjectName().c_str(), fIsInitialState, plNetMsgStreamedObject::AsString().c_str() ); + return plFormat("object:{}, initial:{}, {}", + ObjectInfo()->GetObjectName(), fIsInitialState, plNetMsgStreamedObject::AsString()); } // diff --git a/Sources/Plasma/PubUtilLib/plSDL/plStateDataRecord.cpp b/Sources/Plasma/PubUtilLib/plSDL/plStateDataRecord.cpp index b670d916..8684c418 100644 --- a/Sources/Plasma/PubUtilLib/plSDL/plStateDataRecord.cpp +++ b/Sources/Plasma/PubUtilLib/plSDL/plStateDataRecord.cpp @@ -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; iWrite(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 diff --git a/Sources/Plasma/PubUtilLib/plSDL/plStateVariable.cpp b/Sources/Plasma/PubUtilLib/plSDL/plStateVariable.cpp index ffaf731f..6b78fbc6 100644 --- a/Sources/Plasma/PubUtilLib/plSDL/plStateVariable.cpp +++ b/Sources/Plasma/PubUtilLib/plSDL/plStateVariable.cpp @@ -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; iWriteString(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