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

make RadarCategory enum and Lua names consistent

Browse Source
This commit is contained in:
Chris Danford
2005-12-24 20:18:56 +00:00
parent 035f20d234
commit 0b98adff15
14 changed files with 71 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameConstantsAndTypes.cpp
+2 -3
View File
@@ -21,7 +21,7 @@ static const CString RadarCategoryNames[] = {
"Air", "Air",
"Freeze", "Freeze",
"Chaos", "Chaos",
"Taps", "TapsAndHolds",
"Jumps", "Jumps",
"Holds", "Holds",
"Mines", "Mines",
@@ -37,8 +37,7 @@ static void LuaRadarCategory(lua_State* L)
FOREACH_RadarCategory( rc ) FOREACH_RadarCategory( rc )
{ {
CString s = RadarCategoryToString( rc ); CString s = RadarCategoryToString( rc );
s.MakeUpper(); LUA->SetGlobal( "RadarCategory_"+s, rc );
LUA->SetGlobal( "RADAR_CATEGORY_"+s, rc );
} }
} }
REGISTER_WITH_LUA_FUNCTION( LuaRadarCategory ); REGISTER_WITH_LUA_FUNCTION( LuaRadarCategory );
stepmania/src/GameConstantsAndTypes.h
+11 -11
View File
@@ -18,17 +18,17 @@ const int MIN_METER = 1;
* in the radar. */ * in the radar. */
enum RadarCategory enum RadarCategory
{ {
RADAR_STREAM = 0, RadarCategory_Stream = 0,
RADAR_VOLTAGE, RadarCategory_Voltage,
RADAR_AIR, RadarCategory_Air,
RADAR_FREEZE, RadarCategory_Freeze,
RADAR_CHAOS, RadarCategory_Chaos,
RADAR_NUM_TAPS_AND_HOLDS, RadarCategory_TapsAndHolds,
RADAR_NUM_JUMPS, RadarCategory_Jumps,
RADAR_NUM_HOLDS, RadarCategory_Holds,
RADAR_NUM_MINES, RadarCategory_Mines,
RADAR_NUM_HANDS, RadarCategory_Hands,
RADAR_NUM_ROLLS, RadarCategory_Rolls,
NUM_RADAR_CATEGORIES // leave this at the end NUM_RADAR_CATEGORIES // leave this at the end
}; };
#define FOREACH_RadarCategory( rc ) FOREACH_ENUM( RadarCategory, NUM_RADAR_CATEGORIES, rc ) #define FOREACH_RadarCategory( rc ) FOREACH_ENUM( RadarCategory, NUM_RADAR_CATEGORIES, rc )
stepmania/src/NoteDataUtil.cpp
+11 -11
View File
@@ -580,17 +580,17 @@ void NoteDataUtil::CalculateRadarValues( const NoteData &in, float fSongSeconds,
{ {
switch( rc ) switch( rc )
{ {
case RADAR_STREAM: out[rc] = GetStreamRadarValue( in, fSongSeconds ); break; case RadarCategory_Stream: out[rc] = GetStreamRadarValue( in, fSongSeconds ); break;
case RADAR_VOLTAGE: out[rc] = GetVoltageRadarValue( in, fSongSeconds ); break; case RadarCategory_Voltage: out[rc] = GetVoltageRadarValue( in, fSongSeconds ); break;
case RADAR_AIR: out[rc] = GetAirRadarValue( in, fSongSeconds ); break; case RadarCategory_Air: out[rc] = GetAirRadarValue( in, fSongSeconds ); break;
case RADAR_FREEZE: out[rc] = GetFreezeRadarValue( in, fSongSeconds ); break; case RadarCategory_Freeze: out[rc] = GetFreezeRadarValue( in, fSongSeconds ); break;
case RADAR_CHAOS: out[rc] = GetChaosRadarValue( in, fSongSeconds ); break; case RadarCategory_Chaos: out[rc] = GetChaosRadarValue( in, fSongSeconds ); break;
case RADAR_NUM_TAPS_AND_HOLDS: out[rc] = (float) in.GetNumRowsWithTapOrHoldHead(); break; case RadarCategory_TapsAndHolds: out[rc] = (float) in.GetNumRowsWithTapOrHoldHead(); break;
case RADAR_NUM_JUMPS: out[rc] = (float) in.GetNumJumps(); break; case RadarCategory_Jumps: out[rc] = (float) in.GetNumJumps(); break;
case RADAR_NUM_HOLDS: out[rc] = (float) in.GetNumHoldNotes(); break; case RadarCategory_Holds: out[rc] = (float) in.GetNumHoldNotes(); break;
case RADAR_NUM_MINES: out[rc] = (float) in.GetNumMines(); break; case RadarCategory_Mines: out[rc] = (float) in.GetNumMines(); break;
case RADAR_NUM_HANDS: out[rc] = (float) in.GetNumHands(); break; case RadarCategory_Hands: out[rc] = (float) in.GetNumHands(); break;
case RADAR_NUM_ROLLS: out[rc] = (float) in.GetNumRolls(); break; case RadarCategory_Rolls: out[rc] = (float) in.GetNumRolls(); break;
default: ASSERT(0); default: ASSERT(0);
} }
} }
stepmania/src/NoteDataWithScoring.cpp
+11 -11
View File
@@ -263,17 +263,17 @@ void NoteDataWithScoring::GetActualRadarValues( const NoteData &in, PlayerNumber
{ {
switch( rc ) switch( rc )
{ {
case RADAR_STREAM: out[rc] = GetActualStreamRadarValue( in, fSongSeconds, pn ); break; case RadarCategory_Stream: out[rc] = GetActualStreamRadarValue( in, fSongSeconds, pn ); break;
case RADAR_VOLTAGE: out[rc] = GetActualVoltageRadarValue( in, fSongSeconds, pn ); break; case RadarCategory_Voltage: out[rc] = GetActualVoltageRadarValue( in, fSongSeconds, pn ); break;
case RADAR_AIR: out[rc] = GetActualAirRadarValue( in, fSongSeconds, pn ); break; case RadarCategory_Air: out[rc] = GetActualAirRadarValue( in, fSongSeconds, pn ); break;
case RADAR_FREEZE: out[rc] = GetActualFreezeRadarValue( in, fSongSeconds, pn ); break; case RadarCategory_Freeze: out[rc] = GetActualFreezeRadarValue( in, fSongSeconds, pn ); break;
case RADAR_CHAOS: out[rc] = GetActualChaosRadarValue( in, fSongSeconds, pn ); break; case RadarCategory_Chaos: out[rc] = GetActualChaosRadarValue( in, fSongSeconds, pn ); break;
case RADAR_NUM_TAPS_AND_HOLDS: out[rc] = (float) GetNumNWithScore( in, TNS_W4, 1 ); break; case RadarCategory_TapsAndHolds: out[rc] = (float) GetNumNWithScore( in, TNS_W4, 1 ); break;
case RADAR_NUM_JUMPS: out[rc] = (float) GetNumNWithScore( in, TNS_W4, 2 ); break; case RadarCategory_Jumps: out[rc] = (float) GetNumNWithScore( in, TNS_W4, 2 ); break;
case RADAR_NUM_HOLDS: out[rc] = (float) GetNumHoldNotesWithScore( in, TapNote::hold_head_hold, HNS_Held ); break; case RadarCategory_Holds: out[rc] = (float) GetNumHoldNotesWithScore( in, TapNote::hold_head_hold, HNS_Held ); break;
case RADAR_NUM_MINES: out[rc] = (float) GetSuccessfulMines( in ); break; case RadarCategory_Mines: out[rc] = (float) GetSuccessfulMines( in ); break;
case RADAR_NUM_HANDS: out[rc] = (float) GetSuccessfulHands( in ); break; case RadarCategory_Hands: out[rc] = (float) GetSuccessfulHands( in ); break;
case RADAR_NUM_ROLLS: out[rc] = (float) GetNumHoldNotesWithScore( in, TapNote::hold_head_roll, HNS_Held ); break; case RadarCategory_Rolls: out[rc] = (float) GetNumHoldNotesWithScore( in, TapNote::hold_head_roll, HNS_Held ); break;
default: ASSERT(0); default: ASSERT(0);
} }
} }
stepmania/src/PaneDisplay.cpp
+6 -6
View File
@@ -152,17 +152,17 @@ void PaneDisplay::SetContent( PaneContents c )
switch( c ) switch( c )
{ {
case COURSE_NUM_STEPS: case COURSE_NUM_STEPS:
case SONG_NUM_STEPS: val = rv[RADAR_NUM_TAPS_AND_HOLDS]; break; case SONG_NUM_STEPS: val = rv[RadarCategory_TapsAndHolds]; break;
case COURSE_JUMPS: case COURSE_JUMPS:
case SONG_JUMPS: val = rv[RADAR_NUM_JUMPS]; break; case SONG_JUMPS: val = rv[RadarCategory_Jumps]; break;
case COURSE_HOLDS: case COURSE_HOLDS:
case SONG_HOLDS: val = rv[RADAR_NUM_HOLDS]; break; case SONG_HOLDS: val = rv[RadarCategory_Holds]; break;
case COURSE_ROLLS: case COURSE_ROLLS:
case SONG_ROLLS: val = rv[RADAR_NUM_ROLLS]; break; case SONG_ROLLS: val = rv[RadarCategory_Rolls]; break;
case COURSE_MINES: case COURSE_MINES:
case SONG_MINES: val = rv[RADAR_NUM_MINES]; break; case SONG_MINES: val = rv[RadarCategory_Mines]; break;
case COURSE_HANDS: case COURSE_HANDS:
case SONG_HANDS: val = rv[RADAR_NUM_HANDS]; break; case SONG_HANDS: val = rv[RadarCategory_Hands]; break;
case SONG_PROFILE_HIGH_SCORE: case SONG_PROFILE_HIGH_SCORE:
val = PROFILEMAN->GetProfile(m_PlayerNumber)->GetStepsHighScoreList(pSong,pSteps).GetTopScore().GetPercentDP(); val = PROFILEMAN->GetProfile(m_PlayerNumber)->GetStepsHighScoreList(pSong,pSteps).GetTopScore().GetPercentDP();
break; break;
stepmania/src/PlayerOptions.cpp
+6 -6
View File
@@ -575,17 +575,17 @@ bool PlayerOptions::IsEasierForSongAndSteps( Song* pSong, Steps* pSteps )
{ {
if( m_fTimeSpacing && pSong->HasSignificantBpmChangesOrStops() ) if( m_fTimeSpacing && pSong->HasSignificantBpmChangesOrStops() )
return true; return true;
if( m_bTransforms[TRANSFORM_NOHOLDS] && pSteps->GetRadarValues()[RADAR_NUM_HOLDS]>0 ) if( m_bTransforms[TRANSFORM_NOHOLDS] && pSteps->GetRadarValues()[RadarCategory_Holds]>0 )
return true; return true;
if( m_bTransforms[TRANSFORM_NOROLLS] && pSteps->GetRadarValues()[RADAR_NUM_ROLLS]>0 ) if( m_bTransforms[TRANSFORM_NOROLLS] && pSteps->GetRadarValues()[RadarCategory_Rolls]>0 )
return true; return true;
if( m_bTransforms[TRANSFORM_NOMINES] && pSteps->GetRadarValues()[RADAR_NUM_MINES]>0 ) if( m_bTransforms[TRANSFORM_NOMINES] && pSteps->GetRadarValues()[RadarCategory_Mines]>0 )
return true; return true;
if( m_bTransforms[TRANSFORM_NOHANDS] && pSteps->GetRadarValues()[RADAR_NUM_HANDS]>0 ) if( m_bTransforms[TRANSFORM_NOHANDS] && pSteps->GetRadarValues()[RadarCategory_Hands]>0 )
return true; return true;
if( m_bTransforms[TRANSFORM_NOQUADS] && pSteps->GetRadarValues()[RADAR_NUM_HANDS]>0 ) if( m_bTransforms[TRANSFORM_NOQUADS] && pSteps->GetRadarValues()[RadarCategory_Hands]>0 )
return true; return true;
if( m_bTransforms[TRANSFORM_NOJUMPS] && pSteps->GetRadarValues()[RADAR_NUM_JUMPS]>0 ) if( m_bTransforms[TRANSFORM_NOJUMPS] && pSteps->GetRadarValues()[RadarCategory_Jumps]>0 )
return true; return true;
if( m_bTransforms[TRANSFORM_NOSTRETCH] ) if( m_bTransforms[TRANSFORM_NOSTRETCH] )
return true; return true;
stepmania/src/RadarValues.cpp
+1 -1
View File
@@ -33,7 +33,7 @@ XNode* RadarValues::CreateNode() const
// TRICKY: Don't print a remainder for the integer values. // TRICKY: Don't print a remainder for the integer values.
FOREACH_RadarCategory( rc ) FOREACH_RadarCategory( rc )
{ {
if( rc >= RADAR_NUM_TAPS_AND_HOLDS ) if( rc >= RadarCategory_TapsAndHolds )
{ {
if( WRITE_SIMPLE_VALUES ) if( WRITE_SIMPLE_VALUES )
pNode->AppendChild( RadarCategoryToString(rc), (int)m_Values.f[rc] ); pNode->AppendChild( RadarCategoryToString(rc), (int)m_Values.f[rc] );
stepmania/src/ScoreKeeperNormal.cpp
+6 -6
View File
@@ -444,9 +444,9 @@ int ScoreKeeperNormal::GetPossibleDancePoints( const RadarValues& radars )
/* Note that, if W1 timing is disabled or not active (not course mode), /* Note that, if W1 timing is disabled or not active (not course mode),
* W2 will be used instead. */ * W2 will be used instead. */
int NumTaps = int(radars[RADAR_NUM_TAPS_AND_HOLDS]); int NumTaps = int(radars[RadarCategory_TapsAndHolds]);
int NumHolds = int(radars[RADAR_NUM_HOLDS]); int NumHolds = int(radars[RadarCategory_Holds]);
int NumRolls = int(radars[RADAR_NUM_ROLLS]); int NumRolls = int(radars[RadarCategory_Rolls]);
return return
NumTaps*TapNoteScoreToDancePoints(TNS_W1, false)+ NumTaps*TapNoteScoreToDancePoints(TNS_W1, false)+
NumHolds*HoldNoteScoreToDancePoints(HNS_Held, false) + NumHolds*HoldNoteScoreToDancePoints(HNS_Held, false) +
@@ -469,9 +469,9 @@ int ScoreKeeperNormal::GetPossibleGradePoints( const RadarValues& radars )
/* Note that, if W1 timing is disabled or not active (not course mode), /* Note that, if W1 timing is disabled or not active (not course mode),
* W2 will be used instead. */ * W2 will be used instead. */
int NumTaps = int(radars[RADAR_NUM_TAPS_AND_HOLDS]); int NumTaps = int(radars[RadarCategory_TapsAndHolds]);
int NumHolds = int(radars[RADAR_NUM_HOLDS]); int NumHolds = int(radars[RadarCategory_Holds]);
int NumRolls = int(radars[RADAR_NUM_ROLLS]); int NumRolls = int(radars[RadarCategory_Rolls]);
return return
NumTaps*TapNoteScoreToGradePoints(TNS_W1, false)+ NumTaps*TapNoteScoreToGradePoints(TNS_W1, false)+
NumHolds*HoldNoteScoreToGradePoints(HNS_Held, false) + NumHolds*HoldNoteScoreToGradePoints(HNS_Held, false) +
stepmania/src/ScreenEvaluation.cpp
+1 -1
View File
@@ -540,7 +540,7 @@ void ScreenEvaluation::Init()
static const int indeces[NUM_StatLine] = static const int indeces[NUM_StatLine] =
{ {
RADAR_NUM_JUMPS, RADAR_NUM_HOLDS, RADAR_NUM_MINES, RADAR_NUM_HANDS, RADAR_NUM_ROLLS RadarCategory_Jumps, RadarCategory_Holds, RadarCategory_Mines, RadarCategory_Hands, RadarCategory_Rolls
}; };
const int ind = indeces[l]; const int ind = indeces[l];
const int iActual = (int) roundf(STATSMAN->m_CurStageStats.m_player[p].radarActual[ind]); const int iActual = (int) roundf(STATSMAN->m_CurStageStats.m_player[p].radarActual[ind]);
stepmania/src/ScreenGameplay.cpp
+2 -2
View File
@@ -2239,8 +2239,8 @@ void ScreenGameplay::SongFinished()
// save any statistics // save any statistics
FOREACH_EnabledPlayerInfo( m_vPlayerInfo, pi ) FOREACH_EnabledPlayerInfo( m_vPlayerInfo, pi )
{ {
/* Note that adding stats is only meaningful for the counters (eg. RADAR_NUM_JUMPS), /* Note that adding stats is only meaningful for the counters (eg. RadarCategory_Jumps),
* not for the percentages (RADAR_AIR). */ * not for the percentages (RadarCategory_Air). */
RadarValues v; RadarValues v;
NoteDataUtil::CalculateRadarValues( pi->m_pPlayer->m_NoteData, GAMESTATE->m_pCurSong->m_fMusicLengthSeconds, v ); NoteDataUtil::CalculateRadarValues( pi->m_pPlayer->m_NoteData, GAMESTATE->m_pCurSong->m_fMusicLengthSeconds, v );
stepmania/src/SongUtil.cpp
+1 -1
View File
@@ -362,7 +362,7 @@ void SongUtil::SortSongPointerArrayByMeter( vector<Song*> &vpSongsInOut, Difficu
s += ssprintf( "%c", (pSteps? pSteps->GetDifficulty():0) + '0' ); s += ssprintf( "%c", (pSteps? pSteps->GetDifficulty():0) + '0' );
if( PREFSMAN->m_bSubSortByNumSteps ) if( PREFSMAN->m_bSubSortByNumSteps )
s += ssprintf("%06.0f",pSteps ? pSteps->GetRadarValues()[RADAR_NUM_TAPS_AND_HOLDS] : 0); s += ssprintf("%06.0f",pSteps ? pSteps->GetRadarValues()[RadarCategory_TapsAndHolds] : 0);
} }
stable_sort( vpSongsInOut.begin(), vpSongsInOut.end(), CompareSongPointersBySortValueAscending ); stable_sort( vpSongsInOut.begin(), vpSongsInOut.end(), CompareSongPointersBySortValueAscending );
} }
stepmania/src/StatsManager.cpp
+9 -9
View File
@@ -42,13 +42,13 @@ static StageStats AccumStageStats( const vector<StageStats>& vss )
if( uNumSongs == 0 ) if( uNumSongs == 0 )
return ssreturn; // don't divide by 0 below return ssreturn; // don't divide by 0 below
/* Scale radar percentages back down to roughly 0..1. Don't scale RADAR_NUM_TAPS_AND_HOLDS /* Scale radar percentages back down to roughly 0..1. Don't scale RadarCategory_TapsAndHolds
* and the rest, which are counters. */ * and the rest, which are counters. */
// FIXME: Weight each song by the number of stages it took to account for // FIXME: Weight each song by the number of stages it took to account for
// long, marathon. // long, marathon.
FOREACH_EnabledPlayer( p ) FOREACH_EnabledPlayer( p )
{ {
for( int r = 0; r < RADAR_NUM_TAPS_AND_HOLDS; r++) for( int r = 0; r < RadarCategory_TapsAndHolds; r++)
{ {
ssreturn.m_player[p].radarPossible[r] /= uNumSongs; ssreturn.m_player[p].radarPossible[r] /= uNumSongs;
ssreturn.m_player[p].radarActual[r] /= uNumSongs; ssreturn.m_player[p].radarActual[r] /= uNumSongs;
@@ -56,7 +56,7 @@ static StageStats AccumStageStats( const vector<StageStats>& vss )
} }
FOREACH_EnabledMultiPlayer( p ) FOREACH_EnabledMultiPlayer( p )
{ {
for( int r = 0; r < RADAR_NUM_TAPS_AND_HOLDS; r++) for( int r = 0; r < RadarCategory_TapsAndHolds; r++)
{ {
ssreturn.m_multiPlayer[p].radarPossible[r] /= uNumSongs; ssreturn.m_multiPlayer[p].radarPossible[r] /= uNumSongs;
ssreturn.m_multiPlayer[p].radarActual[r] /= uNumSongs; ssreturn.m_multiPlayer[p].radarActual[r] /= uNumSongs;
@@ -151,12 +151,12 @@ void StatsManager::CommitStatsToProfiles()
// //
FOREACH_HumanPlayer( pn ) FOREACH_HumanPlayer( pn )
{ {
int iNumTapsAndHolds = (int) m_CurStageStats.m_player[pn].radarActual[RADAR_NUM_TAPS_AND_HOLDS]; int iNumTapsAndHolds = (int) m_CurStageStats.m_player[pn].radarActual[RadarCategory_TapsAndHolds];
int iNumJumps = (int) m_CurStageStats.m_player[pn].radarActual[RADAR_NUM_JUMPS]; int iNumJumps = (int) m_CurStageStats.m_player[pn].radarActual[RadarCategory_Jumps];
int iNumHolds = (int) m_CurStageStats.m_player[pn].radarActual[RADAR_NUM_HOLDS]; int iNumHolds = (int) m_CurStageStats.m_player[pn].radarActual[RadarCategory_Holds];
int iNumRolls = (int) m_CurStageStats.m_player[pn].radarActual[RADAR_NUM_ROLLS]; int iNumRolls = (int) m_CurStageStats.m_player[pn].radarActual[RadarCategory_Rolls];
int iNumMines = (int) m_CurStageStats.m_player[pn].radarActual[RADAR_NUM_MINES]; int iNumMines = (int) m_CurStageStats.m_player[pn].radarActual[RadarCategory_Mines];
int iNumHands = (int) m_CurStageStats.m_player[pn].radarActual[RADAR_NUM_HANDS]; int iNumHands = (int) m_CurStageStats.m_player[pn].radarActual[RadarCategory_Hands];
float fCaloriesBurned = m_CurStageStats.m_player[pn].fCaloriesBurned; float fCaloriesBurned = m_CurStageStats.m_player[pn].fCaloriesBurned;
PROFILEMAN->AddStepTotals( pn, iNumTapsAndHolds, iNumJumps, iNumHolds, iNumRolls, iNumMines, iNumHands, fCaloriesBurned ); PROFILEMAN->AddStepTotals( pn, iNumTapsAndHolds, iNumJumps, iNumHolds, iNumRolls, iNumMines, iNumHands, fCaloriesBurned );
} }
stepmania/src/Steps.cpp
+2 -2
View File
@@ -119,8 +119,8 @@ float Steps::PredictMeter() const
pMeter += DifficultyCoeffs[this->GetDifficulty()]; pMeter += DifficultyCoeffs[this->GetDifficulty()];
// Init non-radar values // Init non-radar values
const float SV = this->GetRadarValues()[RADAR_STREAM] * this->GetRadarValues()[RADAR_VOLTAGE]; const float SV = this->GetRadarValues()[RadarCategory_Stream] * this->GetRadarValues()[RadarCategory_Voltage];
const float ChaosSquare = this->GetRadarValues()[RADAR_CHAOS] * this->GetRadarValues()[RADAR_CHAOS]; const float ChaosSquare = this->GetRadarValues()[RadarCategory_Chaos] * this->GetRadarValues()[RadarCategory_Chaos];
pMeter += -6.35f * SV; pMeter += -6.35f * SV;
pMeter += -2.58f * ChaosSquare; pMeter += -2.58f * ChaosSquare;
if (pMeter < 1) pMeter = 1; if (pMeter < 1) pMeter = 1;
stepmania/src/StepsUtil.cpp
+2 -2
View File
@@ -71,8 +71,8 @@ bool StepsUtil::CompareNotesPointersByRadarValues(const Steps* pSteps1, const St
float fScore1 = 0; float fScore1 = 0;
float fScore2 = 0; float fScore2 = 0;
fScore1 += pSteps1->GetRadarValues()[RADAR_NUM_TAPS_AND_HOLDS]; fScore1 += pSteps1->GetRadarValues()[RadarCategory_TapsAndHolds];
fScore2 += pSteps2->GetRadarValues()[RADAR_NUM_TAPS_AND_HOLDS]; fScore2 += pSteps2->GetRadarValues()[RadarCategory_TapsAndHolds];
return fScore1 < fScore2; return fScore1 < fScore2;
} }