OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-18 11:19:10 +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

4
Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIButtonMod.cpp
View File

@ -196,13 +196,13 @@ void pfGUIButtonMod::Read( hsStream *s, hsResMgr *mgr )
uint32_t i, count = s->ReadLE32();
for( i = 0; i < count; i++ )
fAnimationKeys.Append( mgr->ReadKey( s ) );
fAnimName = s->ReadSafeString_TEMP();
fAnimName = s->ReadSafeString();
fMouseOverAnimKeys.Reset();
count = s->ReadLE32();
for( i = 0; i < count; i++ )
fMouseOverAnimKeys.Append( mgr->ReadKey( s ) );
fMouseOverAnimName = s->ReadSafeString_TEMP();
fMouseOverAnimName = s->ReadSafeString();
fNotifyType = s->ReadLE32();
mgr->ReadKeyNotifyMe( s, new plGenRefMsg( GetKey(), plRefMsg::kOnCreate, -1, kRefDraggable ), plRefFlags::kActiveRef );

2
Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUICheckBoxCtrl.cpp
View File

@ -96,7 +96,7 @@ void pfGUICheckBoxCtrl::Read( hsStream *s, hsResMgr *mgr )
for( i = 0; i < count; i++ )
fAnimationKeys.Append( mgr->ReadKey( s ) );
fAnimName = s->ReadSafeString_TEMP();
fAnimName = s->ReadSafeString();
fChecked = s->ReadBool();
}

2
Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIControlMod.cpp
View File

@ -118,7 +118,7 @@ void pfGUIColorScheme::Read( hsStream *s )
fSelBackColor.Read( s );
fTransparent = s->ReadBOOL();
fFontFace = s->ReadSafeString_TEMP();
fFontFace = s->ReadSafeString();
s->ReadLE( &fFontSize );
s->ReadLE( &fFontFlags );
}

2
Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIKnobCtrl.cpp
View File

@ -106,7 +106,7 @@ void pfGUIKnobCtrl::Read( hsStream *s, hsResMgr *mgr )
uint32_t i, count = s->ReadLE32();
for( i = 0; i < count; i++ )
fAnimationKeys.Append( mgr->ReadKey( s ) );
fAnimName = s->ReadSafeString_TEMP();
fAnimName = s->ReadSafeString();
fAnimTimesCalced = false;

4
Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIListElement.cpp
View File

@ -93,7 +93,7 @@ void pfGUIListText::Read( hsStream *s, hsResMgr *mgr )
{
pfGUIListElement::Read( s, mgr );
fText = s->ReadSafeString_TEMP();
fText = s->ReadSafeString();
}
void pfGUIListText::Write( hsStream *s, hsResMgr *mgr )
@ -274,7 +274,7 @@ void pfGUIListTreeRoot::Read( hsStream *s, hsResMgr *mgr )
{
pfGUIListElement::Read( s, mgr );
fText = s->ReadSafeString_TEMP();
fText = s->ReadSafeString();
}
void pfGUIListTreeRoot::Write( hsStream *s, hsResMgr *mgr )

2
Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIProgressCtrl.cpp
View File

@ -108,7 +108,7 @@ void pfGUIProgressCtrl::Read( hsStream *s, hsResMgr *mgr )
uint32_t i, count = s->ReadLE32();
for( i = 0; i < count; i++ )
fAnimationKeys.Append( mgr->ReadKey( s ) );
fAnimName = s->ReadSafeString_TEMP();
fAnimName = s->ReadSafeString();
fAnimTimesCalced = false;
}

2
Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUITextBoxMod.cpp
View File

@ -169,7 +169,7 @@ void pfGUITextBoxMod::Read( hsStream *s, hsResMgr *mgr )
fUseLocalizationPath = s->ReadBool();
if (fUseLocalizationPath)
{
fLocalizationPath = s->ReadSafeWString_TEMP();
fLocalizationPath = s->ReadSafeWString();
}
}

4
Sources/Plasma/FeatureLib/pfMessage/pfBackdoorMsg.h
View File

@ -74,8 +74,8 @@ class pfBackdoorMsg : public plMessage
virtual void Read(hsStream* s, hsResMgr* mgr)
{
plMessage::IMsgRead( s, mgr );
fTarget = s->ReadSafeString_TEMP();
fString = s->ReadSafeString_TEMP();
fTarget = s->ReadSafeString();
fString = s->ReadSafeString();
}
virtual void Write(hsStream* s, hsResMgr* mgr)

2
Sources/Plasma/FeatureLib/pfMessage/pfGameGUIMsg.h
View File

@ -84,7 +84,7 @@ class pfGameGUIMsg : public plMessage
s->Read(sizeof(buffer), buffer);
buffer[GAME_GUI_MSG_STRING_SIZE - 1] = 0;
fString = buffer;
fAge = s->ReadSafeString_TEMP();
fAge = s->ReadSafeString();
}
virtual void Write(hsStream* s, hsResMgr* mgr)

4
Sources/Plasma/FeatureLib/pfMessage/pfKIMsg.h
View File

@ -188,9 +188,9 @@ class pfKIMsg : public plMessage
{
plMessage::IMsgRead( s, mgr );
s->ReadLE( &fCommand );
fUser = s->ReadSafeString_TEMP();
fUser = s->ReadSafeString();
fPlayerID = s->ReadLE32();
fString = s->ReadSafeWString_TEMP();
fString = s->ReadSafeWString();
fFlags = s->ReadLE32();
fDelay = s->ReadLEScalar();
fValue = s->ReadLE32();

2
Sources/Plasma/FeatureLib/pfMessage/pfMovieEventMsg.cpp
View File

@ -49,7 +49,7 @@ void pfMovieEventMsg::Read(hsStream* stream, hsResMgr* mgr)
fReason = (Reason)stream->ReadByte();
fMovieName = stream->ReadSafeString_TEMP();
fMovieName = stream->ReadSafeString();
}
void pfMovieEventMsg::Write(hsStream* stream, hsResMgr* mgr)

2
Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.cpp
View File

@ -2989,7 +2989,7 @@ void plPythonFileMod::Read(hsStream* stream, hsResMgr* mgr)
plMultiModifier::Read(stream, mgr);
// read in the compile python code (pyc)
fPythonFile = stream->ReadSafeString_TEMP();
fPythonFile = stream->ReadSafeString();
// then read in the list of receivers that want to be notified
int nRcvs = stream->ReadLE32();

2
Sources/Plasma/FeatureLib/pfPython/plPythonPack.cpp
View File

@ -148,7 +148,7 @@ bool plPythonPack::Open()
for (int i = 0; i < numFiles; i++)
{
// and pack the index into our own data structure
plString pythonName = fPackStream->ReadSafeString_TEMP();
plString pythonName = fPackStream->ReadSafeString();
uint32_t offset = fPackStream->ReadLE32();
plPackOffsetInfo offsetInfo;