Mirror/UltimateTrainingModpack
1
0
Fork 0
mirror of https://github.com/jugeeya/UltimateTrainingModpack.git synced 2025-03-05 14:22:19 +00:00
Code Issues Activity

use checkmarks for booleans

Browse source
This commit is contained in:
jugeeya 2020-08-19 22:29:09 -07:00
parent 15767e8cf7
commit 257c122b63
3 changed files with 12 additions and 12 deletions
TrainingModpackOverlay
include
taunt_toggles.hppvalue_list_item.hpp
source
gui_main.cpp

7
TrainingModpackOverlay/include/taunt_toggles.hpp
View file

@ -7,6 +7,13 @@
#include "cpp_utils.hpp" #include "cpp_utils.hpp"
const std::vector<std::string> on_off{"Off", "On"}; const std::vector<std::string> on_off{"Off", "On"};
// clang-format off
#define ENUM_CLASS_OnOffFlag(type,x) \
x(type,On,"On") \
x(type,Off,"Off")
// clang-format on
DEFINE_ENUM_CLASS(OnOffFlag);
// Frame Advantage // Frame Advantage
const std::vector<std::string> frame_advantage_items{""}; const std::vector<std::string> frame_advantage_items{""};

2
TrainingModpackOverlay/include/value_list_item.hpp
View file

@ -98,7 +98,7 @@ private:
public: public:
BitFlagToggleListItem(const std::string& text, T mask, FlagType* value) BitFlagToggleListItem(const std::string& text, T mask, FlagType* value)
: tsl::elm::ToggleListItem(text, (mask & *value) != 0), m_mask(mask), m_value(value) : tsl::elm::ToggleListItem(text, (mask & *value) != 0, "\uE14B", "\uE14C"), m_mask(mask), m_value(value)
{ {
setStateChangedListener([this](bool v) { setStateChangedListener([this](bool v) {
if(v) if(v)

15
TrainingModpackOverlay/source/gui_main.cpp
View file

@ -7,7 +7,7 @@
static struct TrainingModpackMenu static struct TrainingModpackMenu
{ {
int HITBOX_VIS = true; OnOffFlags HITBOX_VIS = OnOffFlag::On;
Directions DI_STATE = Directions::None; Directions DI_STATE = Directions::None;
Directions SDI_STATE = Directions::None; Directions SDI_STATE = Directions::None;
Directions LEFT_STICK = Directions::None; Directions LEFT_STICK = Directions::None;
@ -19,7 +19,7 @@ static struct TrainingModpackMenu
DefensiveFlags DEFENSIVE_STATE = DefensiveFlags::All; DefensiveFlags DEFENSIVE_STATE = DefensiveFlags::All;
DelayFlags OOS_OFFSET = DelayFlags::None; DelayFlags OOS_OFFSET = DelayFlags::None;
DelayFlags REACTION_TIME = DelayFlags::None; DelayFlags REACTION_TIME = DelayFlags::None;
int MASH_IN_NEUTRAL = false; OnOffFlags MASH_IN_NEUTRAL = OnOffFlags::None;
BoolFlags FAST_FALL = BoolFlags::None; BoolFlags FAST_FALL = BoolFlags::None;
DelayFlags FAST_FALL_DELAY = DelayFlags::None; DelayFlags FAST_FALL_DELAY = DelayFlags::None;
BoolFlags FALLING_AERIALS = BoolFlags::None; BoolFlags FALLING_AERIALS = BoolFlags::None;
@ -372,11 +372,7 @@ tsl::elm::Element* GuiMain::createUI()
list->addItem(createBitFlagOption(&menu.MASH_STATE, "Mash Toggles", mash_help, this)); list->addItem(createBitFlagOption(&menu.MASH_STATE, "Mash Toggles", mash_help, this));
list->addItem(createBitFlagOption(&menu.FOLLOW_UP, "Followup Toggles", follow_up_help, this)); list->addItem(createBitFlagOption(&menu.FOLLOW_UP, "Followup Toggles", follow_up_help, this));
list->addItem(new BitFlagToggleListItem<OnOffFlags::Type>("Mash In Neutral", OnOffFlag::On, &menu.MASH_IN_NEUTRAL));
ValueListItem* mashNeutralItem =
new ValueListItem("Mash In Neutral", on_off, &menu.MASH_IN_NEUTRAL, "mash_neutral", mash_neutral_help);
list->addItem(mashNeutralItem);
valueListItems.push_back(mashNeutralItem);
list->addItem(new tsl::elm::CategoryHeader("Left Stick", true)); list->addItem(new tsl::elm::CategoryHeader("Left Stick", true));
@ -426,10 +422,7 @@ tsl::elm::Element* GuiMain::createUI()
list->addItem(new tsl::elm::CategoryHeader("Miscellaneous", true)); list->addItem(new tsl::elm::CategoryHeader("Miscellaneous", true));
ValueListItem* hitboxItem = list->addItem(new BitFlagToggleListItem<OnOffFlags::Type>("Hitbox Visualization", OnOffFlag::On, &menu.HITBOX_VIS));
new ValueListItem("Hitbox Visualization", on_off, &menu.HITBOX_VIS, "hitbox", hitbox_help);
list->addItem(hitboxItem);
valueListItems.push_back(hitboxItem);
ClickableListItem* saveStateItem = new ClickableListItem( ClickableListItem* saveStateItem = new ClickableListItem(
"Save States", empty_items, nullptr, "saveStates", 0, "Save States", save_states_help); "Save States", empty_items, nullptr, "saveStates", 0, "Save States", save_states_help);