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/plMessage/plAIMsg.cpp
View File

@ -68,7 +68,7 @@ void plAIMsg::Read(hsStream* stream, hsResMgr* mgr)
{
plMessage::IMsgRead(stream, mgr);
fBrainUserStr = stream->ReadSafeString_TEMP();
fBrainUserStr = stream->ReadSafeString();
}
void plAIMsg::Write(hsStream* stream, hsResMgr* mgr)

6
Sources/Plasma/PubUtilLib/plMessage/plAnimCmdMsg.cpp
View File

@ -86,8 +86,8 @@ void plAnimCmdMsg::Read(hsStream* stream, hsResMgr* mgr)
stream->ReadLE(&fSpeedChangeRate);
stream->ReadLE(&fTime);
fAnimName = stream->ReadSafeString_TEMP();
fLoopName = stream->ReadSafeString_TEMP();
fAnimName = stream->ReadSafeString();
fLoopName = stream->ReadSafeString();
}
void plAnimCmdMsg::Write(hsStream* stream, hsResMgr* mgr)
@ -134,7 +134,7 @@ void plAGCmdMsg::Read(hsStream* stream, hsResMgr* mgr)
stream->ReadLE(&fAmp);
stream->ReadLE(&fAmpRate);
fAnimName = stream->ReadSafeString_TEMP();
fAnimName = stream->ReadSafeString();
}
void plAGCmdMsg::Write(hsStream* stream, hsResMgr* mgr)

4
Sources/Plasma/PubUtilLib/plMessage/plAvatarMsg.cpp
View File

@ -236,7 +236,7 @@ void plAvSeekMsg::Read(hsStream *stream, hsResMgr *mgr)
fDuration = stream->ReadLEScalar();
fSmartSeek = stream->ReadBool();
fAnimName = stream->ReadSafeString_TEMP();
fAnimName = stream->ReadSafeString();
fAlignType = static_cast<plAvAlignment>(stream->ReadLE16());
fNoSeek = stream->ReadBool();
fFlags = stream->ReadByte();
@ -313,7 +313,7 @@ void plAvOneShotMsg::Read(hsStream *stream, hsResMgr *mgr)
{
plAvSeekMsg::Read(stream, mgr);
fAnimName = stream->ReadSafeString_TEMP();
fAnimName = stream->ReadSafeString();
fDrivable = stream->ReadBool();
fReversible = stream->ReadBool();
}

4
Sources/Plasma/PubUtilLib/plMessage/plDynamicTextMsg.cpp
View File

@ -216,7 +216,7 @@ void plDynamicTextMsg::Read( hsStream *s, hsResMgr *mgr )
fClearColor.Read( s );
fColor.Read( s );
fString = s->ReadSafeWString_TEMP();
fString = s->ReadSafeWString();
fImageKey = mgr->ReadKey( s );
s->ReadLE( &fFlags );
@ -301,7 +301,7 @@ void plDynamicTextMsg::ReadVersion(hsStream* s, hsResMgr* mgr)
if (contentFlags.IsBitSet(kDynTextMsgColor))
fColor.Read( s );
if (contentFlags.IsBitSet(kDynTextMsgString))
fString = s->ReadSafeWString_TEMP();
fString = s->ReadSafeWString();
if (contentFlags.IsBitSet(kDynTextMsgImageKey))
fImageKey = mgr->ReadKey( s );
if (contentFlags.IsBitSet(kDynTextMsgFlags))

6
Sources/Plasma/PubUtilLib/plMessage/plInputIfaceMgrMsg.h
View File

@ -102,9 +102,9 @@ class plInputIfaceMgrMsg : public plMessage
plMessage::IMsgRead( s, mgr );
s->ReadLE( &fCommand );
s->ReadLE( &fPageID );
ageName = s->ReadSafeString_TEMP();
ageFileName = s->ReadSafeString_TEMP();
spawnPoint = s->ReadSafeString_TEMP();
ageName = s->ReadSafeString();
ageFileName = s->ReadSafeString();
spawnPoint = s->ReadSafeString();
fAvKey = mgr->ReadKey(s);
}

4
Sources/Plasma/PubUtilLib/plMessage/plLinkToAgeMsg.cpp
View File

@ -79,7 +79,7 @@ void plLinkToAgeMsg::Read(hsStream* stream, hsResMgr* mgr)
plMessage::IMsgRead( stream, mgr );
fFlags = stream->ReadByte();
fAgeLink.Read( stream, mgr );
fLinkInAnimName = stream->ReadSafeString_TEMP();
fLinkInAnimName = stream->ReadSafeString();
}
void plLinkToAgeMsg::Write(hsStream* stream, hsResMgr* mgr)
@ -106,7 +106,7 @@ void plLinkToAgeMsg::ReadVersion(hsStream* s, hsResMgr* mgr)
if ( contentFlags.IsBitSet( kLinkToAgeAgeLinkStruct ) )
fAgeLink.Read( s, mgr );
if ( contentFlags.IsBitSet( kLinkToAgeLinkAnimName ) )
fLinkInAnimName = s->ReadSafeString_TEMP();
fLinkInAnimName = s->ReadSafeString();
}
void plLinkToAgeMsg::WriteVersion(hsStream* s, hsResMgr* mgr)

2
Sources/Plasma/PubUtilLib/plMessage/plLoadAgeMsg.cpp
View File

@ -99,7 +99,7 @@ void plLoadAgeMsg::ReadVersion(hsStream* s, hsResMgr* mgr)
if (contentFlags.IsBitSet(kLoadAgeAgeName))
{
// read agename
fAgeFilename = s->ReadSafeString_TEMP();
fAgeFilename = s->ReadSafeString();
}
if (contentFlags.IsBitSet(kLoadAgeUnload))

4
Sources/Plasma/PubUtilLib/plMessage/plLoadAvatarMsg.cpp
View File

@ -93,7 +93,7 @@ void plLoadAvatarMsg::Read(hsStream* stream, hsResMgr* mgr)
{
fInitialTask = plAvTask::ConvertNoRef(mgr->ReadCreatable(stream));
}
fUserStr = stream->ReadSafeString_TEMP();
fUserStr = stream->ReadSafeString();
}
void plLoadAvatarMsg::Write(hsStream *stream, hsResMgr *mgr)
@ -132,7 +132,7 @@ void plLoadAvatarMsg::ReadVersion(hsStream* stream, hsResMgr* mgr)
fSpawnPoint = mgr->ReadKey(stream);
if (contentFlags.IsBitSet(kLoadAvatarMsgUserStr))
fUserStr = stream->ReadSafeString_TEMP();
fUserStr = stream->ReadSafeString();
}
void plLoadAvatarMsg::WriteVersion(hsStream* stream, hsResMgr* mgr)

2
Sources/Plasma/PubUtilLib/plMessage/plOneShotCallbacks.cpp
View File

@ -74,7 +74,7 @@ void plOneShotCallbacks::Read(hsStream* stream, hsResMgr* mgr)
fCallbacks.reserve(size);
for (int i = 0; i < size; i++)
{
plString marker = stream->ReadSafeString_TEMP();
plString marker = stream->ReadSafeString();
plKey receiver = mgr->ReadKey(stream);
int16_t user = stream->ReadLE16();