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

8
Sources/Plasma/PubUtilLib/plAvatar/plAGAnim.cpp
View File

@ -217,7 +217,7 @@ void plAGAnim::Read(hsStream *stream, hsResMgr *mgr)
plSynchedObject::Read(stream, mgr);
// read in the name of the animation itself
fName = stream->ReadSafeString_TEMP();
fName = stream->ReadSafeString();
fStart = stream->ReadLEScalar();
fEnd = stream->ReadLEScalar();
@ -412,7 +412,7 @@ void plATCAnim::Read(hsStream *stream, hsResMgr *mgr)
int numMarkers = stream->ReadLE32();
for (i = 0; i < numMarkers; i++)
{
plString name = stream->ReadSafeString_TEMP();
plString name = stream->ReadSafeString();
float time = stream->ReadLEFloat();
fMarkers[name] = time;
}
@ -420,7 +420,7 @@ void plATCAnim::Read(hsStream *stream, hsResMgr *mgr)
int numLoops = stream->ReadLE32();
for (i = 0; i < numLoops; i++)
{
plString name = stream->ReadSafeString_TEMP();
plString name = stream->ReadSafeString();
float begin = stream->ReadLEScalar();
float end = stream->ReadLEScalar();
fLoops[name] = std::pair<float,float>(begin,end);
@ -681,7 +681,7 @@ void plAgeGlobalAnim::Read(hsStream *stream, hsResMgr *mgr)
{
plAGAnim::Read(stream, mgr);
fGlobalVarName = stream->ReadSafeString_TEMP();
fGlobalVarName = stream->ReadSafeString();
}
// Write ---------------------------------------------------

2
Sources/Plasma/PubUtilLib/plAvatar/plAGApplicator.cpp
View File

@ -138,7 +138,7 @@ void plAGApplicator::Read(hsStream *stream, hsResMgr *mgr)
fEnabled = stream->ReadBool();
fChannel = nil; // Whatever is reading this applicator in should know what channel to assign it
fChannelName = stream->ReadSafeString_TEMP();
fChannelName = stream->ReadSafeString();
}
// IGETxI

2
Sources/Plasma/PubUtilLib/plAvatar/plAGChannel.cpp
View File

@ -119,7 +119,7 @@ void plAGChannel::Read(hsStream *stream, hsResMgr *mgr)
{
plCreatable::Read(stream, mgr);
fName = stream->ReadSafeString_TEMP();
fName = stream->ReadSafeString();
}
////////////////////////////////////////////////////////////////////////////////////

2
Sources/Plasma/PubUtilLib/plAvatar/plAGModifier.cpp
View File

@ -269,7 +269,7 @@ void plAGModifier::Read(hsStream *stream, hsResMgr *mgr)
plSingleModifier::Read(stream, mgr);
// read in the name of the modifier
fChannelName = stream->ReadSafeString_TEMP();
fChannelName = stream->ReadSafeString();
}
// WRITE

2
Sources/Plasma/PubUtilLib/plAvatar/plAnimStage.cpp
View File

@ -741,7 +741,7 @@ void plAnimStage::DumpDebug(bool active, int &x, int &y, int lineHeight, plDebug
// READ
void plAnimStage::Read(hsStream *stream, hsResMgr *mgr)
{
fAnimName = stream->ReadSafeString_TEMP();
fAnimName = stream->ReadSafeString();
fNotify = stream->ReadByte();
fForwardType = (ForwardType)stream->ReadLE32();
fBackType = (BackType)stream->ReadLE32();

8
Sources/Plasma/PubUtilLib/plAvatar/plArmatureMod.cpp
View File

@ -1756,7 +1756,7 @@ void plArmatureMod::Read(hsStream * stream, hsResMgr *mgr)
fMeshKeys.push_back(mgr->ReadKey(stream));
// read the root name string
fRootName = stream->ReadSafeString_TEMP();
fRootName = stream->ReadSafeString();
// read in the brains
int nBrains = stream->ReadLE32();
@ -1821,9 +1821,9 @@ void plArmatureMod::Read(hsStream * stream, hsResMgr *mgr)
fPhysHeight = stream->ReadLEFloat();
fPhysWidth = stream->ReadLEFloat();
fAnimationPrefix = stream->ReadSafeString_TEMP();
fBodyAgeName = stream->ReadSafeString_TEMP();
fBodyFootstepSoundPage = stream->ReadSafeString_TEMP();
fAnimationPrefix = stream->ReadSafeString();
fBodyAgeName = stream->ReadSafeString();
fBodyFootstepSoundPage = stream->ReadSafeString();
plgDispatch::Dispatch()->RegisterForExactType(plAvatarStealthModeMsg::Index(), GetKey());
}

12
Sources/Plasma/PubUtilLib/plAvatar/plAvatarClothing.cpp
View File

@ -160,14 +160,14 @@ void plClothingItem::Read(hsStream *s, hsResMgr *mgr)
{
hsKeyedObject::Read(s, mgr);
fName = s->ReadSafeString_TEMP();
fName = s->ReadSafeString();
fGroup = s->ReadByte();
fType = s->ReadByte();
fTileset = s->ReadByte();
fSortOrder = s->ReadByte();
fCustomText = s->ReadSafeString_TEMP();
fDescription = s->ReadSafeString_TEMP();
fCustomText = s->ReadSafeString();
fDescription = s->ReadSafeString();
if (s->ReadBool())
mgr->ReadKeyNotifyMe(s, new plGenRefMsg(GetKey(), plRefMsg::kOnCreate, -1, -1), plRefFlags::kActiveRef); // thumbnail
@ -175,7 +175,7 @@ void plClothingItem::Read(hsStream *s, hsResMgr *mgr)
int i, j;
for (i = 0; i < tileCount; i++)
{
fElementNames.Append(s->ReadSafeString_TEMP());
fElementNames.Append(s->ReadSafeString());
int layerCount = s->ReadByte();
for (j = 0; j < layerCount; j++)
@ -375,10 +375,10 @@ void plClothingBase::Read(hsStream* s, hsResMgr* mgr)
{
hsKeyedObject::Read(s, mgr);
fName = s->ReadSafeString_TEMP();
fName = s->ReadSafeString();
if (s->ReadBool())
mgr->ReadKeyNotifyMe(s, new plGenRefMsg(GetKey(), plRefMsg::kOnCreate, -1, -1), plRefFlags::kActiveRef);
fLayoutName = s->ReadSafeString_TEMP();
fLayoutName = s->ReadSafeString();
}
void plClothingBase::Write(hsStream* s, hsResMgr* mgr)

6
Sources/Plasma/PubUtilLib/plAvatar/plAvatarTasks.cpp
View File

@ -465,7 +465,7 @@ void plAvAnimTask::LeaveAge(plArmatureMod *avatar)
// READ
void plAvAnimTask::Read(hsStream *stream, hsResMgr *mgr)
{
fAnimName = stream->ReadSafeString_TEMP();
fAnimName = stream->ReadSafeString();
fInitialBlend = stream->ReadLEScalar();
fTargetBlend = stream->ReadLEScalar();
fFadeSpeed = stream->ReadLEScalar();
@ -802,8 +802,8 @@ void plAvOneShotLinkTask::Write(hsStream *stream, hsResMgr *mgr)
void plAvOneShotLinkTask::Read(hsStream *stream, hsResMgr *mgr)
{
plAvOneShotTask::Read(stream, mgr);
fAnimName = stream->ReadSafeString_TEMP();
fMarkerName = stream->ReadSafeString_TEMP();
fAnimName = stream->ReadSafeString();
fMarkerName = stream->ReadSafeString();
}
void plAvOneShotLinkTask::SetMarkerName(const plString &name)

2
Sources/Plasma/PubUtilLib/plAvatar/plCoopCoordinator.cpp
View File

@ -398,7 +398,7 @@ void plCoopCoordinator::Read(hsStream *stream, hsResMgr *mgr)
else
fGuestAcceptMsg = nil;
fSynchBone = stream->ReadSafeString_TEMP();
fSynchBone = stream->ReadSafeString();
fAutoStartGuest = stream->ReadBool();
fInitiatorID = fHostBrain->GetInitiatorID();

4
Sources/Plasma/PubUtilLib/plAvatar/plNPCSpawnMod.cpp
View File

@ -128,8 +128,8 @@ void plNPCSpawnMod::Read(hsStream *stream, hsResMgr *mgr)
{
plSingleModifier::Read(stream, mgr);
fModelName = stream->ReadSafeString_TEMP();
fAccountName = stream->ReadSafeString_TEMP();
fModelName = stream->ReadSafeString();
fAccountName = stream->ReadSafeString();
fAutoSpawn = stream->ReadBool();
if(stream->ReadBool())
fNotify = plNotifyMsg::ConvertNoRef(mgr->ReadCreatable(stream));

2
Sources/Plasma/PubUtilLib/plAvatar/plOneShotMod.cpp
View File

@ -154,7 +154,7 @@ void plOneShotMod::Read(hsStream *stream, hsResMgr *mgr)
plMultiModifier::Read(stream, mgr);
// read in the name of the animation itself
fAnimName = stream->ReadSafeString_TEMP();
fAnimName = stream->ReadSafeString();
fSeekDuration = stream->ReadLEScalar();
fDrivable = stream->ReadBool();
fReversable = stream->ReadBool();