make RadarCategory enum and Lua names consistent

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
+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),
* W2 will be used instead. */
int NumTaps = int(radars[RADAR_NUM_TAPS_AND_HOLDS]);
int NumHolds = int(radars[RADAR_NUM_HOLDS]);
int NumRolls = int(radars[RADAR_NUM_ROLLS]);
int NumTaps = int(radars[RadarCategory_TapsAndHolds]);
int NumHolds = int(radars[RadarCategory_Holds]);
int NumRolls = int(radars[RadarCategory_Rolls]);
return
NumTaps*TapNoteScoreToDancePoints(TNS_W1, 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),
* W2 will be used instead. */
int NumTaps = int(radars[RADAR_NUM_TAPS_AND_HOLDS]);
int NumHolds = int(radars[RADAR_NUM_HOLDS]);
int NumRolls = int(radars[RADAR_NUM_ROLLS]);
int NumTaps = int(radars[RadarCategory_TapsAndHolds]);
int NumHolds = int(radars[RadarCategory_Holds]);
int NumRolls = int(radars[RadarCategory_Rolls]);
return
NumTaps*TapNoteScoreToGradePoints(TNS_W1, false)+
NumHolds*HoldNoteScoreToGradePoints(HNS_Held, false) +