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

hide more

Browse Source
This commit is contained in:
Glenn Maynard
2005-08-12 03:03:54 +00:00
parent 8af1f7003d
commit 2b1b57b81f
4 changed files with 49 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameCommand.cpp
+3 -3
View File
@@ -622,11 +622,11 @@ static HighScore MakeRandomHighScore( float fPercentDP )
hs.SetDateTime( DateTime::GetNowDateTime() ); hs.SetDateTime( DateTime::GetNowDateTime() );
hs.SetPlayerGuid( Profile::MakeGuid() ); hs.SetPlayerGuid( Profile::MakeGuid() );
hs.SetMachineGuid( Profile::MakeGuid() ); hs.SetMachineGuid( Profile::MakeGuid() );
hs.iProductID = rand()%10; hs.SetProductID( rand()%10 );
FOREACH_TapNoteScore( tns ) FOREACH_TapNoteScore( tns )
hs.iTapNoteScores[tns] = rand() % 100; hs.SetTapNoteScore( tns, rand() % 100 );
FOREACH_HoldNoteScore( hns ) FOREACH_HoldNoteScore( hns )
hs.iHoldNoteScores[hns] = rand() % 100; hs.SetHoldNoteScore( hns, rand() % 100 );
FOREACH_RadarCategory( rc ) FOREACH_RadarCategory( rc )
hs.radarValues.m_Values.f[rc] = randomf( 0, 1 ); hs.radarValues.m_Values.f[rc] = randomf( 0, 1 );
stepmania/src/HighScore.cpp
+35 -26
View File
@@ -20,6 +20,9 @@ struct HighScoreImpl
DateTime dateTime; // return value of time() when screenshot was taken DateTime dateTime; // return value of time() when screenshot was taken
CString sPlayerGuid; // who made this high score CString sPlayerGuid; // who made this high score
CString sMachineGuid; // where this high score was made CString sMachineGuid; // where this high score was made
int iProductID;
int iTapNoteScores[NUM_TAP_NOTE_SCORES];
int iHoldNoteScores[NUM_HOLD_NOTE_SCORES];
void Unset(); void Unset();
void AppendChildren( XNode *pNode ) const; void AppendChildren( XNode *pNode ) const;
@@ -41,6 +44,11 @@ bool HighScoreImpl::operator==( const HighScoreImpl& other ) const
COMPARE( dateTime ); COMPARE( dateTime );
COMPARE( sPlayerGuid ); COMPARE( sPlayerGuid );
COMPARE( sMachineGuid ); COMPARE( sMachineGuid );
COMPARE( iProductID );
FOREACH_TapNoteScore( tns )
COMPARE( iTapNoteScores[tns] );
FOREACH_HoldNoteScore( hns )
COMPARE( iHoldNoteScores[hns] );
#undef COMPARE #undef COMPARE
return true; return true;
@@ -57,6 +65,9 @@ void HighScoreImpl::Unset()
dateTime.Init(); dateTime.Init();
sPlayerGuid = ""; sPlayerGuid = "";
sMachineGuid = ""; sMachineGuid = "";
iProductID = 0;
ZERO( iTapNoteScores );
ZERO( iHoldNoteScores );
} }
@@ -71,6 +82,15 @@ void HighScoreImpl::AppendChildren( XNode *pNode ) const
pNode->AppendChild( "DateTime", dateTime ); pNode->AppendChild( "DateTime", dateTime );
pNode->AppendChild( "PlayerGuid", sPlayerGuid ); pNode->AppendChild( "PlayerGuid", sPlayerGuid );
pNode->AppendChild( "MachineGuid", sMachineGuid ); pNode->AppendChild( "MachineGuid", sMachineGuid );
pNode->AppendChild( "ProductID", iProductID );
XNode* pTapNoteScores = pNode->AppendChild( "TapNoteScores" );
FOREACH_TapNoteScore( tns )
if( tns != TNS_NONE ) // HACK: don't save meaningless "none" count
pTapNoteScores->AppendChild( TapNoteScoreToString(tns), iTapNoteScores[tns] );
XNode* pHoldNoteScores = pNode->AppendChild( "HoldNoteScores" );
FOREACH_HoldNoteScore( hns )
if( hns != HNS_NONE ) // HACK: don't save meaningless "none" count
pHoldNoteScores->AppendChild( HoldNoteScoreToString(hns), iHoldNoteScores[hns] );
} }
void HighScoreImpl::LoadFromNode( const XNode *pNode ) void HighScoreImpl::LoadFromNode( const XNode *pNode )
@@ -87,6 +107,15 @@ void HighScoreImpl::LoadFromNode( const XNode *pNode )
pNode->GetChildValue( "DateTime", dateTime ); pNode->GetChildValue( "DateTime", dateTime );
pNode->GetChildValue( "PlayerGuid", sPlayerGuid ); pNode->GetChildValue( "PlayerGuid", sPlayerGuid );
pNode->GetChildValue( "MachineGuid", sMachineGuid ); pNode->GetChildValue( "MachineGuid", sMachineGuid );
pNode->GetChildValue( "ProductID", iProductID );
const XNode* pTapNoteScores = pNode->GetChild( "TapNoteScores" );
if( pTapNoteScores )
FOREACH_TapNoteScore( tns )
pTapNoteScores->GetChildValue( TapNoteScoreToString(tns), iTapNoteScores[tns] );
const XNode* pHoldNoteScores = pNode->GetChild( "HoldNoteScores" );
if( pHoldNoteScores )
FOREACH_HoldNoteScore( hns )
pHoldNoteScores->GetChildValue( HoldNoteScoreToString(hns), iHoldNoteScores[hns] );
/* Validate input. */ /* Validate input. */
grade = clamp( grade, GRADE_TIER01, GRADE_FAILED ); grade = clamp( grade, GRADE_TIER01, GRADE_FAILED );
@@ -103,9 +132,6 @@ HighScore::HighScore()
void HighScore::Unset() void HighScore::Unset()
{ {
m_Impl->Unset(); m_Impl->Unset();
iProductID = 0;
ZERO( iTapNoteScores );
ZERO( iHoldNoteScores );
radarValues.MakeUnknown(); radarValues.MakeUnknown();
fLifeRemainingSeconds = 0; fLifeRemainingSeconds = 0;
} }
@@ -129,6 +155,12 @@ CString HighScore::GetPlayerGuid() const { return m_Impl->sPlayerGuid; }
void HighScore::SetPlayerGuid( CString s ) { m_Impl->sPlayerGuid = s; } void HighScore::SetPlayerGuid( CString s ) { m_Impl->sPlayerGuid = s; }
CString HighScore::GetMachineGuid() const { return m_Impl->sMachineGuid; } CString HighScore::GetMachineGuid() const { return m_Impl->sMachineGuid; }
void HighScore::SetMachineGuid( CString s ) { m_Impl->sMachineGuid = s; } void HighScore::SetMachineGuid( CString s ) { m_Impl->sMachineGuid = s; }
int HighScore::GetProductID() const { return m_Impl->iProductID; }
void HighScore::SetProductID( int i ) { m_Impl->iProductID = i; }
int HighScore::GetTapNoteScore( TapNoteScore tns ) const { return m_Impl->iTapNoteScores[tns]; }
void HighScore::SetTapNoteScore( TapNoteScore tns, int i ) { m_Impl->iTapNoteScores[tns] = i; }
int HighScore::GetHoldNoteScore( HoldNoteScore hns ) const { return m_Impl->iHoldNoteScores[hns]; }
void HighScore::SetHoldNoteScore( HoldNoteScore hns, int i ) { m_Impl->iHoldNoteScores[hns] = i; }
/* We normally don't give direct access to the members. We need this one /* We normally don't give direct access to the members. We need this one
* for NameToFillIn; use a special accessor so it's easy to find where this * for NameToFillIn; use a special accessor so it's easy to find where this
@@ -160,11 +192,6 @@ bool HighScore::operator==( const HighScore& other ) const
if( *m_Impl != *other.m_Impl ) if( *m_Impl != *other.m_Impl )
return false; return false;
#define COMPARE(x) if( x!=other.x ) return false; #define COMPARE(x) if( x!=other.x ) return false;
COMPARE( iProductID );
FOREACH_TapNoteScore( tns )
COMPARE( iTapNoteScores[tns] );
FOREACH_HoldNoteScore( hns )
COMPARE( iHoldNoteScores[hns] );
COMPARE( radarValues ); COMPARE( radarValues );
COMPARE( fLifeRemainingSeconds ); COMPARE( fLifeRemainingSeconds );
#undef COMPARE #undef COMPARE
@@ -178,15 +205,6 @@ XNode* HighScore::CreateNode() const
// TRICKY: Don't write "name to fill in" markers. // TRICKY: Don't write "name to fill in" markers.
m_Impl->AppendChildren( pNode ); m_Impl->AppendChildren( pNode );
pNode->AppendChild( "ProductID", iProductID );
XNode* pTapNoteScores = pNode->AppendChild( "TapNoteScores" );
FOREACH_TapNoteScore( tns )
if( tns != TNS_NONE ) // HACK: don't save meaningless "none" count
pTapNoteScores->AppendChild( TapNoteScoreToString(tns), iTapNoteScores[tns] );
XNode* pHoldNoteScores = pNode->AppendChild( "HoldNoteScores" );
FOREACH_HoldNoteScore( hns )
if( hns != HNS_NONE ) // HACK: don't save meaningless "none" count
pHoldNoteScores->AppendChild( HoldNoteScoreToString(hns), iHoldNoteScores[hns] );
pNode->AppendChild( radarValues.CreateNode() ); pNode->AppendChild( radarValues.CreateNode() );
pNode->AppendChild( "LifeRemainingSeconds", fLifeRemainingSeconds ); pNode->AppendChild( "LifeRemainingSeconds", fLifeRemainingSeconds );
return pNode; return pNode;
@@ -197,15 +215,6 @@ void HighScore::LoadFromNode( const XNode* pNode )
ASSERT( pNode->m_sName == "HighScore" ); ASSERT( pNode->m_sName == "HighScore" );
m_Impl->LoadFromNode( pNode ); m_Impl->LoadFromNode( pNode );
pNode->GetChildValue( "ProductID", iProductID );
const XNode* pTapNoteScores = pNode->GetChild( "TapNoteScores" );
if( pTapNoteScores )
FOREACH_TapNoteScore( tns )
pTapNoteScores->GetChildValue( TapNoteScoreToString(tns), iTapNoteScores[tns] );
const XNode* pHoldNoteScores = pNode->GetChild( "HoldNoteScores" );
if( pHoldNoteScores )
FOREACH_HoldNoteScore( hns )
pHoldNoteScores->GetChildValue( HoldNoteScoreToString(hns), iHoldNoteScores[hns] );
const XNode* pRadarValues = pNode->GetChild( "RadarValues" ); const XNode* pRadarValues = pNode->GetChild( "RadarValues" );
if( pRadarValues ) if( pRadarValues )
radarValues.LoadFromNode( pRadarValues ); radarValues.LoadFromNode( pRadarValues );
stepmania/src/HighScore.h
+6 -3
View File
@@ -36,10 +36,13 @@ struct HighScore
void SetPlayerGuid( CString s ); void SetPlayerGuid( CString s );
CString GetMachineGuid() const; CString GetMachineGuid() const;
void SetMachineGuid( CString s ); void SetMachineGuid( CString s );
int GetProductID() const;
void SetProductID( int i );
int GetTapNoteScore( TapNoteScore tns ) const;
void SetTapNoteScore( TapNoteScore tns, int i );
int GetHoldNoteScore( HoldNoteScore tns ) const;
void SetHoldNoteScore( HoldNoteScore tns, int i );
int iProductID;
int iTapNoteScores[NUM_TAP_NOTE_SCORES];
int iHoldNoteScores[NUM_HOLD_NOTE_SCORES];
RadarValues radarValues; RadarValues radarValues;
float fLifeRemainingSeconds; float fLifeRemainingSeconds;
stepmania/src/ScreenEvaluation.cpp
+5 -3
View File
@@ -905,9 +905,11 @@ void ScreenEvaluation::CommitScores(
hs.SetDateTime( DateTime::GetNowDateTime() ); hs.SetDateTime( DateTime::GetNowDateTime() );
hs.SetPlayerGuid( PROFILEMAN->IsPersistentProfile(p) ? PROFILEMAN->GetProfile(p)->m_sGuid : CString("") ); hs.SetPlayerGuid( PROFILEMAN->IsPersistentProfile(p) ? PROFILEMAN->GetProfile(p)->m_sGuid : CString("") );
hs.SetMachineGuid( PROFILEMAN->GetMachineProfile()->m_sGuid ); hs.SetMachineGuid( PROFILEMAN->GetMachineProfile()->m_sGuid );
hs.iProductID = PREFSMAN->m_iProductID; hs.SetProductID( PREFSMAN->m_iProductID );
memcpy( hs.iTapNoteScores, stageStats.m_player[p].iTapNoteScores, sizeof(hs.iTapNoteScores) ); FOREACH_TapNoteScore( tns )
memcpy( hs.iHoldNoteScores, stageStats.m_player[p].iHoldNoteScores, sizeof(hs.iHoldNoteScores) ); hs.SetTapNoteScore( tns, stageStats.m_player[p].iTapNoteScores[tns] );
FOREACH_HoldNoteScore( hns )
hs.SetHoldNoteScore( hns, stageStats.m_player[p].iHoldNoteScores[hns] );
hs.radarValues = stageStats.m_player[p].radarActual; hs.radarValues = stageStats.m_player[p].radarActual;
hs.fLifeRemainingSeconds = stageStats.m_player[p].fLifeRemainingSeconds; hs.fLifeRemainingSeconds = stageStats.m_player[p].fLifeRemainingSeconds;