1
0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-18 03:09:13 +00:00

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

unneeded _TEMP variants.  All safe strings read from hsStreams are
now plStringified :)
This commit is contained in:
2014-01-12 18:39:33 -08:00
parent dceb911f25
commit d7fdf10455
51 changed files with 91 additions and 135 deletions

View File

@ -169,7 +169,7 @@ void plUoid::Read(hsStream* s)
s->LogReadLE(&fClassType, "ClassType");
s->LogReadLE(&fObjectID, "ObjectID");
s->LogSubStreamPushDesc("ObjectName");
fObjectName = s->LogReadSafeString_TEMP();
fObjectName = s->LogReadSafeString();
// conditional cloneIDs read
if (contents & kHasCloneIDs)

View File

@ -1351,7 +1351,7 @@ void proVariableEventData::IWriteNumber(hsStream * stream) {
void proVariableEventData::IRead(hsStream* stream, hsResMgr* mgr)
{
fName = stream->ReadSafeString_TEMP();
fName = stream->ReadSafeString();
fDataType = stream->ReadLE32();
IReadNumber(stream);
fKey = mgr->ReadKey(stream);
@ -1379,7 +1379,7 @@ void proVariableEventData::IReadVersion(hsStream* s, hsResMgr* mgr)
contentFlags.Read(s);
if (contentFlags.IsBitSet(kProVariableName))
fName = s->ReadSafeString_TEMP();
fName = s->ReadSafeString();
if (contentFlags.IsBitSet(kProVariableDataType))
fDataType = s->ReadLE32();
if (contentFlags.IsBitSet(kProVariableNumber))

View File

@ -154,7 +154,7 @@ void plGenericType::Read(hsStream* s)
{
case kString:
case kAny:
fS=s->ReadSafeString_TEMP();
fS=s->ReadSafeString();
break;
case kBool:
{int8_t b;
@ -219,7 +219,7 @@ void plGenericType::Write(hsStream* s)
///////////////////////////////////////////////////
void plGenericVar::Read(hsStream* s)
{
fName = s->ReadSafeString_TEMP();
fName = s->ReadSafeString();
fValue.Read(s);
}