mirror of
https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
synced 2025-07-18 11:19: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:
@ -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 );
|
||||
|
@ -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();
|
||||
}
|
||||
|
||||
|
@ -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 );
|
||||
}
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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 )
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -169,7 +169,7 @@ void pfGUITextBoxMod::Read( hsStream *s, hsResMgr *mgr )
|
||||
fUseLocalizationPath = s->ReadBool();
|
||||
if (fUseLocalizationPath)
|
||||
{
|
||||
fLocalizationPath = s->ReadSafeWString_TEMP();
|
||||
fLocalizationPath = s->ReadSafeWString();
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user