summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/ui/ui.cpp
diff options
context:
space:
mode:
author dankan1890 <mewuidev2@gmail.com>2016-02-08 01:23:35 +0100
committer dankan1890 <mewuidev2@gmail.com>2016-02-08 01:23:35 +0100
commit68f167c8866691c57eb676a031c87e45630f8e1b (patch)
tree12efb4e0555320087d977e26eafb45bef29d3d18 /src/emu/ui/ui.cpp
parent7a4e38987f2298711093459356aa475fdb5923d7 (diff)
ui: The video mode in the menu display options are now obtained directly from the settings. (nw)
Diffstat (limited to 'src/emu/ui/ui.cpp')
-rw-r--r--src/emu/ui/ui.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/emu/ui/ui.cpp b/src/emu/ui/ui.cpp
index 6d996ac50a0..013f1c5c4bb 100644
--- a/src/emu/ui/ui.cpp
+++ b/src/emu/ui/ui.cpp
@@ -2591,7 +2591,7 @@ void ui_manager::set_use_natural_keyboard(bool use_natural_keyboard)
// wrap_text
//-------------------------------------------------
-void ui_manager::wrap_text(render_container *container, const char *origs, float x, float y, float origwrapwidth, int &count, std::vector<int> &xstart, std::vector<int> &xend, float text_size)
+int ui_manager::wrap_text(render_container *container, const char *origs, float x, float y, float origwrapwidth, std::vector<int> &xstart, std::vector<int> &xend, float text_size)
{
float lineheight = get_line_height() * text_size;
const char *ends = origs + strlen(origs);
@@ -2600,7 +2600,7 @@ void ui_manager::wrap_text(render_container *container, const char *origs, float
const char *linestart;
float maxwidth = 0;
float aspect = machine().render().ui_aspect(container);
- count = 0;
+ int count = 0;
// loop over lines
while (*s != 0)
@@ -2716,6 +2716,7 @@ void ui_manager::wrap_text(render_container *container, const char *origs, float
break;
}
}
+ return count;
}
//-------------------------------------------------