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

Convert ReadSafe(W)String* to the plString variants, and remove the now

Browse Source 
unneeded _TEMP variants.  All safe strings read from hsStreams are
now plStringified :)
This commit is contained in:
Michael Hansen
2014-01-12 18:39:33 -08:00
parent dceb911f25
commit d7fdf10455
51 changed files with 91 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -403,7 +403,7 @@ bool plStateDataRecord::ReadStreamHeader(hsStream* s, plString* name, int* versi
return false; // bad version
}
*name = s->ReadSafeString_TEMP();
*name = s->ReadSafeString();
*version = s->ReadLE16();
if (objUoid)

2
Sources/Plasma/PubUtilLib/plSDL/plStateDescriptor.cpp
View File

@ -94,7 +94,7 @@ bool plStateDescriptor::Read(hsStream* s)
IDeInit();
fName = s->ReadSafeString_TEMP();
fName = s->ReadSafeString();
uint16_t version=s->ReadLE16();
fVersion=version;

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

@ -107,7 +107,7 @@ public:
void plStateVarNotificationInfo::Read(hsStream* s, uint32_t readOptions)
{
uint8_t saveFlags=s->ReadByte(); // unused
plString hint=s->ReadSafeString_TEMP();
plString hint=s->ReadSafeString();
if (!hint.IsNull() && !(readOptions & plSDL::kSkipNotificationInfo))
fHintString = hint;
}

6
Sources/Plasma/PubUtilLib/plSDL/plVarDescriptor.cpp
View File

@ -157,7 +157,7 @@ bool plVarDescriptor::Read(hsStream* s)
return false;
}
fName=s->ReadSafeString_TEMP();
fName=s->ReadSafeString();
plMsgStdStringHelper::Peek(fDisplayOptions, s);
@ -165,7 +165,7 @@ bool plVarDescriptor::Read(hsStream* s)
fType=(Type)s->ReadByte();
fDefault = s->ReadSafeString_TEMP();
fDefault = s->ReadSafeString();
fFlags = s->ReadLE32();
return true;
@ -372,7 +372,7 @@ bool plSDVarDescriptor::Read(hsStream* s)
if (!plVarDescriptor::Read(s))
return false;
plString sdName=s->ReadSafeString_TEMP();
plString sdName=s->ReadSafeString();
uint16_t version = s->ReadLE16();
plStateDescriptor* sd=plSDLMgr::GetInstance()->FindDescriptor(sdName, version);
hsAssert( sd, plString::Format("Failed to find sdl descriptor: %s,%d. Missing legacy descriptor?", sdName.c_str(), version ).c_str() );