From 38a10900eb057b2a2f92370197936438007925b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1ty=C3=A1s=20Mustoha?= Date: Sat, 30 Mar 2024 19:04:20 +0100 Subject: [PATCH] Removed string and bool support from the old MI_SelectField --- src/common/ui/MI_SelectField.cpp | 15 +- src/common/ui/MI_SelectField.h | 23 +- src/smw/menu/MatchSelectionMenu.cpp | 38 +- src/smw/menu/ModeOptionsMenu.cpp | 916 +++++++++--------- src/smw/menu/options/EyeCandyOptionsMenu.cpp | 34 +- src/smw/menu/options/GameplayOptionsMenu.cpp | 160 +-- src/smw/menu/options/GraphicsOptionsMenu.cpp | 56 +- src/smw/menu/options/PowerupSettingsMenu.cpp | 76 +- src/smw/menu/options/ProjectileLimitsMenu.cpp | 216 ++--- .../menu/options/ProjectileOptionsMenu.cpp | 248 ++--- src/smw/menu/options/SoundOptionsMenu.cpp | 38 +- src/smw/menu/options/TeamOptionsMenu.cpp | 24 +- src/smw/menu/xbox/ScreenSettingsMenu.cpp | 30 +- src/smw/ui/MI_FrenzyModeOptions.cpp | 42 +- src/smw/ui/MI_InputControlContainer.cpp | 2 +- src/smw/ui/MI_PowerupSelection.cpp | 42 +- src/worldeditor/worldeditor.cpp | 38 +- 17 files changed, 990 insertions(+), 1008 deletions(-) diff --git a/src/common/ui/MI_SelectField.cpp b/src/common/ui/MI_SelectField.cpp index b5f9cc0a7..b70462535 100644 --- a/src/common/ui/MI_SelectField.cpp +++ b/src/common/ui/MI_SelectField.cpp @@ -114,9 +114,14 @@ bool MI_SelectField::SetIndex(unsigned short index) return true; } -void MI_SelectField::Add(std::string name, short ivalue, std::string svalue, bool fvalue, bool fhidden, bool fGoodRandom, short iIconOverride) +void MI_SelectField::Add(std::string name, short ivalue) { - SF_ListItem * item = new SF_ListItem(name, ivalue, svalue, fvalue, fhidden, iIconOverride); + Add(std::move(name), ivalue, false); +} + +void MI_SelectField::Add(std::string name, short ivalue, bool fhidden, bool fGoodRandom, short iIconOverride) +{ + SF_ListItem * item = new SF_ListItem(name, ivalue, fhidden, iIconOverride); items.push_back(item); if (fGoodRandom) @@ -306,12 +311,6 @@ void MI_SelectField::SetValues() { if (iValue) *iValue = (*current)->iValue; - - if (sValue) - *sValue = (*current)->sValue; - - if (fValue) - *fValue = (*current)->fValue; } bool MI_SelectField::MoveNext() diff --git a/src/common/ui/MI_SelectField.h b/src/common/ui/MI_SelectField.h index 5e57b736a..59099dd17 100644 --- a/src/common/ui/MI_SelectField.h +++ b/src/common/ui/MI_SelectField.h @@ -18,31 +18,21 @@ class SF_ListItem public: SF_ListItem() { sName = ""; - iValue = 0; - sValue = ""; - fValue = false; fHidden = false; iIconOverride = -1; } - SF_ListItem(std::string sname, short ivalue, std::string svalue, bool fvalue, bool fhidden, short iiconoverride) { + SF_ListItem(std::string sname, short ivalue, bool fhidden, short iiconoverride) { sName = sname; - iValue = ivalue; - sValue = svalue; - fValue = fvalue; fHidden = fhidden; iIconOverride = iiconoverride; } SF_ListItem(const SF_ListItem& other) { sName = other.sName; - iValue = other.iValue; - sValue = other.sValue; - fValue = other.fValue; - fHidden = other.fHidden; iIconOverride = other.iIconOverride; } @@ -50,13 +40,8 @@ class SF_ListItem ~SF_ListItem() {} std::string sName; //Display name - short iValue; //int data - std::string sValue; //string data - bool fValue; //bool data for toggle controls - bool fHidden; - short iIconOverride; }; @@ -82,9 +67,6 @@ class MI_SelectField : public UI_Control short GetShortValue() { return (*current)->iValue; } - std::string GetStringValue() { - return (*current)->sValue; - } //Gets a random value, but does not set the control to that value short GetRandomShortValue() { @@ -104,7 +86,8 @@ class MI_SelectField : public UI_Control MenuCodeEnum Modify(bool modify); //Adds an item to the list - void Add(std::string name, short ivalue, std::string svalue, bool fvalue, bool fhidden, bool fGoodRandom = true, short iIconOverride = -1); + void Add(std::string name, short ivalue); + void Add(std::string name, short ivalue, bool fhidden, bool fGoodRandom = true, short iIconOverride = -1); void Clear() { items.clear(); } diff --git a/src/smw/menu/MatchSelectionMenu.cpp b/src/smw/menu/MatchSelectionMenu.cpp index 047da826b..0b7885198 100644 --- a/src/smw/menu/MatchSelectionMenu.cpp +++ b/src/smw/menu/MatchSelectionMenu.cpp @@ -23,25 +23,25 @@ UI_MatchSelectionMenu::UI_MatchSelectionMenu() miMatchSelectionStartButton->SetCode(MENU_CODE_MATCH_SELECTION_START); miMatchSelectionField = new MI_SelectField(&rm->spr_selectfield, 130, 340, "Match", 380, 100); - miMatchSelectionField->Add("Single Game", MATCH_TYPE_SINGLE_GAME, "", false, false); - miMatchSelectionField->Add("Tournament", MATCH_TYPE_TOURNAMENT, "", false, false); - miMatchSelectionField->Add("Tour", MATCH_TYPE_TOUR, "", false, false); - miMatchSelectionField->Add("World", MATCH_TYPE_WORLD, "", false, false); - miMatchSelectionField->Add("Minigame", MATCH_TYPE_MINIGAME, "", false, false); + miMatchSelectionField->Add("Single Game", MATCH_TYPE_SINGLE_GAME); + miMatchSelectionField->Add("Tournament", MATCH_TYPE_TOURNAMENT); + miMatchSelectionField->Add("Tour", MATCH_TYPE_TOUR); + miMatchSelectionField->Add("World", MATCH_TYPE_WORLD); + miMatchSelectionField->Add("Minigame", MATCH_TYPE_MINIGAME); miMatchSelectionField->SetData(&game_values.matchtype, NULL, NULL); miMatchSelectionField->SetKey(game_values.matchtype); miMatchSelectionField->SetItemChangedCode(MENU_CODE_MATCH_SELECTION_MATCH_CHANGED); miTournamentField = new MI_SelectField(&rm->spr_selectfield, 130, 380, "Wins", 380, 100); - miTournamentField->Add("2", 2, "", false, false); - miTournamentField->Add("3", 3, "", false, false); - miTournamentField->Add("4", 4, "", false, false); - miTournamentField->Add("5", 5, "", false, false); - miTournamentField->Add("6", 6, "", false, false); - miTournamentField->Add("7", 7, "", false, false); - miTournamentField->Add("8", 8, "", false, false); - miTournamentField->Add("9", 9, "", false, false); - miTournamentField->Add("10", 10, "", false, false); + miTournamentField->Add("2", 2); + miTournamentField->Add("3", 3); + miTournamentField->Add("4", 4); + miTournamentField->Add("5", 5); + miTournamentField->Add("6", 6); + miTournamentField->Add("7", 7); + miTournamentField->Add("8", 8); + miTournamentField->Add("9", 9); + miTournamentField->Add("10", 10); miTournamentField->SetData(&game_values.tournamentgames, NULL, NULL); miTournamentField->SetKey(game_values.tournamentgames); miTournamentField->Show(false); @@ -67,11 +67,11 @@ UI_MatchSelectionMenu::UI_MatchSelectionMenu() miWorldField->Show(false); miMinigameField = new MI_SelectField(&rm->spr_selectfield, 130, 380, "Game", 380, 100); - miMinigameField->Add("Pipe Coin Game", 0, "", false, false); - miMinigameField->Add("Hammer Boss Game", 1, "", false, false); - miMinigameField->Add("Bomb Boss Game", 2, "", false, false); - miMinigameField->Add("Fire Boss Game", 3, "", false, false); - miMinigameField->Add("Boxes Game", 4, "", false, false); + miMinigameField->Add("Pipe Coin Game", 0); + miMinigameField->Add("Hammer Boss Game", 1); + miMinigameField->Add("Bomb Boss Game", 2); + miMinigameField->Add("Fire Boss Game", 3); + miMinigameField->Add("Boxes Game", 4); miMinigameField->SetData(&game_values.selectedminigame, NULL, NULL); miMinigameField->SetKey(game_values.selectedminigame); miMinigameField->Show(false); diff --git a/src/smw/menu/ModeOptionsMenu.cpp b/src/smw/menu/ModeOptionsMenu.cpp index df09a0a08..8ba24f85a 100644 --- a/src/smw/menu/ModeOptionsMenu.cpp +++ b/src/smw/menu/ModeOptionsMenu.cpp @@ -22,14 +22,14 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() //*********************** miClassicModeStyleField = new MI_SelectField(&rm->spr_selectfield, 120, 200, "On Kill", 400, 180); - miClassicModeStyleField->Add("Respawn", 0, "", false, false); - miClassicModeStyleField->Add("Shield", 1, "", false, false); + miClassicModeStyleField->Add("Respawn", 0); + miClassicModeStyleField->Add("Shield", 1); miClassicModeStyleField->SetData(&game_values.gamemodemenusettings.classic.style, NULL, NULL); miClassicModeStyleField->SetKey(game_values.gamemodemenusettings.classic.style); miClassicModeScoringField = new MI_SelectField(&rm->spr_selectfield, 120, 240, "Scoring", 400, 180); - miClassicModeScoringField->Add("All Kills", 0, "", false, false); - miClassicModeScoringField->Add("Push Kills Only", 1, "", false, false, false); + miClassicModeScoringField->Add("All Kills", 0); + miClassicModeScoringField->Add("Push Kills Only", 1, false, false); miClassicModeScoringField->SetData(&game_values.gamemodemenusettings.classic.scoring, NULL, NULL); miClassicModeScoringField->SetKey(game_values.gamemodemenusettings.classic.scoring); @@ -57,14 +57,14 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() //*********************** miFragModeStyleField = new MI_SelectField(&rm->spr_selectfield, 120, 200, "On Kill", 400, 180); - miFragModeStyleField->Add("Respawn", 0, "", false, false); - miFragModeStyleField->Add("Shield", 1, "", false, false); + miFragModeStyleField->Add("Respawn", 0); + miFragModeStyleField->Add("Shield", 1); miFragModeStyleField->SetData(&game_values.gamemodemenusettings.frag.style, NULL, NULL); miFragModeStyleField->SetKey(game_values.gamemodemenusettings.frag.style); miFragModeScoringField = new MI_SelectField(&rm->spr_selectfield, 120, 240, "Scoring", 400, 180); - miFragModeScoringField->Add("All Kills", 0, "", false, false); - miFragModeScoringField->Add("Push Kills Only", 1, "", false, false, false); + miFragModeScoringField->Add("All Kills", 0); + miFragModeScoringField->Add("Push Kills Only", 1, false, false); miFragModeScoringField->SetData(&game_values.gamemodemenusettings.frag.scoring, NULL, NULL); miFragModeScoringField->SetKey(game_values.gamemodemenusettings.frag.scoring); @@ -92,39 +92,39 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() //*********************** miTimeLimitModeStyleField = new MI_SelectField(&rm->spr_selectfield, 120, 180, "On Kill", 400, 150); - miTimeLimitModeStyleField->Add("Respawn", 0, "", false, false); - miTimeLimitModeStyleField->Add("Shield", 1, "", false, false); + miTimeLimitModeStyleField->Add("Respawn", 0); + miTimeLimitModeStyleField->Add("Shield", 1); miTimeLimitModeStyleField->SetData(&game_values.gamemodemenusettings.time.style, NULL, NULL); miTimeLimitModeStyleField->SetKey(game_values.gamemodemenusettings.time.style); miTimeLimitModeScoringField = new MI_SelectField(&rm->spr_selectfield, 120, 220, "Scoring", 400, 150); - miTimeLimitModeScoringField->Add("All Kills", 0, "", false, false); - miTimeLimitModeScoringField->Add("Push Kills Only", 1, "", false, false, false); + miTimeLimitModeScoringField->Add("All Kills", 0); + miTimeLimitModeScoringField->Add("Push Kills Only", 1, false, false); miTimeLimitModeScoringField->SetData(&game_values.gamemodemenusettings.time.scoring, NULL, NULL); miTimeLimitModeScoringField->SetKey(game_values.gamemodemenusettings.time.scoring); miTimeLimitModePercentExtraTime = new MI_SliderField(&rm->spr_selectfield, &rm->menu_slider_bar, 120, 260, "Extra Time", 400, 150, 384); - miTimeLimitModePercentExtraTime->Add("0", 0, "", false, false, false); - miTimeLimitModePercentExtraTime->Add("5", 5, "", false, false, false); - miTimeLimitModePercentExtraTime->Add("10", 10, "", false, false); - miTimeLimitModePercentExtraTime->Add("15", 15, "", false, false); - miTimeLimitModePercentExtraTime->Add("20", 20, "", false, false); - miTimeLimitModePercentExtraTime->Add("25", 25, "", false, false); - miTimeLimitModePercentExtraTime->Add("30", 30, "", false, false); - miTimeLimitModePercentExtraTime->Add("35", 35, "", false, false); - miTimeLimitModePercentExtraTime->Add("40", 40, "", false, false); - miTimeLimitModePercentExtraTime->Add("45", 45, "", false, false); - miTimeLimitModePercentExtraTime->Add("50", 50, "", false, false); - miTimeLimitModePercentExtraTime->Add("55", 55, "", false, false, false); - miTimeLimitModePercentExtraTime->Add("60", 60, "", false, false, false); - miTimeLimitModePercentExtraTime->Add("65", 65, "", false, false, false); - miTimeLimitModePercentExtraTime->Add("70", 70, "", false, false, false); - miTimeLimitModePercentExtraTime->Add("75", 75, "", false, false, false); - miTimeLimitModePercentExtraTime->Add("80", 80, "", false, false, false); - miTimeLimitModePercentExtraTime->Add("85", 85, "", false, false, false); - miTimeLimitModePercentExtraTime->Add("90", 90, "", false, false, false); - miTimeLimitModePercentExtraTime->Add("95", 95, "", false, false, false); - miTimeLimitModePercentExtraTime->Add("100", 100, "", false, false, false); + miTimeLimitModePercentExtraTime->Add("0", 0, false, false); + miTimeLimitModePercentExtraTime->Add("5", 5, false, false); + miTimeLimitModePercentExtraTime->Add("10", 10); + miTimeLimitModePercentExtraTime->Add("15", 15); + miTimeLimitModePercentExtraTime->Add("20", 20); + miTimeLimitModePercentExtraTime->Add("25", 25); + miTimeLimitModePercentExtraTime->Add("30", 30); + miTimeLimitModePercentExtraTime->Add("35", 35); + miTimeLimitModePercentExtraTime->Add("40", 40); + miTimeLimitModePercentExtraTime->Add("45", 45); + miTimeLimitModePercentExtraTime->Add("50", 50); + miTimeLimitModePercentExtraTime->Add("55", 55, false, false); + miTimeLimitModePercentExtraTime->Add("60", 60, false, false); + miTimeLimitModePercentExtraTime->Add("65", 65, false, false); + miTimeLimitModePercentExtraTime->Add("70", 70, false, false); + miTimeLimitModePercentExtraTime->Add("75", 75, false, false); + miTimeLimitModePercentExtraTime->Add("80", 80, false, false); + miTimeLimitModePercentExtraTime->Add("85", 85, false, false); + miTimeLimitModePercentExtraTime->Add("90", 90, false, false); + miTimeLimitModePercentExtraTime->Add("95", 95, false, false); + miTimeLimitModePercentExtraTime->Add("100", 100, false, false); miTimeLimitModePercentExtraTime->SetData(&game_values.gamemodemenusettings.time.percentextratime, NULL, NULL); miTimeLimitModePercentExtraTime->SetKey(game_values.gamemodemenusettings.time.percentextratime); miTimeLimitModePercentExtraTime->SetNoWrap(true); @@ -154,26 +154,26 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() //*********************** miJailModeStyleField = new MI_SelectField(&rm->spr_selectfield, 120, 160, "Style", 400, 150); - miJailModeStyleField->Add("Classic", 0, "", false, false); + miJailModeStyleField->Add("Classic", 0); miJailModeStyleField->Add("Owned", 1, "", true, false); miJailModeStyleField->Add("Free For All", 2, "", true, false); miJailModeStyleField->SetData(&game_values.gamemodemenusettings.jail.style, NULL, NULL); miJailModeStyleField->SetKey(game_values.gamemodemenusettings.jail.style); miJailModeTimeFreeField = new MI_SelectField(&rm->spr_selectfield, 120, 200, "Free Timer", 400, 150); - miJailModeTimeFreeField->Add("None", 1, "", false, false); - miJailModeTimeFreeField->Add("5 Seconds", 310, "", false, false, false); - miJailModeTimeFreeField->Add("10 Seconds", 620, "", false, false); - miJailModeTimeFreeField->Add("15 Seconds", 930, "", false, false); - miJailModeTimeFreeField->Add("20 Seconds", 1240, "", false, false); - miJailModeTimeFreeField->Add("25 Seconds", 1550, "", false, false); - miJailModeTimeFreeField->Add("30 Seconds", 1860, "", false, false); - miJailModeTimeFreeField->Add("35 Seconds", 2170, "", false, false); - miJailModeTimeFreeField->Add("40 Seconds", 2480, "", false, false); - miJailModeTimeFreeField->Add("45 Seconds", 2790, "", false, false, false); - miJailModeTimeFreeField->Add("50 Seconds", 3100, "", false, false, false); - miJailModeTimeFreeField->Add("55 Seconds", 3410, "", false, false, false); - miJailModeTimeFreeField->Add("60 Seconds", 3720, "", false, false, false); + miJailModeTimeFreeField->Add("None", 1); + miJailModeTimeFreeField->Add("5 Seconds", 310, false, false); + miJailModeTimeFreeField->Add("10 Seconds", 620); + miJailModeTimeFreeField->Add("15 Seconds", 930); + miJailModeTimeFreeField->Add("20 Seconds", 1240); + miJailModeTimeFreeField->Add("25 Seconds", 1550); + miJailModeTimeFreeField->Add("30 Seconds", 1860); + miJailModeTimeFreeField->Add("35 Seconds", 2170); + miJailModeTimeFreeField->Add("40 Seconds", 2480); + miJailModeTimeFreeField->Add("45 Seconds", 2790, false, false); + miJailModeTimeFreeField->Add("50 Seconds", 3100, false, false); + miJailModeTimeFreeField->Add("55 Seconds", 3410, false, false); + miJailModeTimeFreeField->Add("60 Seconds", 3720, false, false); miJailModeTimeFreeField->SetData(&game_values.gamemodemenusettings.jail.timetofree, NULL, NULL); miJailModeTimeFreeField->SetKey(game_values.gamemodemenusettings.jail.timetofree); @@ -185,27 +185,27 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() miJailModeTagFreeField->setAutoAdvance(true); miJailModeJailKeyField = new MI_SliderField(&rm->spr_selectfield, &rm->menu_slider_bar, 120, 280, "Jail Key", 400, 150, 384); - miJailModeJailKeyField->Add("0", 0, "", false, false, false); - miJailModeJailKeyField->Add("5", 5, "", false, false, false); - miJailModeJailKeyField->Add("10", 10, "", false, false); - miJailModeJailKeyField->Add("15", 15, "", false, false); - miJailModeJailKeyField->Add("20", 20, "", false, false); - miJailModeJailKeyField->Add("25", 25, "", false, false); - miJailModeJailKeyField->Add("30", 30, "", false, false); - miJailModeJailKeyField->Add("35", 35, "", false, false); - miJailModeJailKeyField->Add("40", 40, "", false, false); - miJailModeJailKeyField->Add("45", 45, "", false, false); - miJailModeJailKeyField->Add("50", 50, "", false, false); - miJailModeJailKeyField->Add("55", 55, "", false, false, false); - miJailModeJailKeyField->Add("60", 60, "", false, false, false); - miJailModeJailKeyField->Add("65", 65, "", false, false, false); - miJailModeJailKeyField->Add("70", 70, "", false, false, false); - miJailModeJailKeyField->Add("75", 75, "", false, false, false); - miJailModeJailKeyField->Add("80", 80, "", false, false, false); - miJailModeJailKeyField->Add("85", 85, "", false, false, false); - miJailModeJailKeyField->Add("90", 90, "", false, false, false); - miJailModeJailKeyField->Add("95", 95, "", false, false, false); - miJailModeJailKeyField->Add("100", 100, "", false, false, false); + miJailModeJailKeyField->Add("0", 0, false, false); + miJailModeJailKeyField->Add("5", 5, false, false); + miJailModeJailKeyField->Add("10", 10); + miJailModeJailKeyField->Add("15", 15); + miJailModeJailKeyField->Add("20", 20); + miJailModeJailKeyField->Add("25", 25); + miJailModeJailKeyField->Add("30", 30); + miJailModeJailKeyField->Add("35", 35); + miJailModeJailKeyField->Add("40", 40); + miJailModeJailKeyField->Add("45", 45); + miJailModeJailKeyField->Add("50", 50); + miJailModeJailKeyField->Add("55", 55, false, false); + miJailModeJailKeyField->Add("60", 60, false, false); + miJailModeJailKeyField->Add("65", 65, false, false); + miJailModeJailKeyField->Add("70", 70, false, false); + miJailModeJailKeyField->Add("75", 75, false, false); + miJailModeJailKeyField->Add("80", 80, false, false); + miJailModeJailKeyField->Add("85", 85, false, false); + miJailModeJailKeyField->Add("90", 90, false, false); + miJailModeJailKeyField->Add("95", 95, false, false); + miJailModeJailKeyField->Add("100", 100, false, false); miJailModeJailKeyField->SetData(&game_values.gamemodemenusettings.jail.percentkey, NULL, NULL); miJailModeJailKeyField->SetKey(game_values.gamemodemenusettings.jail.percentkey); miJailModeJailKeyField->SetNoWrap(true); @@ -243,41 +243,41 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() miCoinModePenaltyField->setAutoAdvance(true); miCoinModeQuantityField = new MI_SelectField(&rm->spr_selectfield, 120, 220, "Quantity", 400, 150); - miCoinModeQuantityField->Add("1", 1, "", false, false); - miCoinModeQuantityField->Add("2", 2, "", false, false); - miCoinModeQuantityField->Add("3", 3, "", false, false); - miCoinModeQuantityField->Add("4", 4, "", false, false); - miCoinModeQuantityField->Add("5", 5, "", false, false); - miCoinModeQuantityField->Add("6", 6, "", false, false); - miCoinModeQuantityField->Add("7", 7, "", false, false); - miCoinModeQuantityField->Add("8", 8, "", false, false); - miCoinModeQuantityField->Add("9", 9, "", false, false); - miCoinModeQuantityField->Add("10", 10, "", false, false); + miCoinModeQuantityField->Add("1", 1); + miCoinModeQuantityField->Add("2", 2); + miCoinModeQuantityField->Add("3", 3); + miCoinModeQuantityField->Add("4", 4); + miCoinModeQuantityField->Add("5", 5); + miCoinModeQuantityField->Add("6", 6); + miCoinModeQuantityField->Add("7", 7); + miCoinModeQuantityField->Add("8", 8); + miCoinModeQuantityField->Add("9", 9); + miCoinModeQuantityField->Add("10", 10); miCoinModeQuantityField->SetData(&game_values.gamemodemenusettings.coins.quantity, NULL, NULL); miCoinModeQuantityField->SetKey(game_values.gamemodemenusettings.coins.quantity); miCoinModePercentExtraCoin = new MI_SliderField(&rm->spr_selectfield, &rm->menu_slider_bar, 120, 260, "Extra Coins", 400, 150, 384); - miCoinModePercentExtraCoin->Add("0", 0, "", false, false, false); - miCoinModePercentExtraCoin->Add("5", 5, "", false, false, false); - miCoinModePercentExtraCoin->Add("10", 10, "", false, false); - miCoinModePercentExtraCoin->Add("15", 15, "", false, false); - miCoinModePercentExtraCoin->Add("20", 20, "", false, false); - miCoinModePercentExtraCoin->Add("25", 25, "", false, false); - miCoinModePercentExtraCoin->Add("30", 30, "", false, false); - miCoinModePercentExtraCoin->Add("35", 35, "", false, false); - miCoinModePercentExtraCoin->Add("40", 40, "", false, false); - miCoinModePercentExtraCoin->Add("45", 45, "", false, false); - miCoinModePercentExtraCoin->Add("50", 50, "", false, false); - miCoinModePercentExtraCoin->Add("55", 55, "", false, false, false); - miCoinModePercentExtraCoin->Add("60", 60, "", false, false, false); - miCoinModePercentExtraCoin->Add("65", 65, "", false, false, false); - miCoinModePercentExtraCoin->Add("70", 70, "", false, false, false); - miCoinModePercentExtraCoin->Add("75", 75, "", false, false, false); - miCoinModePercentExtraCoin->Add("80", 80, "", false, false, false); - miCoinModePercentExtraCoin->Add("85", 85, "", false, false, false); - miCoinModePercentExtraCoin->Add("90", 90, "", false, false, false); - miCoinModePercentExtraCoin->Add("95", 95, "", false, false, false); - miCoinModePercentExtraCoin->Add("100", 100, "", false, false, false); + miCoinModePercentExtraCoin->Add("0", 0, false, false); + miCoinModePercentExtraCoin->Add("5", 5, false, false); + miCoinModePercentExtraCoin->Add("10", 10); + miCoinModePercentExtraCoin->Add("15", 15); + miCoinModePercentExtraCoin->Add("20", 20); + miCoinModePercentExtraCoin->Add("25", 25); + miCoinModePercentExtraCoin->Add("30", 30); + miCoinModePercentExtraCoin->Add("35", 35); + miCoinModePercentExtraCoin->Add("40", 40); + miCoinModePercentExtraCoin->Add("45", 45); + miCoinModePercentExtraCoin->Add("50", 50); + miCoinModePercentExtraCoin->Add("55", 55, false, false); + miCoinModePercentExtraCoin->Add("60", 60, false, false); + miCoinModePercentExtraCoin->Add("65", 65, false, false); + miCoinModePercentExtraCoin->Add("70", 70, false, false); + miCoinModePercentExtraCoin->Add("75", 75, false, false); + miCoinModePercentExtraCoin->Add("80", 80, false, false); + miCoinModePercentExtraCoin->Add("85", 85, false, false); + miCoinModePercentExtraCoin->Add("90", 90, false, false); + miCoinModePercentExtraCoin->Add("95", 95, false, false); + miCoinModePercentExtraCoin->Add("100", 100, false, false); miCoinModePercentExtraCoin->SetData(&game_values.gamemodemenusettings.coins.percentextracoin, NULL, NULL); miCoinModePercentExtraCoin->SetKey(game_values.gamemodemenusettings.coins.percentextracoin); miCoinModePercentExtraCoin->SetNoWrap(true); @@ -307,13 +307,13 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() //*********************** miStompModeRateField = new MI_SelectField(&rm->spr_selectfield, 120, 40, "Rate", 400, 180); - miStompModeRateField->Add("Very Slow", 150, "", false, false, false); - miStompModeRateField->Add("Slow", 120, "", false, false); - miStompModeRateField->Add("Moderate", 90, "", false, false); - miStompModeRateField->Add("Fast", 60, "", false, false); - miStompModeRateField->Add("Very Fast", 30, "", false, false, false); - miStompModeRateField->Add("Extremely Fast", 15, "", false, false, false); - miStompModeRateField->Add("Insanely Fast", 5, "", false, false, false); + miStompModeRateField->Add("Very Slow", 150, false, false); + miStompModeRateField->Add("Slow", 120); + miStompModeRateField->Add("Moderate", 90); + miStompModeRateField->Add("Fast", 60); + miStompModeRateField->Add("Very Fast", 30, false, false); + miStompModeRateField->Add("Extremely Fast", 15, false, false); + miStompModeRateField->Add("Insanely Fast", 5, false, false); miStompModeRateField->SetData(&game_values.gamemodemenusettings.stomp.rate, NULL, NULL); miStompModeRateField->SetKey(game_values.gamemodemenusettings.stomp.rate); @@ -371,11 +371,11 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() for (short iEggField = 0; iEggField < 4; iEggField++) { miEggModeEggQuantityField[iEggField] = new MI_PowerupSlider(&rm->spr_selectfield, &rm->menu_slider_bar, &rm->menu_egg, 170, 60 + 40 * iEggField, 300, iEggField); - miEggModeEggQuantityField[iEggField]->Add("0", 0, "", false, false, iEggField == 0 ? false : true); - miEggModeEggQuantityField[iEggField]->Add("1", 1, "", false, false, iEggField >= 2 ? false : true); - miEggModeEggQuantityField[iEggField]->Add("2", 2, "", false, false, iEggField >= 2 ? false : true); - miEggModeEggQuantityField[iEggField]->Add("3", 3, "", false, false, iEggField >= 1 ? false : true); - miEggModeEggQuantityField[iEggField]->Add("4", 4, "", false, false, false); + miEggModeEggQuantityField[iEggField]->Add("0", 0, false, iEggField == 0 ? false : true); + miEggModeEggQuantityField[iEggField]->Add("1", 1, false, iEggField >= 2 ? false : true); + miEggModeEggQuantityField[iEggField]->Add("2", 2, false, iEggField >= 2 ? false : true); + miEggModeEggQuantityField[iEggField]->Add("3", 3, false, iEggField >= 1 ? false : true); + miEggModeEggQuantityField[iEggField]->Add("4", 4, false, false); miEggModeEggQuantityField[iEggField]->SetData(&game_values.gamemodemenusettings.egg.eggs[iEggField], NULL, NULL); miEggModeEggQuantityField[iEggField]->SetKey(game_values.gamemodemenusettings.egg.eggs[iEggField]); miEggModeEggQuantityField[iEggField]->SetNoWrap(true); @@ -383,24 +383,24 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() for (short iYoshiField = 0; iYoshiField < 4; iYoshiField++) { miEggModeYoshiQuantityField[iYoshiField] = new MI_PowerupSlider(&rm->spr_selectfield, &rm->menu_slider_bar, &rm->menu_egg, 170, 220 + 40 * iYoshiField, 300, iYoshiField + 4); - miEggModeYoshiQuantityField[iYoshiField]->Add("0", 0, "", false, false, iYoshiField == 0 ? false : true); - miEggModeYoshiQuantityField[iYoshiField]->Add("1", 1, "", false, false, iYoshiField >= 2 ? false : true); - miEggModeYoshiQuantityField[iYoshiField]->Add("2", 2, "", false, false, iYoshiField >= 1 ? false : true); - miEggModeYoshiQuantityField[iYoshiField]->Add("3", 3, "", false, false, false); - miEggModeYoshiQuantityField[iYoshiField]->Add("4", 4, "", false, false, false); + miEggModeYoshiQuantityField[iYoshiField]->Add("0", 0, false, iYoshiField == 0 ? false : true); + miEggModeYoshiQuantityField[iYoshiField]->Add("1", 1, false, iYoshiField >= 2 ? false : true); + miEggModeYoshiQuantityField[iYoshiField]->Add("2", 2, false, iYoshiField >= 1 ? false : true); + miEggModeYoshiQuantityField[iYoshiField]->Add("3", 3, false, false); + miEggModeYoshiQuantityField[iYoshiField]->Add("4", 4, false, false); miEggModeYoshiQuantityField[iYoshiField]->SetData(&game_values.gamemodemenusettings.egg.yoshis[iYoshiField], NULL, NULL); miEggModeYoshiQuantityField[iYoshiField]->SetKey(game_values.gamemodemenusettings.egg.yoshis[iYoshiField]); miEggModeYoshiQuantityField[iYoshiField]->SetNoWrap(true); } miEggModeExplosionTimeField = new MI_SelectField(&rm->spr_selectfield, 120, 380, "Explosion Timer", 400, 180); - miEggModeExplosionTimeField->Add("Off", 0, "", false, false); - miEggModeExplosionTimeField->Add("3 Seconds", 3, "", false, false, false); - miEggModeExplosionTimeField->Add("5 Seconds", 5, "", false, false); - miEggModeExplosionTimeField->Add("8 Seconds", 8, "", false, false); - miEggModeExplosionTimeField->Add("10 Seconds", 10, "", false, false); - miEggModeExplosionTimeField->Add("15 Seconds", 15, "", false, false); - miEggModeExplosionTimeField->Add("20 Seconds", 20, "", false, false); + miEggModeExplosionTimeField->Add("Off", 0); + miEggModeExplosionTimeField->Add("3 Seconds", 3, false, false); + miEggModeExplosionTimeField->Add("5 Seconds", 5); + miEggModeExplosionTimeField->Add("8 Seconds", 8); + miEggModeExplosionTimeField->Add("10 Seconds", 10); + miEggModeExplosionTimeField->Add("15 Seconds", 15); + miEggModeExplosionTimeField->Add("20 Seconds", 20); miEggModeExplosionTimeField->SetData(&game_values.gamemodemenusettings.egg.explode, NULL, NULL); miEggModeExplosionTimeField->SetKey(game_values.gamemodemenusettings.egg.explode); @@ -437,16 +437,16 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() //*********************** miFlagModeSpeedField = new MI_SliderField(&rm->spr_selectfield, &rm->menu_slider_bar, 120, 120, "Speed", 400, 180, 380); - miFlagModeSpeedField->Add("-", -1, "", false, false); - miFlagModeSpeedField->Add("0", 0, "", false, false); - miFlagModeSpeedField->Add("1", 1, "", false, false); - miFlagModeSpeedField->Add("2", 2, "", false, false); - miFlagModeSpeedField->Add("3", 3, "", false, false); - miFlagModeSpeedField->Add("4", 4, "", false, false); - miFlagModeSpeedField->Add("5", 5, "", false, false); - miFlagModeSpeedField->Add("6", 6, "", false, false, false); - miFlagModeSpeedField->Add("7", 7, "", false, false, false); - miFlagModeSpeedField->Add("8", 8, "", false, false, false); + miFlagModeSpeedField->Add("-", -1); + miFlagModeSpeedField->Add("0", 0); + miFlagModeSpeedField->Add("1", 1); + miFlagModeSpeedField->Add("2", 2); + miFlagModeSpeedField->Add("3", 3); + miFlagModeSpeedField->Add("4", 4); + miFlagModeSpeedField->Add("5", 5); + miFlagModeSpeedField->Add("6", 6, false, false); + miFlagModeSpeedField->Add("7", 7, false, false); + miFlagModeSpeedField->Add("8", 8, false, false); miFlagModeSpeedField->SetData(&game_values.gamemodemenusettings.flag.speed, NULL, NULL); miFlagModeSpeedField->SetKey(game_values.gamemodemenusettings.flag.speed); miFlagModeSpeedField->SetNoWrap(true); @@ -466,19 +466,19 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() miFlagModePointMoveField->setAutoAdvance(true); miFlagModeAutoReturnField = new MI_SelectField(&rm->spr_selectfield, 120, 240, "Auto Return", 400, 180); - miFlagModeAutoReturnField->Add("None", 0, "", false, false); - miFlagModeAutoReturnField->Add("5 Seconds", 310, "", false, false, false); - miFlagModeAutoReturnField->Add("10 Seconds", 620, "", false, false); - miFlagModeAutoReturnField->Add("15 Seconds", 930, "", false, false, false); - miFlagModeAutoReturnField->Add("20 Seconds", 1240, "", false, false); - miFlagModeAutoReturnField->Add("25 Seconds", 1550, "", false, false, false); - miFlagModeAutoReturnField->Add("30 Seconds", 1860, "", false, false, false); - miFlagModeAutoReturnField->Add("35 Seconds", 2170, "", false, false, false); - miFlagModeAutoReturnField->Add("40 Seconds", 2480, "", false, false, false); - miFlagModeAutoReturnField->Add("45 Seconds", 2790, "", false, false, false); - miFlagModeAutoReturnField->Add("50 Seconds", 3100, "", false, false, false); - miFlagModeAutoReturnField->Add("55 Seconds", 3410, "", false, false, false); - miFlagModeAutoReturnField->Add("60 Seconds", 3720, "", false, false, false); + miFlagModeAutoReturnField->Add("None", 0); + miFlagModeAutoReturnField->Add("5 Seconds", 310, false, false); + miFlagModeAutoReturnField->Add("10 Seconds", 620); + miFlagModeAutoReturnField->Add("15 Seconds", 930, false, false); + miFlagModeAutoReturnField->Add("20 Seconds", 1240); + miFlagModeAutoReturnField->Add("25 Seconds", 1550, false, false); + miFlagModeAutoReturnField->Add("30 Seconds", 1860, false, false); + miFlagModeAutoReturnField->Add("35 Seconds", 2170, false, false); + miFlagModeAutoReturnField->Add("40 Seconds", 2480, false, false); + miFlagModeAutoReturnField->Add("45 Seconds", 2790, false, false); + miFlagModeAutoReturnField->Add("50 Seconds", 3100, false, false); + miFlagModeAutoReturnField->Add("55 Seconds", 3410, false, false); + miFlagModeAutoReturnField->Add("60 Seconds", 3720, false, false); miFlagModeAutoReturnField->SetData(&game_values.gamemodemenusettings.flag.autoreturn, NULL, NULL); miFlagModeAutoReturnField->SetKey(game_values.gamemodemenusettings.flag.autoreturn); @@ -593,51 +593,51 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() //*********************** miStarModeTimeField = new MI_SelectField(&rm->spr_selectfield, 120, 180, "Time", 400, 150); - miStarModeTimeField->Add("5 Seconds", 5, "", false, false, false); - miStarModeTimeField->Add("10 Seconds", 10, "", false, false, false); - miStarModeTimeField->Add("15 Seconds", 15, "", false, false); - miStarModeTimeField->Add("20 Seconds", 20, "", false, false); - miStarModeTimeField->Add("25 Seconds", 25, "", false, false); - miStarModeTimeField->Add("30 Seconds", 30, "", false, false); - miStarModeTimeField->Add("35 Seconds", 35, "", false, false); - miStarModeTimeField->Add("40 Seconds", 40, "", false, false); - miStarModeTimeField->Add("45 Seconds", 45, "", false, false, false); - miStarModeTimeField->Add("50 Seconds", 50, "", false, false, false); - miStarModeTimeField->Add("55 Seconds", 55, "", false, false, false); - miStarModeTimeField->Add("60 Seconds", 60, "", false, false, false); + miStarModeTimeField->Add("5 Seconds", 5, false, false); + miStarModeTimeField->Add("10 Seconds", 10, false, false); + miStarModeTimeField->Add("15 Seconds", 15); + miStarModeTimeField->Add("20 Seconds", 20); + miStarModeTimeField->Add("25 Seconds", 25); + miStarModeTimeField->Add("30 Seconds", 30); + miStarModeTimeField->Add("35 Seconds", 35); + miStarModeTimeField->Add("40 Seconds", 40); + miStarModeTimeField->Add("45 Seconds", 45, false, false); + miStarModeTimeField->Add("50 Seconds", 50, false, false); + miStarModeTimeField->Add("55 Seconds", 55, false, false); + miStarModeTimeField->Add("60 Seconds", 60, false, false); miStarModeTimeField->SetData(&game_values.gamemodemenusettings.star.time, NULL, NULL); miStarModeTimeField->SetKey(game_values.gamemodemenusettings.star.time); miStarModeShineField = new MI_SelectField(&rm->spr_selectfield, 120, 220, "Star Type", 400, 150); - miStarModeShineField->Add("Ztar", 0, "", false, false); - miStarModeShineField->Add("Shine", 1, "", false, false); - miStarModeShineField->Add("Multi Star", 2, "", false, false); - miStarModeShineField->Add("Random", 3, "", false, false); + miStarModeShineField->Add("Ztar", 0); + miStarModeShineField->Add("Shine", 1); + miStarModeShineField->Add("Multi Star", 2); + miStarModeShineField->Add("Random", 3); miStarModeShineField->SetData(&game_values.gamemodemenusettings.star.shine, NULL, NULL); miStarModeShineField->SetKey(game_values.gamemodemenusettings.star.shine); miStarModePercentExtraTime = new MI_SliderField(&rm->spr_selectfield, &rm->menu_slider_bar, 120, 260, "Extra Time", 400, 150, 384); - miStarModePercentExtraTime->Add("0", 0, "", false, false, false); - miStarModePercentExtraTime->Add("5", 5, "", false, false, false); - miStarModePercentExtraTime->Add("10", 10, "", false, false); - miStarModePercentExtraTime->Add("15", 15, "", false, false); - miStarModePercentExtraTime->Add("20", 20, "", false, false); - miStarModePercentExtraTime->Add("25", 25, "", false, false); - miStarModePercentExtraTime->Add("30", 30, "", false, false); - miStarModePercentExtraTime->Add("35", 35, "", false, false); - miStarModePercentExtraTime->Add("40", 40, "", false, false); - miStarModePercentExtraTime->Add("45", 45, "", false, false); - miStarModePercentExtraTime->Add("50", 50, "", false, false); - miStarModePercentExtraTime->Add("55", 55, "", false, false, false); - miStarModePercentExtraTime->Add("60", 60, "", false, false, false); - miStarModePercentExtraTime->Add("65", 65, "", false, false, false); - miStarModePercentExtraTime->Add("70", 70, "", false, false, false); - miStarModePercentExtraTime->Add("75", 75, "", false, false, false); - miStarModePercentExtraTime->Add("80", 80, "", false, false, false); - miStarModePercentExtraTime->Add("85", 85, "", false, false, false); - miStarModePercentExtraTime->Add("90", 90, "", false, false, false); - miStarModePercentExtraTime->Add("95", 95, "", false, false, false); - miStarModePercentExtraTime->Add("100", 100, "", false, false, false); + miStarModePercentExtraTime->Add("0", 0, false, false); + miStarModePercentExtraTime->Add("5", 5, false, false); + miStarModePercentExtraTime->Add("10", 10); + miStarModePercentExtraTime->Add("15", 15); + miStarModePercentExtraTime->Add("20", 20); + miStarModePercentExtraTime->Add("25", 25); + miStarModePercentExtraTime->Add("30", 30); + miStarModePercentExtraTime->Add("35", 35); + miStarModePercentExtraTime->Add("40", 40); + miStarModePercentExtraTime->Add("45", 45); + miStarModePercentExtraTime->Add("50", 50); + miStarModePercentExtraTime->Add("55", 55, false, false); + miStarModePercentExtraTime->Add("60", 60, false, false); + miStarModePercentExtraTime->Add("65", 65, false, false); + miStarModePercentExtraTime->Add("70", 70, false, false); + miStarModePercentExtraTime->Add("75", 75, false, false); + miStarModePercentExtraTime->Add("80", 80, false, false); + miStarModePercentExtraTime->Add("85", 85, false, false); + miStarModePercentExtraTime->Add("90", 90, false, false); + miStarModePercentExtraTime->Add("95", 95, false, false); + miStarModePercentExtraTime->Add("100", 100, false, false); miStarModePercentExtraTime->SetData(&game_values.gamemodemenusettings.star.percentextratime, NULL, NULL); miStarModePercentExtraTime->SetKey(game_values.gamemodemenusettings.star.percentextratime); miStarModePercentExtraTime->SetNoWrap(true); @@ -667,46 +667,46 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() //*********************** miDominationModeQuantityField = new MI_SelectField(&rm->spr_selectfield, 120, 120, "Quantity", 400, 180); - miDominationModeQuantityField->Add("1 Base", 1, "", false, false, false); - miDominationModeQuantityField->Add("2 Bases", 2, "", false, false, false); - miDominationModeQuantityField->Add("3 Bases", 3, "", false, false); - miDominationModeQuantityField->Add("4 Bases", 4, "", false, false); - miDominationModeQuantityField->Add("5 Bases", 5, "", false, false); - miDominationModeQuantityField->Add("6 Bases", 6, "", false, false, false); - miDominationModeQuantityField->Add("7 Bases", 7, "", false, false, false); - miDominationModeQuantityField->Add("8 Bases", 8, "", false, false, false); - miDominationModeQuantityField->Add("9 Bases", 9, "", false, false, false); - miDominationModeQuantityField->Add("10 Bases", 10, "", false, false, false); - miDominationModeQuantityField->Add("# Players - 1", 11, "", false, false, false); - miDominationModeQuantityField->Add("# Players", 12, "", false, false, false); - miDominationModeQuantityField->Add("# Players + 1", 13, "", false, false); - miDominationModeQuantityField->Add("# Players + 2", 14, "", false, false); - miDominationModeQuantityField->Add("# Players + 3", 15, "", false, false); - miDominationModeQuantityField->Add("# Players + 4", 16, "", false, false); - miDominationModeQuantityField->Add("# Players + 5", 17, "", false, false); - miDominationModeQuantityField->Add("# Players + 6", 18, "", false, false, false); - miDominationModeQuantityField->Add("2x Players - 3", 19, "", false, false, false); - miDominationModeQuantityField->Add("2x Players - 2", 20, "", false, false, false); - miDominationModeQuantityField->Add("2x Players - 1", 21, "", false, false); - miDominationModeQuantityField->Add("2x Players", 22, "", false, false); - miDominationModeQuantityField->Add("2x Players + 1", 23, "", false, false, false); - miDominationModeQuantityField->Add("2x Players + 2", 24, "", false, false, false); + miDominationModeQuantityField->Add("1 Base", 1, false, false); + miDominationModeQuantityField->Add("2 Bases", 2, false, false); + miDominationModeQuantityField->Add("3 Bases", 3); + miDominationModeQuantityField->Add("4 Bases", 4); + miDominationModeQuantityField->Add("5 Bases", 5); + miDominationModeQuantityField->Add("6 Bases", 6, false, false); + miDominationModeQuantityField->Add("7 Bases", 7, false, false); + miDominationModeQuantityField->Add("8 Bases", 8, false, false); + miDominationModeQuantityField->Add("9 Bases", 9, false, false); + miDominationModeQuantityField->Add("10 Bases", 10, false, false); + miDominationModeQuantityField->Add("# Players - 1", 11, false, false); + miDominationModeQuantityField->Add("# Players", 12, false, false); + miDominationModeQuantityField->Add("# Players + 1", 13); + miDominationModeQuantityField->Add("# Players + 2", 14); + miDominationModeQuantityField->Add("# Players + 3", 15); + miDominationModeQuantityField->Add("# Players + 4", 16); + miDominationModeQuantityField->Add("# Players + 5", 17); + miDominationModeQuantityField->Add("# Players + 6", 18, false, false); + miDominationModeQuantityField->Add("2x Players - 3", 19, false, false); + miDominationModeQuantityField->Add("2x Players - 2", 20, false, false); + miDominationModeQuantityField->Add("2x Players - 1", 21); + miDominationModeQuantityField->Add("2x Players", 22); + miDominationModeQuantityField->Add("2x Players + 1", 23, false, false); + miDominationModeQuantityField->Add("2x Players + 2", 24, false, false); miDominationModeQuantityField->SetData(&game_values.gamemodemenusettings.domination.quantity, NULL, NULL); miDominationModeQuantityField->SetKey(game_values.gamemodemenusettings.domination.quantity); miDominationModeRelocateFrequencyField = new MI_SelectField(&rm->spr_selectfield, 120, 160, "Relocate", 400, 180); - miDominationModeRelocateFrequencyField->Add("Never", 0, "", false, false); - miDominationModeRelocateFrequencyField->Add("5 Seconds", 310, "", false, false, false); - miDominationModeRelocateFrequencyField->Add("10 Seconds", 620, "", false, false); - miDominationModeRelocateFrequencyField->Add("15 Seconds", 930, "", false, false); - miDominationModeRelocateFrequencyField->Add("20 Seconds", 1240, "", false, false); - miDominationModeRelocateFrequencyField->Add("30 Seconds", 1860, "", false, false); - miDominationModeRelocateFrequencyField->Add("45 Seconds", 2790, "", false, false); - miDominationModeRelocateFrequencyField->Add("1 Minute", 3720, "", false, false); - miDominationModeRelocateFrequencyField->Add("1.5 Minutes", 5580, "", false, false); - miDominationModeRelocateFrequencyField->Add("2 Minutes", 7440, "", false, false); - miDominationModeRelocateFrequencyField->Add("2.5 Minutes", 9300, "", false, false); - miDominationModeRelocateFrequencyField->Add("3 Minutes", 11160, "", false, false); + miDominationModeRelocateFrequencyField->Add("Never", 0); + miDominationModeRelocateFrequencyField->Add("5 Seconds", 310, false, false); + miDominationModeRelocateFrequencyField->Add("10 Seconds", 620); + miDominationModeRelocateFrequencyField->Add("15 Seconds", 930); + miDominationModeRelocateFrequencyField->Add("20 Seconds", 1240); + miDominationModeRelocateFrequencyField->Add("30 Seconds", 1860); + miDominationModeRelocateFrequencyField->Add("45 Seconds", 2790); + miDominationModeRelocateFrequencyField->Add("1 Minute", 3720); + miDominationModeRelocateFrequencyField->Add("1.5 Minutes", 5580); + miDominationModeRelocateFrequencyField->Add("2 Minutes", 7440); + miDominationModeRelocateFrequencyField->Add("2.5 Minutes", 9300); + miDominationModeRelocateFrequencyField->Add("3 Minutes", 11160); miDominationModeRelocateFrequencyField->SetData(&game_values.gamemodemenusettings.domination.relocationfrequency, NULL, NULL); miDominationModeRelocateFrequencyField->SetKey(game_values.gamemodemenusettings.domination.relocationfrequency); @@ -763,37 +763,37 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() //*********************** miKingOfTheHillModeSizeField = new MI_SelectField(&rm->spr_selectfield, 120, 180, "Size", 400, 180); - miKingOfTheHillModeSizeField->Add("2 x 2", 2, "", false, false); - miKingOfTheHillModeSizeField->Add("3 x 3", 3, "", false, false); - miKingOfTheHillModeSizeField->Add("4 x 4", 4, "", false, false); - miKingOfTheHillModeSizeField->Add("5 x 5", 5, "", false, false); - miKingOfTheHillModeSizeField->Add("6 x 6", 6, "", false, false); - miKingOfTheHillModeSizeField->Add("7 x 7", 7, "", false, false); + miKingOfTheHillModeSizeField->Add("2 x 2", 2); + miKingOfTheHillModeSizeField->Add("3 x 3", 3); + miKingOfTheHillModeSizeField->Add("4 x 4", 4); + miKingOfTheHillModeSizeField->Add("5 x 5", 5); + miKingOfTheHillModeSizeField->Add("6 x 6", 6); + miKingOfTheHillModeSizeField->Add("7 x 7", 7); miKingOfTheHillModeSizeField->SetData(&game_values.gamemodemenusettings.kingofthehill.areasize, NULL, NULL); miKingOfTheHillModeSizeField->SetKey(game_values.gamemodemenusettings.kingofthehill.areasize); miKingOfTheHillModeRelocateFrequencyField = new MI_SelectField(&rm->spr_selectfield, 120, 220, "Relocate", 400, 180); - miKingOfTheHillModeRelocateFrequencyField->Add("Never", 0, "", false, false); - miKingOfTheHillModeRelocateFrequencyField->Add("5 Seconds", 310, "", false, false, false); - miKingOfTheHillModeRelocateFrequencyField->Add("10 Seconds", 620, "", false, false); - miKingOfTheHillModeRelocateFrequencyField->Add("15 Seconds", 930, "", false, false); - miKingOfTheHillModeRelocateFrequencyField->Add("20 Seconds", 1240, "", false, false); - miKingOfTheHillModeRelocateFrequencyField->Add("30 Seconds", 1860, "", false, false); - miKingOfTheHillModeRelocateFrequencyField->Add("45 Seconds", 2790, "", false, false); - miKingOfTheHillModeRelocateFrequencyField->Add("1 Minute", 3720, "", false, false); - miKingOfTheHillModeRelocateFrequencyField->Add("1.5 Minutes", 5580, "", false, false); - miKingOfTheHillModeRelocateFrequencyField->Add("2 Minutes", 7440, "", false, false); - miKingOfTheHillModeRelocateFrequencyField->Add("2.5 Minutes", 9300, "", false, false); - miKingOfTheHillModeRelocateFrequencyField->Add("3 Minutes", 11160, "", false, false); + miKingOfTheHillModeRelocateFrequencyField->Add("Never", 0); + miKingOfTheHillModeRelocateFrequencyField->Add("5 Seconds", 310, false, false); + miKingOfTheHillModeRelocateFrequencyField->Add("10 Seconds", 620); + miKingOfTheHillModeRelocateFrequencyField->Add("15 Seconds", 930); + miKingOfTheHillModeRelocateFrequencyField->Add("20 Seconds", 1240); + miKingOfTheHillModeRelocateFrequencyField->Add("30 Seconds", 1860); + miKingOfTheHillModeRelocateFrequencyField->Add("45 Seconds", 2790); + miKingOfTheHillModeRelocateFrequencyField->Add("1 Minute", 3720); + miKingOfTheHillModeRelocateFrequencyField->Add("1.5 Minutes", 5580); + miKingOfTheHillModeRelocateFrequencyField->Add("2 Minutes", 7440); + miKingOfTheHillModeRelocateFrequencyField->Add("2.5 Minutes", 9300); + miKingOfTheHillModeRelocateFrequencyField->Add("3 Minutes", 11160); miKingOfTheHillModeRelocateFrequencyField->SetData(&game_values.gamemodemenusettings.kingofthehill.relocationfrequency, NULL, NULL); miKingOfTheHillModeRelocateFrequencyField->SetKey(game_values.gamemodemenusettings.kingofthehill.relocationfrequency); miKingOfTheHillModeMultiplierField = new MI_SelectField(&rm->spr_selectfield, 120, 260, "Max Multiplier", 400, 180); - miKingOfTheHillModeMultiplierField->Add("None", 1, "", false, false); - miKingOfTheHillModeMultiplierField->Add("2", 2, "", false, false); - miKingOfTheHillModeMultiplierField->Add("3", 3, "", false, false); - miKingOfTheHillModeMultiplierField->Add("4", 4, "", false, false); - miKingOfTheHillModeMultiplierField->Add("5", 5, "", false, false); + miKingOfTheHillModeMultiplierField->Add("None", 1); + miKingOfTheHillModeMultiplierField->Add("2", 2); + miKingOfTheHillModeMultiplierField->Add("3", 3); + miKingOfTheHillModeMultiplierField->Add("4", 4); + miKingOfTheHillModeMultiplierField->Add("5", 5); miKingOfTheHillModeMultiplierField->SetData(&game_values.gamemodemenusettings.kingofthehill.maxmultiplier, NULL, NULL); miKingOfTheHillModeMultiplierField->SetKey(game_values.gamemodemenusettings.kingofthehill.maxmultiplier); @@ -823,32 +823,32 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() //*********************** miRaceModeQuantityField = new MI_SelectField(&rm->spr_selectfield, 120, 180, "Quantity", 400, 180); - miRaceModeQuantityField->Add("2", 2, "", false, false, false); - miRaceModeQuantityField->Add("3", 3, "", false, false); - miRaceModeQuantityField->Add("4", 4, "", false, false); - miRaceModeQuantityField->Add("5", 5, "", false, false); - miRaceModeQuantityField->Add("6", 6, "", false, false); - miRaceModeQuantityField->Add("7", 7, "", false, false); - miRaceModeQuantityField->Add("8", MAXRACEGOALS, "", false, false); + miRaceModeQuantityField->Add("2", 2, false, false); + miRaceModeQuantityField->Add("3", 3); + miRaceModeQuantityField->Add("4", 4); + miRaceModeQuantityField->Add("5", 5); + miRaceModeQuantityField->Add("6", 6); + miRaceModeQuantityField->Add("7", 7); + miRaceModeQuantityField->Add("8", MAXRACEGOALS); miRaceModeQuantityField->SetData(&game_values.gamemodemenusettings.race.quantity, NULL, NULL); miRaceModeQuantityField->SetKey(game_values.gamemodemenusettings.race.quantity); miRaceModeSpeedField = new MI_SelectField(&rm->spr_selectfield, 120, 220, "Speed", 400, 180); - miRaceModeSpeedField->Add("Stationary", 0, "", false, false); - miRaceModeSpeedField->Add("Very Slow", 2, "", false, false); - miRaceModeSpeedField->Add("Slow", 3, "", false, false); - miRaceModeSpeedField->Add("Moderate", 4, "", false, false); - miRaceModeSpeedField->Add("Fast", 6, "", false, false); - miRaceModeSpeedField->Add("Very Fast", 8, "", false, false, false); - miRaceModeSpeedField->Add("Extremely Fast", 15, "", false, false, false); - miRaceModeSpeedField->Add("Insanely Fast", 30, "", false, false, false); + miRaceModeSpeedField->Add("Stationary", 0); + miRaceModeSpeedField->Add("Very Slow", 2); + miRaceModeSpeedField->Add("Slow", 3); + miRaceModeSpeedField->Add("Moderate", 4); + miRaceModeSpeedField->Add("Fast", 6); + miRaceModeSpeedField->Add("Very Fast", 8, false, false); + miRaceModeSpeedField->Add("Extremely Fast", 15, false, false); + miRaceModeSpeedField->Add("Insanely Fast", 30, false, false); miRaceModeSpeedField->SetData(&game_values.gamemodemenusettings.race.speed, NULL, NULL); miRaceModeSpeedField->SetKey(game_values.gamemodemenusettings.race.speed); miRaceModePenaltyField = new MI_SelectField(&rm->spr_selectfield, 120, 260, "Penalty", 400, 180); - miRaceModePenaltyField->Add("None", 0, "", false, false); - miRaceModePenaltyField->Add("One Goal", 1, "", false, false); - miRaceModePenaltyField->Add("All Goals", 2, "", false, false); + miRaceModePenaltyField->Add("None", 0); + miRaceModePenaltyField->Add("One Goal", 1); + miRaceModePenaltyField->Add("All Goals", 2); miRaceModePenaltyField->SetData(&game_values.gamemodemenusettings.race.penalty, NULL, NULL); miRaceModePenaltyField->SetKey(game_values.gamemodemenusettings.race.penalty); @@ -917,24 +917,24 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() } miSurvivalModeDensityField = new MI_SelectField(&rm->spr_selectfield, 120, 240, "Density", 400, 180); - miSurvivalModeDensityField->Add("Very Low", 40, "", false, false, false); - miSurvivalModeDensityField->Add("Low", 30, "", false, false); - miSurvivalModeDensityField->Add("Medium", 20, "", false, false); - miSurvivalModeDensityField->Add("High", 15, "", false, false); - miSurvivalModeDensityField->Add("Very High", 10, "", false, false, false); - miSurvivalModeDensityField->Add("Extremely High", 6, "", false, false); - miSurvivalModeDensityField->Add("Insanely High", 2, "", false, false, false); + miSurvivalModeDensityField->Add("Very Low", 40, false, false); + miSurvivalModeDensityField->Add("Low", 30); + miSurvivalModeDensityField->Add("Medium", 20); + miSurvivalModeDensityField->Add("High", 15); + miSurvivalModeDensityField->Add("Very High", 10, false, false); + miSurvivalModeDensityField->Add("Extremely High", 6); + miSurvivalModeDensityField->Add("Insanely High", 2, false, false); miSurvivalModeDensityField->SetData(&game_values.gamemodemenusettings.survival.density, NULL, NULL); miSurvivalModeDensityField->SetKey(game_values.gamemodemenusettings.survival.density); miSurvivalModeSpeedField = new MI_SelectField(&rm->spr_selectfield, 120, 280, "Speed", 400, 180); - miSurvivalModeSpeedField->Add("Very Slow", 2, "", false, false, false); - miSurvivalModeSpeedField->Add("Slow", 3, "", false, false); - miSurvivalModeSpeedField->Add("Moderate", 4, "", false, false); - miSurvivalModeSpeedField->Add("Fast", 6, "", false, false); - miSurvivalModeSpeedField->Add("Very Fast", 8, "", false, false, false); - miSurvivalModeSpeedField->Add("Extremely Fast", 15, "", false, false, false); - miSurvivalModeSpeedField->Add("Insanely Fast", 30, "", false, false, false); + miSurvivalModeSpeedField->Add("Very Slow", 2, false, false); + miSurvivalModeSpeedField->Add("Slow", 3); + miSurvivalModeSpeedField->Add("Moderate", 4); + miSurvivalModeSpeedField->Add("Fast", 6); + miSurvivalModeSpeedField->Add("Very Fast", 8, false, false); + miSurvivalModeSpeedField->Add("Extremely Fast", 15, false, false); + miSurvivalModeSpeedField->Add("Insanely Fast", 30, false, false); miSurvivalModeSpeedField->SetData(&game_values.gamemodemenusettings.survival.speed, NULL, NULL); miSurvivalModeSpeedField->SetKey(game_values.gamemodemenusettings.survival.speed); @@ -972,22 +972,22 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() // Greed Mode Settings //*********************** miGreedModeCoinLife = new MI_SelectField(&rm->spr_selectfield, 120, 160, "Coin Life", 400, 150); - miGreedModeCoinLife->Add("1 Second", 62, "", false, false, false); - miGreedModeCoinLife->Add("2 Seconds", 124, "", false, false, false); - miGreedModeCoinLife->Add("3 Seconds", 186, "", false, false); - miGreedModeCoinLife->Add("4 Seconds", 248, "", false, false); - miGreedModeCoinLife->Add("5 Seconds", 310, "", false, false); - miGreedModeCoinLife->Add("6 Seconds", 372, "", false, false); - miGreedModeCoinLife->Add("7 Seconds", 434, "", false, false); - miGreedModeCoinLife->Add("8 Seconds", 496, "", false, false); - miGreedModeCoinLife->Add("9 Seconds", 558, "", false, false); - miGreedModeCoinLife->Add("10 Seconds", 620, "", false, false); - miGreedModeCoinLife->Add("12 Seconds", 744, "", false, false); - miGreedModeCoinLife->Add("15 Seconds", 930, "", false, false); - miGreedModeCoinLife->Add("18 Seconds", 1116, "", false, false); - miGreedModeCoinLife->Add("20 Seconds", 1240, "", false, false); - miGreedModeCoinLife->Add("25 Seconds", 1550, "", false, false); - miGreedModeCoinLife->Add("30 Seconds", 1860, "", false, false); + miGreedModeCoinLife->Add("1 Second", 62, false, false); + miGreedModeCoinLife->Add("2 Seconds", 124, false, false); + miGreedModeCoinLife->Add("3 Seconds", 186); + miGreedModeCoinLife->Add("4 Seconds", 248); + miGreedModeCoinLife->Add("5 Seconds", 310); + miGreedModeCoinLife->Add("6 Seconds", 372); + miGreedModeCoinLife->Add("7 Seconds", 434); + miGreedModeCoinLife->Add("8 Seconds", 496); + miGreedModeCoinLife->Add("9 Seconds", 558); + miGreedModeCoinLife->Add("10 Seconds", 620); + miGreedModeCoinLife->Add("12 Seconds", 744); + miGreedModeCoinLife->Add("15 Seconds", 930); + miGreedModeCoinLife->Add("18 Seconds", 1116); + miGreedModeCoinLife->Add("20 Seconds", 1240); + miGreedModeCoinLife->Add("25 Seconds", 1550); + miGreedModeCoinLife->Add("30 Seconds", 1860); miGreedModeCoinLife->SetData(&game_values.gamemodemenusettings.greed.coinlife, NULL, NULL); miGreedModeCoinLife->SetKey(game_values.gamemodemenusettings.greed.coinlife); @@ -999,37 +999,37 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() miGreedModeOwnCoins->setAutoAdvance(true); miGreedModeMultiplier = new MI_SelectField(&rm->spr_selectfield, 120, 240, "Multipler", 400, 150); - miGreedModeMultiplier->Add("0.5", 1, "", false, false, false); - miGreedModeMultiplier->Add("1", 2, "", false, false); - miGreedModeMultiplier->Add("1.5", 3, "", false, false); - miGreedModeMultiplier->Add("2", 4, "", false, false); - miGreedModeMultiplier->Add("2.5", 5, "", false, false, false); - miGreedModeMultiplier->Add("3", 6, "", false, false, false); + miGreedModeMultiplier->Add("0.5", 1, false, false); + miGreedModeMultiplier->Add("1", 2); + miGreedModeMultiplier->Add("1.5", 3); + miGreedModeMultiplier->Add("2", 4); + miGreedModeMultiplier->Add("2.5", 5, false, false); + miGreedModeMultiplier->Add("3", 6, false, false); miGreedModeMultiplier->SetData(&game_values.gamemodemenusettings.greed.multiplier, NULL, NULL); miGreedModeMultiplier->SetKey(game_values.gamemodemenusettings.greed.multiplier); miGreedModePercentExtraCoin = new MI_SliderField(&rm->spr_selectfield, &rm->menu_slider_bar, 120, 280, "Extra Coins", 400, 150, 384); - miGreedModePercentExtraCoin->Add("0", 0, "", false, false, false); - miGreedModePercentExtraCoin->Add("5", 5, "", false, false, false); - miGreedModePercentExtraCoin->Add("10", 10, "", false, false); - miGreedModePercentExtraCoin->Add("15", 15, "", false, false); - miGreedModePercentExtraCoin->Add("20", 20, "", false, false); - miGreedModePercentExtraCoin->Add("25", 25, "", false, false); - miGreedModePercentExtraCoin->Add("30", 30, "", false, false); - miGreedModePercentExtraCoin->Add("35", 35, "", false, false); - miGreedModePercentExtraCoin->Add("40", 40, "", false, false); - miGreedModePercentExtraCoin->Add("45", 45, "", false, false); - miGreedModePercentExtraCoin->Add("50", 50, "", false, false); - miGreedModePercentExtraCoin->Add("55", 55, "", false, false, false); - miGreedModePercentExtraCoin->Add("60", 60, "", false, false, false); - miGreedModePercentExtraCoin->Add("65", 65, "", false, false, false); - miGreedModePercentExtraCoin->Add("70", 70, "", false, false, false); - miGreedModePercentExtraCoin->Add("75", 75, "", false, false, false); - miGreedModePercentExtraCoin->Add("80", 80, "", false, false, false); - miGreedModePercentExtraCoin->Add("85", 85, "", false, false, false); - miGreedModePercentExtraCoin->Add("90", 90, "", false, false, false); - miGreedModePercentExtraCoin->Add("95", 95, "", false, false, false); - miGreedModePercentExtraCoin->Add("100", 100, "", false, false, false); + miGreedModePercentExtraCoin->Add("0", 0, false, false); + miGreedModePercentExtraCoin->Add("5", 5, false, false); + miGreedModePercentExtraCoin->Add("10", 10); + miGreedModePercentExtraCoin->Add("15", 15); + miGreedModePercentExtraCoin->Add("20", 20); + miGreedModePercentExtraCoin->Add("25", 25); + miGreedModePercentExtraCoin->Add("30", 30); + miGreedModePercentExtraCoin->Add("35", 35); + miGreedModePercentExtraCoin->Add("40", 40); + miGreedModePercentExtraCoin->Add("45", 45); + miGreedModePercentExtraCoin->Add("50", 50); + miGreedModePercentExtraCoin->Add("55", 55, false, false); + miGreedModePercentExtraCoin->Add("60", 60, false, false); + miGreedModePercentExtraCoin->Add("65", 65, false, false); + miGreedModePercentExtraCoin->Add("70", 70, false, false); + miGreedModePercentExtraCoin->Add("75", 75, false, false); + miGreedModePercentExtraCoin->Add("80", 80, false, false); + miGreedModePercentExtraCoin->Add("85", 85, false, false); + miGreedModePercentExtraCoin->Add("90", 90, false, false); + miGreedModePercentExtraCoin->Add("95", 95, false, false); + miGreedModePercentExtraCoin->Add("100", 100, false, false); miGreedModePercentExtraCoin->SetData(&game_values.gamemodemenusettings.greed.percentextracoin, NULL, NULL); miGreedModePercentExtraCoin->SetKey(game_values.gamemodemenusettings.greed.percentextracoin); miGreedModePercentExtraCoin->SetNoWrap(true); @@ -1060,57 +1060,57 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() // Health Mode Settings //*********************** miHealthModeStartLife = new MI_SelectField(&rm->spr_selectfield, 120, 180, "Start Life", 400, 150); - miHealthModeStartLife->Add("2", 2, "", false, false, false); - miHealthModeStartLife->Add("3", 3, "", false, false, false); - miHealthModeStartLife->Add("4", 4, "", false, false); - miHealthModeStartLife->Add("5", 5, "", false, false); - miHealthModeStartLife->Add("6", 6, "", false, false); - miHealthModeStartLife->Add("7", 7, "", false, false, false); - miHealthModeStartLife->Add("8", 8, "", false, false, false); - miHealthModeStartLife->Add("9", 9, "", false, false, false); - miHealthModeStartLife->Add("10", 10, "", false, false, false); + miHealthModeStartLife->Add("2", 2, false, false); + miHealthModeStartLife->Add("3", 3, false, false); + miHealthModeStartLife->Add("4", 4); + miHealthModeStartLife->Add("5", 5); + miHealthModeStartLife->Add("6", 6); + miHealthModeStartLife->Add("7", 7, false, false); + miHealthModeStartLife->Add("8", 8, false, false); + miHealthModeStartLife->Add("9", 9, false, false); + miHealthModeStartLife->Add("10", 10, false, false); miHealthModeStartLife->SetData(&game_values.gamemodemenusettings.health.startlife, NULL, NULL); miHealthModeStartLife->SetKey(game_values.gamemodemenusettings.health.startlife); miHealthModeStartLife->SetNoWrap(true); miHealthModeStartLife->SetItemChangedCode(MENU_CODE_HEALTH_MODE_START_LIFE_CHANGED); miHealthModeMaxLife = new MI_SelectField(&rm->spr_selectfield, 120, 220, "Max Life", 400, 150); - miHealthModeMaxLife->Add("2", 2, "", false, false, false); - miHealthModeMaxLife->Add("3", 3, "", false, false, false); - miHealthModeMaxLife->Add("4", 4, "", false, false, false); - miHealthModeMaxLife->Add("5", 5, "", false, false, false); - miHealthModeMaxLife->Add("6", 6, "", false, false); - miHealthModeMaxLife->Add("7", 7, "", false, false); - miHealthModeMaxLife->Add("8", 8, "", false, false); - miHealthModeMaxLife->Add("9", 9, "", false, false); - miHealthModeMaxLife->Add("10", 10, "", false, false); + miHealthModeMaxLife->Add("2", 2, false, false); + miHealthModeMaxLife->Add("3", 3, false, false); + miHealthModeMaxLife->Add("4", 4, false, false); + miHealthModeMaxLife->Add("5", 5, false, false); + miHealthModeMaxLife->Add("6", 6); + miHealthModeMaxLife->Add("7", 7); + miHealthModeMaxLife->Add("8", 8); + miHealthModeMaxLife->Add("9", 9); + miHealthModeMaxLife->Add("10", 10); miHealthModeMaxLife->SetData(&game_values.gamemodemenusettings.health.maxlife, NULL, NULL); miHealthModeMaxLife->SetKey(game_values.gamemodemenusettings.health.maxlife); miHealthModeMaxLife->SetNoWrap(true); miHealthModeMaxLife->SetItemChangedCode(MENU_CODE_HEALTH_MODE_MAX_LIFE_CHANGED); miHealthModePercentExtraLife = new MI_SliderField(&rm->spr_selectfield, &rm->menu_slider_bar, 120, 260, "Extra Life", 400, 150, 384); - miHealthModePercentExtraLife->Add("0", 0, "", false, false, false); - miHealthModePercentExtraLife->Add("5", 5, "", false, false, false); - miHealthModePercentExtraLife->Add("10", 10, "", false, false); - miHealthModePercentExtraLife->Add("15", 15, "", false, false); - miHealthModePercentExtraLife->Add("20", 20, "", false, false); - miHealthModePercentExtraLife->Add("25", 25, "", false, false); - miHealthModePercentExtraLife->Add("30", 30, "", false, false); - miHealthModePercentExtraLife->Add("35", 35, "", false, false); - miHealthModePercentExtraLife->Add("40", 40, "", false, false); - miHealthModePercentExtraLife->Add("45", 45, "", false, false); - miHealthModePercentExtraLife->Add("50", 50, "", false, false); - miHealthModePercentExtraLife->Add("55", 55, "", false, false, false); - miHealthModePercentExtraLife->Add("60", 60, "", false, false, false); - miHealthModePercentExtraLife->Add("65", 65, "", false, false, false); - miHealthModePercentExtraLife->Add("70", 70, "", false, false, false); - miHealthModePercentExtraLife->Add("75", 75, "", false, false, false); - miHealthModePercentExtraLife->Add("80", 80, "", false, false, false); - miHealthModePercentExtraLife->Add("85", 85, "", false, false, false); - miHealthModePercentExtraLife->Add("90", 90, "", false, false, false); - miHealthModePercentExtraLife->Add("95", 95, "", false, false, false); - miHealthModePercentExtraLife->Add("100", 100, "", false, false, false); + miHealthModePercentExtraLife->Add("0", 0, false, false); + miHealthModePercentExtraLife->Add("5", 5, false, false); + miHealthModePercentExtraLife->Add("10", 10); + miHealthModePercentExtraLife->Add("15", 15); + miHealthModePercentExtraLife->Add("20", 20); + miHealthModePercentExtraLife->Add("25", 25); + miHealthModePercentExtraLife->Add("30", 30); + miHealthModePercentExtraLife->Add("35", 35); + miHealthModePercentExtraLife->Add("40", 40); + miHealthModePercentExtraLife->Add("45", 45); + miHealthModePercentExtraLife->Add("50", 50); + miHealthModePercentExtraLife->Add("55", 55, false, false); + miHealthModePercentExtraLife->Add("60", 60, false, false); + miHealthModePercentExtraLife->Add("65", 65, false, false); + miHealthModePercentExtraLife->Add("70", 70, false, false); + miHealthModePercentExtraLife->Add("75", 75, false, false); + miHealthModePercentExtraLife->Add("80", 80, false, false); + miHealthModePercentExtraLife->Add("85", 85, false, false); + miHealthModePercentExtraLife->Add("90", 90, false, false); + miHealthModePercentExtraLife->Add("95", 95, false, false); + miHealthModePercentExtraLife->Add("100", 100, false, false); miHealthModePercentExtraLife->SetData(&game_values.gamemodemenusettings.health.percentextralife, NULL, NULL); miHealthModePercentExtraLife->SetKey(game_values.gamemodemenusettings.health.percentextralife); miHealthModePercentExtraLife->SetNoWrap(true); @@ -1140,65 +1140,65 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() //*********************** miCollectionModeQuantityField = new MI_SelectField(&rm->spr_selectfield, 120, 160, "Limit", 400, 180); - miCollectionModeQuantityField->Add("1 Card", 1, "", false, false); - miCollectionModeQuantityField->Add("2 Cards", 2, "", false, false); - miCollectionModeQuantityField->Add("3 Cards", 3, "", false, false); - miCollectionModeQuantityField->Add("4 Cards", 4, "", false, false, false); - miCollectionModeQuantityField->Add("5 Cards", 5, "", false, false, false); - miCollectionModeQuantityField->Add("# Players - 1", 6, "", false, false); - miCollectionModeQuantityField->Add("# Players", 7, "", false, false); - miCollectionModeQuantityField->Add("# Players + 1", 8, "", false, false, false); - miCollectionModeQuantityField->Add("# Players + 2", 9, "", false, false, false); - miCollectionModeQuantityField->Add("# Players + 3", 10, "", false, false, false); + miCollectionModeQuantityField->Add("1 Card", 1); + miCollectionModeQuantityField->Add("2 Cards", 2); + miCollectionModeQuantityField->Add("3 Cards", 3); + miCollectionModeQuantityField->Add("4 Cards", 4, false, false); + miCollectionModeQuantityField->Add("5 Cards", 5, false, false); + miCollectionModeQuantityField->Add("# Players - 1", 6); + miCollectionModeQuantityField->Add("# Players", 7); + miCollectionModeQuantityField->Add("# Players + 1", 8, false, false); + miCollectionModeQuantityField->Add("# Players + 2", 9, false, false); + miCollectionModeQuantityField->Add("# Players + 3", 10, false, false); miCollectionModeQuantityField->SetData(&game_values.gamemodemenusettings.collection.quantity, NULL, NULL); miCollectionModeQuantityField->SetKey(game_values.gamemodemenusettings.collection.quantity); miCollectionModeRateField = new MI_SelectField(&rm->spr_selectfield, 120, 200, "Rate", 400, 180); - miCollectionModeRateField->Add("Instant", 0, "", false, false); - miCollectionModeRateField->Add("1 Second", 62, "", false, false); - miCollectionModeRateField->Add("2 Seconds", 124, "", false, false); - miCollectionModeRateField->Add("3 Seconds", 186, "", false, false); - miCollectionModeRateField->Add("5 Seconds", 310, "", false, false); - miCollectionModeRateField->Add("10 Seconds", 620, "", false, false, false); - miCollectionModeRateField->Add("15 Seconds", 930, "", false, false, false); - miCollectionModeRateField->Add("20 Seconds", 1240, "", false, false, false); - miCollectionModeRateField->Add("25 Seconds", 1550, "", false, false, false); - miCollectionModeRateField->Add("30 Seconds", 1860, "", false, false, false); + miCollectionModeRateField->Add("Instant", 0); + miCollectionModeRateField->Add("1 Second", 62); + miCollectionModeRateField->Add("2 Seconds", 124); + miCollectionModeRateField->Add("3 Seconds", 186); + miCollectionModeRateField->Add("5 Seconds", 310); + miCollectionModeRateField->Add("10 Seconds", 620, false, false); + miCollectionModeRateField->Add("15 Seconds", 930, false, false); + miCollectionModeRateField->Add("20 Seconds", 1240, false, false); + miCollectionModeRateField->Add("25 Seconds", 1550, false, false); + miCollectionModeRateField->Add("30 Seconds", 1860, false, false); miCollectionModeRateField->SetData(&game_values.gamemodemenusettings.collection.rate, NULL, NULL); miCollectionModeRateField->SetKey(game_values.gamemodemenusettings.collection.rate); miCollectionModeBankTimeField = new MI_SelectField(&rm->spr_selectfield, 120, 240, "Bank Time", 400, 180); - miCollectionModeBankTimeField->Add("Instant", 0, "", false, false, false); - miCollectionModeBankTimeField->Add("1 Second", 62, "", false, false, false); - miCollectionModeBankTimeField->Add("2 Seconds", 124, "", false, false); - miCollectionModeBankTimeField->Add("3 Seconds", 186, "", false, false); - miCollectionModeBankTimeField->Add("4 Seconds", 248, "", false, false); - miCollectionModeBankTimeField->Add("5 Seconds", 310, "", false, false); - miCollectionModeBankTimeField->Add("6 Seconds", 372, "", false, false, false); - miCollectionModeBankTimeField->Add("7 Seconds", 434, "", false, false, false); - miCollectionModeBankTimeField->Add("8 Seconds", 496, "", false, false, false); - miCollectionModeBankTimeField->Add("9 Seconds", 558, "", false, false, false); - miCollectionModeBankTimeField->Add("10 Seconds", 620, "", false, false, false); + miCollectionModeBankTimeField->Add("Instant", 0, false, false); + miCollectionModeBankTimeField->Add("1 Second", 62, false, false); + miCollectionModeBankTimeField->Add("2 Seconds", 124); + miCollectionModeBankTimeField->Add("3 Seconds", 186); + miCollectionModeBankTimeField->Add("4 Seconds", 248); + miCollectionModeBankTimeField->Add("5 Seconds", 310); + miCollectionModeBankTimeField->Add("6 Seconds", 372, false, false); + miCollectionModeBankTimeField->Add("7 Seconds", 434, false, false); + miCollectionModeBankTimeField->Add("8 Seconds", 496, false, false); + miCollectionModeBankTimeField->Add("9 Seconds", 558, false, false); + miCollectionModeBankTimeField->Add("10 Seconds", 620, false, false); miCollectionModeBankTimeField->SetData(&game_values.gamemodemenusettings.collection.banktime, NULL, NULL); miCollectionModeBankTimeField->SetKey(game_values.gamemodemenusettings.collection.banktime); miCollectionModeCardLifeField = new MI_SelectField(&rm->spr_selectfield, 120, 280, "Card Life", 400, 180); - miCollectionModeCardLifeField->Add("1 Second", 62, "", false, false, false); - miCollectionModeCardLifeField->Add("2 Seconds", 124, "", false, false, false); - miCollectionModeCardLifeField->Add("3 Seconds", 186, "", false, false); - miCollectionModeCardLifeField->Add("4 Seconds", 248, "", false, false); - miCollectionModeCardLifeField->Add("5 Seconds", 310, "", false, false); - miCollectionModeCardLifeField->Add("6 Seconds", 372, "", false, false); - miCollectionModeCardLifeField->Add("7 Seconds", 434, "", false, false); - miCollectionModeCardLifeField->Add("8 Seconds", 496, "", false, false); - miCollectionModeCardLifeField->Add("9 Seconds", 558, "", false, false); - miCollectionModeCardLifeField->Add("10 Seconds", 620, "", false, false); - miCollectionModeCardLifeField->Add("12 Seconds", 744, "", false, false); - miCollectionModeCardLifeField->Add("15 Seconds", 930, "", false, false); - miCollectionModeCardLifeField->Add("18 Seconds", 1116, "", false, false); - miCollectionModeCardLifeField->Add("20 Seconds", 1240, "", false, false); - miCollectionModeCardLifeField->Add("25 Seconds", 1550, "", false, false); - miCollectionModeCardLifeField->Add("30 Seconds", 1860, "", false, false); + miCollectionModeCardLifeField->Add("1 Second", 62, false, false); + miCollectionModeCardLifeField->Add("2 Seconds", 124, false, false); + miCollectionModeCardLifeField->Add("3 Seconds", 186); + miCollectionModeCardLifeField->Add("4 Seconds", 248); + miCollectionModeCardLifeField->Add("5 Seconds", 310); + miCollectionModeCardLifeField->Add("6 Seconds", 372); + miCollectionModeCardLifeField->Add("7 Seconds", 434); + miCollectionModeCardLifeField->Add("8 Seconds", 496); + miCollectionModeCardLifeField->Add("9 Seconds", 558); + miCollectionModeCardLifeField->Add("10 Seconds", 620); + miCollectionModeCardLifeField->Add("12 Seconds", 744); + miCollectionModeCardLifeField->Add("15 Seconds", 930); + miCollectionModeCardLifeField->Add("18 Seconds", 1116); + miCollectionModeCardLifeField->Add("20 Seconds", 1240); + miCollectionModeCardLifeField->Add("25 Seconds", 1550); + miCollectionModeCardLifeField->Add("30 Seconds", 1860); miCollectionModeCardLifeField->SetData(&game_values.gamemodemenusettings.collection.cardlife, NULL, NULL); miCollectionModeCardLifeField->SetKey(game_values.gamemodemenusettings.collection.cardlife); @@ -1227,24 +1227,24 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() //*********************** miChaseModeSpeedField = new MI_SelectField(&rm->spr_selectfield, 120, 160, "Speed", 400, 180); - miChaseModeSpeedField->Add("Very Slow", 3, "", false, false, false); - miChaseModeSpeedField->Add("Slow", 4, "", false, false); - miChaseModeSpeedField->Add("Moderate", 5, "", false, false); - miChaseModeSpeedField->Add("Fast", 6, "", false, false); - miChaseModeSpeedField->Add("Very Fast", 7, "", false, false); - miChaseModeSpeedField->Add("Extremely Fast", 8, "", false, false, false); - miChaseModeSpeedField->Add("Insanely Fast", 10, "", false, false, false); + miChaseModeSpeedField->Add("Very Slow", 3, false, false); + miChaseModeSpeedField->Add("Slow", 4); + miChaseModeSpeedField->Add("Moderate", 5); + miChaseModeSpeedField->Add("Fast", 6); + miChaseModeSpeedField->Add("Very Fast", 7); + miChaseModeSpeedField->Add("Extremely Fast", 8, false, false); + miChaseModeSpeedField->Add("Insanely Fast", 10, false, false); miChaseModeSpeedField->SetData(&game_values.gamemodemenusettings.chase.phantospeed, NULL, NULL); miChaseModeSpeedField->SetKey(game_values.gamemodemenusettings.chase.phantospeed); for (short iPhanto = 0; iPhanto < 3; iPhanto++) { miChaseModeQuantitySlider[iPhanto] = new MI_PowerupSlider(&rm->spr_selectfield, &rm->menu_slider_bar, &rm->spr_phanto, 120, 200 + 40 * iPhanto, 400, iPhanto); - miChaseModeQuantitySlider[iPhanto]->Add("", 0, "", false, false, iPhanto == 0 ? false : true); - miChaseModeQuantitySlider[iPhanto]->Add("", 1, "", false, false); - miChaseModeQuantitySlider[iPhanto]->Add("", 2, "", false, false); - miChaseModeQuantitySlider[iPhanto]->Add("", 3, "", false, false, false); - miChaseModeQuantitySlider[iPhanto]->Add("", 4, "", false, false, false); - miChaseModeQuantitySlider[iPhanto]->Add("", 5, "", false, false, false); + miChaseModeQuantitySlider[iPhanto]->Add("", 0, false, iPhanto == 0 ? false : true); + miChaseModeQuantitySlider[iPhanto]->Add("", 1); + miChaseModeQuantitySlider[iPhanto]->Add("", 2); + miChaseModeQuantitySlider[iPhanto]->Add("", 3, false, false); + miChaseModeQuantitySlider[iPhanto]->Add("", 4, false, false); + miChaseModeQuantitySlider[iPhanto]->Add("", 5, false, false); miChaseModeQuantitySlider[iPhanto]->SetNoWrap(true); miChaseModeQuantitySlider[iPhanto]->SetData(&game_values.gamemodemenusettings.chase.phantoquantity[iPhanto], NULL, NULL); miChaseModeQuantitySlider[iPhanto]->SetKey(game_values.gamemodemenusettings.chase.phantoquantity[iPhanto]); @@ -1285,24 +1285,24 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() miShyGuyTagModeTagOnSuicideField->setAutoAdvance(true); miShyGuyTagModeTagOnStompField = new MI_SelectField(&rm->spr_selectfield, 120, 220, "Tag Transfer", 400, 180); - miShyGuyTagModeTagOnStompField->Add("Touch Only", 0, "", false, false); - miShyGuyTagModeTagOnStompField->Add("Kills Only", 1, "", false, false); - miShyGuyTagModeTagOnStompField->Add("Touch and Kills", 2, "", false, false); + miShyGuyTagModeTagOnStompField->Add("Touch Only", 0); + miShyGuyTagModeTagOnStompField->Add("Kills Only", 1); + miShyGuyTagModeTagOnStompField->Add("Touch and Kills", 2); miShyGuyTagModeTagOnStompField->SetData(&game_values.gamemodemenusettings.shyguytag.tagtransfer, NULL, NULL); miShyGuyTagModeTagOnStompField->SetKey(game_values.gamemodemenusettings.shyguytag.tagtransfer); miShyGuyTagModeFreeTimeField = new MI_SelectField(&rm->spr_selectfield, 120, 260, "Free Time", 400, 180); - miShyGuyTagModeFreeTimeField->Add("Instant", 0, "", false, false); - miShyGuyTagModeFreeTimeField->Add("1 Second", 1, "", false, false); - miShyGuyTagModeFreeTimeField->Add("2 Seconds", 2, "", false, false); - miShyGuyTagModeFreeTimeField->Add("3 Seconds", 3, "", false, false); - miShyGuyTagModeFreeTimeField->Add("4 Seconds", 4, "", false, false); - miShyGuyTagModeFreeTimeField->Add("5 Seconds", 5, "", false, false); - miShyGuyTagModeFreeTimeField->Add("6 Seconds", 6, "", false, false); - miShyGuyTagModeFreeTimeField->Add("7 Seconds", 7, "", false, false); - miShyGuyTagModeFreeTimeField->Add("8 Seconds", 8, "", false, false); - miShyGuyTagModeFreeTimeField->Add("9 Seconds", 9, "", false, false); - miShyGuyTagModeFreeTimeField->Add("10 Seconds", 10, "", false, false); + miShyGuyTagModeFreeTimeField->Add("Instant", 0); + miShyGuyTagModeFreeTimeField->Add("1 Second", 1); + miShyGuyTagModeFreeTimeField->Add("2 Seconds", 2); + miShyGuyTagModeFreeTimeField->Add("3 Seconds", 3); + miShyGuyTagModeFreeTimeField->Add("4 Seconds", 4); + miShyGuyTagModeFreeTimeField->Add("5 Seconds", 5); + miShyGuyTagModeFreeTimeField->Add("6 Seconds", 6); + miShyGuyTagModeFreeTimeField->Add("7 Seconds", 7); + miShyGuyTagModeFreeTimeField->Add("8 Seconds", 8); + miShyGuyTagModeFreeTimeField->Add("9 Seconds", 9); + miShyGuyTagModeFreeTimeField->Add("10 Seconds", 10); miShyGuyTagModeFreeTimeField->SetData(&game_values.gamemodemenusettings.shyguytag.freetime, NULL, NULL); miShyGuyTagModeFreeTimeField->SetKey(game_values.gamemodemenusettings.shyguytag.freetime); @@ -1331,42 +1331,42 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() //*********************** miBossModeTypeField = new MI_SelectField(&rm->spr_selectfield, 120, 180, "Type", 400, 180); - miBossModeTypeField->Add("Hammer", 0, "", false, false); - miBossModeTypeField->Add("Bomb", 1, "", false, false); - miBossModeTypeField->Add("Fire", 2, "", false, false); + miBossModeTypeField->Add("Hammer", 0); + miBossModeTypeField->Add("Bomb", 1); + miBossModeTypeField->Add("Fire", 2); miBossModeTypeField->SetData(&game_values.gamemodemenusettings.boss.bosstype, NULL, NULL); miBossModeTypeField->SetKey(game_values.gamemodemenusettings.boss.bosstype); miBossModeDifficultyField = new MI_SelectField(&rm->spr_selectfield, 120, 220, "Difficulty", 400, 180); - miBossModeDifficultyField->Add("Very Easy", 0, "", false, false, false); - miBossModeDifficultyField->Add("Easy", 1, "", false, false); - miBossModeDifficultyField->Add("Moderate", 2, "", false, false); - miBossModeDifficultyField->Add("Hard", 3, "", false, false); - miBossModeDifficultyField->Add("Very Hard", 4, "", false, false, false); + miBossModeDifficultyField->Add("Very Easy", 0, false, false); + miBossModeDifficultyField->Add("Easy", 1); + miBossModeDifficultyField->Add("Moderate", 2); + miBossModeDifficultyField->Add("Hard", 3); + miBossModeDifficultyField->Add("Very Hard", 4, false, false); miBossModeDifficultyField->SetData(&game_values.gamemodemenusettings.boss.difficulty, NULL, NULL); miBossModeDifficultyField->SetKey(game_values.gamemodemenusettings.boss.difficulty); miBossModeHitPointsField = new MI_SelectField(&rm->spr_selectfield, 120, 260, "Health", 400, 180); - miBossModeHitPointsField->Add("1", 1, "", false, false, false); - miBossModeHitPointsField->Add("2", 2, "", false, false, false); - miBossModeHitPointsField->Add("3", 3, "", false, false); - miBossModeHitPointsField->Add("4", 4, "", false, false); - miBossModeHitPointsField->Add("5", 5, "", false, false); - miBossModeHitPointsField->Add("6", 6, "", false, false); - miBossModeHitPointsField->Add("7", 7, "", false, false); - miBossModeHitPointsField->Add("8", 8, "", false, false); - miBossModeHitPointsField->Add("9", 9, "", false, false, false); - miBossModeHitPointsField->Add("10", 10, "", false, false, false); - miBossModeHitPointsField->Add("11", 11, "", false, false, false); - miBossModeHitPointsField->Add("12", 12, "", false, false, false); - miBossModeHitPointsField->Add("13", 13, "", false, false, false); - miBossModeHitPointsField->Add("14", 14, "", false, false, false); - miBossModeHitPointsField->Add("15", 15, "", false, false, false); - miBossModeHitPointsField->Add("16", 16, "", false, false, false); - miBossModeHitPointsField->Add("17", 17, "", false, false, false); - miBossModeHitPointsField->Add("18", 18, "", false, false, false); - miBossModeHitPointsField->Add("19", 19, "", false, false, false); - miBossModeHitPointsField->Add("20", 20, "", false, false, false); + miBossModeHitPointsField->Add("1", 1, false, false); + miBossModeHitPointsField->Add("2", 2, false, false); + miBossModeHitPointsField->Add("3", 3); + miBossModeHitPointsField->Add("4", 4); + miBossModeHitPointsField->Add("5", 5); + miBossModeHitPointsField->Add("6", 6); + miBossModeHitPointsField->Add("7", 7); + miBossModeHitPointsField->Add("8", 8); + miBossModeHitPointsField->Add("9", 9, false, false); + miBossModeHitPointsField->Add("10", 10, false, false); + miBossModeHitPointsField->Add("11", 11, false, false); + miBossModeHitPointsField->Add("12", 12, false, false); + miBossModeHitPointsField->Add("13", 13, false, false); + miBossModeHitPointsField->Add("14", 14, false, false); + miBossModeHitPointsField->Add("15", 15, false, false); + miBossModeHitPointsField->Add("16", 16, false, false); + miBossModeHitPointsField->Add("17", 17, false, false); + miBossModeHitPointsField->Add("18", 18, false, false); + miBossModeHitPointsField->Add("19", 19, false, false); + miBossModeHitPointsField->Add("20", 20, false, false); miBossModeHitPointsField->SetData(&game_values.gamemodemenusettings.boss.hitpoints, NULL, NULL); miBossModeHitPointsField->SetKey(game_values.gamemodemenusettings.boss.hitpoints); diff --git a/src/smw/menu/options/EyeCandyOptionsMenu.cpp b/src/smw/menu/options/EyeCandyOptionsMenu.cpp index 09044b699..08585f867 100644 --- a/src/smw/menu/options/EyeCandyOptionsMenu.cpp +++ b/src/smw/menu/options/EyeCandyOptionsMenu.cpp @@ -15,59 +15,59 @@ UI_EyeCandyOptionsMenu::UI_EyeCandyOptionsMenu() : UI_Menu() { miSpawnStyleField = new MI_SelectField(&rm->spr_selectfield, 70, 80, "Spawn Style", 500, 220); - miSpawnStyleField->Add("Instant", 0, "", false, false); - miSpawnStyleField->Add("Door", 1, "", false, false); - miSpawnStyleField->Add("Swirl", 2, "", false, false); + miSpawnStyleField->Add("Instant", 0); + miSpawnStyleField->Add("Door", 1); + miSpawnStyleField->Add("Swirl", 2); miSpawnStyleField->SetData(&game_values.spawnstyle, NULL, NULL); miSpawnStyleField->SetKey(game_values.spawnstyle); miAwardStyleField = new MI_SelectField(&rm->spr_selectfield, 70, 120, "Award Style", 500, 220); - miAwardStyleField->Add("None", 0, "", false, false); - miAwardStyleField->Add("Fireworks", 1, "", false, false); - miAwardStyleField->Add("Spiral", 2, "", false, false); - miAwardStyleField->Add("Ring", 3, "", false, false); - miAwardStyleField->Add("Souls", 4, "", false, false); - miAwardStyleField->Add("Text", 5, "", false, false); + miAwardStyleField->Add("None", 0); + miAwardStyleField->Add("Fireworks", 1); + miAwardStyleField->Add("Spiral", 2); + miAwardStyleField->Add("Ring", 3); + miAwardStyleField->Add("Souls", 4); + miAwardStyleField->Add("Text", 5); miAwardStyleField->SetData(&game_values.awardstyle, NULL, NULL); miAwardStyleField->SetKey(game_values.awardstyle); miScoreStyleField = new MI_SelectField(&rm->spr_selectfield, 70, 160, "Score Location", 500, 220); - miScoreStyleField->Add("Top", 0, "", false, false); - miScoreStyleField->Add("Bottom", 1, "", false, false); - miScoreStyleField->Add("Corners", 2, "", false, false); + miScoreStyleField->Add("Top", 0); + miScoreStyleField->Add("Bottom", 1); + miScoreStyleField->Add("Corners", 2); miScoreStyleField->SetData(&game_values.scoreboardstyle, NULL, NULL); miScoreStyleField->SetKey(game_values.scoreboardstyle); miCrunchField = new MI_SelectField(&rm->spr_selectfield, 70, 200, "Screen Crunch", 500, 220); - miCrunchField->Add("Off", 0, "", false, false); + miCrunchField->Add("Off", 0); miCrunchField->Add("On", 1, "", true, false); miCrunchField->SetData(NULL, NULL, &game_values.screencrunch); miCrunchField->SetKey(game_values.screencrunch ? 1 : 0); miCrunchField->SetAutoAdvance(true); miWinningCrownField = new MI_SelectField(&rm->spr_selectfield, 70, 240, "Leader Crown", 500, 220); - miWinningCrownField->Add("Off", 0, "", false, false); + miWinningCrownField->Add("Off", 0); miWinningCrownField->Add("On", 1, "", true, false); miWinningCrownField->SetData(NULL, NULL, &game_values.showwinningcrown); miWinningCrownField->SetKey(game_values.showwinningcrown ? 1 : 0); miWinningCrownField->SetAutoAdvance(true); miStartCountDownField = new MI_SelectField(&rm->spr_selectfield, 70, 280, "Start Countdown", 500, 220); - miStartCountDownField->Add("Off", 0, "", false, false); + miStartCountDownField->Add("Off", 0); miStartCountDownField->Add("On", 1, "", true, false); miStartCountDownField->SetData(NULL, NULL, &game_values.startgamecountdown); miStartCountDownField->SetKey(game_values.startgamecountdown ? 1 : 0); miStartCountDownField->SetAutoAdvance(true); miStartModeDisplayField = new MI_SelectField(&rm->spr_selectfield, 70, 320, "Show Mode", 500, 220); - miStartModeDisplayField->Add("Off", 0, "", false, false); + miStartModeDisplayField->Add("Off", 0); miStartModeDisplayField->Add("On", 1, "", true, false); miStartModeDisplayField->SetData(NULL, NULL, &game_values.startmodedisplay); miStartModeDisplayField->SetKey(game_values.startmodedisplay ? 1 : 0); miStartModeDisplayField->SetAutoAdvance(true); miDeadTeamNoticeField = new MI_SelectField(&rm->spr_selectfield, 70, 360, "Dead Team Notice", 500, 220); - miDeadTeamNoticeField->Add("Off", 0, "", false, false); + miDeadTeamNoticeField->Add("Off", 0); miDeadTeamNoticeField->Add("On", 1, "", true, false); miDeadTeamNoticeField->SetData(NULL, NULL, &game_values.deadteamnotice); miDeadTeamNoticeField->SetKey(game_values.deadteamnotice ? 1 : 0); diff --git a/src/smw/menu/options/GameplayOptionsMenu.cpp b/src/smw/menu/options/GameplayOptionsMenu.cpp index 57b6e9998..cb8b18e31 100644 --- a/src/smw/menu/options/GameplayOptionsMenu.cpp +++ b/src/smw/menu/options/GameplayOptionsMenu.cpp @@ -15,122 +15,122 @@ UI_GameplayOptionsMenu::UI_GameplayOptionsMenu() : UI_Menu() { miRespawnField = new MI_SelectField(&rm->spr_selectfield, 70, 40, "Respawn Time", 500, 220); - miRespawnField->Add("Instant", 0, "", false, false); - miRespawnField->Add("0.5 Seconds", 1, "", false, false); - miRespawnField->Add("1.0 Seconds", 2, "", false, false); - miRespawnField->Add("1.5 Seconds", 3, "", false, false); - miRespawnField->Add("2.0 Seconds", 4, "", false, false); - miRespawnField->Add("2.5 Seconds", 5, "", false, false); - miRespawnField->Add("3.0 Seconds", 6, "", false, false); - miRespawnField->Add("3.5 Seconds", 7, "", false, false); - miRespawnField->Add("4.0 Seconds", 8, "", false, false); - miRespawnField->Add("4.5 Seconds", 9, "", false, false); - miRespawnField->Add("5.0 Seconds", 10, "", false, false); - miRespawnField->Add("5.5 Seconds", 11, "", false, false); - miRespawnField->Add("6.0 Seconds", 12, "", false, false); - miRespawnField->Add("6.5 Seconds", 13, "", false, false); - miRespawnField->Add("7.0 Seconds", 14, "", false, false); - miRespawnField->Add("7.5 Seconds", 15, "", false, false); - miRespawnField->Add("8.0 Seconds", 16, "", false, false); - miRespawnField->Add("8.5 Seconds", 17, "", false, false); - miRespawnField->Add("9.0 Seconds", 18, "", false, false); - miRespawnField->Add("9.5 Seconds", 19, "", false, false); - miRespawnField->Add("10.0 Seconds", 20, "", false, false); + miRespawnField->Add("Instant", 0); + miRespawnField->Add("0.5 Seconds", 1); + miRespawnField->Add("1.0 Seconds", 2); + miRespawnField->Add("1.5 Seconds", 3); + miRespawnField->Add("2.0 Seconds", 4); + miRespawnField->Add("2.5 Seconds", 5); + miRespawnField->Add("3.0 Seconds", 6); + miRespawnField->Add("3.5 Seconds", 7); + miRespawnField->Add("4.0 Seconds", 8); + miRespawnField->Add("4.5 Seconds", 9); + miRespawnField->Add("5.0 Seconds", 10); + miRespawnField->Add("5.5 Seconds", 11); + miRespawnField->Add("6.0 Seconds", 12); + miRespawnField->Add("6.5 Seconds", 13); + miRespawnField->Add("7.0 Seconds", 14); + miRespawnField->Add("7.5 Seconds", 15); + miRespawnField->Add("8.0 Seconds", 16); + miRespawnField->Add("8.5 Seconds", 17); + miRespawnField->Add("9.0 Seconds", 18); + miRespawnField->Add("9.5 Seconds", 19); + miRespawnField->Add("10.0 Seconds", 20); miRespawnField->SetData(&game_values.respawn, NULL, NULL); miRespawnField->SetKey(game_values.respawn); miShieldStyleField = new MI_SelectField(&rm->spr_selectfield, 70, 80, "Shield Style", 500, 220); - miShieldStyleField->Add("No Shield", 0, "", false, false); - miShieldStyleField->Add("Soft", 1, "", false, false); - miShieldStyleField->Add("Soft with Stomp", 2, "", false, false); - miShieldStyleField->Add("Hard", 3, "", false, false); + miShieldStyleField->Add("No Shield", 0); + miShieldStyleField->Add("Soft", 1); + miShieldStyleField->Add("Soft with Stomp", 2); + miShieldStyleField->Add("Hard", 3); miShieldStyleField->SetData(&game_values.shieldstyle, NULL, NULL); miShieldStyleField->SetKey(game_values.shieldstyle); miShieldTimeField = new MI_SelectField(&rm->spr_selectfield, 70, 120, "Shield Time", 500, 220); - miShieldTimeField->Add("0.5 Seconds", 31, "", false, false); - miShieldTimeField->Add("1.0 Seconds", 62, "", false, false); - miShieldTimeField->Add("1.5 Seconds", 93, "", false, false); - miShieldTimeField->Add("2.0 Seconds", 124, "", false, false); - miShieldTimeField->Add("2.5 Seconds", 155, "", false, false); - miShieldTimeField->Add("3.0 Seconds", 186, "", false, false); - miShieldTimeField->Add("3.5 Seconds", 217, "", false, false); - miShieldTimeField->Add("4.0 Seconds", 248, "", false, false); - miShieldTimeField->Add("4.5 Seconds", 279, "", false, false); - miShieldTimeField->Add("5.0 Seconds", 310, "", false, false); + miShieldTimeField->Add("0.5 Seconds", 31); + miShieldTimeField->Add("1.0 Seconds", 62); + miShieldTimeField->Add("1.5 Seconds", 93); + miShieldTimeField->Add("2.0 Seconds", 124); + miShieldTimeField->Add("2.5 Seconds", 155); + miShieldTimeField->Add("3.0 Seconds", 186); + miShieldTimeField->Add("3.5 Seconds", 217); + miShieldTimeField->Add("4.0 Seconds", 248); + miShieldTimeField->Add("4.5 Seconds", 279); + miShieldTimeField->Add("5.0 Seconds", 310); miShieldTimeField->SetData(&game_values.shieldtime, NULL, NULL); miShieldTimeField->SetKey(game_values.shieldtime); miBoundsTimeField = new MI_SelectField(&rm->spr_selectfield, 70, 160, "Bounds Time", 500, 220); - miBoundsTimeField->Add("Infinite", 0, "", false, false); - miBoundsTimeField->Add("1 Second", 1, "", false, false); - miBoundsTimeField->Add("2 Seconds", 2, "", false, false); - miBoundsTimeField->Add("3 Seconds", 3, "", false, false); - miBoundsTimeField->Add("4 Seconds", 4, "", false, false); - miBoundsTimeField->Add("5 Seconds", 5, "", false, false); - miBoundsTimeField->Add("6 Seconds", 6, "", false, false); - miBoundsTimeField->Add("7 Seconds", 7, "", false, false); - miBoundsTimeField->Add("8 Seconds", 8, "", false, false); - miBoundsTimeField->Add("9 Seconds", 9, "", false, false); - miBoundsTimeField->Add("10 Seconds", 10, "", false, false); + miBoundsTimeField->Add("Infinite", 0); + miBoundsTimeField->Add("1 Second", 1); + miBoundsTimeField->Add("2 Seconds", 2); + miBoundsTimeField->Add("3 Seconds", 3); + miBoundsTimeField->Add("4 Seconds", 4); + miBoundsTimeField->Add("5 Seconds", 5); + miBoundsTimeField->Add("6 Seconds", 6); + miBoundsTimeField->Add("7 Seconds", 7); + miBoundsTimeField->Add("8 Seconds", 8); + miBoundsTimeField->Add("9 Seconds", 9); + miBoundsTimeField->Add("10 Seconds", 10); miBoundsTimeField->SetData(&game_values.outofboundstime, NULL, NULL); miBoundsTimeField->SetKey(game_values.outofboundstime); miSuicideTimeField = new MI_SelectField(&rm->spr_selectfield, 70, 200, "Suicide Time", 500, 220); - miSuicideTimeField->Add("Off", 0, "", false, false); - miSuicideTimeField->Add("3 Seconds", 186, "", false, false); - miSuicideTimeField->Add("5 Seconds", 310, "", false, false); - miSuicideTimeField->Add("8 Seconds", 496, "", false, false); - miSuicideTimeField->Add("10 Seconds", 620, "", false, false); - miSuicideTimeField->Add("15 Seconds", 930, "", false, false); - miSuicideTimeField->Add("20 Seconds", 1240, "", false, false); + miSuicideTimeField->Add("Off", 0); + miSuicideTimeField->Add("3 Seconds", 186); + miSuicideTimeField->Add("5 Seconds", 310); + miSuicideTimeField->Add("8 Seconds", 496); + miSuicideTimeField->Add("10 Seconds", 620); + miSuicideTimeField->Add("15 Seconds", 930); + miSuicideTimeField->Add("20 Seconds", 1240); miSuicideTimeField->SetData(&game_values.suicidetime, NULL, NULL); miSuicideTimeField->SetKey(game_values.suicidetime); miWarpLockStyleField = new MI_SelectField(&rm->spr_selectfield, 70, 240, "Warp Lock Style", 500, 220); - miWarpLockStyleField->Add("Entrance Only", 0, "", false, false); - miWarpLockStyleField->Add("Exit Only", 1, "", false, false); - miWarpLockStyleField->Add("Entrance and Exit", 2, "", false, false); - miWarpLockStyleField->Add("Entire Connection", 3, "", false, false); - miWarpLockStyleField->Add("All Warps", 4, "", false, false); + miWarpLockStyleField->Add("Entrance Only", 0); + miWarpLockStyleField->Add("Exit Only", 1); + miWarpLockStyleField->Add("Entrance and Exit", 2); + miWarpLockStyleField->Add("Entire Connection", 3); + miWarpLockStyleField->Add("All Warps", 4); miWarpLockStyleField->SetData(&game_values.warplockstyle, NULL, NULL); miWarpLockStyleField->SetKey(game_values.warplockstyle); miWarpLockTimeField = new MI_SelectField(&rm->spr_selectfield, 70, 280, "Warp Lock Time", 500, 220); - miWarpLockTimeField->Add("Off", 0, "", false, false); - miWarpLockTimeField->Add("1 Second", 62, "", false, false); - miWarpLockTimeField->Add("2 Seconds", 124, "", false, false); - miWarpLockTimeField->Add("3 Seconds", 186, "", false, false); - miWarpLockTimeField->Add("4 Seconds", 248, "", false, false); - miWarpLockTimeField->Add("5 Seconds", 310, "", false, false); - miWarpLockTimeField->Add("6 Seconds", 372, "", false, false); - miWarpLockTimeField->Add("7 Seconds", 434, "", false, false); - miWarpLockTimeField->Add("8 Seconds", 496, "", false, false); - miWarpLockTimeField->Add("9 Seconds", 558, "", false, false); - miWarpLockTimeField->Add("10 Seconds", 620, "", false, false); + miWarpLockTimeField->Add("Off", 0); + miWarpLockTimeField->Add("1 Second", 62); + miWarpLockTimeField->Add("2 Seconds", 124); + miWarpLockTimeField->Add("3 Seconds", 186); + miWarpLockTimeField->Add("4 Seconds", 248); + miWarpLockTimeField->Add("5 Seconds", 310); + miWarpLockTimeField->Add("6 Seconds", 372); + miWarpLockTimeField->Add("7 Seconds", 434); + miWarpLockTimeField->Add("8 Seconds", 496); + miWarpLockTimeField->Add("9 Seconds", 558); + miWarpLockTimeField->Add("10 Seconds", 620); miWarpLockTimeField->SetData(&game_values.warplocktime, NULL, NULL); miWarpLockTimeField->SetKey(game_values.warplocktime); miBotsField = new MI_SelectField(&rm->spr_selectfield, 70, 320, "Bot Difficulty", 500, 220); - miBotsField->Add("Very Easy", 0, "", false, false); - miBotsField->Add("Easy", 1, "", false, false); - miBotsField->Add("Moderate", 2, "", false, false); - miBotsField->Add("Hard", 3, "", false, false); - miBotsField->Add("Very Hard", 4, "", false, false); + miBotsField->Add("Very Easy", 0); + miBotsField->Add("Easy", 1); + miBotsField->Add("Moderate", 2); + miBotsField->Add("Hard", 3); + miBotsField->Add("Very Hard", 4); miBotsField->SetData(&game_values.cpudifficulty, NULL, NULL); miBotsField->SetKey(game_values.cpudifficulty); miPointSpeedField = new MI_SelectField(&rm->spr_selectfield, 70, 360, "Point Speed", 500, 220); - miPointSpeedField->Add("Very Slow", 60, "", false, false); - miPointSpeedField->Add("Slow", 40, "", false, false); - miPointSpeedField->Add("Moderate", 20, "", false, false); - miPointSpeedField->Add("Fast", 10, "", false, false); - miPointSpeedField->Add("Very Fast", 5, "", false, false); + miPointSpeedField->Add("Very Slow", 60); + miPointSpeedField->Add("Slow", 40); + miPointSpeedField->Add("Moderate", 20); + miPointSpeedField->Add("Fast", 10); + miPointSpeedField->Add("Very Fast", 5); miPointSpeedField->SetData(&game_values.pointspeed, NULL, NULL); miPointSpeedField->SetKey(game_values.pointspeed); miSecretsField = new MI_SelectField(&rm->spr_selectfield, 70, 400, "Secrets", 500, 220); - miSecretsField->Add("Off", 0, "", false, false); + miSecretsField->Add("Off", 0); miSecretsField->Add("On", 1, "", true, false); miSecretsField->SetData(NULL, NULL, &game_values.secretsenabled); miSecretsField->SetKey(game_values.secretsenabled ? 1 : 0); diff --git a/src/smw/menu/options/GraphicsOptionsMenu.cpp b/src/smw/menu/options/GraphicsOptionsMenu.cpp index 35553bd33..af350ca5d 100644 --- a/src/smw/menu/options/GraphicsOptionsMenu.cpp +++ b/src/smw/menu/options/GraphicsOptionsMenu.cpp @@ -20,39 +20,39 @@ UI_GraphicsOptionsMenu::UI_GraphicsOptionsMenu() : UI_Menu() { miTopLayerField = new MI_SelectField(&rm->spr_selectfield, 70, 120, "Draw Top Layer", 500, 220); - miTopLayerField->Add("Background", 0, "", false, false); + miTopLayerField->Add("Background", 0); miTopLayerField->Add("Foreground", 1, "", true, false); miTopLayerField->SetData(NULL, NULL, &game_values.toplayer); miTopLayerField->SetKey(game_values.toplayer ? 1 : 0); miTopLayerField->SetAutoAdvance(true); miFrameLimiterField = new MI_SelectField(&rm->spr_selectfield, 70, 160, "Frame Limit", 500, 220); - miFrameLimiterField->Add("10 FPS", 100, "", false, false); - miFrameLimiterField->Add("15 FPS", 67, "", false, false); - miFrameLimiterField->Add("20 FPS", 50, "", false, false); - miFrameLimiterField->Add("25 FPS", 40, "", false, false); - miFrameLimiterField->Add("30 FPS", 33, "", false, false); - miFrameLimiterField->Add("35 FPS", 28, "", false, false); - miFrameLimiterField->Add("40 FPS", 25, "", false, false); - miFrameLimiterField->Add("45 FPS", 22, "", false, false); - miFrameLimiterField->Add("50 FPS", 20, "", false, false); - miFrameLimiterField->Add("55 FPS", 18, "", false, false); - miFrameLimiterField->Add("62 FPS (Normal)", 16, "", false, false); - miFrameLimiterField->Add("66 FPS", 15, "", false, false); - miFrameLimiterField->Add("71 FPS", 14, "", false, false); - miFrameLimiterField->Add("77 FPS", 13, "", false, false); - miFrameLimiterField->Add("83 FPS", 12, "", false, false); - miFrameLimiterField->Add("90 FPS", 11, "", false, false); - miFrameLimiterField->Add("100 FPS", 10, "", false, false); - miFrameLimiterField->Add("111 FPS", 9, "", false, false); - miFrameLimiterField->Add("125 FPS", 8, "", false, false); - miFrameLimiterField->Add("142 FPS", 7, "", false, false); - miFrameLimiterField->Add("166 FPS", 6, "", false, false); - miFrameLimiterField->Add("200 FPS", 5, "", false, false); - miFrameLimiterField->Add("250 FPS", 4, "", false, false); - miFrameLimiterField->Add("333 FPS", 3, "", false, false); - miFrameLimiterField->Add("500 FPS", 2, "", false, false); - miFrameLimiterField->Add("No Limit", 0, "", false, false); + miFrameLimiterField->Add("10 FPS", 100); + miFrameLimiterField->Add("15 FPS", 67); + miFrameLimiterField->Add("20 FPS", 50); + miFrameLimiterField->Add("25 FPS", 40); + miFrameLimiterField->Add("30 FPS", 33); + miFrameLimiterField->Add("35 FPS", 28); + miFrameLimiterField->Add("40 FPS", 25); + miFrameLimiterField->Add("45 FPS", 22); + miFrameLimiterField->Add("50 FPS", 20); + miFrameLimiterField->Add("55 FPS", 18); + miFrameLimiterField->Add("62 FPS (Normal)", 16); + miFrameLimiterField->Add("66 FPS", 15); + miFrameLimiterField->Add("71 FPS", 14); + miFrameLimiterField->Add("77 FPS", 13); + miFrameLimiterField->Add("83 FPS", 12); + miFrameLimiterField->Add("90 FPS", 11); + miFrameLimiterField->Add("100 FPS", 10); + miFrameLimiterField->Add("111 FPS", 9); + miFrameLimiterField->Add("125 FPS", 8); + miFrameLimiterField->Add("142 FPS", 7); + miFrameLimiterField->Add("166 FPS", 6); + miFrameLimiterField->Add("200 FPS", 5); + miFrameLimiterField->Add("250 FPS", 4); + miFrameLimiterField->Add("333 FPS", 3); + miFrameLimiterField->Add("500 FPS", 2); + miFrameLimiterField->Add("No Limit", 0); miFrameLimiterField->SetData(&game_values.framelimiter, NULL, NULL); miFrameLimiterField->SetKey(game_values.framelimiter); @@ -61,7 +61,7 @@ UI_GraphicsOptionsMenu::UI_GraphicsOptionsMenu() miScreenSettingsButton->SetCode(MENU_CODE_TO_SCREEN_SETTINGS); #else miFullscreenField = new MI_SelectField(&rm->spr_selectfield, 70, 200, "Screen Size", 500, 220); - miFullscreenField->Add("Windowed", 0, "", false, false); + miFullscreenField->Add("Windowed", 0); miFullscreenField->Add("Fullscreen", 1, "", true, false); miFullscreenField->SetData(NULL, NULL, &game_values.fullscreen); miFullscreenField->SetKey(game_values.fullscreen ? 1 : 0); diff --git a/src/smw/menu/options/PowerupSettingsMenu.cpp b/src/smw/menu/options/PowerupSettingsMenu.cpp index 2ae16e43a..ed3b308da 100644 --- a/src/smw/menu/options/PowerupSettingsMenu.cpp +++ b/src/smw/menu/options/PowerupSettingsMenu.cpp @@ -16,64 +16,64 @@ UI_PowerupSettingsMenu::UI_PowerupSettingsMenu() : UI_Menu() { miStoredPowerupDelayField = new MI_SelectField(&rm->spr_selectfield, 70, 100, "Item Use Speed", 500, 220); - miStoredPowerupDelayField->Add("Very Slow", 2, "", false, false); - miStoredPowerupDelayField->Add("Slow", 3, "", false, false); - miStoredPowerupDelayField->Add("Moderate", 4, "", false, false); - miStoredPowerupDelayField->Add("Fast", 5, "", false, false); - miStoredPowerupDelayField->Add("Very Fast", 6, "", false, false); + miStoredPowerupDelayField->Add("Very Slow", 2); + miStoredPowerupDelayField->Add("Slow", 3); + miStoredPowerupDelayField->Add("Moderate", 4); + miStoredPowerupDelayField->Add("Fast", 5); + miStoredPowerupDelayField->Add("Very Fast", 6); miStoredPowerupDelayField->SetData(&game_values.storedpowerupdelay, NULL, NULL); miStoredPowerupDelayField->SetKey(game_values.storedpowerupdelay); miItemRespawnField = new MI_SelectField(&rm->spr_selectfield, 70, 140, "Item Spawn", 500, 220); - miItemRespawnField->Add("Off", 0, "", false, false); - miItemRespawnField->Add("5 Seconds", 310, "", false, false); - miItemRespawnField->Add("10 Seconds", 620, "", false, false); - miItemRespawnField->Add("15 Seconds", 930, "", false, false); - miItemRespawnField->Add("20 Seconds", 1240, "", false, false); - miItemRespawnField->Add("25 Seconds", 1550, "", false, false); - miItemRespawnField->Add("30 Seconds", 1860, "", false, false); - miItemRespawnField->Add("35 Seconds", 2170, "", false, false); - miItemRespawnField->Add("40 Seconds", 2480, "", false, false); - miItemRespawnField->Add("45 Seconds", 2790, "", false, false); - miItemRespawnField->Add("50 Seconds", 3100, "", false, false); - miItemRespawnField->Add("55 Seconds", 3410, "", false, false); - miItemRespawnField->Add("60 Seconds", 3720, "", false, false); + miItemRespawnField->Add("Off", 0); + miItemRespawnField->Add("5 Seconds", 310); + miItemRespawnField->Add("10 Seconds", 620); + miItemRespawnField->Add("15 Seconds", 930); + miItemRespawnField->Add("20 Seconds", 1240); + miItemRespawnField->Add("25 Seconds", 1550); + miItemRespawnField->Add("30 Seconds", 1860); + miItemRespawnField->Add("35 Seconds", 2170); + miItemRespawnField->Add("40 Seconds", 2480); + miItemRespawnField->Add("45 Seconds", 2790); + miItemRespawnField->Add("50 Seconds", 3100); + miItemRespawnField->Add("55 Seconds", 3410); + miItemRespawnField->Add("60 Seconds", 3720); miItemRespawnField->SetData(&game_values.itemrespawntime, NULL, NULL); miItemRespawnField->SetKey(game_values.itemrespawntime); miHiddenBlockRespawnField = new MI_SelectField(&rm->spr_selectfield, 70, 180, "Hidden Block Hide", 500, 220); - miHiddenBlockRespawnField->Add("Off", 0, "", false, false); - miHiddenBlockRespawnField->Add("5 Seconds", 310, "", false, false); - miHiddenBlockRespawnField->Add("10 Seconds", 620, "", false, false); - miHiddenBlockRespawnField->Add("15 Seconds", 930, "", false, false); - miHiddenBlockRespawnField->Add("20 Seconds", 1240, "", false, false); - miHiddenBlockRespawnField->Add("25 Seconds", 1550, "", false, false); - miHiddenBlockRespawnField->Add("30 Seconds", 1860, "", false, false); - miHiddenBlockRespawnField->Add("35 Seconds", 2170, "", false, false); - miHiddenBlockRespawnField->Add("40 Seconds", 2480, "", false, false); - miHiddenBlockRespawnField->Add("45 Seconds", 2790, "", false, false); - miHiddenBlockRespawnField->Add("50 Seconds", 3100, "", false, false); - miHiddenBlockRespawnField->Add("55 Seconds", 3410, "", false, false); - miHiddenBlockRespawnField->Add("60 Seconds", 3720, "", false, false); + miHiddenBlockRespawnField->Add("Off", 0); + miHiddenBlockRespawnField->Add("5 Seconds", 310); + miHiddenBlockRespawnField->Add("10 Seconds", 620); + miHiddenBlockRespawnField->Add("15 Seconds", 930); + miHiddenBlockRespawnField->Add("20 Seconds", 1240); + miHiddenBlockRespawnField->Add("25 Seconds", 1550); + miHiddenBlockRespawnField->Add("30 Seconds", 1860); + miHiddenBlockRespawnField->Add("35 Seconds", 2170); + miHiddenBlockRespawnField->Add("40 Seconds", 2480); + miHiddenBlockRespawnField->Add("45 Seconds", 2790); + miHiddenBlockRespawnField->Add("50 Seconds", 3100); + miHiddenBlockRespawnField->Add("55 Seconds", 3410); + miHiddenBlockRespawnField->Add("60 Seconds", 3720); miHiddenBlockRespawnField->SetData(&game_values.hiddenblockrespawn, NULL, NULL); miHiddenBlockRespawnField->SetKey(game_values.hiddenblockrespawn); miSwapStyleField = new MI_SelectField(&rm->spr_selectfield, 70, 220, "Swap Style", 500, 220); - miSwapStyleField->Add("Walk", 0, "", false, false); - miSwapStyleField->Add("Blink", 1, "", false, false); - miSwapStyleField->Add("Instant", 2, "", false, false); + miSwapStyleField->Add("Walk", 0); + miSwapStyleField->Add("Blink", 1); + miSwapStyleField->Add("Instant", 2); miSwapStyleField->SetData(&game_values.swapstyle, NULL, NULL); miSwapStyleField->SetKey(game_values.swapstyle); miBonusWheelField = new MI_SelectField(&rm->spr_selectfield, 70, 260, "Bonus Wheel", 500, 220); - miBonusWheelField->Add("Off", 0, "", false, false); - miBonusWheelField->Add("Tournament Win", 1, "", false, false); - miBonusWheelField->Add("Every Game", 2, "", false, false); + miBonusWheelField->Add("Off", 0); + miBonusWheelField->Add("Tournament Win", 1); + miBonusWheelField->Add("Every Game", 2); miBonusWheelField->SetData(&game_values.bonuswheel, NULL, NULL); miBonusWheelField->SetKey(game_values.bonuswheel); miKeepPowerupField = new MI_SelectField(&rm->spr_selectfield, 70, 300, "Bonus Item", 500, 220); - miKeepPowerupField->Add("Until Next Spin", 0, "", false, false); + miKeepPowerupField->Add("Until Next Spin", 0); miKeepPowerupField->Add("Keep Always", 1, "", true, false); miKeepPowerupField->SetData(NULL, NULL, &game_values.keeppowerup); miKeepPowerupField->SetKey(game_values.keeppowerup ? 1 : 0); diff --git a/src/smw/menu/options/ProjectileLimitsMenu.cpp b/src/smw/menu/options/ProjectileLimitsMenu.cpp index 6488c1acb..f1ecfe130 100644 --- a/src/smw/menu/options/ProjectileLimitsMenu.cpp +++ b/src/smw/menu/options/ProjectileLimitsMenu.cpp @@ -15,146 +15,146 @@ UI_ProjectileLimitsMenu::UI_ProjectileLimitsMenu() : UI_Menu() { miFireballLimitField = new MI_SelectField(&rm->spr_selectfield, 70, 60, "Fireball Limit", 500, 220); - miFireballLimitField->Add("Unlimited", 0, "", false, false); - miFireballLimitField->Add("2", 2, "", false, false); - miFireballLimitField->Add("5", 5, "", false, false); - miFireballLimitField->Add("8", 8, "", false, false); - miFireballLimitField->Add("10", 10, "", false, false); - miFireballLimitField->Add("12", 12, "", false, false); - miFireballLimitField->Add("15", 15, "", false, false); - miFireballLimitField->Add("20", 20, "", false, false); - miFireballLimitField->Add("25", 25, "", false, false); - miFireballLimitField->Add("30", 30, "", false, false); - miFireballLimitField->Add("40", 40, "", false, false); - miFireballLimitField->Add("50", 50, "", false, false); + miFireballLimitField->Add("Unlimited", 0); + miFireballLimitField->Add("2", 2); + miFireballLimitField->Add("5", 5); + miFireballLimitField->Add("8", 8); + miFireballLimitField->Add("10", 10); + miFireballLimitField->Add("12", 12); + miFireballLimitField->Add("15", 15); + miFireballLimitField->Add("20", 20); + miFireballLimitField->Add("25", 25); + miFireballLimitField->Add("30", 30); + miFireballLimitField->Add("40", 40); + miFireballLimitField->Add("50", 50); miFireballLimitField->SetData(&game_values.fireballlimit, NULL, NULL); miFireballLimitField->SetKey(game_values.fireballlimit); miHammerLimitField = new MI_SelectField(&rm->spr_selectfield, 70, 100, "Hammer Limit", 500, 220); - miHammerLimitField->Add("Unlimited", 0, "", false, false); - miHammerLimitField->Add("2", 2, "", false, false); - miHammerLimitField->Add("5", 5, "", false, false); - miHammerLimitField->Add("8", 8, "", false, false); - miHammerLimitField->Add("10", 10, "", false, false); - miHammerLimitField->Add("12", 12, "", false, false); - miHammerLimitField->Add("15", 15, "", false, false); - miHammerLimitField->Add("20", 20, "", false, false); - miHammerLimitField->Add("25", 25, "", false, false); - miHammerLimitField->Add("30", 30, "", false, false); - miHammerLimitField->Add("40", 40, "", false, false); - miHammerLimitField->Add("50", 50, "", false, false); + miHammerLimitField->Add("Unlimited", 0); + miHammerLimitField->Add("2", 2); + miHammerLimitField->Add("5", 5); + miHammerLimitField->Add("8", 8); + miHammerLimitField->Add("10", 10); + miHammerLimitField->Add("12", 12); + miHammerLimitField->Add("15", 15); + miHammerLimitField->Add("20", 20); + miHammerLimitField->Add("25", 25); + miHammerLimitField->Add("30", 30); + miHammerLimitField->Add("40", 40); + miHammerLimitField->Add("50", 50); miHammerLimitField->SetData(&game_values.hammerlimit, NULL, NULL); miHammerLimitField->SetKey(game_values.hammerlimit); miBoomerangLimitField = new MI_SelectField(&rm->spr_selectfield, 70, 140, "Boomerang Limit", 500, 220); - miBoomerangLimitField->Add("Unlimited", 0, "", false, false); - miBoomerangLimitField->Add("2", 2, "", false, false); - miBoomerangLimitField->Add("5", 5, "", false, false); - miBoomerangLimitField->Add("8", 8, "", false, false); - miBoomerangLimitField->Add("10", 10, "", false, false); - miBoomerangLimitField->Add("12", 12, "", false, false); - miBoomerangLimitField->Add("15", 15, "", false, false); - miBoomerangLimitField->Add("20", 20, "", false, false); - miBoomerangLimitField->Add("25", 25, "", false, false); - miBoomerangLimitField->Add("30", 30, "", false, false); - miBoomerangLimitField->Add("40", 40, "", false, false); - miBoomerangLimitField->Add("50", 50, "", false, false); + miBoomerangLimitField->Add("Unlimited", 0); + miBoomerangLimitField->Add("2", 2); + miBoomerangLimitField->Add("5", 5); + miBoomerangLimitField->Add("8", 8); + miBoomerangLimitField->Add("10", 10); + miBoomerangLimitField->Add("12", 12); + miBoomerangLimitField->Add("15", 15); + miBoomerangLimitField->Add("20", 20); + miBoomerangLimitField->Add("25", 25); + miBoomerangLimitField->Add("30", 30); + miBoomerangLimitField->Add("40", 40); + miBoomerangLimitField->Add("50", 50); miBoomerangLimitField->SetData(&game_values.boomeranglimit, NULL, NULL); miBoomerangLimitField->SetKey(game_values.boomeranglimit); miFeatherLimitField = new MI_SelectField(&rm->spr_selectfield, 70, 180, "Feather Limit", 500, 220); - miFeatherLimitField->Add("Unlimited", 0, "", false, false); - miFeatherLimitField->Add("2", 2, "", false, false); - miFeatherLimitField->Add("5", 5, "", false, false); - miFeatherLimitField->Add("8", 8, "", false, false); - miFeatherLimitField->Add("10", 10, "", false, false); - miFeatherLimitField->Add("12", 12, "", false, false); - miFeatherLimitField->Add("15", 15, "", false, false); - miFeatherLimitField->Add("20", 20, "", false, false); - miFeatherLimitField->Add("25", 25, "", false, false); - miFeatherLimitField->Add("30", 30, "", false, false); - miFeatherLimitField->Add("40", 40, "", false, false); - miFeatherLimitField->Add("50", 50, "", false, false); + miFeatherLimitField->Add("Unlimited", 0); + miFeatherLimitField->Add("2", 2); + miFeatherLimitField->Add("5", 5); + miFeatherLimitField->Add("8", 8); + miFeatherLimitField->Add("10", 10); + miFeatherLimitField->Add("12", 12); + miFeatherLimitField->Add("15", 15); + miFeatherLimitField->Add("20", 20); + miFeatherLimitField->Add("25", 25); + miFeatherLimitField->Add("30", 30); + miFeatherLimitField->Add("40", 40); + miFeatherLimitField->Add("50", 50); miFeatherLimitField->SetData(&game_values.featherlimit, NULL, NULL); miFeatherLimitField->SetKey(game_values.featherlimit); miLeafLimitField = new MI_SelectField(&rm->spr_selectfield, 70, 220, "Leaf Limit", 500, 220); - miLeafLimitField->Add("Unlimited", 0, "", false, false); - miLeafLimitField->Add("2", 2, "", false, false); - miLeafLimitField->Add("5", 5, "", false, false); - miLeafLimitField->Add("8", 8, "", false, false); - miLeafLimitField->Add("10", 10, "", false, false); - miLeafLimitField->Add("12", 12, "", false, false); - miLeafLimitField->Add("15", 15, "", false, false); - miLeafLimitField->Add("20", 20, "", false, false); - miLeafLimitField->Add("25", 25, "", false, false); - miLeafLimitField->Add("30", 30, "", false, false); - miLeafLimitField->Add("40", 40, "", false, false); - miLeafLimitField->Add("50", 50, "", false, false); + miLeafLimitField->Add("Unlimited", 0); + miLeafLimitField->Add("2", 2); + miLeafLimitField->Add("5", 5); + miLeafLimitField->Add("8", 8); + miLeafLimitField->Add("10", 10); + miLeafLimitField->Add("12", 12); + miLeafLimitField->Add("15", 15); + miLeafLimitField->Add("20", 20); + miLeafLimitField->Add("25", 25); + miLeafLimitField->Add("30", 30); + miLeafLimitField->Add("40", 40); + miLeafLimitField->Add("50", 50); miLeafLimitField->SetData(&game_values.leaflimit, NULL, NULL); miLeafLimitField->SetKey(game_values.leaflimit); miPwingsLimitField = new MI_SelectField(&rm->spr_selectfield, 70, 260, "P-Wings Limit", 500, 220); - miPwingsLimitField->Add("Unlimited", 0, "", false, false); - miPwingsLimitField->Add("2", 2, "", false, false); - miPwingsLimitField->Add("5", 5, "", false, false); - miPwingsLimitField->Add("8", 8, "", false, false); - miPwingsLimitField->Add("10", 10, "", false, false); - miPwingsLimitField->Add("12", 12, "", false, false); - miPwingsLimitField->Add("15", 15, "", false, false); - miPwingsLimitField->Add("20", 20, "", false, false); - miPwingsLimitField->Add("25", 25, "", false, false); - miPwingsLimitField->Add("30", 30, "", false, false); - miPwingsLimitField->Add("40", 40, "", false, false); - miPwingsLimitField->Add("50", 50, "", false, false); + miPwingsLimitField->Add("Unlimited", 0); + miPwingsLimitField->Add("2", 2); + miPwingsLimitField->Add("5", 5); + miPwingsLimitField->Add("8", 8); + miPwingsLimitField->Add("10", 10); + miPwingsLimitField->Add("12", 12); + miPwingsLimitField->Add("15", 15); + miPwingsLimitField->Add("20", 20); + miPwingsLimitField->Add("25", 25); + miPwingsLimitField->Add("30", 30); + miPwingsLimitField->Add("40", 40); + miPwingsLimitField->Add("50", 50); miPwingsLimitField->SetData(&game_values.pwingslimit, NULL, NULL); miPwingsLimitField->SetKey(game_values.pwingslimit); miTanookiLimitField = new MI_SelectField(&rm->spr_selectfield, 70, 300, "Tanooki Limit", 500, 220); - miTanookiLimitField->Add("Unlimited", 0, "", false, false); - miTanookiLimitField->Add("2", 2, "", false, false); - miTanookiLimitField->Add("5", 5, "", false, false); - miTanookiLimitField->Add("8", 8, "", false, false); - miTanookiLimitField->Add("10", 10, "", false, false); - miTanookiLimitField->Add("12", 12, "", false, false); - miTanookiLimitField->Add("15", 15, "", false, false); - miTanookiLimitField->Add("20", 20, "", false, false); - miTanookiLimitField->Add("25", 25, "", false, false); - miTanookiLimitField->Add("30", 30, "", false, false); - miTanookiLimitField->Add("40", 40, "", false, false); - miTanookiLimitField->Add("50", 50, "", false, false); + miTanookiLimitField->Add("Unlimited", 0); + miTanookiLimitField->Add("2", 2); + miTanookiLimitField->Add("5", 5); + miTanookiLimitField->Add("8", 8); + miTanookiLimitField->Add("10", 10); + miTanookiLimitField->Add("12", 12); + miTanookiLimitField->Add("15", 15); + miTanookiLimitField->Add("20", 20); + miTanookiLimitField->Add("25", 25); + miTanookiLimitField->Add("30", 30); + miTanookiLimitField->Add("40", 40); + miTanookiLimitField->Add("50", 50); miTanookiLimitField->SetData(&game_values.tanookilimit, NULL, NULL); miTanookiLimitField->SetKey(game_values.tanookilimit); miBombLimitField = new MI_SelectField(&rm->spr_selectfield, 70, 340, "Bomb Limit", 500, 220); - miBombLimitField->Add("Unlimited", 0, "", false, false); - miBombLimitField->Add("2", 2, "", false, false); - miBombLimitField->Add("5", 5, "", false, false); - miBombLimitField->Add("8", 8, "", false, false); - miBombLimitField->Add("10", 10, "", false, false); - miBombLimitField->Add("12", 12, "", false, false); - miBombLimitField->Add("15", 15, "", false, false); - miBombLimitField->Add("20", 20, "", false, false); - miBombLimitField->Add("25", 25, "", false, false); - miBombLimitField->Add("30", 30, "", false, false); - miBombLimitField->Add("40", 40, "", false, false); - miBombLimitField->Add("50", 50, "", false, false); + miBombLimitField->Add("Unlimited", 0); + miBombLimitField->Add("2", 2); + miBombLimitField->Add("5", 5); + miBombLimitField->Add("8", 8); + miBombLimitField->Add("10", 10); + miBombLimitField->Add("12", 12); + miBombLimitField->Add("15", 15); + miBombLimitField->Add("20", 20); + miBombLimitField->Add("25", 25); + miBombLimitField->Add("30", 30); + miBombLimitField->Add("40", 40); + miBombLimitField->Add("50", 50); miBombLimitField->SetData(&game_values.bombslimit, NULL, NULL); miBombLimitField->SetKey(game_values.bombslimit); miWandLimitField = new MI_SelectField(&rm->spr_selectfield, 70, 380, "Wand Limit", 500, 220); - miWandLimitField->Add("Unlimited", 0, "", false, false); - miWandLimitField->Add("2", 2, "", false, false); - miWandLimitField->Add("5", 5, "", false, false); - miWandLimitField->Add("8", 8, "", false, false); - miWandLimitField->Add("10", 10, "", false, false); - miWandLimitField->Add("12", 12, "", false, false); - miWandLimitField->Add("15", 15, "", false, false); - miWandLimitField->Add("20", 20, "", false, false); - miWandLimitField->Add("25", 25, "", false, false); - miWandLimitField->Add("30", 30, "", false, false); - miWandLimitField->Add("40", 40, "", false, false); - miWandLimitField->Add("50", 50, "", false, false); + miWandLimitField->Add("Unlimited", 0); + miWandLimitField->Add("2", 2); + miWandLimitField->Add("5", 5); + miWandLimitField->Add("8", 8); + miWandLimitField->Add("10", 10); + miWandLimitField->Add("12", 12); + miWandLimitField->Add("15", 15); + miWandLimitField->Add("20", 20); + miWandLimitField->Add("25", 25); + miWandLimitField->Add("30", 30); + miWandLimitField->Add("40", 40); + miWandLimitField->Add("50", 50); miWandLimitField->SetData(&game_values.wandlimit, NULL, NULL); miWandLimitField->SetKey(game_values.wandlimit); diff --git a/src/smw/menu/options/ProjectileOptionsMenu.cpp b/src/smw/menu/options/ProjectileOptionsMenu.cpp index 555a02fe4..c25a5086d 100644 --- a/src/smw/menu/options/ProjectileOptionsMenu.cpp +++ b/src/smw/menu/options/ProjectileOptionsMenu.cpp @@ -15,176 +15,176 @@ UI_ProjectileOptionsMenu::UI_ProjectileOptionsMenu() : UI_Menu() { miFireballLifeField = new MI_SelectField(&rm->spr_selectfield, 10, 80, "Life", 305, 120); - miFireballLifeField->Add("1 Second", 62, "", false, false); - miFireballLifeField->Add("2 Seconds", 124, "", false, false); - miFireballLifeField->Add("3 Seconds", 186, "", false, false); - miFireballLifeField->Add("4 Seconds", 248, "", false, false); - miFireballLifeField->Add("5 Seconds", 310, "", false, false); - miFireballLifeField->Add("6 Seconds", 372, "", false, false); - miFireballLifeField->Add("7 Seconds", 434, "", false, false); - miFireballLifeField->Add("8 Seconds", 496, "", false, false); - miFireballLifeField->Add("9 Seconds", 558, "", false, false); - miFireballLifeField->Add("10 Seconds", 620, "", false, false); + miFireballLifeField->Add("1 Second", 62); + miFireballLifeField->Add("2 Seconds", 124); + miFireballLifeField->Add("3 Seconds", 186); + miFireballLifeField->Add("4 Seconds", 248); + miFireballLifeField->Add("5 Seconds", 310); + miFireballLifeField->Add("6 Seconds", 372); + miFireballLifeField->Add("7 Seconds", 434); + miFireballLifeField->Add("8 Seconds", 496); + miFireballLifeField->Add("9 Seconds", 558); + miFireballLifeField->Add("10 Seconds", 620); miFireballLifeField->SetData(&game_values.fireballttl, NULL, NULL); miFireballLifeField->SetKey(game_values.fireballttl); miFeatherJumpsField = new MI_SelectField(&rm->spr_selectfield, 10, 150, "Jumps", 305, 120); - miFeatherJumpsField->Add("1", 1, "", false, false); - miFeatherJumpsField->Add("2", 2, "", false, false); - miFeatherJumpsField->Add("3", 3, "", false, false); - miFeatherJumpsField->Add("4", 4, "", false, false); - miFeatherJumpsField->Add("5", 5, "", false, false); + miFeatherJumpsField->Add("1", 1); + miFeatherJumpsField->Add("2", 2); + miFeatherJumpsField->Add("3", 3); + miFeatherJumpsField->Add("4", 4); + miFeatherJumpsField->Add("5", 5); miFeatherJumpsField->SetData(&game_values.featherjumps, NULL, NULL); miFeatherJumpsField->SetKey(game_values.featherjumps); miBoomerangStyleField = new MI_SelectField(&rm->spr_selectfield, 10, 220, "Style", 305, 120); - miBoomerangStyleField->Add("Flat", 0, "", false, false); - miBoomerangStyleField->Add("SMB3", 1, "", false, false); - miBoomerangStyleField->Add("Zelda", 2, "", false, false); - miBoomerangStyleField->Add("Random", 3, "", false, false); + miBoomerangStyleField->Add("Flat", 0); + miBoomerangStyleField->Add("SMB3", 1); + miBoomerangStyleField->Add("Zelda", 2); + miBoomerangStyleField->Add("Random", 3); miBoomerangStyleField->SetData(&game_values.boomerangstyle, NULL, NULL); miBoomerangStyleField->SetKey(game_values.boomerangstyle); miBoomerangLifeField = new MI_SelectField(&rm->spr_selectfield, 10, 260, "Life", 305, 120); - miBoomerangLifeField->Add("1 Second", 62, "", false, false); - miBoomerangLifeField->Add("2 Seconds", 124, "", false, false); - miBoomerangLifeField->Add("3 Seconds", 186, "", false, false); - miBoomerangLifeField->Add("4 Seconds", 248, "", false, false); - miBoomerangLifeField->Add("5 Seconds", 310, "", false, false); - miBoomerangLifeField->Add("6 Seconds", 372, "", false, false); - miBoomerangLifeField->Add("7 Seconds", 434, "", false, false); - miBoomerangLifeField->Add("8 Seconds", 496, "", false, false); - miBoomerangLifeField->Add("9 Seconds", 558, "", false, false); - miBoomerangLifeField->Add("10 Seconds", 620, "", false, false); + miBoomerangLifeField->Add("1 Second", 62); + miBoomerangLifeField->Add("2 Seconds", 124); + miBoomerangLifeField->Add("3 Seconds", 186); + miBoomerangLifeField->Add("4 Seconds", 248); + miBoomerangLifeField->Add("5 Seconds", 310); + miBoomerangLifeField->Add("6 Seconds", 372); + miBoomerangLifeField->Add("7 Seconds", 434); + miBoomerangLifeField->Add("8 Seconds", 496); + miBoomerangLifeField->Add("9 Seconds", 558); + miBoomerangLifeField->Add("10 Seconds", 620); miBoomerangLifeField->SetData(&game_values.boomeranglife, NULL, NULL); miBoomerangLifeField->SetKey(game_values.boomeranglife); miHammerLifeField = new MI_SelectField(&rm->spr_selectfield, 325, 80, "Life", 305, 120); - miHammerLifeField->Add("No Limit", 310, "", false, false); - miHammerLifeField->Add("0.5 Seconds", 31, "", false, false); - miHammerLifeField->Add("0.6 Seconds", 37, "", false, false); - miHammerLifeField->Add("0.7 Seconds", 43, "", false, false); - miHammerLifeField->Add("0.8 Seconds", 49, "", false, false); - miHammerLifeField->Add("0.9 Seconds", 55, "", false, false); - miHammerLifeField->Add("1.0 Seconds", 62, "", false, false); - miHammerLifeField->Add("1.1 Seconds", 68, "", false, false); - miHammerLifeField->Add("1.2 Seconds", 74, "", false, false); + miHammerLifeField->Add("No Limit", 310); + miHammerLifeField->Add("0.5 Seconds", 31); + miHammerLifeField->Add("0.6 Seconds", 37); + miHammerLifeField->Add("0.7 Seconds", 43); + miHammerLifeField->Add("0.8 Seconds", 49); + miHammerLifeField->Add("0.9 Seconds", 55); + miHammerLifeField->Add("1.0 Seconds", 62); + miHammerLifeField->Add("1.1 Seconds", 68); + miHammerLifeField->Add("1.2 Seconds", 74); miHammerLifeField->SetData(&game_values.hammerttl, NULL, NULL); miHammerLifeField->SetKey(game_values.hammerttl); miHammerDelayField = new MI_SelectField(&rm->spr_selectfield, 325, 120, "Delay", 305, 120); - miHammerDelayField->Add("None", 0, "", false, false); - miHammerDelayField->Add("0.1 Seconds", 6, "", false, false); - miHammerDelayField->Add("0.2 Seconds", 12, "", false, false); - miHammerDelayField->Add("0.3 Seconds", 19, "", false, false); - miHammerDelayField->Add("0.4 Seconds", 25, "", false, false); - miHammerDelayField->Add("0.5 Seconds", 31, "", false, false); - miHammerDelayField->Add("0.6 Seconds", 37, "", false, false); - miHammerDelayField->Add("0.7 Seconds", 43, "", false, false); - miHammerDelayField->Add("0.8 Seconds", 49, "", false, false); - miHammerDelayField->Add("0.9 Seconds", 55, "", false, false); - miHammerDelayField->Add("1.0 Seconds", 62, "", false, false); + miHammerDelayField->Add("None", 0); + miHammerDelayField->Add("0.1 Seconds", 6); + miHammerDelayField->Add("0.2 Seconds", 12); + miHammerDelayField->Add("0.3 Seconds", 19); + miHammerDelayField->Add("0.4 Seconds", 25); + miHammerDelayField->Add("0.5 Seconds", 31); + miHammerDelayField->Add("0.6 Seconds", 37); + miHammerDelayField->Add("0.7 Seconds", 43); + miHammerDelayField->Add("0.8 Seconds", 49); + miHammerDelayField->Add("0.9 Seconds", 55); + miHammerDelayField->Add("1.0 Seconds", 62); miHammerDelayField->SetData(&game_values.hammerdelay, NULL, NULL); miHammerDelayField->SetKey(game_values.hammerdelay); miHammerOneKillField = new MI_SelectField(&rm->spr_selectfield, 325, 160, "Power", 305, 120); miHammerOneKillField->Add("One Kill", 0, "", true, false); - miHammerOneKillField->Add("Multiple Kills", 1, "", false, false); + miHammerOneKillField->Add("Multiple Kills", 1); miHammerOneKillField->SetData(NULL, NULL, &game_values.hammerpower); miHammerOneKillField->SetKey(game_values.hammerpower ? 0 : 1); miHammerOneKillField->SetAutoAdvance(true); miShellLifeField = new MI_SelectField(&rm->spr_selectfield, 10, 330, "Life", 305, 120); - miShellLifeField->Add("Unlimited", 0, "", false, false); - miShellLifeField->Add("1 Second", 62, "", false, false); - miShellLifeField->Add("2 Seconds", 124, "", false, false); - miShellLifeField->Add("3 Seconds", 186, "", false, false); - miShellLifeField->Add("4 Seconds", 248, "", false, false); - miShellLifeField->Add("5 Seconds", 310, "", false, false); - miShellLifeField->Add("6 Seconds", 372, "", false, false); - miShellLifeField->Add("7 Seconds", 434, "", false, false); - miShellLifeField->Add("8 Seconds", 496, "", false, false); - miShellLifeField->Add("9 Seconds", 558, "", false, false); - miShellLifeField->Add("10 Seconds", 620, "", false, false); - miShellLifeField->Add("15 Seconds", 930, "", false, false); - miShellLifeField->Add("20 Seconds", 1240, "", false, false); - miShellLifeField->Add("25 Seconds", 1550, "", false, false); - miShellLifeField->Add("30 Seconds", 1860, "", false, false); + miShellLifeField->Add("Unlimited", 0); + miShellLifeField->Add("1 Second", 62); + miShellLifeField->Add("2 Seconds", 124); + miShellLifeField->Add("3 Seconds", 186); + miShellLifeField->Add("4 Seconds", 248); + miShellLifeField->Add("5 Seconds", 310); + miShellLifeField->Add("6 Seconds", 372); + miShellLifeField->Add("7 Seconds", 434); + miShellLifeField->Add("8 Seconds", 496); + miShellLifeField->Add("9 Seconds", 558); + miShellLifeField->Add("10 Seconds", 620); + miShellLifeField->Add("15 Seconds", 930); + miShellLifeField->Add("20 Seconds", 1240); + miShellLifeField->Add("25 Seconds", 1550); + miShellLifeField->Add("30 Seconds", 1860); miShellLifeField->SetData(&game_values.shellttl, NULL, NULL); miShellLifeField->SetKey(game_values.shellttl); miWandFreezeTimeField = new MI_SelectField(&rm->spr_selectfield, 10, 400, "Freeze", 305, 120); - miWandFreezeTimeField->Add("1 Second", 62, "", false, false); - miWandFreezeTimeField->Add("2 Seconds", 124, "", false, false); - miWandFreezeTimeField->Add("3 Seconds", 186, "", false, false); - miWandFreezeTimeField->Add("4 Seconds", 248, "", false, false); - miWandFreezeTimeField->Add("5 Seconds", 310, "", false, false); - miWandFreezeTimeField->Add("6 Seconds", 372, "", false, false); - miWandFreezeTimeField->Add("7 Seconds", 434, "", false, false); - miWandFreezeTimeField->Add("8 Seconds", 496, "", false, false); - miWandFreezeTimeField->Add("9 Seconds", 558, "", false, false); - miWandFreezeTimeField->Add("10 Seconds", 620, "", false, false); - miWandFreezeTimeField->Add("12 Seconds", 744, "", false, false); - miWandFreezeTimeField->Add("15 Seconds", 930, "", false, false); - miWandFreezeTimeField->Add("18 Seconds", 1116, "", false, false); - miWandFreezeTimeField->Add("20 Seconds", 1240, "", false, false); + miWandFreezeTimeField->Add("1 Second", 62); + miWandFreezeTimeField->Add("2 Seconds", 124); + miWandFreezeTimeField->Add("3 Seconds", 186); + miWandFreezeTimeField->Add("4 Seconds", 248); + miWandFreezeTimeField->Add("5 Seconds", 310); + miWandFreezeTimeField->Add("6 Seconds", 372); + miWandFreezeTimeField->Add("7 Seconds", 434); + miWandFreezeTimeField->Add("8 Seconds", 496); + miWandFreezeTimeField->Add("9 Seconds", 558); + miWandFreezeTimeField->Add("10 Seconds", 620); + miWandFreezeTimeField->Add("12 Seconds", 744); + miWandFreezeTimeField->Add("15 Seconds", 930); + miWandFreezeTimeField->Add("18 Seconds", 1116); + miWandFreezeTimeField->Add("20 Seconds", 1240); miWandFreezeTimeField->SetData(&game_values.wandfreezetime, NULL, NULL); miWandFreezeTimeField->SetKey(game_values.wandfreezetime); miBlueBlockLifeField = new MI_SelectField(&rm->spr_selectfield, 325, 230, "Blue Life", 305, 120); - miBlueBlockLifeField->Add("Unlimited", 0, "", false, false); - miBlueBlockLifeField->Add("1 Second", 62, "", false, false); - miBlueBlockLifeField->Add("2 Seconds", 124, "", false, false); - miBlueBlockLifeField->Add("3 Seconds", 186, "", false, false); - miBlueBlockLifeField->Add("4 Seconds", 248, "", false, false); - miBlueBlockLifeField->Add("5 Seconds", 310, "", false, false); - miBlueBlockLifeField->Add("6 Seconds", 372, "", false, false); - miBlueBlockLifeField->Add("7 Seconds", 434, "", false, false); - miBlueBlockLifeField->Add("8 Seconds", 496, "", false, false); - miBlueBlockLifeField->Add("9 Seconds", 558, "", false, false); - miBlueBlockLifeField->Add("10 Seconds", 620, "", false, false); - miBlueBlockLifeField->Add("15 Seconds", 930, "", false, false); - miBlueBlockLifeField->Add("20 Seconds", 1240, "", false, false); - miBlueBlockLifeField->Add("25 Seconds", 1550, "", false, false); - miBlueBlockLifeField->Add("30 Seconds", 1860, "", false, false); + miBlueBlockLifeField->Add("Unlimited", 0); + miBlueBlockLifeField->Add("1 Second", 62); + miBlueBlockLifeField->Add("2 Seconds", 124); + miBlueBlockLifeField->Add("3 Seconds", 186); + miBlueBlockLifeField->Add("4 Seconds", 248); + miBlueBlockLifeField->Add("5 Seconds", 310); + miBlueBlockLifeField->Add("6 Seconds", 372); + miBlueBlockLifeField->Add("7 Seconds", 434); + miBlueBlockLifeField->Add("8 Seconds", 496); + miBlueBlockLifeField->Add("9 Seconds", 558); + miBlueBlockLifeField->Add("10 Seconds", 620); + miBlueBlockLifeField->Add("15 Seconds", 930); + miBlueBlockLifeField->Add("20 Seconds", 1240); + miBlueBlockLifeField->Add("25 Seconds", 1550); + miBlueBlockLifeField->Add("30 Seconds", 1860); miBlueBlockLifeField->SetData(&game_values.blueblockttl, NULL, NULL); miBlueBlockLifeField->SetKey(game_values.blueblockttl); miGrayBlockLifeField = new MI_SelectField(&rm->spr_selectfield, 325, 270, "Gray Life", 305, 120); - miGrayBlockLifeField->Add("Unlimited", 0, "", false, false); - miGrayBlockLifeField->Add("1 Second", 62, "", false, false); - miGrayBlockLifeField->Add("2 Seconds", 124, "", false, false); - miGrayBlockLifeField->Add("3 Seconds", 186, "", false, false); - miGrayBlockLifeField->Add("4 Seconds", 248, "", false, false); - miGrayBlockLifeField->Add("5 Seconds", 310, "", false, false); - miGrayBlockLifeField->Add("6 Seconds", 372, "", false, false); - miGrayBlockLifeField->Add("7 Seconds", 434, "", false, false); - miGrayBlockLifeField->Add("8 Seconds", 496, "", false, false); - miGrayBlockLifeField->Add("9 Seconds", 558, "", false, false); - miGrayBlockLifeField->Add("10 Seconds", 620, "", false, false); - miGrayBlockLifeField->Add("15 Seconds", 930, "", false, false); - miGrayBlockLifeField->Add("20 Seconds", 1240, "", false, false); - miGrayBlockLifeField->Add("25 Seconds", 1550, "", false, false); - miGrayBlockLifeField->Add("30 Seconds", 1860, "", false, false); + miGrayBlockLifeField->Add("Unlimited", 0); + miGrayBlockLifeField->Add("1 Second", 62); + miGrayBlockLifeField->Add("2 Seconds", 124); + miGrayBlockLifeField->Add("3 Seconds", 186); + miGrayBlockLifeField->Add("4 Seconds", 248); + miGrayBlockLifeField->Add("5 Seconds", 310); + miGrayBlockLifeField->Add("6 Seconds", 372); + miGrayBlockLifeField->Add("7 Seconds", 434); + miGrayBlockLifeField->Add("8 Seconds", 496); + miGrayBlockLifeField->Add("9 Seconds", 558); + miGrayBlockLifeField->Add("10 Seconds", 620); + miGrayBlockLifeField->Add("15 Seconds", 930); + miGrayBlockLifeField->Add("20 Seconds", 1240); + miGrayBlockLifeField->Add("25 Seconds", 1550); + miGrayBlockLifeField->Add("30 Seconds", 1860); miGrayBlockLifeField->SetData(&game_values.grayblockttl, NULL, NULL); miGrayBlockLifeField->SetKey(game_values.grayblockttl); miRedBlockLifeField = new MI_SelectField(&rm->spr_selectfield, 325, 310, "Red Life", 305, 120); - miRedBlockLifeField->Add("Unlimited", 0, "", false, false); - miRedBlockLifeField->Add("1 Second", 62, "", false, false); - miRedBlockLifeField->Add("2 Seconds", 124, "", false, false); - miRedBlockLifeField->Add("3 Seconds", 186, "", false, false); - miRedBlockLifeField->Add("4 Seconds", 248, "", false, false); - miRedBlockLifeField->Add("5 Seconds", 310, "", false, false); - miRedBlockLifeField->Add("6 Seconds", 372, "", false, false); - miRedBlockLifeField->Add("7 Seconds", 434, "", false, false); - miRedBlockLifeField->Add("8 Seconds", 496, "", false, false); - miRedBlockLifeField->Add("9 Seconds", 558, "", false, false); - miRedBlockLifeField->Add("10 Seconds", 620, "", false, false); - miRedBlockLifeField->Add("15 Seconds", 930, "", false, false); - miRedBlockLifeField->Add("20 Seconds", 1240, "", false, false); - miRedBlockLifeField->Add("25 Seconds", 1550, "", false, false); - miRedBlockLifeField->Add("30 Seconds", 1860, "", false, false); + miRedBlockLifeField->Add("Unlimited", 0); + miRedBlockLifeField->Add("1 Second", 62); + miRedBlockLifeField->Add("2 Seconds", 124); + miRedBlockLifeField->Add("3 Seconds", 186); + miRedBlockLifeField->Add("4 Seconds", 248); + miRedBlockLifeField->Add("5 Seconds", 310); + miRedBlockLifeField->Add("6 Seconds", 372); + miRedBlockLifeField->Add("7 Seconds", 434); + miRedBlockLifeField->Add("8 Seconds", 496); + miRedBlockLifeField->Add("9 Seconds", 558); + miRedBlockLifeField->Add("10 Seconds", 620); + miRedBlockLifeField->Add("15 Seconds", 930); + miRedBlockLifeField->Add("20 Seconds", 1240); + miRedBlockLifeField->Add("25 Seconds", 1550); + miRedBlockLifeField->Add("30 Seconds", 1860); miRedBlockLifeField->SetData(&game_values.redblockttl, NULL, NULL); miRedBlockLifeField->SetKey(game_values.redblockttl); diff --git a/src/smw/menu/options/SoundOptionsMenu.cpp b/src/smw/menu/options/SoundOptionsMenu.cpp index 2c3166989..23b031256 100644 --- a/src/smw/menu/options/SoundOptionsMenu.cpp +++ b/src/smw/menu/options/SoundOptionsMenu.cpp @@ -24,37 +24,37 @@ UI_SoundOptionsMenu::UI_SoundOptionsMenu() : UI_Menu() { miSoundVolumeField = new MI_SliderField(&rm->spr_selectfield, &rm->menu_slider_bar, 70, 100, "Sound Volume", 500, 220, 484); - miSoundVolumeField->Add("Off", 0, "", false, false); - miSoundVolumeField->Add("1", 16, "", false, false); - miSoundVolumeField->Add("2", 32, "", false, false); - miSoundVolumeField->Add("3", 48, "", false, false); - miSoundVolumeField->Add("4", 64, "", false, false); - miSoundVolumeField->Add("5", 80, "", false, false); - miSoundVolumeField->Add("6", 96, "", false, false); - miSoundVolumeField->Add("7", 112, "", false, false); - miSoundVolumeField->Add("Max", 128, "", false, false); + miSoundVolumeField->Add("Off", 0); + miSoundVolumeField->Add("1", 16); + miSoundVolumeField->Add("2", 32); + miSoundVolumeField->Add("3", 48); + miSoundVolumeField->Add("4", 64); + miSoundVolumeField->Add("5", 80); + miSoundVolumeField->Add("6", 96); + miSoundVolumeField->Add("7", 112); + miSoundVolumeField->Add("Max", 128); miSoundVolumeField->SetData(&game_values.soundvolume, NULL, NULL); miSoundVolumeField->SetKey(game_values.soundvolume); miSoundVolumeField->SetNoWrap(true); miSoundVolumeField->SetItemChangedCode(MENU_CODE_SOUND_VOLUME_CHANGED); miMusicVolumeField = new MI_SliderField(&rm->spr_selectfield, &rm->menu_slider_bar, 70, 140, "Music Volume", 500, 220, 484); - miMusicVolumeField->Add("Off", 0, "", false, false); - miMusicVolumeField->Add("1", 16, "", false, false); - miMusicVolumeField->Add("2", 32, "", false, false); - miMusicVolumeField->Add("3", 48, "", false, false); - miMusicVolumeField->Add("4", 64, "", false, false); - miMusicVolumeField->Add("5", 80, "", false, false); - miMusicVolumeField->Add("6", 96, "", false, false); - miMusicVolumeField->Add("7", 112, "", false, false); - miMusicVolumeField->Add("Max", 128, "", false, false); + miMusicVolumeField->Add("Off", 0); + miMusicVolumeField->Add("1", 16); + miMusicVolumeField->Add("2", 32); + miMusicVolumeField->Add("3", 48); + miMusicVolumeField->Add("4", 64); + miMusicVolumeField->Add("5", 80); + miMusicVolumeField->Add("6", 96); + miMusicVolumeField->Add("7", 112); + miMusicVolumeField->Add("Max", 128); miMusicVolumeField->SetData(&game_values.musicvolume, NULL, NULL); miMusicVolumeField->SetKey(game_values.musicvolume); miMusicVolumeField->SetNoWrap(true); miMusicVolumeField->SetItemChangedCode(MENU_CODE_MUSIC_VOLUME_CHANGED); miPlayNextMusicField = new MI_SelectField(&rm->spr_selectfield, 70, 180, "Next Music", 500, 220); - miPlayNextMusicField->Add("Off", 0, "", false, false); + miPlayNextMusicField->Add("Off", 0); miPlayNextMusicField->Add("On", 1, "", true, false); miPlayNextMusicField->SetData(NULL, NULL, &game_values.playnextmusic); miPlayNextMusicField->SetKey(game_values.playnextmusic ? 1 : 0); diff --git a/src/smw/menu/options/TeamOptionsMenu.cpp b/src/smw/menu/options/TeamOptionsMenu.cpp index c1823c1ef..fa8cb253d 100644 --- a/src/smw/menu/options/TeamOptionsMenu.cpp +++ b/src/smw/menu/options/TeamOptionsMenu.cpp @@ -15,28 +15,28 @@ UI_TeamOptionsMenu::UI_TeamOptionsMenu() : UI_Menu() { miTeamKillsField = new MI_SelectField(&rm->spr_selectfield, 70, 180, "Player Collision", 500, 220); - miTeamKillsField->Add("Off", 0, "", false, false); - miTeamKillsField->Add("Assist", 1, "", false, false); - miTeamKillsField->Add("On", 2, "", false, false); + miTeamKillsField->Add("Off", 0); + miTeamKillsField->Add("Assist", 1); + miTeamKillsField->Add("On", 2); miTeamKillsField->SetData(&game_values.teamcollision, NULL, NULL); miTeamKillsField->SetKey(game_values.teamcollision); miTeamColorsField = new MI_SelectField(&rm->spr_selectfield, 70, 220, "Colors", 500, 220); - miTeamColorsField->Add("Individual", 0, "", false, false); + miTeamColorsField->Add("Individual", 0); miTeamColorsField->Add("Team", 1, "", true, false); miTeamColorsField->SetData(NULL, NULL, &game_values.teamcolors); miTeamColorsField->SetKey(game_values.teamcolors ? 1 : 0); miTeamColorsField->SetAutoAdvance(true); miTournamentControlField = new MI_SelectField(&rm->spr_selectfield, 70, 260, "Tournament Control", 500, 220); - miTournamentControlField->Add("All", 0, "", false, false); - miTournamentControlField->Add("Game Winner", 1, "", false, false); - miTournamentControlField->Add("Game Loser", 2, "", false, false); - miTournamentControlField->Add("Leading Teams", 3, "", false, false); - miTournamentControlField->Add("Trailing Teams", 4, "", false, false); - miTournamentControlField->Add("Random", 5, "", false, false); - miTournamentControlField->Add("Random Loser", 6, "", false, false); - miTournamentControlField->Add("Round Robin", 7, "", false, false); + miTournamentControlField->Add("All", 0); + miTournamentControlField->Add("Game Winner", 1); + miTournamentControlField->Add("Game Loser", 2); + miTournamentControlField->Add("Leading Teams", 3); + miTournamentControlField->Add("Trailing Teams", 4); + miTournamentControlField->Add("Random", 5); + miTournamentControlField->Add("Random Loser", 6); + miTournamentControlField->Add("Round Robin", 7); miTournamentControlField->SetData(&game_values.tournamentcontrolstyle, NULL, NULL); miTournamentControlField->SetKey(game_values.tournamentcontrolstyle); diff --git a/src/smw/menu/xbox/ScreenSettingsMenu.cpp b/src/smw/menu/xbox/ScreenSettingsMenu.cpp index ed4629bbd..527cc6d1a 100644 --- a/src/smw/menu/xbox/ScreenSettingsMenu.cpp +++ b/src/smw/menu/xbox/ScreenSettingsMenu.cpp @@ -11,31 +11,31 @@ UI_ScreenSettingsMenu::UI_ScreenSettingsMenu() : UI_Menu() miScreenResizeButton->SetCode(MENU_CODE_TO_SCREEN_RESIZE); miScreenHardwareFilterField = new MI_SelectField(&rm->spr_selectfield, 70, 200, "Screen Filter", 500, 220); - //miScreenHardwareFilterField->Add("None", 0, "", false, false); - miScreenHardwareFilterField->Add("Point", 1, "", false, false); - miScreenHardwareFilterField->Add("Bilinear", 2, "", false, false); - miScreenHardwareFilterField->Add("Trilinear", 3, "", false, false); - miScreenHardwareFilterField->Add("Anisotrpoic", 4, "", false, false); - miScreenHardwareFilterField->Add("Quincunx", 5, "", false, false); - miScreenHardwareFilterField->Add("Gaussian Cubic", 6, "", false, false); + //miScreenHardwareFilterField->Add("None", 0); + miScreenHardwareFilterField->Add("Point", 1); + miScreenHardwareFilterField->Add("Bilinear", 2); + miScreenHardwareFilterField->Add("Trilinear", 3); + miScreenHardwareFilterField->Add("Anisotrpoic", 4); + miScreenHardwareFilterField->Add("Quincunx", 5); + miScreenHardwareFilterField->Add("Gaussian Cubic", 6); miScreenHardwareFilterField->SetData(&game_values.hardwarefilter, NULL, NULL); miScreenHardwareFilterField->SetKey(game_values.hardwarefilter); miScreenHardwareFilterField->SetItemChangedCode(MENU_CODE_SCREEN_FILTER_CHANGED); miScreenFlickerFilterField = new MI_SliderField(&rm->spr_selectfield, &rm->menu_slider_bar, 70, 240, "Flicker Filter", 500, 220, 380); - miScreenFlickerFilterField->Add("0", 0, "", false, false); - miScreenFlickerFilterField->Add("1", 1, "", false, false); - miScreenFlickerFilterField->Add("2", 2, "", false, false); - miScreenFlickerFilterField->Add("3", 3, "", false, false); - miScreenFlickerFilterField->Add("4", 4, "", false, false); - miScreenFlickerFilterField->Add("5", 5, "", false, false); + miScreenFlickerFilterField->Add("0", 0); + miScreenFlickerFilterField->Add("1", 1); + miScreenFlickerFilterField->Add("2", 2); + miScreenFlickerFilterField->Add("3", 3); + miScreenFlickerFilterField->Add("4", 4); + miScreenFlickerFilterField->Add("5", 5); miScreenFlickerFilterField->SetData(&game_values.flickerfilter, NULL, NULL); miScreenFlickerFilterField->SetKey(game_values.flickerfilter); miScreenFlickerFilterField->SetNoWrap(true); miScreenFlickerFilterField->SetItemChangedCode(MENU_CODE_SCREEN_SETTINGS_CHANGED); miScreenSoftFilterField = new MI_SelectField(&rm->spr_selectfield, 70, 280, "Soften Filter", 500, 220); - miScreenSoftFilterField->Add("Off", 0, "", false, false); + miScreenSoftFilterField->Add("Off", 0); miScreenSoftFilterField->Add("On", 1, "", true, false); miScreenSoftFilterField->SetData(&game_values.softfilter, NULL, NULL); miScreenSoftFilterField->SetKey(game_values.softfilter); @@ -44,7 +44,7 @@ UI_ScreenSettingsMenu::UI_ScreenSettingsMenu() : UI_Menu() /* miScreenAspectRatioField = new MI_SelectField(&rm->spr_selectfield, 70, 300, "10x11 Aspect", 500, 220); - miScreenAspectRatioField->Add("Off", 0, "", false, false); + miScreenAspectRatioField->Add("Off", 0); miScreenAspectRatioField->Add("On", 1, "", true, false); miScreenAspectRatioField->SetData(NULL, NULL, &game_values.aspectratio10x11); miScreenAspectRatioField->SetKey(game_values.aspectratio10x11 ? 1 : 0); diff --git a/src/smw/ui/MI_FrenzyModeOptions.cpp b/src/smw/ui/MI_FrenzyModeOptions.cpp index 4f8e3aa92..20205eb58 100644 --- a/src/smw/ui/MI_FrenzyModeOptions.cpp +++ b/src/smw/ui/MI_FrenzyModeOptions.cpp @@ -30,31 +30,31 @@ MI_FrenzyModeOptions::MI_FrenzyModeOptions(short x, short y, short width, short mMenu = new UI_Menu(); miQuantityField = new MI_SelectField(&rm->spr_selectfield, 120, 40, "Limit", 400, 180); - miQuantityField->Add("Single Powerup", 0, "", false, false); - miQuantityField->Add("1 Powerup", 1, "", false, false); - miQuantityField->Add("2 Powerups", 2, "", false, false); - miQuantityField->Add("3 Powerups", 3, "", false, false); - miQuantityField->Add("4 Powerups", 4, "", false, false); - miQuantityField->Add("5 Powerups", 5, "", false, false); - miQuantityField->Add("# Players - 1", 6, "", false, false); - miQuantityField->Add("# Players", 7, "", false, false); - miQuantityField->Add("# Players + 1", 8, "", false, false, false); - miQuantityField->Add("# Players + 2", 9, "", false, false, false); - miQuantityField->Add("# Players + 3", 10, "", false, false, false); + miQuantityField->Add("Single Powerup", 0); + miQuantityField->Add("1 Powerup", 1); + miQuantityField->Add("2 Powerups", 2); + miQuantityField->Add("3 Powerups", 3); + miQuantityField->Add("4 Powerups", 4); + miQuantityField->Add("5 Powerups", 5); + miQuantityField->Add("# Players - 1", 6); + miQuantityField->Add("# Players", 7); + miQuantityField->Add("# Players + 1", 8, false, false); + miQuantityField->Add("# Players + 2", 9, false, false); + miQuantityField->Add("# Players + 3", 10, false, false); miQuantityField->SetData(&game_values.gamemodemenusettings.frenzy.quantity, NULL, NULL); miQuantityField->SetKey(game_values.gamemodemenusettings.frenzy.quantity); miRateField = new MI_SelectField(&rm->spr_selectfield, 120, 80, "Rate", 400, 180); - miRateField->Add("Instant", 0, "", false, false); - miRateField->Add("1 Second", 62, "", false, false); - miRateField->Add("2 Seconds", 124, "", false, false); - miRateField->Add("3 Seconds", 186, "", false, false); - miRateField->Add("5 Seconds", 310, "", false, false); - miRateField->Add("10 Seconds", 620, "", false, false, false); - miRateField->Add("15 Seconds", 930, "", false, false, false); - miRateField->Add("20 Seconds", 1240, "", false, false, false); - miRateField->Add("25 Seconds", 1550, "", false, false, false); - miRateField->Add("30 Seconds", 1860, "", false, false, false); + miRateField->Add("Instant", 0); + miRateField->Add("1 Second", 62); + miRateField->Add("2 Seconds", 124); + miRateField->Add("3 Seconds", 186); + miRateField->Add("5 Seconds", 310); + miRateField->Add("10 Seconds", 620, false, false); + miRateField->Add("15 Seconds", 930, false, false); + miRateField->Add("20 Seconds", 1240, false, false); + miRateField->Add("25 Seconds", 1550, false, false); + miRateField->Add("30 Seconds", 1860, false, false); miRateField->SetData(&game_values.gamemodemenusettings.frenzy.rate, NULL, NULL); miRateField->SetKey(game_values.gamemodemenusettings.frenzy.rate); diff --git a/src/smw/ui/MI_InputControlContainer.cpp b/src/smw/ui/MI_InputControlContainer.cpp index 1e76511b4..b74296eea 100644 --- a/src/smw/ui/MI_InputControlContainer.cpp +++ b/src/smw/ui/MI_InputControlContainer.cpp @@ -394,7 +394,7 @@ MI_InputControlContainer::MI_InputControlContainer(gfxSprite * spr_button, short miDeviceSelectField = new MI_SelectField(spr_button, x + 16, y + 38, "Device", 420, 150); miDeviceSelectField->SetItemChangedCode(MENU_CODE_INPUT_DEVICE_CHANGED); - miDeviceSelectField->Add("Keyboard", -1, "", false, false); + miDeviceSelectField->Add("Keyboard", -1); #ifdef _XBOX miDeviceSelectField->Disable(true); diff --git a/src/smw/ui/MI_PowerupSelection.cpp b/src/smw/ui/MI_PowerupSelection.cpp index cba011908..6efa21b4e 100644 --- a/src/smw/ui/MI_PowerupSelection.cpp +++ b/src/smw/ui/MI_PowerupSelection.cpp @@ -76,32 +76,32 @@ MI_PowerupSelection::MI_PowerupSelection(short x, short y, short width, short nu mMenu = std::make_unique(); miOverride = new MI_SelectField(&rm->spr_selectfield, 70, iy, "Use Settings From", 500, 250); - miOverride->Add("Map Only", 0, "", false, false); - miOverride->Add("Game Only", 1, "", false, false); - miOverride->Add("Basic Average", 2, "", false, false); - miOverride->Add("Weighted Average", 3, "", false, false); + miOverride->Add("Map Only", 0); + miOverride->Add("Game Only", 1); + miOverride->Add("Basic Average", 2); + miOverride->Add("Weighted Average", 3); miOverride->SetData(&game_values.overridepowerupsettings, NULL, NULL); miOverride->SetKey(game_values.overridepowerupsettings); //miOverride->SetItemChangedCode(MENU_CODE_POWERUP_OVERRIDE_CHANGED); miPreset = new MI_SelectField(&rm->spr_selectfield, 70, iy + 40, "Item Set", 500, 250); - miPreset->Add("Custom Set 1", 0, "", false, false); - miPreset->Add("Custom Set 2", 1, "", false, false); - miPreset->Add("Custom Set 3", 2, "", false, false); - miPreset->Add("Custom Set 4", 3, "", false, false); - miPreset->Add("Custom Set 5", 4, "", false, false); - miPreset->Add("Balanced Set", 5, "", false, false); - miPreset->Add("Weapons Only", 6, "", false, false); - miPreset->Add("Koopa Bros Weapons", 7, "", false, false); - miPreset->Add("Support Items", 8, "", false, false); - miPreset->Add("Booms and Shakes", 9, "", false, false); - miPreset->Add("Fly and Glide", 10, "", false, false); - miPreset->Add("Shells Only", 11, "", false, false); - miPreset->Add("Mushrooms Only", 12, "", false, false); - miPreset->Add("Super Mario Bros 1", 13, "", false, false); - miPreset->Add("Super Mario Bros 2", 14, "", false, false); - miPreset->Add("Super Mario Bros 3", 15, "", false, false); - miPreset->Add("Super Mario World", 16, "", false, false); + miPreset->Add("Custom Set 1", 0); + miPreset->Add("Custom Set 2", 1); + miPreset->Add("Custom Set 3", 2); + miPreset->Add("Custom Set 4", 3); + miPreset->Add("Custom Set 5", 4); + miPreset->Add("Balanced Set", 5); + miPreset->Add("Weapons Only", 6); + miPreset->Add("Koopa Bros Weapons", 7); + miPreset->Add("Support Items", 8); + miPreset->Add("Booms and Shakes", 9); + miPreset->Add("Fly and Glide", 10); + miPreset->Add("Shells Only", 11); + miPreset->Add("Mushrooms Only", 12); + miPreset->Add("Super Mario Bros 1", 13); + miPreset->Add("Super Mario Bros 2", 14); + miPreset->Add("Super Mario Bros 3", 15); + miPreset->Add("Super Mario World", 16); miPreset->SetData(&game_values.poweruppreset, NULL, NULL); miPreset->SetKey(game_values.poweruppreset); miPreset->SetItemChangedCode(MENU_CODE_POWERUP_PRESET_CHANGED); diff --git a/src/worldeditor/worldeditor.cpp b/src/worldeditor/worldeditor.cpp index 263cbae3e..9c2859c16 100644 --- a/src/worldeditor/worldeditor.cpp +++ b/src/worldeditor/worldeditor.cpp @@ -667,10 +667,10 @@ int main(int argc, char *argv[]) //miGoalField[iGameMode]->SetKey(gamemodes[iGameMode]->goal); } - miModeField->Add("Bonus House", 24, "", false, false); - miModeField->Add("Pipe Minigame", 25, "", false, false); - miModeField->Add("Boss Minigame", 26, "", false, false); - miModeField->Add("Boxes Minigame", 27, "", false, false); + miModeField->Add("Bonus House", 24); + miModeField->Add("Pipe Minigame", 25); + miModeField->Add("Boss Minigame", 26); + miModeField->Add("Boxes Minigame", 27); //Create goal field for pipe game miSpecialGoalField[0] = new MI_SelectField(&rm->spr_selectfield, 70, 100, "Points", 352, 120); @@ -717,7 +717,7 @@ int main(int argc, char *argv[]) //Final Stage Field miFinalStageField = new MI_SelectField(&rm->spr_selectfield, 325, 140, "End Stage", 245, 120); - miFinalStageField->Add("No", 0, "", false, false); + miFinalStageField->Add("No", 0); miFinalStageField->Add("Yes", 1, "", true, false); miFinalStageField->SetAutoAdvance(true); @@ -730,7 +730,7 @@ int main(int argc, char *argv[]) //Bonus Type miBonusType = new MI_SelectField(&rm->spr_selectfield, 70, 100, "Type", 500, 120); - miBonusType->Add("Fixed", 0, "", false, false); + miBonusType->Add("Fixed", 0); miBonusType->Add("Random", 1, "", true, false); miBonusType->SetAutoAdvance(true); @@ -838,15 +838,15 @@ int main(int argc, char *argv[]) //Create Vehicle Menu miVehicleSpriteField = new MI_ImageSelectField(&rm->spr_selectfield, &spr_vehicleicons, 70, 80, "Sprite", 500, 150, 16, 16); - miVehicleSpriteField->Add("Hammer Brother", 0, "", false, false); - miVehicleSpriteField->Add("Boomerang Brother", 1, "", false, false); - miVehicleSpriteField->Add("Fire Brother", 2, "", false, false); - miVehicleSpriteField->Add("Tank 1", 3, "", false, false); - miVehicleSpriteField->Add("Boat 1", 4, "", false, false); - miVehicleSpriteField->Add("Boat 2", 5, "", false, false); - miVehicleSpriteField->Add("Airship 1", 6, "", false, false); - miVehicleSpriteField->Add("Airship 2", 7, "", false, false); - miVehicleSpriteField->Add("Tank 2", 8, "", false, false); + miVehicleSpriteField->Add("Hammer Brother", 0); + miVehicleSpriteField->Add("Boomerang Brother", 1); + miVehicleSpriteField->Add("Fire Brother", 2); + miVehicleSpriteField->Add("Tank 1", 3); + miVehicleSpriteField->Add("Boat 1", 4); + miVehicleSpriteField->Add("Boat 2", 5); + miVehicleSpriteField->Add("Airship 1", 6); + miVehicleSpriteField->Add("Airship 2", 7); + miVehicleSpriteField->Add("Tank 2", 8); miVehicleSpriteField->SetData(&g_wvVehicleStamp.iDrawSprite, NULL, NULL); miVehicleSpriteField->SetKey(g_wvVehicleStamp.iDrawSprite); @@ -882,21 +882,21 @@ int main(int argc, char *argv[]) miVehicleMaxMovesField->AllowFastScroll(true); miVehiclePacesField = new MI_SelectField(&rm->spr_selectfield, 70, 240, "Paces", 500, 150); - miVehiclePacesField->Add("No", 0, "", false, false); + miVehiclePacesField->Add("No", 0); miVehiclePacesField->Add("Yes", 1, "", true, false); miVehiclePacesField->SetData(NULL, NULL, &g_wvVehicleStamp.fSpritePaces); miVehiclePacesField->SetKey(g_wvVehicleStamp.fSpritePaces ? 1 : 0); miVehiclePacesField->SetAutoAdvance(true); miVehicleDirectionField = new MI_SelectField(&rm->spr_selectfield, 70, 280, "Direction", 500, 150); - miVehicleDirectionField->Add("Left", 0, "", false, false); + miVehicleDirectionField->Add("Left", 0); miVehicleDirectionField->Add("Right", 1, "", true, false); miVehiclePacesField->SetData(&g_wvVehicleStamp.iDrawDirection, NULL, NULL); miVehiclePacesField->SetKey(g_wvVehicleStamp.iDrawDirection); miVehicleDirectionField->SetAutoAdvance(true); miVehicleBoundaryField = new MI_SelectField(&rm->spr_selectfield, 70, 320, "Boundary", 500, 150); - miVehicleBoundaryField->Add("No Boundary", 0, "", false, false); + miVehicleBoundaryField->Add("No Boundary", 0); for (short iBoundary = 1; iBoundary <= 100; iBoundary++) { char szBoundary[8]; @@ -3303,7 +3303,7 @@ int editor_vehicles() TourStop * ts = game_values.tourstops[iStage]; char szStageName[256]; sprintf(szStageName, "(%d) %s", iStage + 1, ts->szName); - miVehicleStageField->Add(szStageName, iStage, "", false, false, true, ts->iStageType == 1 ? 24 : (ts->iMode >= 1000 ? ts->iMode - 975 : ts->iMode)); + miVehicleStageField->Add(szStageName, iStage, false, true, ts->iStageType == 1 ? 24 : (ts->iMode >= 1000 ? ts->iMode - 975 : ts->iMode)); } miVehicleStageField->SetKey(g_wvVehicleStamp.iActionId);