This commit is contained in:
Steve Checkoway
2006-06-24 00:06:57 +00:00
parent da87f6d956
commit aa2c86ce35
5 changed files with 12 additions and 12 deletions
+1 -1
View File
@@ -10,7 +10,7 @@ class Game;
enum GameController
{
GAME_CONTROLLER_1 = 0, // left controller
GAME_CONTROLLER_2, // right controller
GAME_CONTROLLER_2, // right controller
MAX_GAME_CONTROLLERS, // leave this at the end
GAME_CONTROLLER_INVALID,
};
+7 -7
View File
@@ -204,19 +204,19 @@ void MusicWheel::LoadFromMetrics( RString sType )
ROULETTE_SWITCH_SECONDS .Load(sType,"RouletteSwitchSeconds");
ROULETTE_SLOW_DOWN_SWITCHES .Load(sType,"RouletteSlowDownSwitches");
NUM_SECTION_COLORS .Load(sType,"NumSectionColors");
NUM_SECTION_COLORS .Load(sType,"NumSectionColors");
SONG_REAL_EXTRA_COLOR .Load(sType,"SongRealExtraColor");
SORT_MENU_COLOR .Load(sType,"SortMenuColor");
SHOW_ROULETTE .Load(sType,"ShowRoulette");
SHOW_RANDOM .Load(sType,"ShowRandom");
SHOW_PORTAL .Load(sType,"ShowPortal");
SORT_MENU_COLOR .Load(sType,"SortMenuColor");
SHOW_ROULETTE .Load(sType,"ShowRoulette");
SHOW_RANDOM .Load(sType,"ShowRandom");
SHOW_PORTAL .Load(sType,"ShowPortal");
RANDOM_PICKS_LOCKED_SONGS .Load(sType,"RandomPicksLockedSongs");
MOST_PLAYED_SONGS_TO_SHOW .Load(sType,"MostPlayedSongsToShow");
MODE_MENU_CHOICE_NAMES .Load(sType,"ModeMenuChoiceNames");
vector<RString> vsModeChoiceNames;
split( MODE_MENU_CHOICE_NAMES, ",", vsModeChoiceNames );
CHOICE .Load(sType,CHOICE_NAME,vsModeChoiceNames);
SECTION_COLORS .Load(sType,SECTION_COLORS_NAME,NUM_SECTION_COLORS);
CHOICE .Load(sType,CHOICE_NAME,vsModeChoiceNames);
SECTION_COLORS .Load(sType,SECTION_COLORS_NAME,NUM_SECTION_COLORS);
}
MusicWheel::~MusicWheel()
+2 -2
View File
@@ -270,8 +270,8 @@ void ScoreKeeperNormal::AddScore( TapNoteScore score )
{
case TNS_W1: p = 10; break;
case TNS_W2: p = GAMESTATE->ShowW1()? 9:10; break;
case TNS_W3: p = 5; break;
default: p = 0; break;
case TNS_W3: p = 5; break;
default: p = 0; break;
}
m_iTapNotesHit++;
+1 -1
View File
@@ -25,7 +25,7 @@ public:
bool m_bUsedForHowToPlay; // Can be used for HowToPlay?
/* The name of the style. (This is currently unused.) */
const char *m_szName;
const char *m_szName;
/* Steps format used for each player. For example, "dance versus" reads
* the Steps with the tag "dance-single". */
+1 -1
View File
@@ -9,7 +9,7 @@
struct StyleInput
{
PlayerNumber player;
int col;
int col;
StyleInput() { MakeInvalid(); };
StyleInput( PlayerNumber pn, int c ) { player = pn; col = c; };