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

working towards issue 24

Browse Source 
http://ssc.ajworld.net/sm-ssc/bugtracker/view.php?id=24
This commit is contained in:
AJ Kelly
2011-02-15 23:44:36 -06:00
parent 20b539f652
commit 0b13f2f5a5
2 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/GameState.cpp
+16 -2
View File
@@ -1389,8 +1389,6 @@ StageResult GameState::GetStageResult( PlayerNumber pn ) const
return win; return win;
} }
void GameState::GetDefaultPlayerOptions( PlayerOptions &po ) void GameState::GetDefaultPlayerOptions( PlayerOptions &po )
{ {
po.Init(); po.Init();
@@ -1450,6 +1448,22 @@ bool GameState::CurrentOptionsDisqualifyPlayer( PlayerNumber pn )
return po.IsEasierForSongAndSteps( m_pCurSong, m_pCurSteps[pn], pn); return po.IsEasierForSongAndSteps( m_pCurSong, m_pCurSteps[pn], pn);
} }
/*
void GameState::LoadNoteSkinMetrics( PlayerNumber pn )
{
// Read metrics from current noteskin for setting row/col spacing and
// arrow size (originally from StepMania AMX)
if( !IsPlayerEnabled( pn ) )
return;
ASSERT( this->m_pCurSteps[pn] );
RString m_sNoteSkin = m_pPlayerState[pn]->m_PlayerOptions.GetStage().m_sNoteSkin;
RString sStepsType = StringConversion::ToString( this->m_pCurSteps[pn]->m_StepsType );
LOG->Trace("Loading Row/Col/Size values for Noteskin %s | StepsType: %s",m_sNoteSkin.c_str(),sStepsType.c_str());
}
*/
/* reset noteskins (?) /* reset noteskins (?)
* GameState::ResetNoteSkins() * GameState::ResetNoteSkins()
* GameState::ResetNoteSkinsForPlayer( PlayerNumber pn ) * GameState::ResetNoteSkinsForPlayer( PlayerNumber pn )
src/GameState.h
+11 -5
View File
@@ -123,7 +123,6 @@ public:
bool IsCpuPlayer( PlayerNumber pn ) const; bool IsCpuPlayer( PlayerNumber pn ) const;
bool AnyPlayersAreCpu() const; bool AnyPlayersAreCpu() const;
bool IsCourseMode() const; bool IsCourseMode() const;
bool IsBattleMode() const; // not Rave bool IsBattleMode() const; // not Rave
@@ -214,10 +213,17 @@ public:
BroadcastOnChange<bool> m_bGameplayLeadIn; BroadcastOnChange<bool> m_bGameplayLeadIn;
// Metricable noteskin things // Metricable noteskin things
// void LoadNoteSkinMetrics( PlayerNumber pn ); /*
// int m_iRowSpacing; void LoadNoteSkinMetrics( PlayerNumber pn );
// int m_iColSpacing; int m_iNoteSkinColSpacing[NUM_PLAYERS];
// int m_iArrowSize; int m_iNoteSkinArrowSize[NUM_PLAYERS];
*/
// not sure I want to let noteskins change row spacing, as that changes how
// the speed mods work... -aj
//int m_iNoteSkinRowSpacing[NUM_PLAYERS];
// what are these for, exactly? -aj
//bool m_bNoteSkinOverrideDim[NUM_PLAYERS];
//bool m_bNoteSkinOverrideBright[NUM_PLAYERS];
float m_fMusicSecondsVisible; float m_fMusicSecondsVisible;
float m_fSongBeatVisible; float m_fSongBeatVisible;