Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-07 05:13:46 +03:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Possibly uninitialized class member fix. (nw)

Browse Source
This commit is contained in:
dankan1890 2017-03-07 16:10:58 +01:00 committed by Vas Crabb
parent 39164d40e2
commit 99d93ac056
3 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/frontend/mame/ui/datmenu.cpp
View File

@ -32,10 +32,11 @@ menu_dats_view::menu_dats_view(mame_ui_manager &mui, render_container &container
: menu(mui, container) : menu(mui, container)
, m_actual(0) , m_actual(0)
, m_driver((driver == nullptr) ? &mui.machine().system() : driver) , m_driver((driver == nullptr) ? &mui.machine().system() : driver)
, m_swinfo(nullptr)
, m_issoft(false) , 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()) 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; 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; int count = 0;
for(std::string &item : lua_list) for (std::string& item : lua_list)
{ {
std::string version; std::string version;
mame_machine_manager::instance()->lua()->call_plugin("data_version", count, 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(); draw_background();
hover = item.size() + 1; hover = item.size() + 1;
visible_items = item.size() - 2; int visible_items = item.size() - 2;
float extra_height = 2.0f * line_height; float extra_height = 2.0f * line_height;
float visible_extra_menu_height = get_customtop() + get_custombottom() + extra_height; float visible_extra_menu_height = get_customtop() + get_custombottom() + extra_height;

1
src/frontend/mame/ui/datmenu.h
View File

@ -45,7 +45,6 @@ private:
virtual void populate(float &customtop, float &custombottom) override; virtual void populate(float &customtop, float &custombottom) override;
virtual void handle() override; virtual void handle() override;
int visible_items;
int m_actual; int m_actual;
const game_driver *m_driver; const game_driver *m_driver;
ui_software_info *m_swinfo; ui_software_info *m_swinfo;

27
src/frontend/mame/ui/ui.cpp
View File

@ -172,20 +172,19 @@ static const uint32_t mouse_bitmap[32*32] =
//------------------------------------------------- //-------------------------------------------------
mame_ui_manager::mame_ui_manager(running_machine &machine) mame_ui_manager::mame_ui_manager(running_machine &machine)
: ui_manager(machine), : ui_manager(machine)
m_font(nullptr), , m_font(nullptr)
m_handler_callback(nullptr), , m_handler_callback(nullptr)
m_handler_param(0), , m_handler_callback_type(ui_callback_type::GENERAL)
m_single_step(false), , m_handler_param(0)
m_showfps(false), , m_single_step(false)
m_showfps_end(0), , m_showfps(false)
m_show_profiler(false), , m_showfps_end(0)
m_popup_text_end(0), , m_show_profiler(false)
m_mouse_arrow_texture(nullptr), , m_popup_text_end(0)
m_mouse_show(false), , m_mouse_arrow_texture(nullptr)
m_load_save_hold(false) , m_mouse_show(false)
{ , m_load_save_hold(false) {}
}
mame_ui_manager::~mame_ui_manager() mame_ui_manager::~mame_ui_manager()
{ {