diff options
Diffstat (limited to 'src/emu')
| -rw-r--r-- | src/emu/bookkeeping.cpp | 5 | ||||
| -rw-r--r-- | src/emu/bookkeeping.h | 4 | ||||
| -rw-r--r-- | src/emu/config.h | 2 | ||||
| -rw-r--r-- | src/emu/diimage.cpp | 11 | ||||
| -rw-r--r-- | src/emu/image.cpp | 3 | ||||
| -rw-r--r-- | src/emu/image.h | 2 | ||||
| -rw-r--r-- | src/emu/luaengine.cpp | 6 | ||||
| -rw-r--r-- | src/emu/machine.h | 10 | ||||
| -rw-r--r-- | src/emu/output.cpp | 6 | ||||
| -rw-r--r-- | src/emu/ui/ui.cpp | 4 | ||||
| -rw-r--r-- | src/emu/uiinput.cpp | 37 | ||||
| -rw-r--r-- | src/emu/uiinput.h | 2 |
12 files changed, 44 insertions, 48 deletions
diff --git a/src/emu/bookkeeping.cpp b/src/emu/bookkeeping.cpp index 753d9c8e270..b93493db9a4 100644 --- a/src/emu/bookkeeping.cpp +++ b/src/emu/bookkeeping.cpp @@ -22,9 +22,8 @@ bookkeeping_manager::bookkeeping_manager(running_machine &machine) : m_machine(machine), - m_dispensed_tickets(0) + m_dispensed_tickets(0) { - /* reset coin counters */ for (int counternum = 0; counternum < COIN_COUNTERS; counternum++) { @@ -33,7 +32,7 @@ bookkeeping_manager::bookkeeping_manager(running_machine &machine) m_coin_count[counternum] = 0; } - // register coin save state + // register coin save state machine.save().save_item(NAME(m_coin_count)); machine.save().save_item(NAME(m_coinlockedout)); machine.save().save_item(NAME(m_lastcoin)); diff --git a/src/emu/bookkeeping.h b/src/emu/bookkeeping.h index 26b5699c6ae..7285a40f058 100644 --- a/src/emu/bookkeeping.h +++ b/src/emu/bookkeeping.h @@ -44,14 +44,14 @@ public: // increment the number of dispensed tickets void increment_dispensed_tickets(int delta); - // ----- coin counters ----- + // ----- coin counters ----- // write to a particular coin counter (clocks on active high edge) void coin_counter_w(int num, int on); // return the coin count for a given coin int coin_counter_get_count(int num); - // enable/disable coin lockout for a particular coin + // enable/disable coin lockout for a particular coin void coin_lockout_w(int num, int on); // return current lockout state for a particular coin diff --git a/src/emu/config.h b/src/emu/config.h index 6875fba899e..172f9f19daa 100644 --- a/src/emu/config.h +++ b/src/emu/config.h @@ -45,7 +45,7 @@ class configuration_manager { struct config_element { - std::string name; /* node name */ + std::string name; /* node name */ config_saveload_delegate load; /* load callback */ config_saveload_delegate save; /* save callback */ }; diff --git a/src/emu/diimage.cpp b/src/emu/diimage.cpp index 86c654e25f1..392da316dbb 100644 --- a/src/emu/diimage.cpp +++ b/src/emu/diimage.cpp @@ -61,13 +61,13 @@ device_image_interface::device_image_interface(const machine_config &mconfig, de m_mame_file(nullptr), m_software_info_ptr(nullptr), m_software_part_ptr(nullptr), - m_supported(0), + m_supported(0), m_readonly(false), m_created(false), - m_init_phase(false), - m_from_swlist(false), - m_create_format(0), - m_create_args(nullptr), + m_init_phase(false), + m_from_swlist(false), + m_create_format(0), + m_create_args(nullptr), m_is_loading(FALSE) { } @@ -1420,4 +1420,3 @@ struct io_procs image_ioprocs = image_fwrite_thunk, image_fsize_thunk }; - diff --git a/src/emu/image.cpp b/src/emu/image.cpp index d49c395bbdf..76de04714fb 100644 --- a/src/emu/image.cpp +++ b/src/emu/image.cpp @@ -231,7 +231,7 @@ void image_manager::postdevice_init() { /* retrieve image error message */ std::string image_err = std::string(image->error()); - + /* unload all images */ unload_all(); @@ -243,4 +243,3 @@ void image_manager::postdevice_init() /* add a callback for when we shut down */ machine().add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(FUNC(image_manager::unload_all), this)); } - diff --git a/src/emu/image.h b/src/emu/image.h index 99fc61c3bda..32b8035d14d 100644 --- a/src/emu/image.h +++ b/src/emu/image.h @@ -20,7 +20,7 @@ class image_manager public: // construction/destruction image_manager(running_machine &machine); - + void unload_all(); void postdevice_init(); std::string &mandatory_scan(std::string &mandatory); diff --git a/src/emu/luaengine.cpp b/src/emu/luaengine.cpp index ba7cecc1c95..733c99537c7 100644 --- a/src/emu/luaengine.cpp +++ b/src/emu/luaengine.cpp @@ -863,9 +863,9 @@ void lua_engine::serve_lua() static void *serve_lua(void *param) { - lua_engine *engine = (lua_engine *)param; - engine->serve_lua(); - return NULL; + lua_engine *engine = (lua_engine *)param; + engine->serve_lua(); + return NULL; } //------------------------------------------------- diff --git a/src/emu/machine.h b/src/emu/machine.h index 957ff4bbe13..24b0840c93d 100644 --- a/src/emu/machine.h +++ b/src/emu/machine.h @@ -294,11 +294,11 @@ private: std::unique_ptr<network_manager> m_network; // internal data from network.cpp std::unique_ptr<bookkeeping_manager> m_bookkeeping;// internal data from bookkeeping.cpp std::unique_ptr<configuration_manager> m_configuration; // internal data from config.cpp - std::unique_ptr<output_manager> m_output; // internal data from output.cpp - std::unique_ptr<crosshair_manager> m_crosshair; // internal data from crsshair.cpp - std::unique_ptr<image_manager> m_image; // internal data from image.cpp - std::unique_ptr<rom_load_manager> m_rom_load; // internal data from romload.cpp - std::unique_ptr<debugger_manager> m_debugger; // internal data from debugger.cpp + std::unique_ptr<output_manager> m_output; // internal data from output.cpp + std::unique_ptr<crosshair_manager> m_crosshair; // internal data from crsshair.cpp + std::unique_ptr<image_manager> m_image; // internal data from image.cpp + std::unique_ptr<rom_load_manager> m_rom_load; // internal data from romload.cpp + std::unique_ptr<debugger_manager> m_debugger; // internal data from debugger.cpp // system state machine_phase m_current_phase; // current execution phase diff --git a/src/emu/output.cpp b/src/emu/output.cpp index a1ca5518ef9..25d37dd4c43 100644 --- a/src/emu/output.cpp +++ b/src/emu/output.cpp @@ -20,7 +20,7 @@ output_manager::output_manager(running_machine &machine) : m_machine(machine), - m_uniqueid(12345) + m_uniqueid(12345) { /* add pause callback */ machine.add_notifier(MACHINE_NOTIFY_PAUSE, machine_notify_delegate(FUNC(output_manager::pause), this)); @@ -49,7 +49,7 @@ output_manager::output_item* output_manager::find_item(const char *string) output_manager::output_item *output_manager::create_new_item(const char *outname, INT32 value) { output_item item; - + /* fill in the data */ item.name = outname; item.id = m_uniqueid++; @@ -197,7 +197,7 @@ void output_manager::set_notifier(const char *outname, output_notifier_func call /* if no item of that name, create a new one */ if (item == nullptr) item = create_new_item(outname, 0); - + item->notifylist.push_back(notify); } else diff --git a/src/emu/ui/ui.cpp b/src/emu/ui/ui.cpp index 8175df2871e..3f2d252c107 100644 --- a/src/emu/ui/ui.cpp +++ b/src/emu/ui/ui.cpp @@ -1091,14 +1091,14 @@ std::string &ui_manager::warnings_string(std::string &str) str.append(emulator_info::get_gamenoun()); str.append(" was never completed. It may exhibit strange behavior or missing elements that are not bugs in the emulation.\n"); } - + if (machine().system().flags & MACHINE_NO_SOUND_HW ) { str.append("This "); str.append(emulator_info::get_gamenoun()); str.append(" has no sound hardware, MAME will produce no sounds, this is expected behaviour.\n"); } - + // if there's a NOT WORKING, UNEMULATED PROTECTION or GAME MECHANICAL warning, make it stronger if (machine().system().flags & (MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_MECHANICAL)) { diff --git a/src/emu/uiinput.cpp b/src/emu/uiinput.cpp index 3f9b95021e7..6b26bb323b5 100644 --- a/src/emu/uiinput.cpp +++ b/src/emu/uiinput.cpp @@ -33,11 +33,11 @@ enum //------------------------------------------------- ui_input_manager::ui_input_manager(running_machine &machine) - : m_machine(machine), - m_current_mouse_target(nullptr), - m_current_mouse_down(false), - m_events_start(0), - m_events_end(0) + : m_machine(machine), + m_current_mouse_target(nullptr), + m_current_mouse_down(false), + m_events_start(0), + m_events_end(0) { /* create the private data */ m_current_mouse_x = -1; @@ -78,7 +78,6 @@ void ui_input_manager::frame_update() bool ui_input_manager::push_event(ui_event evt) { - /* some pre-processing (this is an icky place to do this stuff!) */ switch (evt.event_type) { @@ -241,8 +240,8 @@ g_profiler.stop(); } /*------------------------------------------------- - push_mouse_move_event - pushes a mouse - move event to the specified render_target + push_mouse_move_event - pushes a mouse + move event to the specified render_target -------------------------------------------------*/ void ui_input_manager::push_mouse_move_event(render_target* target, INT32 x, INT32 y) @@ -256,8 +255,8 @@ void ui_input_manager::push_mouse_move_event(render_target* target, INT32 x, INT } /*------------------------------------------------- - push_mouse_leave_event - pushes a - mouse leave event to the specified render_target + push_mouse_leave_event - pushes a + mouse leave event to the specified render_target -------------------------------------------------*/ void ui_input_manager::push_mouse_leave_event(render_target* target) @@ -269,8 +268,8 @@ void ui_input_manager::push_mouse_leave_event(render_target* target) } /*------------------------------------------------- - push_mouse_down_event - pushes a mouse - down event to the specified render_target + push_mouse_down_event - pushes a mouse + down event to the specified render_target -------------------------------------------------*/ void ui_input_manager::push_mouse_down_event(render_target* target, INT32 x, INT32 y) @@ -284,8 +283,8 @@ void ui_input_manager::push_mouse_down_event(render_target* target, INT32 x, INT } /*------------------------------------------------- - push_mouse_down_event - pushes a mouse - down event to the specified render_target + push_mouse_down_event - pushes a mouse + down event to the specified render_target -------------------------------------------------*/ void ui_input_manager::push_mouse_up_event(render_target* target, INT32 x, INT32 y) @@ -299,9 +298,9 @@ void ui_input_manager::push_mouse_up_event(render_target* target, INT32 x, INT32 } /*------------------------------------------------- - push_mouse_double_click_event - pushes - a mouse double-click event to the specified - render_target + push_mouse_double_click_event - pushes + a mouse double-click event to the specified + render_target -------------------------------------------------*/ void ui_input_manager::push_mouse_double_click_event(render_target* target, INT32 x, INT32 y) { @@ -314,8 +313,8 @@ void ui_input_manager::push_mouse_double_click_event(render_target* target, INT3 } /*------------------------------------------------- - push_char_event - pushes a char event - to the specified render_target + push_char_event - pushes a char event + to the specified render_target -------------------------------------------------*/ void ui_input_manager::push_char_event(render_target* target, unicode_char ch) { diff --git a/src/emu/uiinput.h b/src/emu/uiinput.h index e05cad56dc5..2e89a0c413a 100644 --- a/src/emu/uiinput.h +++ b/src/emu/uiinput.h @@ -16,7 +16,7 @@ /*************************************************************************** - CONSTANTS + CONSTANTS ***************************************************************************/ #define EVENT_QUEUE_SIZE 128 |
