From 04ceabf0c562eea244b37732ff0ab431c1b439b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1ty=C3=A1s=20Mustoha?= Date: Sun, 31 Mar 2024 14:15:27 +0200 Subject: [PATCH] Renamed the new select field class to match the old one's name --- src/common/ui/MI_ImageSelectField.cpp | 2 +- src/common/ui/MI_ImageSelectField.h | 2 +- src/common/ui/MI_SelectField.cpp | 42 +++---- src/common/ui/MI_SelectField.h | 14 +-- src/common/ui/MI_SliderField.cpp | 6 +- src/common/ui/MI_SliderField.h | 2 +- src/smw/menu/GameSettingsMenu.cpp | 2 +- src/smw/menu/GameSettingsMenu.h | 4 +- src/smw/menu/MatchSelectionMenu.cpp | 10 +- src/smw/menu/MatchSelectionMenu.h | 12 +- src/smw/menu/ModeOptionsMenu.cpp | 106 ++++++++--------- src/smw/menu/ModeOptionsMenu.h | 108 +++++++++--------- .../menu/network/NetNewRoomSettingsMenu.cpp | 2 +- src/smw/menu/network/NetNewRoomSettingsMenu.h | 4 +- src/smw/menu/options/EyeCandyOptionsMenu.cpp | 16 +-- src/smw/menu/options/EyeCandyOptionsMenu.h | 18 +-- src/smw/menu/options/GameplayOptionsMenu.cpp | 20 ++-- src/smw/menu/options/GameplayOptionsMenu.h | 22 ++-- src/smw/menu/options/GraphicsOptionsMenu.cpp | 6 +- src/smw/menu/options/GraphicsOptionsMenu.h | 8 +- src/smw/menu/options/PowerupSettingsMenu.cpp | 12 +- src/smw/menu/options/PowerupSettingsMenu.h | 14 +-- src/smw/menu/options/ProjectileLimitsMenu.cpp | 18 +-- src/smw/menu/options/ProjectileLimitsMenu.h | 20 ++-- .../menu/options/ProjectileOptionsMenu.cpp | 24 ++-- src/smw/menu/options/ProjectileOptionsMenu.h | 28 ++--- src/smw/menu/options/SoundOptionsMenu.cpp | 4 +- src/smw/menu/options/SoundOptionsMenu.h | 6 +- src/smw/menu/options/TeamOptionsMenu.cpp | 6 +- src/smw/menu/options/TeamOptionsMenu.h | 8 +- src/smw/menu/xbox/ScreenSettingsMenu.cpp | 8 +- src/smw/menu/xbox/ScreenSettingsMenu.h | 8 +- src/smw/ui/MI_FrenzyModeOptions.cpp | 6 +- src/smw/ui/MI_FrenzyModeOptions.h | 6 +- src/smw/ui/MI_InputControlContainer.cpp | 2 +- src/smw/ui/MI_InputControlContainer.h | 4 +- src/smw/ui/MI_PowerupSelection.cpp | 4 +- src/smw/ui/MI_PowerupSelection.h | 6 +- src/smw/ui/MI_TourStop.cpp | 10 +- src/smw/ui/MI_TourStop.h | 8 +- src/worldeditor/worldeditor.cpp | 46 ++++---- 41 files changed, 327 insertions(+), 327 deletions(-) diff --git a/src/common/ui/MI_ImageSelectField.cpp b/src/common/ui/MI_ImageSelectField.cpp index a237b79c..5dbaf7cc 100644 --- a/src/common/ui/MI_ImageSelectField.cpp +++ b/src/common/ui/MI_ImageSelectField.cpp @@ -15,7 +15,7 @@ MI_ImageSelectField::MI_ImageSelectField( std::string name, short width, short indent, short imageHeight, short imageWidth) - : MI_SelectFieldDyn(nspr, x, y, std::move(name), width, indent) + : MI_SelectField(nspr, x, y, std::move(name), width, indent) , spr_image(nspr_image) , iImageWidth(imageWidth) , iImageHeight(imageHeight) diff --git a/src/common/ui/MI_ImageSelectField.h b/src/common/ui/MI_ImageSelectField.h index 92ca6f8a..343f5831 100644 --- a/src/common/ui/MI_ImageSelectField.h +++ b/src/common/ui/MI_ImageSelectField.h @@ -3,7 +3,7 @@ #include "ui/MI_SelectField.h" -class MI_ImageSelectField : public MI_SelectFieldDyn { +class MI_ImageSelectField : public MI_SelectField { public: MI_ImageSelectField( gfxSprite* nspr, gfxSprite* nspr_image, diff --git a/src/common/ui/MI_SelectField.cpp b/src/common/ui/MI_SelectField.cpp index b23a224b..4f0115ea 100644 --- a/src/common/ui/MI_SelectField.cpp +++ b/src/common/ui/MI_SelectField.cpp @@ -10,7 +10,7 @@ extern CResourceManager* rm; template -MI_SelectFieldDyn::MI_SelectFieldDyn(gfxSprite* nspr, short x, short y, std::string name, short width, short indent) +MI_SelectField::MI_SelectField(gfxSprite* nspr, short x, short y, std::string name, short width, short indent) : UI_Control(x, y) , m_spr(nspr) , m_name(std::move(name)) @@ -27,7 +27,7 @@ MI_SelectFieldDyn::MI_SelectFieldDyn(gfxSprite* nspr, short x, short y, std:: template -MI_SelectFieldDyn::MI_SelectFieldDyn(const MI_SelectFieldDyn& other) +MI_SelectField::MI_SelectField(const MI_SelectField& other) : UI_Control(other) , m_spr(other.m_spr) , m_name(other.m_name) @@ -54,7 +54,7 @@ MI_SelectFieldDyn::MI_SelectFieldDyn(const MI_SelectFieldDyn& other) template -void MI_SelectFieldDyn::Update() +void MI_SelectField::Update() { miModifyImageRight->Update(); miModifyImageLeft->Update(); @@ -62,7 +62,7 @@ void MI_SelectFieldDyn::Update() template -void MI_SelectFieldDyn::Draw() +void MI_SelectField::Draw() { if (!fShow) return; @@ -96,7 +96,7 @@ void MI_SelectFieldDyn::Draw() template -MenuCodeEnum MI_SelectFieldDyn::Modify(bool modify) +MenuCodeEnum MI_SelectField::Modify(bool modify) { if (fDisable) return MENU_CODE_UNSELECT_ITEM; @@ -117,7 +117,7 @@ MenuCodeEnum MI_SelectFieldDyn::Modify(bool modify) template -MenuCodeEnum MI_SelectFieldDyn::SendInput(CPlayerInput * playerInput) +MenuCodeEnum MI_SelectField::SendInput(CPlayerInput * playerInput) { for (int iPlayer = 0; iPlayer < 4; iPlayer++) { short iNumMoves = 1; @@ -166,7 +166,7 @@ MenuCodeEnum MI_SelectFieldDyn::SendInput(CPlayerInput * playerInput) template -MenuCodeEnum MI_SelectFieldDyn::MouseClick(short iMouseX, short iMouseY) { +MenuCodeEnum MI_SelectField::MouseClick(short iMouseX, short iMouseY) { if (fDisable) return MENU_CODE_NONE; @@ -203,7 +203,7 @@ MenuCodeEnum MI_SelectFieldDyn::MouseClick(short iMouseX, short iMouseY) { template -void MI_SelectFieldDyn::Refresh() +void MI_SelectField::Refresh() { if (m_outputPtr) setCurrentValue(*m_outputPtr); @@ -211,7 +211,7 @@ void MI_SelectFieldDyn::Refresh() template -T MI_SelectFieldDyn::randomValue() const +T MI_SelectField::randomValue() const { const size_t idx = m_goodRandomIndices.at(RANDOM_INT(m_goodRandomIndices.size())); return m_items.at(idx).value; @@ -219,7 +219,7 @@ T MI_SelectFieldDyn::randomValue() const template -bool MI_SelectFieldDyn::setCurrentValue(T value) +bool MI_SelectField::setCurrentValue(T value) { for (m_index = 0; m_index < m_items.size(); m_index++) { if (m_items[m_index].value == value) { @@ -232,7 +232,7 @@ bool MI_SelectFieldDyn::setCurrentValue(T value) template -bool MI_SelectFieldDyn::setCurrentIndex(size_t index) +bool MI_SelectField::setCurrentIndex(size_t index) { if (m_index < m_items.size()) { m_index = index; @@ -244,7 +244,7 @@ bool MI_SelectFieldDyn::setCurrentIndex(size_t index) template -void MI_SelectFieldDyn::updateOutput() const +void MI_SelectField::updateOutput() const { if (m_outputPtr) *m_outputPtr = currentValue(); @@ -252,7 +252,7 @@ void MI_SelectFieldDyn::updateOutput() const template -SF_ListItemDyn& MI_SelectFieldDyn::add(std::string name, T value, bool goodRandom) +SF_ListItem& MI_SelectField::add(std::string name, T value, bool goodRandom) { size_t new_idx = m_items.size(); m_items.emplace_back(std::move(name), std::move(value)); @@ -266,7 +266,7 @@ SF_ListItemDyn& MI_SelectFieldDyn::add(std::string name, T value, bool goo template -void MI_SelectFieldDyn::clear() +void MI_SelectField::clear() { m_items.clear(); m_goodRandomIndices.clear(); @@ -274,7 +274,7 @@ void MI_SelectFieldDyn::clear() template -void MI_SelectFieldDyn::hideItem(T value, bool hide) +void MI_SelectField::hideItem(T value, bool hide) { for (Item& item : m_items) { if (item.value == value) @@ -286,7 +286,7 @@ void MI_SelectFieldDyn::hideItem(T value, bool hide) template -void MI_SelectFieldDyn::hideAllItems(bool hide) +void MI_SelectField::hideAllItems(bool hide) { for (Item& item : m_items) { item.hidden = hide; @@ -295,7 +295,7 @@ void MI_SelectFieldDyn::hideAllItems(bool hide) template -bool MI_SelectFieldDyn::moveNext() +bool MI_SelectField::moveNext() { if (m_items.empty()) return false; @@ -318,7 +318,7 @@ bool MI_SelectFieldDyn::moveNext() template -bool MI_SelectFieldDyn::movePrev() +bool MI_SelectField::movePrev() { if (m_items.empty()) return false; @@ -341,7 +341,7 @@ bool MI_SelectFieldDyn::movePrev() template -bool MI_SelectFieldDyn::moveRandom() +bool MI_SelectField::moveRandom() { std::vector valid_indices; valid_indices.reserve(m_items.size()); @@ -360,5 +360,5 @@ bool MI_SelectFieldDyn::moveRandom() // Actual typed classes -template class MI_SelectFieldDyn; -template class MI_SelectFieldDyn; +template class MI_SelectField; +template class MI_SelectField; diff --git a/src/common/ui/MI_SelectField.h b/src/common/ui/MI_SelectField.h index 3a7010a0..2f49ed83 100644 --- a/src/common/ui/MI_SelectField.h +++ b/src/common/ui/MI_SelectField.h @@ -13,8 +13,8 @@ class MI_Image; template -struct SF_ListItemDyn { - SF_ListItemDyn(std::string&& name, T value) +struct SF_ListItem { + SF_ListItem(std::string&& name, T value) : name(std::move(name)) , value(value) { @@ -29,13 +29,13 @@ struct SF_ListItemDyn { template -class MI_SelectFieldDyn : public UI_Control { - using Item = SF_ListItemDyn; +class MI_SelectField : public UI_Control { + using Item = SF_ListItem; public: - MI_SelectFieldDyn(gfxSprite* nspr, short x, short y, std::string name, short width, short indent); - MI_SelectFieldDyn(const MI_SelectFieldDyn&); - virtual ~MI_SelectFieldDyn() = default; + MI_SelectField(gfxSprite* nspr, short x, short y, std::string name, short width, short indent); + MI_SelectField(const MI_SelectField&); + virtual ~MI_SelectField() = default; //! Set the displayed name. void setTitle(std::string name) { diff --git a/src/common/ui/MI_SliderField.cpp b/src/common/ui/MI_SliderField.cpp index 856a7393..d498ea2f 100644 --- a/src/common/ui/MI_SliderField.cpp +++ b/src/common/ui/MI_SliderField.cpp @@ -11,7 +11,7 @@ extern CResourceManager* rm; **************************************/ MI_SliderField::MI_SliderField(gfxSprite * nspr, gfxSprite * nsprSlider, short x, short y, const char * name, short width, short indent1, short indent2) - : MI_SelectFieldDyn(nspr, x, y, name, width, indent1) + : MI_SelectField(nspr, x, y, name, width, indent1) { m_indent2 = indent2; m_sprSlider = nsprSlider; @@ -24,7 +24,7 @@ MI_SliderField::~MI_SliderField() void MI_SliderField::SetPosition(short x, short y) { - MI_SelectFieldDyn::SetPosition(x, y); + MI_SelectField::SetPosition(x, y); miModifyImageLeft->SetPosition(ix + m_indent - 26, iy + 4); miModifyImageRight->SetPosition(ix + m_width - 16, iy + 4); } @@ -80,5 +80,5 @@ MenuCodeEnum MI_SliderField::SendInput(CPlayerInput * playerInput) } } - return MI_SelectFieldDyn::SendInput(playerInput); + return MI_SelectField::SendInput(playerInput); } diff --git a/src/common/ui/MI_SliderField.h b/src/common/ui/MI_SliderField.h index 652d401b..a2226da4 100644 --- a/src/common/ui/MI_SliderField.h +++ b/src/common/ui/MI_SliderField.h @@ -3,7 +3,7 @@ #include "ui/MI_SelectField.h" -class MI_SliderField : public MI_SelectFieldDyn { +class MI_SliderField : public MI_SelectField { public: MI_SliderField(gfxSprite * nspr, gfxSprite * nsprSlider, short x, short y, const char * name, short width, short indent1, short indent2); virtual ~MI_SliderField(); diff --git a/src/smw/menu/GameSettingsMenu.cpp b/src/smw/menu/GameSettingsMenu.cpp index 70f0b71f..d18d0d37 100644 --- a/src/smw/menu/GameSettingsMenu.cpp +++ b/src/smw/menu/GameSettingsMenu.cpp @@ -40,7 +40,7 @@ UI_GameSettingsMenu::UI_GameSettingsMenu() miModeField->setItemChangedCode(MENU_CODE_MODE_CHANGED); for (short iGameMode = 0; iGameMode < GAMEMODE_LAST; iGameMode++) { - miGoalField[iGameMode] = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, 125, gamemodes[iGameMode]->GetGoalName().c_str(), 352, 120); + miGoalField[iGameMode] = new MI_SelectField(&rm->spr_selectfield, 70, 125, gamemodes[iGameMode]->GetGoalName().c_str(), 352, 120); // miGoalField[iGameMode]->SetKey(gamemodes[iGameMode]->goal); miGoalField[iGameMode]->Show(iGameMode == 0); diff --git a/src/smw/menu/GameSettingsMenu.h b/src/smw/menu/GameSettingsMenu.h index 6a1c8908..8610ff69 100644 --- a/src/smw/menu/GameSettingsMenu.h +++ b/src/smw/menu/GameSettingsMenu.h @@ -8,7 +8,7 @@ class MI_ImageSelectField; class MI_MapField; class MI_MapFilterScroll; class MI_Text; -template class MI_SelectFieldDyn; +template class MI_SelectField; class UI_GameSettingsMenu : public UI_Menu { @@ -30,7 +30,7 @@ class UI_GameSettingsMenu : public UI_Menu { MI_MapFilterScroll* miMapFilterScroll = nullptr; MI_MapField* miMapField = nullptr; - MI_SelectFieldDyn* miGoalField[22]; + MI_SelectField* miGoalField[22]; private: MI_ImageSelectField* miModeField = nullptr; diff --git a/src/smw/menu/MatchSelectionMenu.cpp b/src/smw/menu/MatchSelectionMenu.cpp index 338cb7a1..8dd663e6 100644 --- a/src/smw/menu/MatchSelectionMenu.cpp +++ b/src/smw/menu/MatchSelectionMenu.cpp @@ -22,7 +22,7 @@ UI_MatchSelectionMenu::UI_MatchSelectionMenu() miMatchSelectionStartButton = new MI_Button(&rm->spr_selectfield, 270, 420, "Start", 100); miMatchSelectionStartButton->SetCode(MENU_CODE_MATCH_SELECTION_START); - miMatchSelectionField = new MI_SelectFieldDyn(&rm->spr_selectfield, 130, 340, "Match", 380, 100); + miMatchSelectionField = new MI_SelectField(&rm->spr_selectfield, 130, 340, "Match", 380, 100); miMatchSelectionField->add("Single Game", MATCH_TYPE_SINGLE_GAME); miMatchSelectionField->add("Tournament", MATCH_TYPE_TOURNAMENT); miMatchSelectionField->add("Tour", MATCH_TYPE_TOUR); @@ -32,7 +32,7 @@ UI_MatchSelectionMenu::UI_MatchSelectionMenu() miMatchSelectionField->setCurrentValue(game_values.matchtype); miMatchSelectionField->setItemChangedCode(MENU_CODE_MATCH_SELECTION_MATCH_CHANGED); - miTournamentField = new MI_SelectFieldDyn(&rm->spr_selectfield, 130, 380, "Wins", 380, 100); + miTournamentField = new MI_SelectField(&rm->spr_selectfield, 130, 380, "Wins", 380, 100); miTournamentField->add("2", 2); miTournamentField->add("3", 3); miTournamentField->add("4", 4); @@ -46,7 +46,7 @@ UI_MatchSelectionMenu::UI_MatchSelectionMenu() miTournamentField->setCurrentValue(game_values.tournamentgames); miTournamentField->Show(false); - miTourField = new MI_SelectFieldDyn(&rm->spr_selectfield, 130, 380, "Tour", 380, 100); + miTourField = new MI_SelectField(&rm->spr_selectfield, 130, 380, "Tour", 380, 100); for (short iTour = 0; iTour < tourlist->GetCount(); iTour++) { std::string szTemp = GetNameFromFileName(tourlist->GetIndex(iTour), true); // strcat(szTemp, " Tour"); @@ -56,7 +56,7 @@ UI_MatchSelectionMenu::UI_MatchSelectionMenu() miTourField->setCurrentValue(game_values.tourindex); miTourField->Show(false); - miWorldField = new MI_SelectFieldDyn(&rm->spr_selectfield, 130, 380, "World", 380, 100); + miWorldField = new MI_SelectField(&rm->spr_selectfield, 130, 380, "World", 380, 100); for (short iWorld = 0; iWorld < worldlist->GetCount(); iWorld++) { std::string szTemp = GetNameFromFileName(worldlist->GetIndex(iWorld), true); miWorldField->add(std::move(szTemp), iWorld); @@ -66,7 +66,7 @@ UI_MatchSelectionMenu::UI_MatchSelectionMenu() miWorldField->setItemChangedCode(MENU_CODE_WORLD_MAP_CHANGED); miWorldField->Show(false); - miMinigameField = new MI_SelectFieldDyn(&rm->spr_selectfield, 130, 380, "Game", 380, 100); + miMinigameField = new MI_SelectField(&rm->spr_selectfield, 130, 380, "Game", 380, 100); miMinigameField->add("Pipe Coin Game", 0); miMinigameField->add("Hammer Boss Game", 1); miMinigameField->add("Bomb Boss Game", 2); diff --git a/src/smw/menu/MatchSelectionMenu.h b/src/smw/menu/MatchSelectionMenu.h index 60da79c1..ff137e56 100644 --- a/src/smw/menu/MatchSelectionMenu.h +++ b/src/smw/menu/MatchSelectionMenu.h @@ -6,7 +6,7 @@ class MI_Button; class MI_Image; class MI_Text; class MI_WorldPreviewDisplay; -template class MI_SelectFieldDyn; +template class MI_SelectField; class UI_MatchSelectionMenu : public UI_Menu { @@ -22,11 +22,11 @@ class UI_MatchSelectionMenu : public UI_Menu { private: MI_Image* miMatchSelectionDisplayImage; - MI_SelectFieldDyn* miMatchSelectionField; - MI_SelectFieldDyn* miTournamentField; - MI_SelectFieldDyn* miTourField; - MI_SelectFieldDyn* miWorldField; - MI_SelectFieldDyn* miMinigameField; + MI_SelectField* miMatchSelectionField; + MI_SelectField* miTournamentField; + MI_SelectField* miTourField; + MI_SelectField* miWorldField; + MI_SelectField* miMinigameField; MI_WorldPreviewDisplay* miWorldPreviewDisplay; MI_Button* miMatchSelectionStartButton; diff --git a/src/smw/menu/ModeOptionsMenu.cpp b/src/smw/menu/ModeOptionsMenu.cpp index a9186c04..5b0e7ffe 100644 --- a/src/smw/menu/ModeOptionsMenu.cpp +++ b/src/smw/menu/ModeOptionsMenu.cpp @@ -21,13 +21,13 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() // Classic Mode Settings //*********************** - miClassicModeStyleField = new MI_SelectFieldDyn(&rm->spr_selectfield, 120, 200, "On Kill", 400, 180); + miClassicModeStyleField = new MI_SelectField(&rm->spr_selectfield, 120, 200, "On Kill", 400, 180); miClassicModeStyleField->add("Respawn", 0); miClassicModeStyleField->add("Shield", 1); miClassicModeStyleField->setOutputPtr(&game_values.gamemodemenusettings.classic.style); miClassicModeStyleField->setCurrentValue(game_values.gamemodemenusettings.classic.style); - miClassicModeScoringField = new MI_SelectFieldDyn(&rm->spr_selectfield, 120, 240, "Scoring", 400, 180); + miClassicModeScoringField = new MI_SelectField(&rm->spr_selectfield, 120, 240, "Scoring", 400, 180); miClassicModeScoringField->add("All Kills", 0); miClassicModeScoringField->add("Push Kills Only", 1, false); miClassicModeScoringField->setOutputPtr(&game_values.gamemodemenusettings.classic.scoring); @@ -56,13 +56,13 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() // Frag Mode Settings //*********************** - miFragModeStyleField = new MI_SelectFieldDyn(&rm->spr_selectfield, 120, 200, "On Kill", 400, 180); + miFragModeStyleField = new MI_SelectField(&rm->spr_selectfield, 120, 200, "On Kill", 400, 180); miFragModeStyleField->add("Respawn", 0); miFragModeStyleField->add("Shield", 1); miFragModeStyleField->setOutputPtr(&game_values.gamemodemenusettings.frag.style); miFragModeStyleField->setCurrentValue(game_values.gamemodemenusettings.frag.style); - miFragModeScoringField = new MI_SelectFieldDyn(&rm->spr_selectfield, 120, 240, "Scoring", 400, 180); + miFragModeScoringField = new MI_SelectField(&rm->spr_selectfield, 120, 240, "Scoring", 400, 180); miFragModeScoringField->add("All Kills", 0); miFragModeScoringField->add("Push Kills Only", 1, false); miFragModeScoringField->setOutputPtr(&game_values.gamemodemenusettings.frag.scoring); @@ -91,13 +91,13 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() // Time Limit Mode Settings //*********************** - miTimeLimitModeStyleField = new MI_SelectFieldDyn(&rm->spr_selectfield, 120, 180, "On Kill", 400, 150); + miTimeLimitModeStyleField = new MI_SelectField(&rm->spr_selectfield, 120, 180, "On Kill", 400, 150); miTimeLimitModeStyleField->add("Respawn", 0); miTimeLimitModeStyleField->add("Shield", 1); miTimeLimitModeStyleField->setOutputPtr(&game_values.gamemodemenusettings.time.style); miTimeLimitModeStyleField->setCurrentValue(game_values.gamemodemenusettings.time.style); - miTimeLimitModeScoringField = new MI_SelectFieldDyn(&rm->spr_selectfield, 120, 220, "Scoring", 400, 150); + miTimeLimitModeScoringField = new MI_SelectField(&rm->spr_selectfield, 120, 220, "Scoring", 400, 150); miTimeLimitModeScoringField->add("All Kills", 0); miTimeLimitModeScoringField->add("Push Kills Only", 1, false); miTimeLimitModeScoringField->setOutputPtr(&game_values.gamemodemenusettings.time.scoring); @@ -153,14 +153,14 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() // Jail Mode Settings //*********************** - miJailModeStyleField = new MI_SelectFieldDyn(&rm->spr_selectfield, 120, 160, "Style", 400, 150); + miJailModeStyleField = new MI_SelectField(&rm->spr_selectfield, 120, 160, "Style", 400, 150); miJailModeStyleField->add("Classic", 0); miJailModeStyleField->add("Owned", 1, false); miJailModeStyleField->add("Free For All", 2, false); miJailModeStyleField->setOutputPtr(&game_values.gamemodemenusettings.jail.style); miJailModeStyleField->setCurrentValue(game_values.gamemodemenusettings.jail.style); - miJailModeTimeFreeField = new MI_SelectFieldDyn(&rm->spr_selectfield, 120, 200, "Free Timer", 400, 150); + miJailModeTimeFreeField = new MI_SelectField(&rm->spr_selectfield, 120, 200, "Free Timer", 400, 150); miJailModeTimeFreeField->add("None", 1); miJailModeTimeFreeField->add("5 Seconds", 310, false); miJailModeTimeFreeField->add("10 Seconds", 620); @@ -177,7 +177,7 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() miJailModeTimeFreeField->setOutputPtr(&game_values.gamemodemenusettings.jail.timetofree); miJailModeTimeFreeField->setCurrentValue(game_values.gamemodemenusettings.jail.timetofree); - miJailModeTagFreeField = new MI_SelectFieldDyn(&rm->spr_selectfield, 120, 240, "Tag Free", 400, 150); + miJailModeTagFreeField = new MI_SelectField(&rm->spr_selectfield, 120, 240, "Tag Free", 400, 150); miJailModeTagFreeField->add("Off", false); miJailModeTagFreeField->add("On", true); miJailModeTagFreeField->setOutputPtr(&game_values.gamemodemenusettings.jail.tagfree); @@ -235,14 +235,14 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() // Coins Mode Settings //*********************** - miCoinModePenaltyField = new MI_SelectFieldDyn(&rm->spr_selectfield, 120, 180, "Penalty", 400, 150); + miCoinModePenaltyField = new MI_SelectField(&rm->spr_selectfield, 120, 180, "Penalty", 400, 150); miCoinModePenaltyField->add("Off", false); miCoinModePenaltyField->add("On", true); miCoinModePenaltyField->setOutputPtr(&game_values.gamemodemenusettings.coins.penalty); miCoinModePenaltyField->setCurrentValue(game_values.gamemodemenusettings.coins.penalty ? 1 : 0); miCoinModePenaltyField->setAutoAdvance(true); - miCoinModeQuantityField = new MI_SelectFieldDyn(&rm->spr_selectfield, 120, 220, "Quantity", 400, 150); + miCoinModeQuantityField = new MI_SelectField(&rm->spr_selectfield, 120, 220, "Quantity", 400, 150); miCoinModeQuantityField->add("1", 1); miCoinModeQuantityField->add("2", 2); miCoinModeQuantityField->add("3", 3); @@ -306,7 +306,7 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() // Stomp Mode Settings //*********************** - miStompModeRateField = new MI_SelectFieldDyn(&rm->spr_selectfield, 120, 40, "Rate", 400, 180); + miStompModeRateField = new MI_SelectField(&rm->spr_selectfield, 120, 40, "Rate", 400, 180); miStompModeRateField->add("Very Slow", 150, false); miStompModeRateField->add("Slow", 120); miStompModeRateField->add("Moderate", 90); @@ -393,7 +393,7 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() miEggModeYoshiQuantityField[iYoshiField]->allowWrap(false); } - miEggModeExplosionTimeField = new MI_SelectFieldDyn(&rm->spr_selectfield, 120, 380, "Explosion Timer", 400, 180); + miEggModeExplosionTimeField = new MI_SelectField(&rm->spr_selectfield, 120, 380, "Explosion Timer", 400, 180); miEggModeExplosionTimeField->add("Off", 0); miEggModeExplosionTimeField->add("3 Seconds", 3, false); miEggModeExplosionTimeField->add("5 Seconds", 5); @@ -451,21 +451,21 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() miFlagModeSpeedField->setCurrentValue(game_values.gamemodemenusettings.flag.speed); miFlagModeSpeedField->allowWrap(false); - miFlagModeTouchReturnField = new MI_SelectFieldDyn(&rm->spr_selectfield, 120, 160, "Touch Return", 400, 180); + miFlagModeTouchReturnField = new MI_SelectField(&rm->spr_selectfield, 120, 160, "Touch Return", 400, 180); miFlagModeTouchReturnField->add("Off", false); miFlagModeTouchReturnField->add("On", true); miFlagModeTouchReturnField->setOutputPtr(&game_values.gamemodemenusettings.flag.touchreturn); miFlagModeTouchReturnField->setCurrentValue(game_values.gamemodemenusettings.flag.touchreturn ? 1 : 0); miFlagModeTouchReturnField->setAutoAdvance(true); - miFlagModePointMoveField = new MI_SelectFieldDyn(&rm->spr_selectfield, 120, 200, "Point Move", 400, 180); + miFlagModePointMoveField = new MI_SelectField(&rm->spr_selectfield, 120, 200, "Point Move", 400, 180); miFlagModePointMoveField->add("Off", false); miFlagModePointMoveField->add("On", true); miFlagModePointMoveField->setOutputPtr(&game_values.gamemodemenusettings.flag.pointmove); miFlagModePointMoveField->setCurrentValue(game_values.gamemodemenusettings.flag.pointmove ? 1 : 0); miFlagModePointMoveField->setAutoAdvance(true); - miFlagModeAutoReturnField = new MI_SelectFieldDyn(&rm->spr_selectfield, 120, 240, "Auto Return", 400, 180); + miFlagModeAutoReturnField = new MI_SelectField(&rm->spr_selectfield, 120, 240, "Auto Return", 400, 180); miFlagModeAutoReturnField->add("None", 0); miFlagModeAutoReturnField->add("5 Seconds", 310, false); miFlagModeAutoReturnField->add("10 Seconds", 620); @@ -482,14 +482,14 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() miFlagModeAutoReturnField->setOutputPtr(&game_values.gamemodemenusettings.flag.autoreturn); miFlagModeAutoReturnField->setCurrentValue(game_values.gamemodemenusettings.flag.autoreturn); - miFlagModeHomeScoreField = new MI_SelectFieldDyn(&rm->spr_selectfield, 120, 280, "Need Home", 400, 180); + miFlagModeHomeScoreField = new MI_SelectField(&rm->spr_selectfield, 120, 280, "Need Home", 400, 180); miFlagModeHomeScoreField->add("Off", false); miFlagModeHomeScoreField->add("On", true); miFlagModeHomeScoreField->setOutputPtr(&game_values.gamemodemenusettings.flag.homescore); miFlagModeHomeScoreField->setCurrentValue(game_values.gamemodemenusettings.flag.homescore ? 1 : 0); miFlagModeHomeScoreField->setAutoAdvance(true); - miFlagModeCenterFlagField = new MI_SelectFieldDyn(&rm->spr_selectfield, 120, 320, "Center Flag", 400, 180); + miFlagModeCenterFlagField = new MI_SelectField(&rm->spr_selectfield, 120, 320, "Center Flag", 400, 180); miFlagModeCenterFlagField->add("Off", false); miFlagModeCenterFlagField->add("On", true); miFlagModeCenterFlagField->setOutputPtr(&game_values.gamemodemenusettings.flag.centerflag); @@ -524,14 +524,14 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() // Chicken Mode Settings //*********************** - miChickenModeShowTargetField = new MI_SelectFieldDyn(&rm->spr_selectfield, 120, 200, "Show Target", 400, 180); + miChickenModeShowTargetField = new MI_SelectField(&rm->spr_selectfield, 120, 200, "Show Target", 400, 180); miChickenModeShowTargetField->add("Off", false); miChickenModeShowTargetField->add("On", true); miChickenModeShowTargetField->setOutputPtr(&game_values.gamemodemenusettings.chicken.usetarget); miChickenModeShowTargetField->setCurrentValue(game_values.gamemodemenusettings.chicken.usetarget ? 1 : 0); miChickenModeShowTargetField->setAutoAdvance(true); - miChickenModeGlideField = new MI_SelectFieldDyn(&rm->spr_selectfield, 120, 240, "Chicken Glide", 400, 180); + miChickenModeGlideField = new MI_SelectField(&rm->spr_selectfield, 120, 240, "Chicken Glide", 400, 180); miChickenModeGlideField->add("Off", false); miChickenModeGlideField->add("On", true); miChickenModeGlideField->setOutputPtr(&game_values.gamemodemenusettings.chicken.glide); @@ -562,7 +562,7 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() // Tag Mode Settings //*********************** - miTagModeTagOnTouchField = new MI_SelectFieldDyn(&rm->spr_selectfield, 120, 220, "Touch Tag", 400, 180); + miTagModeTagOnTouchField = new MI_SelectField(&rm->spr_selectfield, 120, 220, "Touch Tag", 400, 180); miTagModeTagOnTouchField->add("Off", false); miTagModeTagOnTouchField->add("On", true); miTagModeTagOnTouchField->setOutputPtr(&game_values.gamemodemenusettings.tag.tagontouch); @@ -592,7 +592,7 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() // Star Mode Settings //*********************** - miStarModeTimeField = new MI_SelectFieldDyn(&rm->spr_selectfield, 120, 180, "Time", 400, 150); + miStarModeTimeField = new MI_SelectField(&rm->spr_selectfield, 120, 180, "Time", 400, 150); miStarModeTimeField->add("5 Seconds", 5, false); miStarModeTimeField->add("10 Seconds", 10, false); miStarModeTimeField->add("15 Seconds", 15); @@ -608,7 +608,7 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() miStarModeTimeField->setOutputPtr(&game_values.gamemodemenusettings.star.time); miStarModeTimeField->setCurrentValue(game_values.gamemodemenusettings.star.time); - miStarModeShineField = new MI_SelectFieldDyn(&rm->spr_selectfield, 120, 220, "Star Type", 400, 150); + miStarModeShineField = new MI_SelectField(&rm->spr_selectfield, 120, 220, "Star Type", 400, 150); miStarModeShineField->add("Ztar", 0); miStarModeShineField->add("Shine", 1); miStarModeShineField->add("Multi Star", 2); @@ -666,7 +666,7 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() // Domination Mode Settings //*********************** - miDominationModeQuantityField = new MI_SelectFieldDyn(&rm->spr_selectfield, 120, 120, "Quantity", 400, 180); + miDominationModeQuantityField = new MI_SelectField(&rm->spr_selectfield, 120, 120, "Quantity", 400, 180); miDominationModeQuantityField->add("1 Base", 1, false); miDominationModeQuantityField->add("2 Bases", 2, false); miDominationModeQuantityField->add("3 Bases", 3); @@ -694,7 +694,7 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() miDominationModeQuantityField->setOutputPtr(&game_values.gamemodemenusettings.domination.quantity); miDominationModeQuantityField->setCurrentValue(game_values.gamemodemenusettings.domination.quantity); - miDominationModeRelocateFrequencyField = new MI_SelectFieldDyn(&rm->spr_selectfield, 120, 160, "Relocate", 400, 180); + miDominationModeRelocateFrequencyField = new MI_SelectField(&rm->spr_selectfield, 120, 160, "Relocate", 400, 180); miDominationModeRelocateFrequencyField->add("Never", 0); miDominationModeRelocateFrequencyField->add("5 Seconds", 310, false); miDominationModeRelocateFrequencyField->add("10 Seconds", 620); @@ -712,21 +712,21 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() miDominationModeDeathText = new MI_Text("On Death", 120, 210, 0, true, TextAlign::LEFT); - miDominationModeLoseOnDeathField = new MI_SelectFieldDyn(&rm->spr_selectfield, 120, 240, "Lose Bases", 400, 180); + miDominationModeLoseOnDeathField = new MI_SelectField(&rm->spr_selectfield, 120, 240, "Lose Bases", 400, 180); miDominationModeLoseOnDeathField->add("Off", false); miDominationModeLoseOnDeathField->add("On", true); miDominationModeLoseOnDeathField->setOutputPtr(&game_values.gamemodemenusettings.domination.loseondeath); miDominationModeLoseOnDeathField->setCurrentValue(game_values.gamemodemenusettings.domination.loseondeath ? 1 : 0); miDominationModeLoseOnDeathField->setAutoAdvance(true); - miDominationModeRelocateOnDeathField = new MI_SelectFieldDyn(&rm->spr_selectfield, 120, 280, "Move Bases", 400, 180); + miDominationModeRelocateOnDeathField = new MI_SelectField(&rm->spr_selectfield, 120, 280, "Move Bases", 400, 180); miDominationModeRelocateOnDeathField->add("Off", false); miDominationModeRelocateOnDeathField->add("On", true); miDominationModeRelocateOnDeathField->setOutputPtr(&game_values.gamemodemenusettings.domination.relocateondeath); miDominationModeRelocateOnDeathField->setCurrentValue(game_values.gamemodemenusettings.domination.relocateondeath ? 1 : 0); miDominationModeRelocateOnDeathField->setAutoAdvance(true); - miDominationModeStealOnDeathField = new MI_SelectFieldDyn(&rm->spr_selectfield, 120, 320, "Steal Bases", 400, 180); + miDominationModeStealOnDeathField = new MI_SelectField(&rm->spr_selectfield, 120, 320, "Steal Bases", 400, 180); miDominationModeStealOnDeathField->add("Off", false); miDominationModeStealOnDeathField->add("On", true); miDominationModeStealOnDeathField->setOutputPtr(&game_values.gamemodemenusettings.domination.stealondeath); @@ -762,7 +762,7 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() // King of the Hill Mode Settings //*********************** - miKingOfTheHillModeSizeField = new MI_SelectFieldDyn(&rm->spr_selectfield, 120, 180, "Size", 400, 180); + miKingOfTheHillModeSizeField = new MI_SelectField(&rm->spr_selectfield, 120, 180, "Size", 400, 180); miKingOfTheHillModeSizeField->add("2 x 2", 2); miKingOfTheHillModeSizeField->add("3 x 3", 3); miKingOfTheHillModeSizeField->add("4 x 4", 4); @@ -772,7 +772,7 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() miKingOfTheHillModeSizeField->setOutputPtr(&game_values.gamemodemenusettings.kingofthehill.areasize); miKingOfTheHillModeSizeField->setCurrentValue(game_values.gamemodemenusettings.kingofthehill.areasize); - miKingOfTheHillModeRelocateFrequencyField = new MI_SelectFieldDyn(&rm->spr_selectfield, 120, 220, "Relocate", 400, 180); + miKingOfTheHillModeRelocateFrequencyField = new MI_SelectField(&rm->spr_selectfield, 120, 220, "Relocate", 400, 180); miKingOfTheHillModeRelocateFrequencyField->add("Never", 0); miKingOfTheHillModeRelocateFrequencyField->add("5 Seconds", 310, false); miKingOfTheHillModeRelocateFrequencyField->add("10 Seconds", 620); @@ -788,7 +788,7 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() miKingOfTheHillModeRelocateFrequencyField->setOutputPtr(&game_values.gamemodemenusettings.kingofthehill.relocationfrequency); miKingOfTheHillModeRelocateFrequencyField->setCurrentValue(game_values.gamemodemenusettings.kingofthehill.relocationfrequency); - miKingOfTheHillModeMultiplierField = new MI_SelectFieldDyn(&rm->spr_selectfield, 120, 260, "Max Multiplier", 400, 180); + miKingOfTheHillModeMultiplierField = new MI_SelectField(&rm->spr_selectfield, 120, 260, "Max Multiplier", 400, 180); miKingOfTheHillModeMultiplierField->add("None", 1); miKingOfTheHillModeMultiplierField->add("2", 2); miKingOfTheHillModeMultiplierField->add("3", 3); @@ -822,7 +822,7 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() // Race Mode Settings //*********************** - miRaceModeQuantityField = new MI_SelectFieldDyn(&rm->spr_selectfield, 120, 180, "Quantity", 400, 180); + miRaceModeQuantityField = new MI_SelectField(&rm->spr_selectfield, 120, 180, "Quantity", 400, 180); miRaceModeQuantityField->add("2", 2, false); miRaceModeQuantityField->add("3", 3); miRaceModeQuantityField->add("4", 4); @@ -833,7 +833,7 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() miRaceModeQuantityField->setOutputPtr(&game_values.gamemodemenusettings.race.quantity); miRaceModeQuantityField->setCurrentValue(game_values.gamemodemenusettings.race.quantity); - miRaceModeSpeedField = new MI_SelectFieldDyn(&rm->spr_selectfield, 120, 220, "Speed", 400, 180); + miRaceModeSpeedField = new MI_SelectField(&rm->spr_selectfield, 120, 220, "Speed", 400, 180); miRaceModeSpeedField->add("Stationary", 0); miRaceModeSpeedField->add("Very Slow", 2); miRaceModeSpeedField->add("Slow", 3); @@ -845,7 +845,7 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() miRaceModeSpeedField->setOutputPtr(&game_values.gamemodemenusettings.race.speed); miRaceModeSpeedField->setCurrentValue(game_values.gamemodemenusettings.race.speed); - miRaceModePenaltyField = new MI_SelectFieldDyn(&rm->spr_selectfield, 120, 260, "Penalty", 400, 180); + miRaceModePenaltyField = new MI_SelectField(&rm->spr_selectfield, 120, 260, "Penalty", 400, 180); miRaceModePenaltyField->add("None", 0); miRaceModePenaltyField->add("One Goal", 1); miRaceModePenaltyField->add("All Goals", 2); @@ -916,7 +916,7 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() miSurvivalModeEnemySlider[iEnemy]->setCurrentValue(game_values.gamemodemenusettings.survival.enemyweight[iEnemy]); } - miSurvivalModeDensityField = new MI_SelectFieldDyn(&rm->spr_selectfield, 120, 240, "Density", 400, 180); + miSurvivalModeDensityField = new MI_SelectField(&rm->spr_selectfield, 120, 240, "Density", 400, 180); miSurvivalModeDensityField->add("Very Low", 40, false); miSurvivalModeDensityField->add("Low", 30); miSurvivalModeDensityField->add("Medium", 20); @@ -927,7 +927,7 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() miSurvivalModeDensityField->setOutputPtr(&game_values.gamemodemenusettings.survival.density); miSurvivalModeDensityField->setCurrentValue(game_values.gamemodemenusettings.survival.density); - miSurvivalModeSpeedField = new MI_SelectFieldDyn(&rm->spr_selectfield, 120, 280, "Speed", 400, 180); + miSurvivalModeSpeedField = new MI_SelectField(&rm->spr_selectfield, 120, 280, "Speed", 400, 180); miSurvivalModeSpeedField->add("Very Slow", 2, false); miSurvivalModeSpeedField->add("Slow", 3); miSurvivalModeSpeedField->add("Moderate", 4); @@ -938,7 +938,7 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() miSurvivalModeSpeedField->setOutputPtr(&game_values.gamemodemenusettings.survival.speed); miSurvivalModeSpeedField->setCurrentValue(game_values.gamemodemenusettings.survival.speed); - miSurvivalModeShieldField = new MI_SelectFieldDyn(&rm->spr_selectfield, 120, 320, "Shield", 400, 180); + miSurvivalModeShieldField = new MI_SelectField(&rm->spr_selectfield, 120, 320, "Shield", 400, 180); miSurvivalModeShieldField->add("Off", false); miSurvivalModeShieldField->add("On", true); miSurvivalModeShieldField->setOutputPtr(&game_values.gamemodemenusettings.survival.shield); @@ -971,7 +971,7 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() //*********************** // Greed Mode Settings //*********************** - miGreedModeCoinLife = new MI_SelectFieldDyn(&rm->spr_selectfield, 120, 160, "Coin Life", 400, 150); + miGreedModeCoinLife = new MI_SelectField(&rm->spr_selectfield, 120, 160, "Coin Life", 400, 150); miGreedModeCoinLife->add("1 Second", 62, false); miGreedModeCoinLife->add("2 Seconds", 124, false); miGreedModeCoinLife->add("3 Seconds", 186); @@ -991,14 +991,14 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() miGreedModeCoinLife->setOutputPtr(&game_values.gamemodemenusettings.greed.coinlife); miGreedModeCoinLife->setCurrentValue(game_values.gamemodemenusettings.greed.coinlife); - miGreedModeOwnCoins = new MI_SelectFieldDyn(&rm->spr_selectfield, 120, 200, "Own Coins", 400, 150); + miGreedModeOwnCoins = new MI_SelectField(&rm->spr_selectfield, 120, 200, "Own Coins", 400, 150); miGreedModeOwnCoins->add("Yes", true); miGreedModeOwnCoins->add("No", false); miGreedModeOwnCoins->setOutputPtr(&game_values.gamemodemenusettings.greed.owncoins); miGreedModeOwnCoins->setCurrentValue(game_values.gamemodemenusettings.greed.owncoins); miGreedModeOwnCoins->setAutoAdvance(true); - miGreedModeMultiplier = new MI_SelectFieldDyn(&rm->spr_selectfield, 120, 240, "Multipler", 400, 150); + miGreedModeMultiplier = new MI_SelectField(&rm->spr_selectfield, 120, 240, "Multipler", 400, 150); miGreedModeMultiplier->add("0.5", 1, false); miGreedModeMultiplier->add("1", 2); miGreedModeMultiplier->add("1.5", 3); @@ -1059,7 +1059,7 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() //*********************** // Health Mode Settings //*********************** - miHealthModeStartLife = new MI_SelectFieldDyn(&rm->spr_selectfield, 120, 180, "Start Life", 400, 150); + miHealthModeStartLife = new MI_SelectField(&rm->spr_selectfield, 120, 180, "Start Life", 400, 150); miHealthModeStartLife->add("2", 2, false); miHealthModeStartLife->add("3", 3, false); miHealthModeStartLife->add("4", 4); @@ -1074,7 +1074,7 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() miHealthModeStartLife->allowWrap(false); miHealthModeStartLife->setItemChangedCode(MENU_CODE_HEALTH_MODE_START_LIFE_CHANGED); - miHealthModeMaxLife = new MI_SelectFieldDyn(&rm->spr_selectfield, 120, 220, "Max Life", 400, 150); + miHealthModeMaxLife = new MI_SelectField(&rm->spr_selectfield, 120, 220, "Max Life", 400, 150); miHealthModeMaxLife->add("2", 2, false); miHealthModeMaxLife->add("3", 3, false); miHealthModeMaxLife->add("4", 4, false); @@ -1139,7 +1139,7 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() // Card Collection Mode Settings //*********************** - miCollectionModeQuantityField = new MI_SelectFieldDyn(&rm->spr_selectfield, 120, 160, "Limit", 400, 180); + miCollectionModeQuantityField = new MI_SelectField(&rm->spr_selectfield, 120, 160, "Limit", 400, 180); miCollectionModeQuantityField->add("1 Card", 1); miCollectionModeQuantityField->add("2 Cards", 2); miCollectionModeQuantityField->add("3 Cards", 3); @@ -1153,7 +1153,7 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() miCollectionModeQuantityField->setOutputPtr(&game_values.gamemodemenusettings.collection.quantity); miCollectionModeQuantityField->setCurrentValue(game_values.gamemodemenusettings.collection.quantity); - miCollectionModeRateField = new MI_SelectFieldDyn(&rm->spr_selectfield, 120, 200, "Rate", 400, 180); + miCollectionModeRateField = new MI_SelectField(&rm->spr_selectfield, 120, 200, "Rate", 400, 180); miCollectionModeRateField->add("Instant", 0); miCollectionModeRateField->add("1 Second", 62); miCollectionModeRateField->add("2 Seconds", 124); @@ -1167,7 +1167,7 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() miCollectionModeRateField->setOutputPtr(&game_values.gamemodemenusettings.collection.rate); miCollectionModeRateField->setCurrentValue(game_values.gamemodemenusettings.collection.rate); - miCollectionModeBankTimeField = new MI_SelectFieldDyn(&rm->spr_selectfield, 120, 240, "Bank Time", 400, 180); + miCollectionModeBankTimeField = new MI_SelectField(&rm->spr_selectfield, 120, 240, "Bank Time", 400, 180); miCollectionModeBankTimeField->add("Instant", 0, false); miCollectionModeBankTimeField->add("1 Second", 62, false); miCollectionModeBankTimeField->add("2 Seconds", 124); @@ -1182,7 +1182,7 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() miCollectionModeBankTimeField->setOutputPtr(&game_values.gamemodemenusettings.collection.banktime); miCollectionModeBankTimeField->setCurrentValue(game_values.gamemodemenusettings.collection.banktime); - miCollectionModeCardLifeField = new MI_SelectFieldDyn(&rm->spr_selectfield, 120, 280, "Card Life", 400, 180); + miCollectionModeCardLifeField = new MI_SelectField(&rm->spr_selectfield, 120, 280, "Card Life", 400, 180); miCollectionModeCardLifeField->add("1 Second", 62, false); miCollectionModeCardLifeField->add("2 Seconds", 124, false); miCollectionModeCardLifeField->add("3 Seconds", 186); @@ -1226,7 +1226,7 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() // Chase Mode Settings //*********************** - miChaseModeSpeedField = new MI_SelectFieldDyn(&rm->spr_selectfield, 120, 160, "Speed", 400, 180); + miChaseModeSpeedField = new MI_SelectField(&rm->spr_selectfield, 120, 160, "Speed", 400, 180); miChaseModeSpeedField->add("Very Slow", 3, false); miChaseModeSpeedField->add("Slow", 4); miChaseModeSpeedField->add("Moderate", 5); @@ -1277,21 +1277,21 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() // Shyguy Tag Mode Settings //*********************** - miShyGuyTagModeTagOnSuicideField = new MI_SelectFieldDyn(&rm->spr_selectfield, 120, 180, "Suicide Tag", 400, 180); + miShyGuyTagModeTagOnSuicideField = new MI_SelectField(&rm->spr_selectfield, 120, 180, "Suicide Tag", 400, 180); miShyGuyTagModeTagOnSuicideField->add("Off", false); miShyGuyTagModeTagOnSuicideField->add("On", true); miShyGuyTagModeTagOnSuicideField->setOutputPtr(&game_values.gamemodemenusettings.shyguytag.tagonsuicide); miShyGuyTagModeTagOnSuicideField->setCurrentValue(game_values.gamemodemenusettings.shyguytag.tagonsuicide ? 1 : 0); miShyGuyTagModeTagOnSuicideField->setAutoAdvance(true); - miShyGuyTagModeTagOnStompField = new MI_SelectFieldDyn(&rm->spr_selectfield, 120, 220, "Tag Transfer", 400, 180); + miShyGuyTagModeTagOnStompField = new MI_SelectField(&rm->spr_selectfield, 120, 220, "Tag Transfer", 400, 180); miShyGuyTagModeTagOnStompField->add("Touch Only", 0); miShyGuyTagModeTagOnStompField->add("Kills Only", 1); miShyGuyTagModeTagOnStompField->add("Touch and Kills", 2); miShyGuyTagModeTagOnStompField->setOutputPtr(&game_values.gamemodemenusettings.shyguytag.tagtransfer); miShyGuyTagModeTagOnStompField->setCurrentValue(game_values.gamemodemenusettings.shyguytag.tagtransfer); - miShyGuyTagModeFreeTimeField = new MI_SelectFieldDyn(&rm->spr_selectfield, 120, 260, "Free Time", 400, 180); + miShyGuyTagModeFreeTimeField = new MI_SelectField(&rm->spr_selectfield, 120, 260, "Free Time", 400, 180); miShyGuyTagModeFreeTimeField->add("Instant", 0); miShyGuyTagModeFreeTimeField->add("1 Second", 1); miShyGuyTagModeFreeTimeField->add("2 Seconds", 2); @@ -1330,14 +1330,14 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() // Boss Mode Settings //*********************** - miBossModeTypeField = new MI_SelectFieldDyn(&rm->spr_selectfield, 120, 180, "Type", 400, 180); + miBossModeTypeField = new MI_SelectField(&rm->spr_selectfield, 120, 180, "Type", 400, 180); miBossModeTypeField->add("Hammer", 0); miBossModeTypeField->add("Bomb", 1); miBossModeTypeField->add("Fire", 2); miBossModeTypeField->setOutputPtr(&game_values.gamemodemenusettings.boss.bosstype); miBossModeTypeField->setCurrentValue(game_values.gamemodemenusettings.boss.bosstype); - miBossModeDifficultyField = new MI_SelectFieldDyn(&rm->spr_selectfield, 120, 220, "Difficulty", 400, 180); + miBossModeDifficultyField = new MI_SelectField(&rm->spr_selectfield, 120, 220, "Difficulty", 400, 180); miBossModeDifficultyField->add("Very Easy", 0, false); miBossModeDifficultyField->add("Easy", 1); miBossModeDifficultyField->add("Moderate", 2); @@ -1346,7 +1346,7 @@ UI_ModeOptionsMenu::UI_ModeOptionsMenu() miBossModeDifficultyField->setOutputPtr(&game_values.gamemodemenusettings.boss.difficulty); miBossModeDifficultyField->setCurrentValue(game_values.gamemodemenusettings.boss.difficulty); - miBossModeHitPointsField = new MI_SelectFieldDyn(&rm->spr_selectfield, 120, 260, "Health", 400, 180); + miBossModeHitPointsField = new MI_SelectField(&rm->spr_selectfield, 120, 260, "Health", 400, 180); miBossModeHitPointsField->add("1", 1, false); miBossModeHitPointsField->add("2", 2, false); miBossModeHitPointsField->add("3", 3); diff --git a/src/smw/menu/ModeOptionsMenu.h b/src/smw/menu/ModeOptionsMenu.h index 38dcd034..c2d2304d 100644 --- a/src/smw/menu/ModeOptionsMenu.h +++ b/src/smw/menu/ModeOptionsMenu.h @@ -8,7 +8,7 @@ class MI_FrenzyModeOptions; class MI_PowerupSlider; class MI_SliderField; class MI_Text; -template class MI_SelectFieldDyn; +template class MI_SelectField; class UI_ModeOptionsMenu : public UI_Menu { @@ -37,8 +37,8 @@ class UI_ModeOptionsMenu : public UI_Menu { UI_Menu mBossSettingsMenu; // Classic - MI_SelectFieldDyn* miClassicModeStyleField; - MI_SelectFieldDyn* miClassicModeScoringField; + MI_SelectField* miClassicModeStyleField; + MI_SelectField* miClassicModeScoringField; MI_Button* miClassicModeBackButton; MI_Image* miClassicModeLeftHeaderBar; @@ -46,8 +46,8 @@ class UI_ModeOptionsMenu : public UI_Menu { MI_Text* miClassicModeHeaderText; // Frag - MI_SelectFieldDyn* miFragModeStyleField; - MI_SelectFieldDyn* miFragModeScoringField; + MI_SelectField* miFragModeStyleField; + MI_SelectField* miFragModeScoringField; MI_Button* miFragModeBackButton; MI_Image* miFragModeLeftHeaderBar; @@ -55,8 +55,8 @@ class UI_ModeOptionsMenu : public UI_Menu { MI_Text* miFragModeHeaderText; // Time Limit - MI_SelectFieldDyn* miTimeLimitModeStyleField; - MI_SelectFieldDyn* miTimeLimitModeScoringField; + MI_SelectField* miTimeLimitModeStyleField; + MI_SelectField* miTimeLimitModeScoringField; MI_SliderField* miTimeLimitModePercentExtraTime; MI_Button* miTimeLimitModeBackButton; @@ -65,9 +65,9 @@ class UI_ModeOptionsMenu : public UI_Menu { MI_Text* miTimeLimitModeHeaderText; // Jail - MI_SelectFieldDyn* miJailModeStyleField; - MI_SelectFieldDyn* miJailModeTagFreeField; - MI_SelectFieldDyn* miJailModeTimeFreeField; + MI_SelectField* miJailModeStyleField; + MI_SelectField* miJailModeTagFreeField; + MI_SelectField* miJailModeTimeFreeField; MI_SliderField* miJailModeJailKeyField; MI_Button* miJailModeBackButton; @@ -76,8 +76,8 @@ class UI_ModeOptionsMenu : public UI_Menu { MI_Text* miJailModeHeaderText; // Coins - MI_SelectFieldDyn* miCoinModePenaltyField; - MI_SelectFieldDyn* miCoinModeQuantityField; + MI_SelectField* miCoinModePenaltyField; + MI_SelectField* miCoinModeQuantityField; MI_SliderField* miCoinModePercentExtraCoin; MI_Button* miCoinModeBackButton; @@ -88,7 +88,7 @@ class UI_ModeOptionsMenu : public UI_Menu { // Yoshi's Eggs MI_PowerupSlider* miEggModeEggQuantityField[4]; MI_PowerupSlider* miEggModeYoshiQuantityField[4]; - MI_SelectFieldDyn* miEggModeExplosionTimeField; + MI_SelectField* miEggModeExplosionTimeField; MI_Button* miEggModeBackButton; MI_Image* miEggModeLeftHeaderBar; @@ -97,11 +97,11 @@ class UI_ModeOptionsMenu : public UI_Menu { // Capture The Flag MI_SliderField* miFlagModeSpeedField; - MI_SelectFieldDyn* miFlagModeTouchReturnField; - MI_SelectFieldDyn* miFlagModePointMoveField; - MI_SelectFieldDyn* miFlagModeAutoReturnField; - MI_SelectFieldDyn* miFlagModeHomeScoreField; - MI_SelectFieldDyn* miFlagModeCenterFlagField; + MI_SelectField* miFlagModeTouchReturnField; + MI_SelectField* miFlagModePointMoveField; + MI_SelectField* miFlagModeAutoReturnField; + MI_SelectField* miFlagModeHomeScoreField; + MI_SelectField* miFlagModeCenterFlagField; MI_Button* miFlagModeBackButton; MI_Image* miFlagModeLeftHeaderBar; @@ -109,8 +109,8 @@ class UI_ModeOptionsMenu : public UI_Menu { MI_Text* miFlagModeHeaderText; // Chicken - MI_SelectFieldDyn* miChickenModeShowTargetField; - MI_SelectFieldDyn* miChickenModeGlideField; + MI_SelectField* miChickenModeShowTargetField; + MI_SelectField* miChickenModeGlideField; MI_Button* miChickenModeBackButton; MI_Image* miChickenModeLeftHeaderBar; @@ -118,7 +118,7 @@ class UI_ModeOptionsMenu : public UI_Menu { MI_Text* miChickenModeHeaderText; // Tag - MI_SelectFieldDyn* miTagModeTagOnTouchField; + MI_SelectField* miTagModeTagOnTouchField; MI_Button* miTagModeBackButton; MI_Image* miTagModeLeftHeaderBar; @@ -126,8 +126,8 @@ class UI_ModeOptionsMenu : public UI_Menu { MI_Text* miTagModeHeaderText; // Star - MI_SelectFieldDyn* miStarModeTimeField; - MI_SelectFieldDyn* miStarModeShineField; + MI_SelectField* miStarModeTimeField; + MI_SelectField* miStarModeShineField; MI_SliderField* miStarModePercentExtraTime; MI_Button* miStarModeBackButton; @@ -136,11 +136,11 @@ class UI_ModeOptionsMenu : public UI_Menu { MI_Text* miStarModeHeaderText; // Domination - MI_SelectFieldDyn* miDominationModeQuantityField; - MI_SelectFieldDyn* miDominationModeLoseOnDeathField; - MI_SelectFieldDyn* miDominationModeRelocateOnDeathField; - MI_SelectFieldDyn* miDominationModeStealOnDeathField; - MI_SelectFieldDyn* miDominationModeRelocateFrequencyField; + MI_SelectField* miDominationModeQuantityField; + MI_SelectField* miDominationModeLoseOnDeathField; + MI_SelectField* miDominationModeRelocateOnDeathField; + MI_SelectField* miDominationModeStealOnDeathField; + MI_SelectField* miDominationModeRelocateFrequencyField; MI_Text* miDominationModeDeathText; @@ -151,9 +151,9 @@ class UI_ModeOptionsMenu : public UI_Menu { MI_Text* miDominationModeHeaderText; // King of the Hill - MI_SelectFieldDyn* miKingOfTheHillModeSizeField; - MI_SelectFieldDyn* miKingOfTheHillModeRelocateFrequencyField; - MI_SelectFieldDyn* miKingOfTheHillModeMultiplierField; + MI_SelectField* miKingOfTheHillModeSizeField; + MI_SelectField* miKingOfTheHillModeRelocateFrequencyField; + MI_SelectField* miKingOfTheHillModeMultiplierField; MI_Button* miKingOfTheHillModeBackButton; @@ -162,9 +162,9 @@ class UI_ModeOptionsMenu : public UI_Menu { MI_Text* miKingOfTheHillModeHeaderText; // Race - MI_SelectFieldDyn* miRaceModeQuantityField; - MI_SelectFieldDyn* miRaceModeSpeedField; - MI_SelectFieldDyn* miRaceModePenaltyField; + MI_SelectField* miRaceModeQuantityField; + MI_SelectField* miRaceModeSpeedField; + MI_SelectField* miRaceModePenaltyField; MI_Button* miRaceModeBackButton; MI_Image* miRaceModeLeftHeaderBar; @@ -172,7 +172,7 @@ class UI_ModeOptionsMenu : public UI_Menu { MI_Text* miRaceModeHeaderText; // Stomp - MI_SelectFieldDyn* miStompModeRateField; + MI_SelectField* miStompModeRateField; MI_PowerupSlider* miStompModeEnemySlider[NUMSTOMPENEMIES]; MI_Button* miStompModeBackButton; @@ -189,9 +189,9 @@ class UI_ModeOptionsMenu : public UI_Menu { // Survival MI_PowerupSlider* miSurvivalModeEnemySlider[NUMSURVIVALENEMIES]; - MI_SelectFieldDyn* miSurvivalModeDensityField; - MI_SelectFieldDyn* miSurvivalModeSpeedField; - MI_SelectFieldDyn* miSurvivalModeShieldField; + MI_SelectField* miSurvivalModeDensityField; + MI_SelectField* miSurvivalModeSpeedField; + MI_SelectField* miSurvivalModeShieldField; MI_Button* miSurvivalModeBackButton; MI_Image* miSurvivalModeLeftHeaderBar; @@ -199,9 +199,9 @@ class UI_ModeOptionsMenu : public UI_Menu { MI_Text* miSurvivalModeHeaderText; // Greed - MI_SelectFieldDyn* miGreedModeCoinLife; - MI_SelectFieldDyn* miGreedModeOwnCoins; - MI_SelectFieldDyn* miGreedModeMultiplier; + MI_SelectField* miGreedModeCoinLife; + MI_SelectField* miGreedModeOwnCoins; + MI_SelectField* miGreedModeMultiplier; MI_SliderField* miGreedModePercentExtraCoin; MI_Button* miGreedModeBackButton; @@ -210,8 +210,8 @@ class UI_ModeOptionsMenu : public UI_Menu { MI_Text* miGreedModeHeaderText; // Health - MI_SelectFieldDyn* miHealthModeStartLife; - MI_SelectFieldDyn* miHealthModeMaxLife; + MI_SelectField* miHealthModeStartLife; + MI_SelectField* miHealthModeMaxLife; MI_SliderField* miHealthModePercentExtraLife; MI_Button* miHealthModeBackButton; @@ -220,10 +220,10 @@ class UI_ModeOptionsMenu : public UI_Menu { MI_Text* miHealthModeHeaderText; // Card Collection - MI_SelectFieldDyn* miCollectionModeQuantityField; - MI_SelectFieldDyn* miCollectionModeRateField; - MI_SelectFieldDyn* miCollectionModeBankTimeField; - MI_SelectFieldDyn* miCollectionModeCardLifeField; + MI_SelectField* miCollectionModeQuantityField; + MI_SelectField* miCollectionModeRateField; + MI_SelectField* miCollectionModeBankTimeField; + MI_SelectField* miCollectionModeCardLifeField; MI_Button* miCollectionModeBackButton; MI_Image* miCollectionModeLeftHeaderBar; @@ -231,7 +231,7 @@ class UI_ModeOptionsMenu : public UI_Menu { MI_Text* miCollectionModeHeaderText; // Phanto Chase - MI_SelectFieldDyn* miChaseModeSpeedField; + MI_SelectField* miChaseModeSpeedField; MI_PowerupSlider* miChaseModeQuantitySlider[3]; MI_Button* miChaseModeBackButton; @@ -240,9 +240,9 @@ class UI_ModeOptionsMenu : public UI_Menu { MI_Text* miChaseModeHeaderText; // Shyguy Tag - MI_SelectFieldDyn* miShyGuyTagModeTagOnSuicideField; - MI_SelectFieldDyn* miShyGuyTagModeTagOnStompField; - MI_SelectFieldDyn* miShyGuyTagModeFreeTimeField; + MI_SelectField* miShyGuyTagModeTagOnSuicideField; + MI_SelectField* miShyGuyTagModeTagOnStompField; + MI_SelectField* miShyGuyTagModeFreeTimeField; MI_Button* miShyGuyTagModeBackButton; MI_Image* miShyGuyTagModeLeftHeaderBar; @@ -250,9 +250,9 @@ class UI_ModeOptionsMenu : public UI_Menu { MI_Text* miShyGuyTagModeHeaderText; // Boss - MI_SelectFieldDyn* miBossModeTypeField; - MI_SelectFieldDyn* miBossModeDifficultyField; - MI_SelectFieldDyn* miBossModeHitPointsField; + MI_SelectField* miBossModeTypeField; + MI_SelectField* miBossModeDifficultyField; + MI_SelectField* miBossModeHitPointsField; MI_Button* miBossModeBackButton; MI_Image* miBossModeLeftHeaderBar; diff --git a/src/smw/menu/network/NetNewRoomSettingsMenu.cpp b/src/smw/menu/network/NetNewRoomSettingsMenu.cpp index 33d94742..5c3d61b6 100644 --- a/src/smw/menu/network/NetNewRoomSettingsMenu.cpp +++ b/src/smw/menu/network/NetNewRoomSettingsMenu.cpp @@ -23,7 +23,7 @@ UI_NetNewRoomSettingsMenu::UI_NetNewRoomSettingsMenu(const UI_GameSettingsMenu* miModeField = new MI_ImageSelectField(*(gsm->miModeField)); for (short iGoalField = 0; iGoalField < GAMEMODE_LAST; iGoalField++) - miGoalField[iGoalField] = new MI_SelectFieldDyn(*(gsm->miGoalField[iGoalField])); + miGoalField[iGoalField] = new MI_SelectField(*(gsm->miGoalField[iGoalField])); miMapField = new MI_MapField(&rm->spr_selectfield, 70, 165, "Map", 400, 120, true); netplay.mapfilepath = getCurrentMapPath(); diff --git a/src/smw/menu/network/NetNewRoomSettingsMenu.h b/src/smw/menu/network/NetNewRoomSettingsMenu.h index cf7483dc..83c5fc57 100644 --- a/src/smw/menu/network/NetNewRoomSettingsMenu.h +++ b/src/smw/menu/network/NetNewRoomSettingsMenu.h @@ -10,7 +10,7 @@ class MI_ImageSelectField; class MI_MapField; class MI_Text; class UI_GameSettingsMenu; -template class MI_SelectFieldDyn; +template class MI_SelectField; class UI_NetNewRoomSettingsMenu : public UI_Menu { @@ -24,7 +24,7 @@ class UI_NetNewRoomSettingsMenu : public UI_Menu { private: MI_ImageSelectField* miModeField; - MI_SelectFieldDyn* miGoalField[22]; + MI_SelectField* miGoalField[22]; MI_Button* miModeSettingsButton; MI_MapField* miMapField; MI_Button* miContinueButton; diff --git a/src/smw/menu/options/EyeCandyOptionsMenu.cpp b/src/smw/menu/options/EyeCandyOptionsMenu.cpp index f13e7683..cad0116d 100644 --- a/src/smw/menu/options/EyeCandyOptionsMenu.cpp +++ b/src/smw/menu/options/EyeCandyOptionsMenu.cpp @@ -14,14 +14,14 @@ extern CGameValues game_values; UI_EyeCandyOptionsMenu::UI_EyeCandyOptionsMenu() : UI_Menu() { - miSpawnStyleField = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, 80, "Spawn Style", 500, 220); + miSpawnStyleField = new MI_SelectField(&rm->spr_selectfield, 70, 80, "Spawn Style", 500, 220); miSpawnStyleField->add("Instant", 0); miSpawnStyleField->add("Door", 1); miSpawnStyleField->add("Swirl", 2); miSpawnStyleField->setOutputPtr(&game_values.spawnstyle); miSpawnStyleField->setCurrentValue(game_values.spawnstyle); - miAwardStyleField = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, 120, "Award Style", 500, 220); + miAwardStyleField = new MI_SelectField(&rm->spr_selectfield, 70, 120, "Award Style", 500, 220); miAwardStyleField->add("None", 0); miAwardStyleField->add("Fireworks", 1); miAwardStyleField->add("Spiral", 2); @@ -31,42 +31,42 @@ UI_EyeCandyOptionsMenu::UI_EyeCandyOptionsMenu() miAwardStyleField->setOutputPtr(&game_values.awardstyle); miAwardStyleField->setCurrentValue(game_values.awardstyle); - miScoreStyleField = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, 160, "Score Location", 500, 220); + miScoreStyleField = new MI_SelectField(&rm->spr_selectfield, 70, 160, "Score Location", 500, 220); miScoreStyleField->add("Top", 0); miScoreStyleField->add("Bottom", 1); miScoreStyleField->add("Corners", 2); miScoreStyleField->setOutputPtr(&game_values.scoreboardstyle); miScoreStyleField->setCurrentValue(game_values.scoreboardstyle); - miCrunchField = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, 200, "Screen Crunch", 500, 220); + miCrunchField = new MI_SelectField(&rm->spr_selectfield, 70, 200, "Screen Crunch", 500, 220); miCrunchField->add("Off", false); miCrunchField->add("On", true); miCrunchField->setOutputPtr(&game_values.screencrunch); miCrunchField->setCurrentValue(game_values.screencrunch ? 1 : 0); miCrunchField->setAutoAdvance(true); - miWinningCrownField = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, 240, "Leader Crown", 500, 220); + miWinningCrownField = new MI_SelectField(&rm->spr_selectfield, 70, 240, "Leader Crown", 500, 220); miWinningCrownField->add("Off", false); miWinningCrownField->add("On", true); miWinningCrownField->setOutputPtr(&game_values.showwinningcrown); miWinningCrownField->setCurrentValue(game_values.showwinningcrown ? 1 : 0); miWinningCrownField->setAutoAdvance(true); - miStartCountDownField = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, 280, "Start Countdown", 500, 220); + miStartCountDownField = new MI_SelectField(&rm->spr_selectfield, 70, 280, "Start Countdown", 500, 220); miStartCountDownField->add("Off", false); miStartCountDownField->add("On", true); miStartCountDownField->setOutputPtr(&game_values.startgamecountdown); miStartCountDownField->setCurrentValue(game_values.startgamecountdown ? 1 : 0); miStartCountDownField->setAutoAdvance(true); - miStartModeDisplayField = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, 320, "Show Mode", 500, 220); + miStartModeDisplayField = new MI_SelectField(&rm->spr_selectfield, 70, 320, "Show Mode", 500, 220); miStartModeDisplayField->add("Off", false); miStartModeDisplayField->add("On", true); miStartModeDisplayField->setOutputPtr(&game_values.startmodedisplay); miStartModeDisplayField->setCurrentValue(game_values.startmodedisplay ? 1 : 0); miStartModeDisplayField->setAutoAdvance(true); - miDeadTeamNoticeField = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, 360, "Dead Team Notice", 500, 220); + miDeadTeamNoticeField = new MI_SelectField(&rm->spr_selectfield, 70, 360, "Dead Team Notice", 500, 220); miDeadTeamNoticeField->add("Off", false); miDeadTeamNoticeField->add("On", true); miDeadTeamNoticeField->setOutputPtr(&game_values.deadteamnotice); diff --git a/src/smw/menu/options/EyeCandyOptionsMenu.h b/src/smw/menu/options/EyeCandyOptionsMenu.h index 90d5e5e5..62e8d69f 100644 --- a/src/smw/menu/options/EyeCandyOptionsMenu.h +++ b/src/smw/menu/options/EyeCandyOptionsMenu.h @@ -5,7 +5,7 @@ class MI_Button; class MI_Image; class MI_Text; -template class MI_SelectFieldDyn; +template class MI_SelectField; class UI_EyeCandyOptionsMenu : public UI_Menu { @@ -13,14 +13,14 @@ class UI_EyeCandyOptionsMenu : public UI_Menu { UI_EyeCandyOptionsMenu(); private: - MI_SelectFieldDyn* miSpawnStyleField; - MI_SelectFieldDyn* miAwardStyleField; - MI_SelectFieldDyn* miScoreStyleField; - MI_SelectFieldDyn* miCrunchField; - MI_SelectFieldDyn* miWinningCrownField; - MI_SelectFieldDyn* miStartCountDownField; - MI_SelectFieldDyn* miStartModeDisplayField; - MI_SelectFieldDyn* miDeadTeamNoticeField; + MI_SelectField* miSpawnStyleField; + MI_SelectField* miAwardStyleField; + MI_SelectField* miScoreStyleField; + MI_SelectField* miCrunchField; + MI_SelectField* miWinningCrownField; + MI_SelectField* miStartCountDownField; + MI_SelectField* miStartModeDisplayField; + MI_SelectField* miDeadTeamNoticeField; MI_Button* miEyeCandyOptionsMenuBackButton; diff --git a/src/smw/menu/options/GameplayOptionsMenu.cpp b/src/smw/menu/options/GameplayOptionsMenu.cpp index fcc6faf5..d3a13ca1 100644 --- a/src/smw/menu/options/GameplayOptionsMenu.cpp +++ b/src/smw/menu/options/GameplayOptionsMenu.cpp @@ -14,7 +14,7 @@ extern CGameValues game_values; UI_GameplayOptionsMenu::UI_GameplayOptionsMenu() : UI_Menu() { - miRespawnField = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, 40, "Respawn Time", 500, 220); + miRespawnField = new MI_SelectField(&rm->spr_selectfield, 70, 40, "Respawn Time", 500, 220); miRespawnField->add("Instant", 0); miRespawnField->add("0.5 Seconds", 1); miRespawnField->add("1.0 Seconds", 2); @@ -39,7 +39,7 @@ UI_GameplayOptionsMenu::UI_GameplayOptionsMenu() miRespawnField->setOutputPtr(&game_values.respawn); miRespawnField->setCurrentValue(game_values.respawn); - miShieldStyleField = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, 80, "Shield Style", 500, 220); + miShieldStyleField = new MI_SelectField(&rm->spr_selectfield, 70, 80, "Shield Style", 500, 220); miShieldStyleField->add("No Shield", 0); miShieldStyleField->add("Soft", 1); miShieldStyleField->add("Soft with Stomp", 2); @@ -47,7 +47,7 @@ UI_GameplayOptionsMenu::UI_GameplayOptionsMenu() miShieldStyleField->setOutputPtr(&game_values.shieldstyle); miShieldStyleField->setCurrentValue(game_values.shieldstyle); - miShieldTimeField = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, 120, "Shield Time", 500, 220); + miShieldTimeField = new MI_SelectField(&rm->spr_selectfield, 70, 120, "Shield Time", 500, 220); miShieldTimeField->add("0.5 Seconds", 31); miShieldTimeField->add("1.0 Seconds", 62); miShieldTimeField->add("1.5 Seconds", 93); @@ -61,7 +61,7 @@ UI_GameplayOptionsMenu::UI_GameplayOptionsMenu() miShieldTimeField->setOutputPtr(&game_values.shieldtime); miShieldTimeField->setCurrentValue(game_values.shieldtime); - miBoundsTimeField = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, 160, "Bounds Time", 500, 220); + miBoundsTimeField = new MI_SelectField(&rm->spr_selectfield, 70, 160, "Bounds Time", 500, 220); miBoundsTimeField->add("Infinite", 0); miBoundsTimeField->add("1 Second", 1); miBoundsTimeField->add("2 Seconds", 2); @@ -76,7 +76,7 @@ UI_GameplayOptionsMenu::UI_GameplayOptionsMenu() miBoundsTimeField->setOutputPtr(&game_values.outofboundstime); miBoundsTimeField->setCurrentValue(game_values.outofboundstime); - miSuicideTimeField = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, 200, "Suicide Time", 500, 220); + miSuicideTimeField = new MI_SelectField(&rm->spr_selectfield, 70, 200, "Suicide Time", 500, 220); miSuicideTimeField->add("Off", 0); miSuicideTimeField->add("3 Seconds", 186); miSuicideTimeField->add("5 Seconds", 310); @@ -87,7 +87,7 @@ UI_GameplayOptionsMenu::UI_GameplayOptionsMenu() miSuicideTimeField->setOutputPtr(&game_values.suicidetime); miSuicideTimeField->setCurrentValue(game_values.suicidetime); - miWarpLockStyleField = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, 240, "Warp Lock Style", 500, 220); + miWarpLockStyleField = new MI_SelectField(&rm->spr_selectfield, 70, 240, "Warp Lock Style", 500, 220); miWarpLockStyleField->add("Entrance Only", 0); miWarpLockStyleField->add("Exit Only", 1); miWarpLockStyleField->add("Entrance and Exit", 2); @@ -96,7 +96,7 @@ UI_GameplayOptionsMenu::UI_GameplayOptionsMenu() miWarpLockStyleField->setOutputPtr(&game_values.warplockstyle); miWarpLockStyleField->setCurrentValue(game_values.warplockstyle); - miWarpLockTimeField = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, 280, "Warp Lock Time", 500, 220); + miWarpLockTimeField = new MI_SelectField(&rm->spr_selectfield, 70, 280, "Warp Lock Time", 500, 220); miWarpLockTimeField->add("Off", 0); miWarpLockTimeField->add("1 Second", 62); miWarpLockTimeField->add("2 Seconds", 124); @@ -111,7 +111,7 @@ UI_GameplayOptionsMenu::UI_GameplayOptionsMenu() miWarpLockTimeField->setOutputPtr(&game_values.warplocktime); miWarpLockTimeField->setCurrentValue(game_values.warplocktime); - miBotsField = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, 320, "Bot Difficulty", 500, 220); + miBotsField = new MI_SelectField(&rm->spr_selectfield, 70, 320, "Bot Difficulty", 500, 220); miBotsField->add("Very Easy", 0); miBotsField->add("Easy", 1); miBotsField->add("Moderate", 2); @@ -120,7 +120,7 @@ UI_GameplayOptionsMenu::UI_GameplayOptionsMenu() miBotsField->setOutputPtr(&game_values.cpudifficulty); miBotsField->setCurrentValue(game_values.cpudifficulty); - miPointSpeedField = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, 360, "Point Speed", 500, 220); + miPointSpeedField = new MI_SelectField(&rm->spr_selectfield, 70, 360, "Point Speed", 500, 220); miPointSpeedField->add("Very Slow", 60); miPointSpeedField->add("Slow", 40); miPointSpeedField->add("Moderate", 20); @@ -129,7 +129,7 @@ UI_GameplayOptionsMenu::UI_GameplayOptionsMenu() miPointSpeedField->setOutputPtr(&game_values.pointspeed); miPointSpeedField->setCurrentValue(game_values.pointspeed); - miSecretsField = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, 400, "Secrets", 500, 220); + miSecretsField = new MI_SelectField(&rm->spr_selectfield, 70, 400, "Secrets", 500, 220); miSecretsField->add("Off", false); miSecretsField->add("On", true); miSecretsField->setOutputPtr(&game_values.secretsenabled); diff --git a/src/smw/menu/options/GameplayOptionsMenu.h b/src/smw/menu/options/GameplayOptionsMenu.h index 527b1c4e..c86f4146 100644 --- a/src/smw/menu/options/GameplayOptionsMenu.h +++ b/src/smw/menu/options/GameplayOptionsMenu.h @@ -5,7 +5,7 @@ class MI_Button; class MI_Image; class MI_Text; -template class MI_SelectFieldDyn; +template class MI_SelectField; /* This menu is where you can change various gameplay-related @@ -16,16 +16,16 @@ class UI_GameplayOptionsMenu : public UI_Menu { UI_GameplayOptionsMenu(); private: - MI_SelectFieldDyn* miRespawnField; - MI_SelectFieldDyn* miShieldStyleField; - MI_SelectFieldDyn* miShieldTimeField; - MI_SelectFieldDyn* miBoundsTimeField; - MI_SelectFieldDyn* miSuicideTimeField; - MI_SelectFieldDyn* miWarpLockStyleField; - MI_SelectFieldDyn* miWarpLockTimeField; - MI_SelectFieldDyn* miBotsField; - MI_SelectFieldDyn* miPointSpeedField; - MI_SelectFieldDyn* miSecretsField; + MI_SelectField* miRespawnField; + MI_SelectField* miShieldStyleField; + MI_SelectField* miShieldTimeField; + MI_SelectField* miBoundsTimeField; + MI_SelectField* miSuicideTimeField; + MI_SelectField* miWarpLockStyleField; + MI_SelectField* miWarpLockTimeField; + MI_SelectField* miBotsField; + MI_SelectField* miPointSpeedField; + MI_SelectField* miSecretsField; MI_Button* miGameplayOptionsMenuBackButton; MI_Image* miGameplayOptionsMenuLeftHeaderBar; diff --git a/src/smw/menu/options/GraphicsOptionsMenu.cpp b/src/smw/menu/options/GraphicsOptionsMenu.cpp index a7a82780..fd13d6ed 100644 --- a/src/smw/menu/options/GraphicsOptionsMenu.cpp +++ b/src/smw/menu/options/GraphicsOptionsMenu.cpp @@ -19,14 +19,14 @@ extern GraphicsList* gamegraphicspacklist; UI_GraphicsOptionsMenu::UI_GraphicsOptionsMenu() : UI_Menu() { - miTopLayerField = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, 120, "Draw Top Layer", 500, 220); + miTopLayerField = new MI_SelectField(&rm->spr_selectfield, 70, 120, "Draw Top Layer", 500, 220); miTopLayerField->add("Background", false); miTopLayerField->add("Foreground", true); miTopLayerField->setOutputPtr(&game_values.toplayer); miTopLayerField->setCurrentValue(game_values.toplayer ? 1 : 0); miTopLayerField->setAutoAdvance(true); - miFrameLimiterField = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, 160, "Frame Limit", 500, 220); + miFrameLimiterField = new MI_SelectField(&rm->spr_selectfield, 70, 160, "Frame Limit", 500, 220); miFrameLimiterField->add("10 FPS", 100); miFrameLimiterField->add("15 FPS", 67); miFrameLimiterField->add("20 FPS", 50); @@ -60,7 +60,7 @@ UI_GraphicsOptionsMenu::UI_GraphicsOptionsMenu() miScreenSettingsButton = new MI_Button(&rm->spr_selectfield, 70, 200, "Screen Settings", 500, 0); miScreenSettingsButton->SetCode(MENU_CODE_TO_SCREEN_SETTINGS); #else - miFullscreenField = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, 200, "Screen Size", 500, 220); + miFullscreenField = new MI_SelectField(&rm->spr_selectfield, 70, 200, "Screen Size", 500, 220); miFullscreenField->add("Windowed", false); miFullscreenField->add("Fullscreen", true); miFullscreenField->setOutputPtr(&game_values.fullscreen); diff --git a/src/smw/menu/options/GraphicsOptionsMenu.h b/src/smw/menu/options/GraphicsOptionsMenu.h index 7ba98948..cb20e225 100644 --- a/src/smw/menu/options/GraphicsOptionsMenu.h +++ b/src/smw/menu/options/GraphicsOptionsMenu.h @@ -6,7 +6,7 @@ class MI_Button; class MI_Image; class MI_PacksField; class MI_Text; -template class MI_SelectFieldDyn; +template class MI_SelectField; /* @@ -18,13 +18,13 @@ class UI_GraphicsOptionsMenu : public UI_Menu { UI_GraphicsOptionsMenu(); private: - MI_SelectFieldDyn* miTopLayerField; - MI_SelectFieldDyn* miFrameLimiterField; + MI_SelectField* miTopLayerField; + MI_SelectField* miFrameLimiterField; #ifdef _XBOX MI_Button* miScreenSettingsButton; #else - MI_SelectFieldDyn* miFullscreenField; + MI_SelectField* miFullscreenField; #endif //_XBOX MI_PacksField* miMenuGraphicsPackField; diff --git a/src/smw/menu/options/PowerupSettingsMenu.cpp b/src/smw/menu/options/PowerupSettingsMenu.cpp index 7ddb95f5..fac2f80e 100644 --- a/src/smw/menu/options/PowerupSettingsMenu.cpp +++ b/src/smw/menu/options/PowerupSettingsMenu.cpp @@ -15,7 +15,7 @@ extern CGameValues game_values; UI_PowerupSettingsMenu::UI_PowerupSettingsMenu() : UI_Menu() { - miStoredPowerupDelayField = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, 100, "Item Use Speed", 500, 220); + miStoredPowerupDelayField = new MI_SelectField(&rm->spr_selectfield, 70, 100, "Item Use Speed", 500, 220); miStoredPowerupDelayField->add("Very Slow", 2); miStoredPowerupDelayField->add("Slow", 3); miStoredPowerupDelayField->add("Moderate", 4); @@ -24,7 +24,7 @@ UI_PowerupSettingsMenu::UI_PowerupSettingsMenu() miStoredPowerupDelayField->setOutputPtr(&game_values.storedpowerupdelay); miStoredPowerupDelayField->setCurrentValue(game_values.storedpowerupdelay); - miItemRespawnField = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, 140, "Item Spawn", 500, 220); + miItemRespawnField = new MI_SelectField(&rm->spr_selectfield, 70, 140, "Item Spawn", 500, 220); miItemRespawnField->add("Off", 0); miItemRespawnField->add("5 Seconds", 310); miItemRespawnField->add("10 Seconds", 620); @@ -41,7 +41,7 @@ UI_PowerupSettingsMenu::UI_PowerupSettingsMenu() miItemRespawnField->setOutputPtr(&game_values.itemrespawntime); miItemRespawnField->setCurrentValue(game_values.itemrespawntime); - miHiddenBlockRespawnField = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, 180, "Hidden Block Hide", 500, 220); + miHiddenBlockRespawnField = new MI_SelectField(&rm->spr_selectfield, 70, 180, "Hidden Block Hide", 500, 220); miHiddenBlockRespawnField->add("Off", 0); miHiddenBlockRespawnField->add("5 Seconds", 310); miHiddenBlockRespawnField->add("10 Seconds", 620); @@ -58,21 +58,21 @@ UI_PowerupSettingsMenu::UI_PowerupSettingsMenu() miHiddenBlockRespawnField->setOutputPtr(&game_values.hiddenblockrespawn); miHiddenBlockRespawnField->setCurrentValue(game_values.hiddenblockrespawn); - miSwapStyleField = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, 220, "Swap Style", 500, 220); + miSwapStyleField = new MI_SelectField(&rm->spr_selectfield, 70, 220, "Swap Style", 500, 220); miSwapStyleField->add("Walk", 0); miSwapStyleField->add("Blink", 1); miSwapStyleField->add("Instant", 2); miSwapStyleField->setOutputPtr(&game_values.swapstyle); miSwapStyleField->setCurrentValue(game_values.swapstyle); - miBonusWheelField = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, 260, "Bonus Wheel", 500, 220); + miBonusWheelField = new MI_SelectField(&rm->spr_selectfield, 70, 260, "Bonus Wheel", 500, 220); miBonusWheelField->add("Off", 0); miBonusWheelField->add("Tournament Win", 1); miBonusWheelField->add("Every Game", 2); miBonusWheelField->setOutputPtr(&game_values.bonuswheel); miBonusWheelField->setCurrentValue(game_values.bonuswheel); - miKeepPowerupField = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, 300, "Bonus Item", 500, 220); + miKeepPowerupField = new MI_SelectField(&rm->spr_selectfield, 70, 300, "Bonus Item", 500, 220); miKeepPowerupField->add("Until Next Spin", false); miKeepPowerupField->add("Keep Always", true); miKeepPowerupField->setOutputPtr(&game_values.keeppowerup); diff --git a/src/smw/menu/options/PowerupSettingsMenu.h b/src/smw/menu/options/PowerupSettingsMenu.h index 58a5d71c..185716bf 100644 --- a/src/smw/menu/options/PowerupSettingsMenu.h +++ b/src/smw/menu/options/PowerupSettingsMenu.h @@ -6,7 +6,7 @@ class MI_Button; class MI_Image; class MI_StoredPowerupResetButton; class MI_Text; -template class MI_SelectFieldDyn; +template class MI_SelectField; /* In this menu, you can change some powerup settings, @@ -17,12 +17,12 @@ class UI_PowerupSettingsMenu : public UI_Menu { UI_PowerupSettingsMenu(); private: - MI_SelectFieldDyn* miStoredPowerupDelayField = nullptr; - MI_SelectFieldDyn* miItemRespawnField = nullptr; - MI_SelectFieldDyn* miSwapStyleField = nullptr; - MI_SelectFieldDyn* miBonusWheelField = nullptr; - MI_SelectFieldDyn* miKeepPowerupField = nullptr; - MI_SelectFieldDyn* miHiddenBlockRespawnField = nullptr; + MI_SelectField* miStoredPowerupDelayField = nullptr; + MI_SelectField* miItemRespawnField = nullptr; + MI_SelectField* miSwapStyleField = nullptr; + MI_SelectField* miBonusWheelField = nullptr; + MI_SelectField* miKeepPowerupField = nullptr; + MI_SelectField* miHiddenBlockRespawnField = nullptr; MI_StoredPowerupResetButton* miStoredPowerupResetButton = nullptr; MI_Button* miPowerupSettingsMenuBackButton = nullptr; diff --git a/src/smw/menu/options/ProjectileLimitsMenu.cpp b/src/smw/menu/options/ProjectileLimitsMenu.cpp index 1c863562..8e7901e5 100644 --- a/src/smw/menu/options/ProjectileLimitsMenu.cpp +++ b/src/smw/menu/options/ProjectileLimitsMenu.cpp @@ -14,7 +14,7 @@ extern CGameValues game_values; UI_ProjectileLimitsMenu::UI_ProjectileLimitsMenu() : UI_Menu() { - miFireballLimitField = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, 60, "Fireball Limit", 500, 220); + miFireballLimitField = new MI_SelectField(&rm->spr_selectfield, 70, 60, "Fireball Limit", 500, 220); miFireballLimitField->add("Unlimited", 0); miFireballLimitField->add("2", 2); miFireballLimitField->add("5", 5); @@ -30,7 +30,7 @@ UI_ProjectileLimitsMenu::UI_ProjectileLimitsMenu() miFireballLimitField->setOutputPtr(&game_values.fireballlimit); miFireballLimitField->setCurrentValue(game_values.fireballlimit); - miHammerLimitField = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, 100, "Hammer Limit", 500, 220); + miHammerLimitField = new MI_SelectField(&rm->spr_selectfield, 70, 100, "Hammer Limit", 500, 220); miHammerLimitField->add("Unlimited", 0); miHammerLimitField->add("2", 2); miHammerLimitField->add("5", 5); @@ -46,7 +46,7 @@ UI_ProjectileLimitsMenu::UI_ProjectileLimitsMenu() miHammerLimitField->setOutputPtr(&game_values.hammerlimit); miHammerLimitField->setCurrentValue(game_values.hammerlimit); - miBoomerangLimitField = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, 140, "Boomerang Limit", 500, 220); + miBoomerangLimitField = new MI_SelectField(&rm->spr_selectfield, 70, 140, "Boomerang Limit", 500, 220); miBoomerangLimitField->add("Unlimited", 0); miBoomerangLimitField->add("2", 2); miBoomerangLimitField->add("5", 5); @@ -62,7 +62,7 @@ UI_ProjectileLimitsMenu::UI_ProjectileLimitsMenu() miBoomerangLimitField->setOutputPtr(&game_values.boomeranglimit); miBoomerangLimitField->setCurrentValue(game_values.boomeranglimit); - miFeatherLimitField = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, 180, "Feather Limit", 500, 220); + miFeatherLimitField = new MI_SelectField(&rm->spr_selectfield, 70, 180, "Feather Limit", 500, 220); miFeatherLimitField->add("Unlimited", 0); miFeatherLimitField->add("2", 2); miFeatherLimitField->add("5", 5); @@ -78,7 +78,7 @@ UI_ProjectileLimitsMenu::UI_ProjectileLimitsMenu() miFeatherLimitField->setOutputPtr(&game_values.featherlimit); miFeatherLimitField->setCurrentValue(game_values.featherlimit); - miLeafLimitField = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, 220, "Leaf Limit", 500, 220); + miLeafLimitField = new MI_SelectField(&rm->spr_selectfield, 70, 220, "Leaf Limit", 500, 220); miLeafLimitField->add("Unlimited", 0); miLeafLimitField->add("2", 2); miLeafLimitField->add("5", 5); @@ -94,7 +94,7 @@ UI_ProjectileLimitsMenu::UI_ProjectileLimitsMenu() miLeafLimitField->setOutputPtr(&game_values.leaflimit); miLeafLimitField->setCurrentValue(game_values.leaflimit); - miPwingsLimitField = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, 260, "P-Wings Limit", 500, 220); + miPwingsLimitField = new MI_SelectField(&rm->spr_selectfield, 70, 260, "P-Wings Limit", 500, 220); miPwingsLimitField->add("Unlimited", 0); miPwingsLimitField->add("2", 2); miPwingsLimitField->add("5", 5); @@ -110,7 +110,7 @@ UI_ProjectileLimitsMenu::UI_ProjectileLimitsMenu() miPwingsLimitField->setOutputPtr(&game_values.pwingslimit); miPwingsLimitField->setCurrentValue(game_values.pwingslimit); - miTanookiLimitField = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, 300, "Tanooki Limit", 500, 220); + miTanookiLimitField = new MI_SelectField(&rm->spr_selectfield, 70, 300, "Tanooki Limit", 500, 220); miTanookiLimitField->add("Unlimited", 0); miTanookiLimitField->add("2", 2); miTanookiLimitField->add("5", 5); @@ -126,7 +126,7 @@ UI_ProjectileLimitsMenu::UI_ProjectileLimitsMenu() miTanookiLimitField->setOutputPtr(&game_values.tanookilimit); miTanookiLimitField->setCurrentValue(game_values.tanookilimit); - miBombLimitField = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, 340, "Bomb Limit", 500, 220); + miBombLimitField = new MI_SelectField(&rm->spr_selectfield, 70, 340, "Bomb Limit", 500, 220); miBombLimitField->add("Unlimited", 0); miBombLimitField->add("2", 2); miBombLimitField->add("5", 5); @@ -142,7 +142,7 @@ UI_ProjectileLimitsMenu::UI_ProjectileLimitsMenu() miBombLimitField->setOutputPtr(&game_values.bombslimit); miBombLimitField->setCurrentValue(game_values.bombslimit); - miWandLimitField = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, 380, "Wand Limit", 500, 220); + miWandLimitField = new MI_SelectField(&rm->spr_selectfield, 70, 380, "Wand Limit", 500, 220); miWandLimitField->add("Unlimited", 0); miWandLimitField->add("2", 2); miWandLimitField->add("5", 5); diff --git a/src/smw/menu/options/ProjectileLimitsMenu.h b/src/smw/menu/options/ProjectileLimitsMenu.h index 9bfe03a1..bd927864 100644 --- a/src/smw/menu/options/ProjectileLimitsMenu.h +++ b/src/smw/menu/options/ProjectileLimitsMenu.h @@ -5,7 +5,7 @@ class MI_Button; class MI_Image; class MI_Text; -template class MI_SelectFieldDyn; +template class MI_SelectField; /* You can set the maximum number of uses of certain @@ -16,15 +16,15 @@ class UI_ProjectileLimitsMenu : public UI_Menu { UI_ProjectileLimitsMenu(); private: - MI_SelectFieldDyn* miFireballLimitField; - MI_SelectFieldDyn* miHammerLimitField; - MI_SelectFieldDyn* miBoomerangLimitField; - MI_SelectFieldDyn* miFeatherLimitField; - MI_SelectFieldDyn* miLeafLimitField; - MI_SelectFieldDyn* miPwingsLimitField; - MI_SelectFieldDyn* miTanookiLimitField; - MI_SelectFieldDyn* miBombLimitField; - MI_SelectFieldDyn* miWandLimitField; + MI_SelectField* miFireballLimitField; + MI_SelectField* miHammerLimitField; + MI_SelectField* miBoomerangLimitField; + MI_SelectField* miFeatherLimitField; + MI_SelectField* miLeafLimitField; + MI_SelectField* miPwingsLimitField; + MI_SelectField* miTanookiLimitField; + MI_SelectField* miBombLimitField; + MI_SelectField* miWandLimitField; MI_Button* miProjectilesLimitsMenuBackButton; diff --git a/src/smw/menu/options/ProjectileOptionsMenu.cpp b/src/smw/menu/options/ProjectileOptionsMenu.cpp index a533ceb3..38f0ad1e 100644 --- a/src/smw/menu/options/ProjectileOptionsMenu.cpp +++ b/src/smw/menu/options/ProjectileOptionsMenu.cpp @@ -14,7 +14,7 @@ extern CGameValues game_values; UI_ProjectileOptionsMenu::UI_ProjectileOptionsMenu() : UI_Menu() { - miFireballLifeField = new MI_SelectFieldDyn(&rm->spr_selectfield, 10, 80, "Life", 305, 120); + miFireballLifeField = new MI_SelectField(&rm->spr_selectfield, 10, 80, "Life", 305, 120); miFireballLifeField->add("1 Second", 62); miFireballLifeField->add("2 Seconds", 124); miFireballLifeField->add("3 Seconds", 186); @@ -28,7 +28,7 @@ UI_ProjectileOptionsMenu::UI_ProjectileOptionsMenu() miFireballLifeField->setOutputPtr(&game_values.fireballttl); miFireballLifeField->setCurrentValue(game_values.fireballttl); - miFeatherJumpsField = new MI_SelectFieldDyn(&rm->spr_selectfield, 10, 150, "Jumps", 305, 120); + miFeatherJumpsField = new MI_SelectField(&rm->spr_selectfield, 10, 150, "Jumps", 305, 120); miFeatherJumpsField->add("1", 1); miFeatherJumpsField->add("2", 2); miFeatherJumpsField->add("3", 3); @@ -37,7 +37,7 @@ UI_ProjectileOptionsMenu::UI_ProjectileOptionsMenu() miFeatherJumpsField->setOutputPtr(&game_values.featherjumps); miFeatherJumpsField->setCurrentValue(game_values.featherjumps); - miBoomerangStyleField = new MI_SelectFieldDyn(&rm->spr_selectfield, 10, 220, "Style", 305, 120); + miBoomerangStyleField = new MI_SelectField(&rm->spr_selectfield, 10, 220, "Style", 305, 120); miBoomerangStyleField->add("Flat", 0); miBoomerangStyleField->add("SMB3", 1); miBoomerangStyleField->add("Zelda", 2); @@ -45,7 +45,7 @@ UI_ProjectileOptionsMenu::UI_ProjectileOptionsMenu() miBoomerangStyleField->setOutputPtr(&game_values.boomerangstyle); miBoomerangStyleField->setCurrentValue(game_values.boomerangstyle); - miBoomerangLifeField = new MI_SelectFieldDyn(&rm->spr_selectfield, 10, 260, "Life", 305, 120); + miBoomerangLifeField = new MI_SelectField(&rm->spr_selectfield, 10, 260, "Life", 305, 120); miBoomerangLifeField->add("1 Second", 62); miBoomerangLifeField->add("2 Seconds", 124); miBoomerangLifeField->add("3 Seconds", 186); @@ -59,7 +59,7 @@ UI_ProjectileOptionsMenu::UI_ProjectileOptionsMenu() miBoomerangLifeField->setOutputPtr(&game_values.boomeranglife); miBoomerangLifeField->setCurrentValue(game_values.boomeranglife); - miHammerLifeField = new MI_SelectFieldDyn(&rm->spr_selectfield, 325, 80, "Life", 305, 120); + miHammerLifeField = new MI_SelectField(&rm->spr_selectfield, 325, 80, "Life", 305, 120); miHammerLifeField->add("No Limit", 310); miHammerLifeField->add("0.5 Seconds", 31); miHammerLifeField->add("0.6 Seconds", 37); @@ -72,7 +72,7 @@ UI_ProjectileOptionsMenu::UI_ProjectileOptionsMenu() miHammerLifeField->setOutputPtr(&game_values.hammerttl); miHammerLifeField->setCurrentValue(game_values.hammerttl); - miHammerDelayField = new MI_SelectFieldDyn(&rm->spr_selectfield, 325, 120, "Delay", 305, 120); + miHammerDelayField = new MI_SelectField(&rm->spr_selectfield, 325, 120, "Delay", 305, 120); miHammerDelayField->add("None", 0); miHammerDelayField->add("0.1 Seconds", 6); miHammerDelayField->add("0.2 Seconds", 12); @@ -87,14 +87,14 @@ UI_ProjectileOptionsMenu::UI_ProjectileOptionsMenu() miHammerDelayField->setOutputPtr(&game_values.hammerdelay); miHammerDelayField->setCurrentValue(game_values.hammerdelay); - miHammerOneKillField = new MI_SelectFieldDyn(&rm->spr_selectfield, 325, 160, "Power", 305, 120); + miHammerOneKillField = new MI_SelectField(&rm->spr_selectfield, 325, 160, "Power", 305, 120); miHammerOneKillField->add("One Kill", true); miHammerOneKillField->add("Multiple Kills", false); miHammerOneKillField->setOutputPtr(&game_values.hammerpower); miHammerOneKillField->setCurrentValue(game_values.hammerpower); miHammerOneKillField->setAutoAdvance(true); - miShellLifeField = new MI_SelectFieldDyn(&rm->spr_selectfield, 10, 330, "Life", 305, 120); + miShellLifeField = new MI_SelectField(&rm->spr_selectfield, 10, 330, "Life", 305, 120); miShellLifeField->add("Unlimited", 0); miShellLifeField->add("1 Second", 62); miShellLifeField->add("2 Seconds", 124); @@ -113,7 +113,7 @@ UI_ProjectileOptionsMenu::UI_ProjectileOptionsMenu() miShellLifeField->setOutputPtr(&game_values.shellttl); miShellLifeField->setCurrentValue(game_values.shellttl); - miWandFreezeTimeField = new MI_SelectFieldDyn(&rm->spr_selectfield, 10, 400, "Freeze", 305, 120); + miWandFreezeTimeField = new MI_SelectField(&rm->spr_selectfield, 10, 400, "Freeze", 305, 120); miWandFreezeTimeField->add("1 Second", 62); miWandFreezeTimeField->add("2 Seconds", 124); miWandFreezeTimeField->add("3 Seconds", 186); @@ -131,7 +131,7 @@ UI_ProjectileOptionsMenu::UI_ProjectileOptionsMenu() miWandFreezeTimeField->setOutputPtr(&game_values.wandfreezetime); miWandFreezeTimeField->setCurrentValue(game_values.wandfreezetime); - miBlueBlockLifeField = new MI_SelectFieldDyn(&rm->spr_selectfield, 325, 230, "Blue Life", 305, 120); + miBlueBlockLifeField = new MI_SelectField(&rm->spr_selectfield, 325, 230, "Blue Life", 305, 120); miBlueBlockLifeField->add("Unlimited", 0); miBlueBlockLifeField->add("1 Second", 62); miBlueBlockLifeField->add("2 Seconds", 124); @@ -150,7 +150,7 @@ UI_ProjectileOptionsMenu::UI_ProjectileOptionsMenu() miBlueBlockLifeField->setOutputPtr(&game_values.blueblockttl); miBlueBlockLifeField->setCurrentValue(game_values.blueblockttl); - miGrayBlockLifeField = new MI_SelectFieldDyn(&rm->spr_selectfield, 325, 270, "Gray Life", 305, 120); + miGrayBlockLifeField = new MI_SelectField(&rm->spr_selectfield, 325, 270, "Gray Life", 305, 120); miGrayBlockLifeField->add("Unlimited", 0); miGrayBlockLifeField->add("1 Second", 62); miGrayBlockLifeField->add("2 Seconds", 124); @@ -169,7 +169,7 @@ UI_ProjectileOptionsMenu::UI_ProjectileOptionsMenu() miGrayBlockLifeField->setOutputPtr(&game_values.grayblockttl); miGrayBlockLifeField->setCurrentValue(game_values.grayblockttl); - miRedBlockLifeField = new MI_SelectFieldDyn(&rm->spr_selectfield, 325, 310, "Red Life", 305, 120); + miRedBlockLifeField = new MI_SelectField(&rm->spr_selectfield, 325, 310, "Red Life", 305, 120); miRedBlockLifeField->add("Unlimited", 0); miRedBlockLifeField->add("1 Second", 62); miRedBlockLifeField->add("2 Seconds", 124); diff --git a/src/smw/menu/options/ProjectileOptionsMenu.h b/src/smw/menu/options/ProjectileOptionsMenu.h index e608f32d..04a23a82 100644 --- a/src/smw/menu/options/ProjectileOptionsMenu.h +++ b/src/smw/menu/options/ProjectileOptionsMenu.h @@ -5,7 +5,7 @@ class MI_Button; class MI_Image; class MI_Text; -template class MI_SelectFieldDyn; +template class MI_SelectField; class UI_ProjectileOptionsMenu : public UI_Menu { @@ -13,19 +13,19 @@ class UI_ProjectileOptionsMenu : public UI_Menu { UI_ProjectileOptionsMenu(); private: - MI_SelectFieldDyn* miFireballLifeField; - MI_SelectFieldDyn* miHammerLifeField; - MI_SelectFieldDyn* miHammerDelayField; - MI_SelectFieldDyn* miHammerOneKillField; - MI_SelectFieldDyn* miShellLifeField; - MI_SelectFieldDyn* miWandFreezeTimeField; - - MI_SelectFieldDyn* miBlueBlockLifeField; - MI_SelectFieldDyn* miGrayBlockLifeField; - MI_SelectFieldDyn* miRedBlockLifeField; - MI_SelectFieldDyn* miBoomerangStyleField; - MI_SelectFieldDyn* miBoomerangLifeField; - MI_SelectFieldDyn* miFeatherJumpsField; + MI_SelectField* miFireballLifeField; + MI_SelectField* miHammerLifeField; + MI_SelectField* miHammerDelayField; + MI_SelectField* miHammerOneKillField; + MI_SelectField* miShellLifeField; + MI_SelectField* miWandFreezeTimeField; + + MI_SelectField* miBlueBlockLifeField; + MI_SelectField* miGrayBlockLifeField; + MI_SelectField* miRedBlockLifeField; + MI_SelectField* miBoomerangStyleField; + MI_SelectField* miBoomerangLifeField; + MI_SelectField* miFeatherJumpsField; MI_Button* miProjectileOptionsMenuBackButton; diff --git a/src/smw/menu/options/SoundOptionsMenu.cpp b/src/smw/menu/options/SoundOptionsMenu.cpp index 26891a8a..3155c627 100644 --- a/src/smw/menu/options/SoundOptionsMenu.cpp +++ b/src/smw/menu/options/SoundOptionsMenu.cpp @@ -53,7 +53,7 @@ UI_SoundOptionsMenu::UI_SoundOptionsMenu() miMusicVolumeField->allowWrap(false); miMusicVolumeField->setItemChangedCode(MENU_CODE_MUSIC_VOLUME_CHANGED); - miPlayNextMusicField = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, 180, "Next Music", 500, 220); + miPlayNextMusicField = new MI_SelectField(&rm->spr_selectfield, 70, 180, "Next Music", 500, 220); miPlayNextMusicField->add("Off", false); miPlayNextMusicField->add("On", true); miPlayNextMusicField->setOutputPtr(&game_values.playnextmusic); @@ -64,7 +64,7 @@ UI_SoundOptionsMenu::UI_SoundOptionsMenu() miSoundPackField = new MI_PacksField(&rm->spr_selectfield, 70, 260, "Sound Pack", 500, 220, soundpacklist, MENU_CODE_SOUND_PACK_CHANGED); miPlaylistField = new MI_PlaylistField(&rm->spr_selectfield, 70, 300, "Game Music Pack", 500, 220); - miWorldMusicField = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, 340, "World Music Pack", 500, 220); + miWorldMusicField = new MI_SelectField(&rm->spr_selectfield, 70, 340, "World Music Pack", 500, 220); int iCurrentMusic = worldmusiclist->GetCurrentIndex(); worldmusiclist->SetCurrent(0); diff --git a/src/smw/menu/options/SoundOptionsMenu.h b/src/smw/menu/options/SoundOptionsMenu.h index 5c1f3225..b179663f 100644 --- a/src/smw/menu/options/SoundOptionsMenu.h +++ b/src/smw/menu/options/SoundOptionsMenu.h @@ -9,7 +9,7 @@ class MI_SliderField; class MI_PacksField; class MI_PlaylistField; class MI_Text; -template class MI_SelectFieldDyn; +template class MI_SelectField; class UI_SoundOptionsMenu : public UI_Menu { @@ -21,10 +21,10 @@ class UI_SoundOptionsMenu : public UI_Menu { private: MI_SliderField* miSoundVolumeField; MI_SliderField* miMusicVolumeField; - MI_SelectFieldDyn* miPlayNextMusicField; + MI_SelectField* miPlayNextMusicField; MI_AnnouncerField* miAnnouncerField; MI_PlaylistField* miPlaylistField; - MI_SelectFieldDyn* miWorldMusicField; + MI_SelectField* miWorldMusicField; MI_PacksField* miSoundPackField; MI_Button* miSoundOptionsMenuBackButton; diff --git a/src/smw/menu/options/TeamOptionsMenu.cpp b/src/smw/menu/options/TeamOptionsMenu.cpp index 2bc43cc2..5e0e34cd 100644 --- a/src/smw/menu/options/TeamOptionsMenu.cpp +++ b/src/smw/menu/options/TeamOptionsMenu.cpp @@ -14,21 +14,21 @@ extern CGameValues game_values; UI_TeamOptionsMenu::UI_TeamOptionsMenu() : UI_Menu() { - miTeamKillsField = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, 180, "Player Collision", 500, 220); + miTeamKillsField = new MI_SelectField(&rm->spr_selectfield, 70, 180, "Player Collision", 500, 220); miTeamKillsField->add("Off", 0); miTeamKillsField->add("Assist", 1); miTeamKillsField->add("On", 2); miTeamKillsField->setOutputPtr(&game_values.teamcollision); miTeamKillsField->setCurrentValue(game_values.teamcollision); - miTeamColorsField = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, 220, "Colors", 500, 220); + miTeamColorsField = new MI_SelectField(&rm->spr_selectfield, 70, 220, "Colors", 500, 220); miTeamColorsField->add("Individual", false); miTeamColorsField->add("Team", true); miTeamColorsField->setOutputPtr(&game_values.teamcolors); miTeamColorsField->setCurrentValue(game_values.teamcolors ? 1 : 0); miTeamColorsField->setAutoAdvance(true); - miTournamentControlField = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, 260, "Tournament Control", 500, 220); + miTournamentControlField = new MI_SelectField(&rm->spr_selectfield, 70, 260, "Tournament Control", 500, 220); miTournamentControlField->add("All", 0); miTournamentControlField->add("Game Winner", 1); miTournamentControlField->add("Game Loser", 2); diff --git a/src/smw/menu/options/TeamOptionsMenu.h b/src/smw/menu/options/TeamOptionsMenu.h index f8c26141..7c240f68 100644 --- a/src/smw/menu/options/TeamOptionsMenu.h +++ b/src/smw/menu/options/TeamOptionsMenu.h @@ -5,7 +5,7 @@ class MI_Button; class MI_Image; class MI_Text; -template class MI_SelectFieldDyn; +template class MI_SelectField; /* In this menu, you can set team-relates preferences, @@ -16,9 +16,9 @@ class UI_TeamOptionsMenu : public UI_Menu { UI_TeamOptionsMenu(); private: - MI_SelectFieldDyn* miTeamKillsField; - MI_SelectFieldDyn* miTeamColorsField; - MI_SelectFieldDyn* miTournamentControlField; + MI_SelectField* miTeamKillsField; + MI_SelectField* miTeamColorsField; + MI_SelectField* miTournamentControlField; MI_Button* miTeamOptionsMenuBackButton; MI_Image* miTeamOptionsMenuLeftHeaderBar; diff --git a/src/smw/menu/xbox/ScreenSettingsMenu.cpp b/src/smw/menu/xbox/ScreenSettingsMenu.cpp index 1fa68dbe..5e55ffd5 100644 --- a/src/smw/menu/xbox/ScreenSettingsMenu.cpp +++ b/src/smw/menu/xbox/ScreenSettingsMenu.cpp @@ -10,7 +10,7 @@ UI_ScreenSettingsMenu::UI_ScreenSettingsMenu() : UI_Menu() miScreenResizeButton = new MI_Button(&rm->spr_selectfield, 70, 160, "Resize Screen", 500, 0); miScreenResizeButton->SetCode(MENU_CODE_TO_SCREEN_RESIZE); - miScreenHardwareFilterField = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, 200, "Screen Filter", 500, 220); + miScreenHardwareFilterField = new MI_SelectField(&rm->spr_selectfield, 70, 200, "Screen Filter", 500, 220); //miScreenHardwareFilterField->add("None", 0); miScreenHardwareFilterField->add("Point", 1); miScreenHardwareFilterField->add("Bilinear", 2); @@ -22,7 +22,7 @@ UI_ScreenSettingsMenu::UI_ScreenSettingsMenu() : UI_Menu() miScreenHardwareFilterField->setCurrenzValue(game_values.hardwarefilter); miScreenHardwareFilterField->setItemChangedCode(MENU_CODE_SCREEN_FILTER_CHANGED); - miScreenFlickerFilterField = new MI_SelectFieldDyn(&rm->spr_selectfield, &rm->menu_slider_bar, 70, 240, "Flicker Filter", 500, 220, 380); + miScreenFlickerFilterField = new MI_SelectField(&rm->spr_selectfield, &rm->menu_slider_bar, 70, 240, "Flicker Filter", 500, 220, 380); miScreenFlickerFilterField->add("0", 0); miScreenFlickerFilterField->add("1", 1); miScreenFlickerFilterField->add("2", 2); @@ -34,7 +34,7 @@ UI_ScreenSettingsMenu::UI_ScreenSettingsMenu() : UI_Menu() miScreenFlickerFilterField->allowWrap(false); miScreenFlickerFilterField->setItemChangedCode(MENU_CODE_SCREEN_SETTINGS_CHANGED); - miScreenSoftFilterField = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, 280, "Soften Filter", 500, 220); + miScreenSoftFilterField = new MI_SelectField(&rm->spr_selectfield, 70, 280, "Soften Filter", 500, 220); miScreenSoftFilterField->add("Off", false); miScreenSoftFilterField->add("On", true); miScreenSoftFilterField->setOutputPtr(&game_values.softfilter); @@ -43,7 +43,7 @@ UI_ScreenSettingsMenu::UI_ScreenSettingsMenu() : UI_Menu() miScreenSoftFilterField->setItemChangedCode(MENU_CODE_SCREEN_SETTINGS_CHANGED); /* - miScreenAspectRatioField = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, 300, "10x11 Aspect", 500, 220); + miScreenAspectRatioField = new MI_SelectField(&rm->spr_selectfield, 70, 300, "10x11 Aspect", 500, 220); miScreenAspectRatioField->add("Off", false); miScreenAspectRatioField->add("On", true); miScreenAspectRatioField->setOutputPtr(&game_values.aspectratio10x11); diff --git a/src/smw/menu/xbox/ScreenSettingsMenu.h b/src/smw/menu/xbox/ScreenSettingsMenu.h index b4cf1837..e67ac000 100644 --- a/src/smw/menu/xbox/ScreenSettingsMenu.h +++ b/src/smw/menu/xbox/ScreenSettingsMenu.h @@ -16,10 +16,10 @@ class UI_ScreenSettingsMenu : public UI_Menu private: MI_Button * miScreenResizeButton; - MI_SelectFieldDyn* miScreenHardwareFilterField; - MI_SelectFieldDyn* miScreenFlickerFilterField; - MI_SelectFieldDyn* miScreenSoftFilterField; - //MI_SelectFieldDyn* miScreenAspectRatioField; + MI_SelectField* miScreenHardwareFilterField; + MI_SelectField* miScreenFlickerFilterField; + MI_SelectField* miScreenSoftFilterField; + //MI_SelectField* miScreenAspectRatioField; MI_Button * miScreenSettingsMenuBackButton; diff --git a/src/smw/ui/MI_FrenzyModeOptions.cpp b/src/smw/ui/MI_FrenzyModeOptions.cpp index 0e984f87..46b27c03 100644 --- a/src/smw/ui/MI_FrenzyModeOptions.cpp +++ b/src/smw/ui/MI_FrenzyModeOptions.cpp @@ -29,7 +29,7 @@ MI_FrenzyModeOptions::MI_FrenzyModeOptions(short x, short y, short width, short mMenu = new UI_Menu(); - miQuantityField = new MI_SelectFieldDyn(&rm->spr_selectfield, 120, 40, "Limit", 400, 180); + miQuantityField = new MI_SelectField(&rm->spr_selectfield, 120, 40, "Limit", 400, 180); miQuantityField->add("Single Powerup", 0); miQuantityField->add("1 Powerup", 1); miQuantityField->add("2 Powerups", 2); @@ -44,7 +44,7 @@ MI_FrenzyModeOptions::MI_FrenzyModeOptions(short x, short y, short width, short miQuantityField->setOutputPtr(&game_values.gamemodemenusettings.frenzy.quantity); miQuantityField->setCurrentValue(game_values.gamemodemenusettings.frenzy.quantity); - miRateField = new MI_SelectFieldDyn(&rm->spr_selectfield, 120, 80, "Rate", 400, 180); + miRateField = new MI_SelectField(&rm->spr_selectfield, 120, 80, "Rate", 400, 180); miRateField->add("Instant", 0); miRateField->add("1 Second", 62); miRateField->add("2 Seconds", 124); @@ -58,7 +58,7 @@ MI_FrenzyModeOptions::MI_FrenzyModeOptions(short x, short y, short width, short miRateField->setOutputPtr(&game_values.gamemodemenusettings.frenzy.rate); miRateField->setCurrentValue(game_values.gamemodemenusettings.frenzy.rate); - miStoredShellsField = new MI_SelectFieldDyn(&rm->spr_selectfield, 120, 120, "Store Shells", 400, 180); + miStoredShellsField = new MI_SelectField(&rm->spr_selectfield, 120, 120, "Store Shells", 400, 180); miStoredShellsField->add("Off", false); miStoredShellsField->add("On", true); miStoredShellsField->setOutputPtr(&game_values.gamemodemenusettings.frenzy.storedshells); diff --git a/src/smw/ui/MI_FrenzyModeOptions.h b/src/smw/ui/MI_FrenzyModeOptions.h index b8fd5f95..92923dd1 100644 --- a/src/smw/ui/MI_FrenzyModeOptions.h +++ b/src/smw/ui/MI_FrenzyModeOptions.h @@ -42,9 +42,9 @@ class MI_FrenzyModeOptions : public UI_Control UI_Menu * mMenu; - MI_SelectFieldDyn * miQuantityField; - MI_SelectFieldDyn * miRateField; - MI_SelectFieldDyn* miStoredShellsField; + MI_SelectField * miQuantityField; + MI_SelectField * miRateField; + MI_SelectField* miStoredShellsField; MI_PowerupSlider * miPowerupSlider[NUMFRENZYCARDS]; MI_Button * miBackButton; diff --git a/src/smw/ui/MI_InputControlContainer.cpp b/src/smw/ui/MI_InputControlContainer.cpp index 23623a2d..00fd58e2 100644 --- a/src/smw/ui/MI_InputControlContainer.cpp +++ b/src/smw/ui/MI_InputControlContainer.cpp @@ -392,7 +392,7 @@ MI_InputControlContainer::MI_InputControlContainer(gfxSprite * spr_button, short miImage[0] = new MI_Image(spr_button, 0, 0, 0, 0, 320, 32, 1, 1, 0); miImage[1] = new MI_Image(spr_button, 320, 0, 192, 0, 320, 32, 1, 1, 0); - miDeviceSelectField = new MI_SelectFieldDyn(spr_button, x + 16, y + 38, "Device", 420, 150); + miDeviceSelectField = new MI_SelectField(spr_button, x + 16, y + 38, "Device", 420, 150); miDeviceSelectField->setItemChangedCode(MENU_CODE_INPUT_DEVICE_CHANGED); miDeviceSelectField->add("Keyboard", -1); #ifdef _XBOX diff --git a/src/smw/ui/MI_InputControlContainer.h b/src/smw/ui/MI_InputControlContainer.h index 80ac910e..0511b853 100644 --- a/src/smw/ui/MI_InputControlContainer.h +++ b/src/smw/ui/MI_InputControlContainer.h @@ -7,7 +7,7 @@ class gfxSprite; class MI_Image; class MI_Text; class MI_Button; -template class MI_SelectFieldDyn; +template class MI_SelectField; class MI_InputControlField : public UI_Control { @@ -86,7 +86,7 @@ class MI_InputControlContainer : public UI_Control MI_Image * miImage[2]; MI_Text * miText; - MI_SelectFieldDyn* miDeviceSelectField; + MI_SelectField* miDeviceSelectField; MI_Button * miInputTypeButton; MI_InputControlField * miGameInputControlFields[NUM_KEYS]; MI_InputControlField * miMenuInputControlFields[NUM_KEYS]; diff --git a/src/smw/ui/MI_PowerupSelection.cpp b/src/smw/ui/MI_PowerupSelection.cpp index 943f7497..9207a76f 100644 --- a/src/smw/ui/MI_PowerupSelection.cpp +++ b/src/smw/ui/MI_PowerupSelection.cpp @@ -75,7 +75,7 @@ MI_PowerupSelection::MI_PowerupSelection(short x, short y, short width, short nu { mMenu = std::make_unique(); - miOverride = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, iy, "Use Settings From", 500, 250); + miOverride = new MI_SelectField(&rm->spr_selectfield, 70, iy, "Use Settings From", 500, 250); miOverride->add("Map Only", 0); miOverride->add("Game Only", 1); miOverride->add("Basic Average", 2); @@ -84,7 +84,7 @@ MI_PowerupSelection::MI_PowerupSelection(short x, short y, short width, short nu miOverride->setCurrentValue(game_values.overridepowerupsettings); //miOverride->SetItemChangedCode(MENU_CODE_POWERUP_OVERRIDE_CHANGED); - miPreset = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, iy + 40, "Item Set", 500, 250); + miPreset = new MI_SelectField(&rm->spr_selectfield, 70, iy + 40, "Item Set", 500, 250); miPreset->add("Custom Set 1", 0); miPreset->add("Custom Set 2", 1); miPreset->add("Custom Set 3", 2); diff --git a/src/smw/ui/MI_PowerupSelection.h b/src/smw/ui/MI_PowerupSelection.h index f970ef7b..30ed4c82 100644 --- a/src/smw/ui/MI_PowerupSelection.h +++ b/src/smw/ui/MI_PowerupSelection.h @@ -11,7 +11,7 @@ class MI_Image; class MI_PowerupSlider; class MI_Text; class UI_Menu; -template class MI_SelectFieldDyn; +template class MI_SelectField; class MI_PowerupSelection : public UI_Control { @@ -42,8 +42,8 @@ class MI_PowerupSelection : public UI_Control { // TODO: Ownership of most members gets passed to this menu std::unique_ptr mMenu; - MI_SelectFieldDyn* miOverride = nullptr; - MI_SelectFieldDyn* miPreset = nullptr; + MI_SelectField* miOverride = nullptr; + MI_SelectField* miPreset = nullptr; std::array miPowerupSlider; diff --git a/src/smw/ui/MI_TourStop.cpp b/src/smw/ui/MI_TourStop.cpp index 001a1f41..2aa62a3b 100644 --- a/src/smw/ui/MI_TourStop.cpp +++ b/src/smw/ui/MI_TourStop.cpp @@ -28,10 +28,10 @@ MI_TourStop::MI_TourStop(short x, short y, bool fWorld) { if (fIsWorld) { miModeField = std::make_unique(&rm->spr_selectfielddisabled, &rm->menu_mode_small, 70, 85, "Mode", 305, 90, 16, 16); - miGoalField = std::make_unique>(&rm->spr_selectfielddisabled, 380, 85, "Goal", 190, 90); - miPointsField = std::make_unique>(&rm->spr_selectfielddisabled, 380, 125, "Score", 190, 90); + miGoalField = std::make_unique>(&rm->spr_selectfielddisabled, 380, 85, "Goal", 190, 90); + miPointsField = std::make_unique>(&rm->spr_selectfielddisabled, 380, 125, "Score", 190, 90); - miBonusField = std::make_unique>(&rm->spr_selectfielddisabled, 70, 125, "Bonus", 305, 90); + miBonusField = std::make_unique>(&rm->spr_selectfielddisabled, 70, 125, "Bonus", 305, 90); miBonusField->Disable(true); miEndStageImage[0] = std::make_unique(&rm->spr_worlditemsplace, 54, 201, 0, 20, 80, 248, 1, 1, 0); @@ -49,8 +49,8 @@ MI_TourStop::MI_TourStop(short x, short y, bool fWorld) } } else { miModeField = std::make_unique(&rm->spr_selectfielddisabled, &rm->menu_mode_small, 70, 85, "Mode", 500, 120, 16, 16); - miGoalField = std::make_unique>(&rm->spr_selectfielddisabled, 70, 125, "Goal", 246, 120); - miPointsField = std::make_unique>(&rm->spr_selectfielddisabled, 70 + 254, 125, "Score", 246, 120); + miGoalField = std::make_unique>(&rm->spr_selectfielddisabled, 70, 125, "Goal", 246, 120); + miPointsField = std::make_unique>(&rm->spr_selectfielddisabled, 70 + 254, 125, "Score", 246, 120); miBonusField = 0; } diff --git a/src/smw/ui/MI_TourStop.h b/src/smw/ui/MI_TourStop.h index ffdae671..1a2fc7ca 100644 --- a/src/smw/ui/MI_TourStop.h +++ b/src/smw/ui/MI_TourStop.h @@ -9,7 +9,7 @@ class MI_Image; class MI_ImageSelectField; class MI_MapField; class MI_Text; -template class MI_SelectFieldDyn; +template class MI_SelectField; class MI_TourStop : public UI_Control { @@ -24,12 +24,12 @@ class MI_TourStop : public UI_Control { private: std::unique_ptr miModeField; - std::unique_ptr> miGoalField; - std::unique_ptr> miPointsField; + std::unique_ptr> miGoalField; + std::unique_ptr> miPointsField; std::unique_ptr miMapField; std::unique_ptr miStartButton; - std::unique_ptr> miBonusField; + std::unique_ptr> miBonusField; std::array, 2> miEndStageImage; std::array, 10> miBonusIcon; diff --git a/src/worldeditor/worldeditor.cpp b/src/worldeditor/worldeditor.cpp index 70925ea7..03cd641c 100644 --- a/src/worldeditor/worldeditor.cpp +++ b/src/worldeditor/worldeditor.cpp @@ -357,16 +357,16 @@ UI_Menu mStageSettingsMenu; UI_Menu mBonusItemPicker; MI_ImageSelectField * miModeField; -MI_SelectFieldDyn * miGoalField[GAMEMODE_LAST]; +MI_SelectField * miGoalField[GAMEMODE_LAST]; MI_Button * miModeSettingsButton; MI_Button * miBonusItemsButton; -MI_SelectFieldDyn * miSpecialGoalField[3]; +MI_SelectField * miSpecialGoalField[3]; -MI_SelectFieldDyn * miFinalStageField; -MI_SelectFieldDyn * miPointsField; +MI_SelectField * miFinalStageField; +MI_SelectField * miPointsField; MI_TextField * miNameField; -MI_SelectFieldDyn * miBonusType; +MI_SelectField * miBonusType; MI_TextField * miBonusTextField[5]; MI_MapField * miMapField; @@ -383,11 +383,11 @@ MI_Button * miDeleteStageDialogNoButton; UI_Menu mVehicleMenu; MI_ImageSelectField * miVehicleSpriteField; MI_ImageSelectField * miVehicleStageField; -MI_SelectFieldDyn * miVehicleMinMovesField; -MI_SelectFieldDyn * miVehicleMaxMovesField; -MI_SelectFieldDyn * miVehiclePacesField; -MI_SelectFieldDyn * miVehicleDirectionField; -MI_SelectFieldDyn * miVehicleBoundaryField; +MI_SelectField * miVehicleMinMovesField; +MI_SelectField * miVehicleMaxMovesField; +MI_SelectField * miVehiclePacesField; +MI_SelectField * miVehicleDirectionField; +MI_SelectField * miVehicleBoundaryField; MI_Button * miVehicleCreateButton; MI_Text * miTitleText; @@ -655,7 +655,7 @@ int main(int argc, char *argv[]) for (short iGameMode = 0; iGameMode < GAMEMODE_LAST; iGameMode++) { miModeField->add(stagemodes[iGameMode].szName, iGameMode); - miGoalField[iGameMode] = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, 100, stagemodes[iGameMode].szGoal, 352, 120); + miGoalField[iGameMode] = new MI_SelectField(&rm->spr_selectfield, 70, 100, stagemodes[iGameMode].szGoal, 352, 120); miGoalField[iGameMode]->Show(iGameMode == 0); for (short iGameModeOption = 0; iGameModeOption < GAMEMODE_NUM_OPTIONS - 1; iGameModeOption++) { @@ -673,7 +673,7 @@ int main(int argc, char *argv[]) miModeField->add("Boxes Minigame", 27); //Create goal field for pipe game - miSpecialGoalField[0] = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, 100, "Points", 352, 120); + miSpecialGoalField[0] = new MI_SelectField(&rm->spr_selectfield, 70, 100, "Points", 352, 120); miSpecialGoalField[0]->Show(false); for (short iGameModeOption = 0; iGameModeOption < GAMEMODE_NUM_OPTIONS - 1; iGameModeOption++) { @@ -684,7 +684,7 @@ int main(int argc, char *argv[]) } //Create goal field for boss game - miSpecialGoalField[1] = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, 100, "Lives", 352, 120); + miSpecialGoalField[1] = new MI_SelectField(&rm->spr_selectfield, 70, 100, "Lives", 352, 120); miSpecialGoalField[1]->Show(false); for (short iGameLives = 1; iGameLives <= 30; iGameLives++) { @@ -694,7 +694,7 @@ int main(int argc, char *argv[]) } //Create goal field for boxes game - miSpecialGoalField[2] = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, 100, "Lives", 352, 120); + miSpecialGoalField[2] = new MI_SelectField(&rm->spr_selectfield, 70, 100, "Lives", 352, 120); miSpecialGoalField[2]->Show(false); for (short iGameLives = 1; iGameLives <= 30; iGameLives++) { @@ -708,7 +708,7 @@ int main(int argc, char *argv[]) miModeSettingsButton->SetCode(MENU_CODE_TO_MODE_SETTINGS_MENU); //Points Field - miPointsField = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, 140, "Points", 245, 120); + miPointsField = new MI_SelectField(&rm->spr_selectfield, 70, 140, "Points", 245, 120); for (short iPoints = 0; iPoints <= 20; iPoints++) { char szPoints[8]; sprintf(szPoints, "%d", iPoints); @@ -716,7 +716,7 @@ int main(int argc, char *argv[]) } //Final Stage Field - miFinalStageField = new MI_SelectFieldDyn(&rm->spr_selectfield, 325, 140, "End Stage", 245, 120); + miFinalStageField = new MI_SelectField(&rm->spr_selectfield, 325, 140, "End Stage", 245, 120); miFinalStageField->add("No", false); miFinalStageField->add("Yes", true); miFinalStageField->setAutoAdvance(true); @@ -729,7 +729,7 @@ int main(int argc, char *argv[]) miBonusItemsButton->SetCode(MENU_CODE_TO_BONUS_PICKER_MENU); //Bonus Type - miBonusType = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, 100, "Type", 500, 120); + miBonusType = new MI_SelectField(&rm->spr_selectfield, 70, 100, "Type", 500, 120); miBonusType->add("Fixed", false); miBonusType->add("Random", true); miBonusType->setAutoAdvance(true); @@ -853,7 +853,7 @@ int main(int argc, char *argv[]) miVehicleStageField = new MI_ImageSelectField(&rm->spr_selectfield, &rm->menu_mode_small, 70, 120, "Stage", 500, 150, 16, 16); miVehicleStageField->setOutputPtr(&g_wvVehicleStamp.iActionId); - miVehicleMinMovesField = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, 160, "Min Moves", 500, 150); + miVehicleMinMovesField = new MI_SelectField(&rm->spr_selectfield, 70, 160, "Min Moves", 500, 150); for (short iMinMoves = 0; iMinMoves <= 100; iMinMoves++) { char szMinMoves[8]; @@ -867,7 +867,7 @@ int main(int argc, char *argv[]) miVehicleMinMovesField->allowWrap(false); miVehicleMinMovesField->allowFastScroll(true); - miVehicleMaxMovesField = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, 200, "Max Moves", 500, 150); + miVehicleMaxMovesField = new MI_SelectField(&rm->spr_selectfield, 70, 200, "Max Moves", 500, 150); for (short iMaxMoves = 0; iMaxMoves <= 100; iMaxMoves++) { char szMaxMoves[8]; @@ -881,21 +881,21 @@ int main(int argc, char *argv[]) miVehicleMaxMovesField->allowWrap(false); miVehicleMaxMovesField->allowFastScroll(true); - miVehiclePacesField = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, 240, "Paces", 500, 150); + miVehiclePacesField = new MI_SelectField(&rm->spr_selectfield, 70, 240, "Paces", 500, 150); miVehiclePacesField->add("No", false); miVehiclePacesField->add("Yes", true); miVehiclePacesField->setOutputPtr(&g_wvVehicleStamp.fSpritePaces); miVehiclePacesField->setCurrentValue(g_wvVehicleStamp.fSpritePaces ? 1 : 0); miVehiclePacesField->setAutoAdvance(true); - miVehicleDirectionField = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, 280, "Direction", 500, 150); + miVehicleDirectionField = new MI_SelectField(&rm->spr_selectfield, 70, 280, "Direction", 500, 150); miVehicleDirectionField->add("Left", false); miVehicleDirectionField->add("Right", true); miVehicleDirectionField->setOutputPtr(&g_wvVehicleStamp.iDrawDirection); miVehicleDirectionField->setCurrentValue(g_wvVehicleStamp.iDrawDirection); miVehicleDirectionField->setAutoAdvance(true); - miVehicleBoundaryField = new MI_SelectFieldDyn(&rm->spr_selectfield, 70, 320, "Boundary", 500, 150); + miVehicleBoundaryField = new MI_SelectField(&rm->spr_selectfield, 70, 320, "Boundary", 500, 150); miVehicleBoundaryField->add("No Boundary", 0); for (short iBoundary = 1; iBoundary <= 100; iBoundary++) { @@ -3304,7 +3304,7 @@ int editor_vehicles() char szStageName[256]; sprintf(szStageName, "(%d) %s", iStage + 1, ts->szName); - SF_ListItemDyn& item = miVehicleStageField->add(szStageName, iStage); + SF_ListItem& item = miVehicleStageField->add(szStageName, iStage); item.iconOverride = ts->iStageType == 1 ? 24 : (ts->iMode >= 1000 ? ts->iMode - 975 : ts->iMode); }