diff options
author | 2009-03-12 07:43:03 +0000 | |
---|---|---|
committer | 2009-03-12 07:43:03 +0000 | |
commit | eb539cce9d58a349e0dffff237dc96bb926ca06f (patch) | |
tree | e86162a925dfb228169afd2fb6309cba906400c5 /src/emu/ui.c | |
parent | feb4e2c8b368f5ec7f251e764167fd24708700f3 (diff) |
Many casts added to the core files, and various other tweaks
to make them compile as either C or C++.
Diffstat (limited to 'src/emu/ui.c')
-rw-r--r-- | src/emu/ui.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/emu/ui.c b/src/emu/ui.c index 11a6977c2e1..efa8c8032b3 100644 --- a/src/emu/ui.c +++ b/src/emu/ui.c @@ -1059,7 +1059,7 @@ astring *game_info_astring(running_machine *machine, astring *string) for (screen = video_screen_first(machine->config); screen != NULL; screen = video_screen_next(screen)) { - const screen_config *scrconfig = screen->inline_config; + const screen_config *scrconfig = (const screen_config *)screen->inline_config; if (scrcount > 1) { @@ -1414,7 +1414,7 @@ const slider_state *ui_get_slider_list(void) static slider_state *slider_alloc(const char *title, INT32 minval, INT32 defval, INT32 maxval, INT32 incval, slider_update update, void *arg) { int size = sizeof(slider_state) + strlen(title); - slider_state *state = auto_malloc(size); + slider_state *state = (slider_state *)auto_malloc(size); memset(state, 0, size); state->minval = minval; @@ -1488,7 +1488,7 @@ static slider_state *slider_init(running_machine *machine) /* add screen parameters */ for (device = video_screen_first(machine->config); device != NULL; device = video_screen_next(device)) { - const screen_config *scrconfig = device->inline_config; + const screen_config *scrconfig = (const screen_config *)device->inline_config; int defxscale = floor(scrconfig->xscale * 1000.0f + 0.5f); int defyscale = floor(scrconfig->yscale * 1000.0f + 0.5f); int defxoffset = floor(scrconfig->xoffset * 1000.0f + 0.5f); @@ -1531,7 +1531,7 @@ static slider_state *slider_init(running_machine *machine) for (device = device_list_first(machine->config->devicelist, LASERDISC); device != NULL; device = device_list_next(device, LASERDISC)) { - const laserdisc_config *config = device->inline_config; + const laserdisc_config *config = (const laserdisc_config *)device->inline_config; if (config->overupdate != NULL) { int defxscale = floor(config->overscalex * 1000.0f + 0.5f); @@ -1558,7 +1558,7 @@ static slider_state *slider_init(running_machine *machine) for (device = video_screen_first(machine->config); device != NULL; device = video_screen_next(device)) { - const screen_config *scrconfig = device->inline_config; + const screen_config *scrconfig = (const screen_config *)device->inline_config; if (scrconfig->type == SCREEN_TYPE_VECTOR) { /* add flicker control */ @@ -1628,7 +1628,7 @@ static INT32 slider_mixervol(running_machine *machine, void *arg, astring *strin static INT32 slider_adjuster(running_machine *machine, void *arg, astring *string, INT32 newval) { - const input_field_config *field = arg; + const input_field_config *field = (const input_field_config *)arg; input_field_user_settings settings; input_field_get_user_settings(field, &settings); @@ -1665,8 +1665,8 @@ static INT32 slider_overclock(running_machine *machine, void *arg, astring *stri static INT32 slider_refresh(running_machine *machine, void *arg, astring *string, INT32 newval) { - const device_config *screen = arg; - const screen_config *scrconfig = screen->inline_config; + const device_config *screen = (const device_config *)arg; + const screen_config *scrconfig = (const screen_config *)screen->inline_config; double defrefresh = ATTOSECONDS_TO_HZ(scrconfig->refresh); double refresh; @@ -1692,7 +1692,7 @@ static INT32 slider_refresh(running_machine *machine, void *arg, astring *string static INT32 slider_brightness(running_machine *machine, void *arg, astring *string, INT32 newval) { - const device_config *screen = arg; + const device_config *screen = (const device_config *)arg; render_container *container = render_container_get_screen(screen); render_container_user_settings settings; @@ -1715,7 +1715,7 @@ static INT32 slider_brightness(running_machine *machine, void *arg, astring *str static INT32 slider_contrast(running_machine *machine, void *arg, astring *string, INT32 newval) { - const device_config *screen = arg; + const device_config *screen = (const device_config *)arg; render_container *container = render_container_get_screen(screen); render_container_user_settings settings; @@ -1737,7 +1737,7 @@ static INT32 slider_contrast(running_machine *machine, void *arg, astring *strin static INT32 slider_gamma(running_machine *machine, void *arg, astring *string, INT32 newval) { - const device_config *screen = arg; + const device_config *screen = (const device_config *)arg; render_container *container = render_container_get_screen(screen); render_container_user_settings settings; @@ -1760,7 +1760,7 @@ static INT32 slider_gamma(running_machine *machine, void *arg, astring *string, static INT32 slider_xscale(running_machine *machine, void *arg, astring *string, INT32 newval) { - const device_config *screen = arg; + const device_config *screen = (const device_config *)arg; render_container *container = render_container_get_screen(screen); render_container_user_settings settings; @@ -1783,7 +1783,7 @@ static INT32 slider_xscale(running_machine *machine, void *arg, astring *string, static INT32 slider_yscale(running_machine *machine, void *arg, astring *string, INT32 newval) { - const device_config *screen = arg; + const device_config *screen = (const device_config *)arg; render_container *container = render_container_get_screen(screen); render_container_user_settings settings; @@ -1806,7 +1806,7 @@ static INT32 slider_yscale(running_machine *machine, void *arg, astring *string, static INT32 slider_xoffset(running_machine *machine, void *arg, astring *string, INT32 newval) { - const device_config *screen = arg; + const device_config *screen = (const device_config *)arg; render_container *container = render_container_get_screen(screen); render_container_user_settings settings; @@ -1829,7 +1829,7 @@ static INT32 slider_xoffset(running_machine *machine, void *arg, astring *string static INT32 slider_yoffset(running_machine *machine, void *arg, astring *string, INT32 newval) { - const device_config *screen = arg; + const device_config *screen = (const device_config *)arg; render_container *container = render_container_get_screen(screen); render_container_user_settings settings; @@ -1852,7 +1852,7 @@ static INT32 slider_yoffset(running_machine *machine, void *arg, astring *string static INT32 slider_overxscale(running_machine *machine, void *arg, astring *string, INT32 newval) { - const device_config *laserdisc = arg; + const device_config *laserdisc = (const device_config *)arg; laserdisc_config settings; laserdisc_get_config(laserdisc, &settings); @@ -1874,7 +1874,7 @@ static INT32 slider_overxscale(running_machine *machine, void *arg, astring *str static INT32 slider_overyscale(running_machine *machine, void *arg, astring *string, INT32 newval) { - const device_config *laserdisc = arg; + const device_config *laserdisc = (const device_config *)arg; laserdisc_config settings; laserdisc_get_config(laserdisc, &settings); @@ -1896,7 +1896,7 @@ static INT32 slider_overyscale(running_machine *machine, void *arg, astring *str static INT32 slider_overxoffset(running_machine *machine, void *arg, astring *string, INT32 newval) { - const device_config *laserdisc = arg; + const device_config *laserdisc = (const device_config *)arg; laserdisc_config settings; laserdisc_get_config(laserdisc, &settings); @@ -1918,7 +1918,7 @@ static INT32 slider_overxoffset(running_machine *machine, void *arg, astring *st static INT32 slider_overyoffset(running_machine *machine, void *arg, astring *string, INT32 newval) { - const device_config *laserdisc = arg; + const device_config *laserdisc = (const device_config *)arg; laserdisc_config settings; laserdisc_get_config(laserdisc, &settings); |