mirror of
https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
synced 2025-07-21 12:49:10 +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:
@ -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() );
|
||||
|
Reference in New Issue
Block a user