summaryrefslogtreecommitdiffstatshomepage
path: root/src/frontend
diff options
context:
space:
mode:
author dankan1890 <mewuidev2@gmail.com>2017-03-07 16:10:58 +0100
committer Vas Crabb <cuavas@users.noreply.github.com>2017-03-08 08:18:24 +1100
commit99d93ac05606fca670defacf771807a2c921015f (patch)
treea7d7934a2866e9cc0eafe2e2055b283ba138f74b /src/frontend
parent39164d40e2c9233037d0809a5c927c615cbc6a79 (diff)
Possibly uninitialized class member fix. (nw)
Diffstat (limited to 'src/frontend')
-rw-r--r--src/frontend/mame/ui/datmenu.cpp9
-rw-r--r--src/frontend/mame/ui/datmenu.h1
-rw-r--r--src/frontend/mame/ui/ui.cpp27
3 files changed, 18 insertions, 19 deletions
diff --git a/src/frontend/mame/ui/datmenu.cpp b/src/frontend/mame/ui/datmenu.cpp
index e8bb21d1f3a..3bd13dd4d04 100644
--- a/src/frontend/mame/ui/datmenu.cpp
+++ b/src/frontend/mame/ui/datmenu.cpp
@@ -32,10 +32,11 @@ menu_dats_view::menu_dats_view(mame_ui_manager &mui, render_container &container
: menu(mui, container)
, m_actual(0)
, m_driver((driver == nullptr) ? &mui.machine().system() : driver)
+ , m_swinfo(nullptr)
, m_issoft(false)
{
- for (device_image_interface &image : image_interface_iterator(mui.machine().root_device()))
+ for (device_image_interface& image : image_interface_iterator(mui.machine().root_device()))
{
if (image.filename())
{
@@ -46,10 +47,10 @@ menu_dats_view::menu_dats_view(mame_ui_manager &mui, render_container &container
}
}
std::vector<std::string> lua_list;
- if(mame_machine_manager::instance()->lua()->call_plugin("data_list", driver ? driver->name : "", lua_list))
+ if (mame_machine_manager::instance()->lua()->call_plugin("data_list", driver ? driver->name : "", lua_list))
{
int count = 0;
- for(std::string &item : lua_list)
+ for (std::string& item : lua_list)
{
std::string version;
mame_machine_manager::instance()->lua()->call_plugin("data_version", count, version);
@@ -157,7 +158,7 @@ void menu_dats_view::draw(uint32_t flags)
draw_background();
hover = item.size() + 1;
- visible_items = item.size() - 2;
+ int visible_items = item.size() - 2;
float extra_height = 2.0f * line_height;
float visible_extra_menu_height = get_customtop() + get_custombottom() + extra_height;
diff --git a/src/frontend/mame/ui/datmenu.h b/src/frontend/mame/ui/datmenu.h
index f12cd61e67d..851355c7806 100644
--- a/src/frontend/mame/ui/datmenu.h
+++ b/src/frontend/mame/ui/datmenu.h
@@ -45,7 +45,6 @@ private:
virtual void populate(float &customtop, float &custombottom) override;
virtual void handle() override;
- int visible_items;
int m_actual;
const game_driver *m_driver;
ui_software_info *m_swinfo;
diff --git a/src/frontend/mame/ui/ui.cpp b/src/frontend/mame/ui/ui.cpp
index bda9bdcf3be..3212ab8c116 100644
--- a/src/frontend/mame/ui/ui.cpp
+++ b/src/frontend/mame/ui/ui.cpp
@@ -172,20 +172,19 @@ static const uint32_t mouse_bitmap[32*32] =
//-------------------------------------------------
mame_ui_manager::mame_ui_manager(running_machine &machine)
- : ui_manager(machine),
- m_font(nullptr),
- m_handler_callback(nullptr),
- m_handler_param(0),
- m_single_step(false),
- m_showfps(false),
- m_showfps_end(0),
- m_show_profiler(false),
- m_popup_text_end(0),
- m_mouse_arrow_texture(nullptr),
- m_mouse_show(false),
- m_load_save_hold(false)
-{
-}
+ : ui_manager(machine)
+ , m_font(nullptr)
+ , m_handler_callback(nullptr)
+ , m_handler_callback_type(ui_callback_type::GENERAL)
+ , m_handler_param(0)
+ , m_single_step(false)
+ , m_showfps(false)
+ , m_showfps_end(0)
+ , m_show_profiler(false)
+ , m_popup_text_end(0)
+ , m_mouse_arrow_texture(nullptr)
+ , m_mouse_show(false)
+ , m_load_save_hold(false) {}
mame_ui_manager::~mame_ui_manager()
{