summaryrefslogtreecommitdiffstatshomepage
path: root/src/frontend/mame/ui/miscmenu.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/frontend/mame/ui/miscmenu.h')
-rw-r--r--src/frontend/mame/ui/miscmenu.h24
1 files changed, 14 insertions, 10 deletions
diff --git a/src/frontend/mame/ui/miscmenu.h b/src/frontend/mame/ui/miscmenu.h
index 4df94c60a78..acff544dee6 100644
--- a/src/frontend/mame/ui/miscmenu.h
+++ b/src/frontend/mame/ui/miscmenu.h
@@ -13,12 +13,15 @@
#pragma once
+#include "ui/menu.h"
+
#include "crsshair.h"
#include "emuopts.h"
#include <utility>
#include <vector>
+
namespace ui {
class menu_keyboard_mode : public menu
@@ -69,23 +72,24 @@ private:
CROSSHAIR_ITEM_AUTO_TIME
};
- // FIXME: use std::string instead of fixed-length arrays
- constexpr static int CROSSHAIR_PIC_NAME_LENGTH = 12;
-
/* internal crosshair menu item data */
struct crosshair_item_data
{
- uint8_t type;
- uint8_t player;
- uint8_t min, max;
- uint8_t cur;
- uint8_t defvalue;
- char last_name[CROSSHAIR_PIC_NAME_LENGTH + 1];
- char next_name[CROSSHAIR_PIC_NAME_LENGTH + 1];
+ render_crosshair *crosshair = nullptr;
+ uint8_t type = 0U;
+ uint8_t player = 0U;
+ uint8_t min = 0U, max = 0U;
+ uint32_t cur = 0U;
+ uint8_t defvalue = 0U;
+ std::string last_name;
+ std::string next_name;
};
virtual void populate(float &customtop, float &custombottom) override;
virtual void handle() override;
+
+ std::vector<crosshair_item_data> m_data;
+ std::vector<std::string> m_pics;
};
class menu_quit_game : public menu