actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Character -> CharacterID

Browse Source 
add Character DisplayName
This commit is contained in:
Chris Danford
2005-08-14 02:00:27 +00:00
parent c5fa8517dd
commit 23b2cbdd59
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/OptionRowHandler.cpp
+1 -1
View File
@@ -370,7 +370,7 @@ public:
for( unsigned i=0; i<apCharacters.size(); i++ ) for( unsigned i=0; i<apCharacters.size(); i++ )
{ {
Character* pCharacter = apCharacters[i]; Character* pCharacter = apCharacters[i];
CString s = pCharacter->m_sName; CString s = pCharacter->GetDisplayName();
s.MakeUpper(); s.MakeUpper();
defOut.m_vsChoices.push_back( s ); defOut.m_vsChoices.push_back( s );
stepmania/src/Profile.cpp
+10 -10
View File
@@ -77,7 +77,7 @@ int Profile::HighScoresForACourse::GetNumTimesPlayed() const
void Profile::InitEditableData() void Profile::InitEditableData()
{ {
m_sDisplayName = ""; m_sDisplayName = "";
m_sCharacter = ""; m_sCharacterID = "";
m_sLastUsedHighScoreName = ""; m_sLastUsedHighScoreName = "";
m_iWeightPounds = 0; m_iWeightPounds = 0;
} }
@@ -195,7 +195,7 @@ Character *Profile::GetCharacter() const
GAMESTATE->GetCharacters( vpCharacters ); GAMESTATE->GetCharacters( vpCharacters );
FOREACH_CONST( Character*, vpCharacters, c ) FOREACH_CONST( Character*, vpCharacters, c )
{ {
if( (*c)->m_sName.CompareNoCase(m_sCharacter)==0 ) if( (*c)->m_sCharacterID.CompareNoCase(m_sCharacterID)==0 )
return *c; return *c;
} }
return GAMESTATE->GetDefaultCharacter(); return GAMESTATE->GetDefaultCharacter();
@@ -866,7 +866,7 @@ ProfileLoadResult Profile::LoadStatsXmlFromNode( const XNode *xml, bool bIgnoreE
/* These are loaded from Editable, so we usually want to ignore them /* These are loaded from Editable, so we usually want to ignore them
* here. */ * here. */
CString sName = m_sDisplayName; CString sName = m_sDisplayName;
CString sCharacter = m_sCharacter; CString sCharacterID = m_sCharacterID;
CString sLastUsedHighScoreName = m_sLastUsedHighScoreName; CString sLastUsedHighScoreName = m_sLastUsedHighScoreName;
int iWeightPounds = m_iWeightPounds; int iWeightPounds = m_iWeightPounds;
@@ -882,7 +882,7 @@ ProfileLoadResult Profile::LoadStatsXmlFromNode( const XNode *xml, bool bIgnoreE
if( bIgnoreEditable ) if( bIgnoreEditable )
{ {
m_sDisplayName = sName; m_sDisplayName = sName;
m_sCharacter = sCharacter; m_sCharacterID = sCharacterID;
m_sLastUsedHighScoreName = sLastUsedHighScoreName; m_sLastUsedHighScoreName = sLastUsedHighScoreName;
m_iWeightPounds = iWeightPounds; m_iWeightPounds = iWeightPounds;
} }
@@ -969,7 +969,7 @@ void Profile::SaveEditableDataToDir( CString sDir ) const
IniFile ini; IniFile ini;
ini.SetValue( "Editable", "DisplayName", m_sDisplayName ); ini.SetValue( "Editable", "DisplayName", m_sDisplayName );
ini.SetValue( "Editable", "Character", m_sCharacter ); ini.SetValue( "Editable", "CharacterID", m_sCharacterID );
ini.SetValue( "Editable", "LastUsedHighScoreName", m_sLastUsedHighScoreName ); ini.SetValue( "Editable", "LastUsedHighScoreName", m_sLastUsedHighScoreName );
ini.SetValue( "Editable", "WeightPounds", m_iWeightPounds ); ini.SetValue( "Editable", "WeightPounds", m_iWeightPounds );
@@ -985,7 +985,7 @@ XNode* Profile::SaveGeneralDataCreateNode() const
// This data is required by other apps (like internet ranking), but is // This data is required by other apps (like internet ranking), but is
// redundant to the game app. // redundant to the game app.
pGeneralDataNode->AppendChild( "DisplayName", GetDisplayNameOrHighScoreName() ); pGeneralDataNode->AppendChild( "DisplayName", GetDisplayNameOrHighScoreName() );
pGeneralDataNode->AppendChild( "Character", m_sCharacter ); pGeneralDataNode->AppendChild( "CharacterID", m_sCharacterID );
pGeneralDataNode->AppendChild( "LastUsedHighScoreName", m_sLastUsedHighScoreName ); pGeneralDataNode->AppendChild( "LastUsedHighScoreName", m_sLastUsedHighScoreName );
pGeneralDataNode->AppendChild( "WeightPounds", m_iWeightPounds ); pGeneralDataNode->AppendChild( "WeightPounds", m_iWeightPounds );
pGeneralDataNode->AppendChild( "IsMachine", IsMachine() ); pGeneralDataNode->AppendChild( "IsMachine", IsMachine() );
@@ -1126,10 +1126,10 @@ ProfileLoadResult Profile::LoadEditableDataFromDir( CString sDir )
IniFile ini; IniFile ini;
ini.ReadFile( fn ); ini.ReadFile( fn );
ini.GetValue( "Editable", "DisplayName", m_sDisplayName ); ini.GetValue( "Editable", "DisplayName", m_sDisplayName );
ini.GetValue( "Editable", "Character", m_sCharacter ); ini.GetValue( "Editable", "CharacterID", m_sCharacterID );
ini.GetValue( "Editable", "LastUsedHighScoreName", m_sLastUsedHighScoreName ); ini.GetValue( "Editable", "LastUsedHighScoreName", m_sLastUsedHighScoreName );
ini.GetValue( "Editable", "WeightPounds", m_iWeightPounds ); ini.GetValue( "Editable", "WeightPounds", m_iWeightPounds );
// This is data that the user can change, so we have to validate it. // This is data that the user can change, so we have to validate it.
wstring wstr = CStringToWstring(m_sDisplayName); wstring wstr = CStringToWstring(m_sDisplayName);
@@ -1151,7 +1151,7 @@ void Profile::LoadGeneralDataFromNode( const XNode* pNode )
const XNode* pTemp; const XNode* pTemp;
pNode->GetChildValue( "DisplayName", m_sDisplayName ); pNode->GetChildValue( "DisplayName", m_sDisplayName );
pNode->GetChildValue( "Character", m_sCharacter ); pNode->GetChildValue( "CharacterID", m_sCharacterID );
pNode->GetChildValue( "LastUsedHighScoreName", m_sLastUsedHighScoreName ); pNode->GetChildValue( "LastUsedHighScoreName", m_sLastUsedHighScoreName );
pNode->GetChildValue( "WeightPounds", m_iWeightPounds ); pNode->GetChildValue( "WeightPounds", m_iWeightPounds );
pNode->GetChildValue( "Guid", m_sGuid ); pNode->GetChildValue( "Guid", m_sGuid );
stepmania/src/Profile.h
+1 -1
View File
@@ -98,7 +98,7 @@ public:
// Editable data // Editable data
// //
CString m_sDisplayName; CString m_sDisplayName;
CString m_sCharacter; CString m_sCharacterID;
CString m_sLastUsedHighScoreName; // this doesn't really belong in "editable", but we need it in the smaller editable file so that it can be ready quickly. CString m_sLastUsedHighScoreName; // this doesn't really belong in "editable", but we need it in the smaller editable file so that it can be ready quickly.
int m_iWeightPounds; // 0 == not set int m_iWeightPounds; // 0 == not set