Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-24 17:30:55 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into netlist_dev

Browse Source
This commit is contained in:
couriersud 2016-05-29 15:47:35 +02:00
commit b6ad2435b9
3 changed files with 41 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2051,76 +2051,52 @@ std::vector<ui::menu_item> mame_ui_manager::slider_init(running_machine &machine
INT32 mame_ui_manager::slider_changed(running_machine &machine, void *arg, int id, std::string *str, INT32 newval)
{
switch (id)
{
case SLIDER_ID_VOLUME:
return slider_volume(machine, arg, id, str, newval);
case SLIDER_ID_MIXERVOL ... SLIDER_ID_MIXERVOL_LAST:
return slider_mixervol(machine, arg, id, str, newval);
case SLIDER_ID_ADJUSTER ... SLIDER_ID_ADJUSTER_LAST:
if (id == SLIDER_ID_VOLUME)
return slider_volume(machine, arg, id, str, newval);
else if (id >= SLIDER_ID_MIXERVOL && id <= SLIDER_ID_MIXERVOL_LAST)
return slider_mixervol(machine, arg, id, str, newval);
else if (id >= SLIDER_ID_ADJUSTER && id <= SLIDER_ID_ADJUSTER_LAST)
return slider_adjuster(machine, arg, id, str, newval);
case SLIDER_ID_OVERCLOCK ... SLIDER_ID_OVERCLOCK_LAST:
else if (id >= SLIDER_ID_OVERCLOCK && id <= SLIDER_ID_OVERCLOCK_LAST)
return slider_overclock(machine, arg, id, str, newval);
case SLIDER_ID_REFRESH ... SLIDER_ID_REFRESH_LAST:
else if (id >= SLIDER_ID_REFRESH && id <= SLIDER_ID_REFRESH_LAST)
return slider_refresh(machine, arg, id, str, newval);
case SLIDER_ID_BRIGHTNESS ... SLIDER_ID_BRIGHTNESS_LAST:
else if (id >= SLIDER_ID_BRIGHTNESS && id <= SLIDER_ID_BRIGHTNESS_LAST)
return slider_brightness(machine, arg, id, str, newval);
case SLIDER_ID_CONTRAST ... SLIDER_ID_CONTRAST_LAST:
else if (id >= SLIDER_ID_CONTRAST && id <= SLIDER_ID_CONTRAST_LAST)
return slider_contrast(machine, arg, id, str, newval);
case SLIDER_ID_GAMMA ... SLIDER_ID_GAMMA_LAST:
else if (id >= SLIDER_ID_GAMMA && id <= SLIDER_ID_GAMMA_LAST)
return slider_gamma(machine, arg, id, str, newval);
case SLIDER_ID_XSCALE ... SLIDER_ID_XSCALE_LAST:
else if (id >= SLIDER_ID_XSCALE && id <= SLIDER_ID_XSCALE_LAST)
return slider_xscale(machine, arg, id, str, newval);
case SLIDER_ID_YSCALE ... SLIDER_ID_YSCALE_LAST:
else if (id >= SLIDER_ID_YSCALE && id <= SLIDER_ID_YSCALE_LAST)
return slider_yscale(machine, arg, id, str, newval);
case SLIDER_ID_XOFFSET ... SLIDER_ID_XOFFSET_LAST:
else if (id >= SLIDER_ID_XOFFSET && id <= SLIDER_ID_XOFFSET_LAST)
return slider_xoffset(machine, arg, id, str, newval);
case SLIDER_ID_YOFFSET ... SLIDER_ID_YOFFSET_LAST:
else if (id >= SLIDER_ID_YOFFSET && id <= SLIDER_ID_YOFFSET_LAST)
return slider_yoffset(machine, arg, id, str, newval);
case SLIDER_ID_OVERLAY_XSCALE ... SLIDER_ID_OVERLAY_XSCALE_LAST:
else if (id >= SLIDER_ID_OVERLAY_XSCALE && id <= SLIDER_ID_OVERLAY_XSCALE_LAST)
return slider_overxscale(machine, arg, id, str, newval);
case SLIDER_ID_OVERLAY_YSCALE ... SLIDER_ID_OVERLAY_YSCALE_LAST:
else if (id >= SLIDER_ID_OVERLAY_YSCALE && id <= SLIDER_ID_OVERLAY_YSCALE_LAST)
return slider_overyscale(machine, arg, id, str, newval);
case SLIDER_ID_OVERLAY_XOFFSET ... SLIDER_ID_OVERLAY_XOFFSET_LAST:
else if (id >= SLIDER_ID_OVERLAY_XOFFSET && id <= SLIDER_ID_OVERLAY_XOFFSET_LAST)
return slider_overxoffset(machine, arg, id, str, newval);
case SLIDER_ID_OVERLAY_YOFFSET ... SLIDER_ID_OVERLAY_YOFFSET_LAST:
else if (id >= SLIDER_ID_OVERLAY_YOFFSET && id <= SLIDER_ID_OVERLAY_YOFFSET_LAST)
return slider_overyoffset(machine, arg, id, str, newval);
case SLIDER_ID_FLICKER ... SLIDER_ID_FLICKER_LAST:
else if (id >= SLIDER_ID_FLICKER && id <= SLIDER_ID_FLICKER_LAST)
return slider_flicker(machine, arg, id, str, newval);
case SLIDER_ID_BEAM_WIDTH_MIN ... SLIDER_ID_BEAM_WIDTH_MIN_LAST:
else if (id >= SLIDER_ID_BEAM_WIDTH_MIN && id <= SLIDER_ID_BEAM_WIDTH_MIN_LAST)
return slider_beam_width_min(machine, arg, id, str, newval);
case SLIDER_ID_BEAM_WIDTH_MAX ... SLIDER_ID_BEAM_WIDTH_MAX_LAST:
else if (id >= SLIDER_ID_BEAM_WIDTH_MAX && id <= SLIDER_ID_BEAM_WIDTH_MAX_LAST)
return slider_beam_width_max(machine, arg, id, str, newval);
case SLIDER_ID_BEAM_INTENSITY ... SLIDER_ID_BEAM_INTENSITY_LAST:
else if (id >= SLIDER_ID_BEAM_INTENSITY && id <= SLIDER_ID_BEAM_INTENSITY_LAST)
return slider_beam_intensity_weight(machine, arg, id, str, newval);
#ifdef MAME_DEBUG
case SLIDER_ID_CROSSHAIR_SCALE ... SLIDER_ID_CROSSHAIR_SCALE_LAST:
else if (id >= SLIDER_ID_CROSSHAIR_SCALE && id <= SLIDER_ID_CROSSHAIR_SCALE_LAST)
return slider_crossscale(machine, arg, id, str, newval);
case SLIDER_ID_CROSSHAIR_OFFSET ... SLIDER_ID_CROSSHAIR_OFFSET_LAST:
else if (id >= SLIDER_ID_CROSSHAIR_OFFSET && id <= SLIDER_ID_CROSSHAIR_OFFSET_LAST)
return slider_crossoffset(machine, arg, id, str, newval);
#endif
}
return 0;
}

17
src/mame/drivers/de_3.cpp
View File

@ -733,6 +733,20 @@ ROM_START(lw3_208)
ROM_END
ROM_START(lw3_207)
ROM_REGION(0x10000, "maincpu", 0)
ROM_LOAD("lw3ugc5.207", 0x0000, 0x10000, CRC(edca3e08) SHA1(6c9714a2021acc8c0965f96a1af8b33c87a1708d))
ROM_REGION(0x10000, "cpu3", ROMREGION_ERASEFF)
ROM_REGION(0x80000, "gfx3", 0)
ROM_LOAD("lw3drom1.a26", 0x00000, 0x40000, CRC(44a4cf81) SHA1(c7f3e3d5fbe930650e48423c8ba0ac484ce0640c))
ROM_LOAD("lw3drom0.a26", 0x40000, 0x40000, CRC(22932ed5) SHA1(395aa376cd8562de7956a6e34b8747e7cf81f935))
ROM_REGION(0x010000, "soundcpu", 0)
ROM_LOAD("lw3u7.dat", 0x8000, 0x8000, CRC(ba845ac3) SHA1(bb50413ace1885870cb3817edae478904b0eefb8))
ROM_REGION(0x1000000, "bsmt", 0)
ROM_LOAD("lw3u17.dat", 0x000000, 0x40000, CRC(e34cf2fc) SHA1(417c83ded6637f891c8bb42b32d6898c90a0e5cf))
ROM_LOAD("lw3u21.dat", 0x040000, 0x40000, CRC(82bed051) SHA1(49ddc4190762d9b473fda270e0d6d88a4422d5d7))
ROM_END
ROM_START(lw3_207c)
ROM_REGION(0x10000, "maincpu", 0)
ROM_LOAD("lw3gc5.207", 0x0000, 0x10000, CRC(27aeaea9) SHA1(f8c40cbc37edac20187ac880be281dd45d8ad614))
ROM_REGION(0x10000, "cpu3", ROMREGION_ERASEFF)
@ -1115,7 +1129,8 @@ GAME(1993, lah_l104, lah_112, de_3_dmd2, de_3, de_3_state, de_3,
GAME(1993, lah_l108, lah_112, de_3_dmd2, de_3, de_3_state, de_3, ROT0, "Data East", "Last Action Hero (1.08 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
GAME(1993, lah_110, lah_112, de_3_dmd2, de_3, de_3_state, de_3, ROT0, "Data East", "Last Action Hero (1.10)", MACHINE_IS_SKELETON_MECHANICAL)
GAME(1992, lw3_208, 0, de_3_dmd2, de_3, de_3_state, de_3, ROT0, "Data East", "Lethal Weapon 3 (2.08)", MACHINE_IS_SKELETON_MECHANICAL)
GAME(1992, lw3_207, lw3_208, de_3_dmd2, de_3, de_3_state, de_3, ROT0, "Data East", "Lethal Weapon 3 (2.07 Canada)", MACHINE_IS_SKELETON_MECHANICAL)
GAME(1992, lw3_207, lw3_208, de_3_dmd2, de_3, de_3_state, de_3, ROT0, "Data East", "Lethal Weapon 3 (2.07)", MACHINE_IS_SKELETON_MECHANICAL)
GAME(1992, lw3_207c, lw3_208, de_3_dmd2, de_3, de_3_state, de_3, ROT0, "Data East", "Lethal Weapon 3 (2.07 Canada)", MACHINE_IS_SKELETON_MECHANICAL)
GAME(1992, lw3_205, lw3_208, de_3_dmd2, de_3, de_3_state, de_3, ROT0, "Data East", "Lethal Weapon 3 (2.05)", MACHINE_IS_SKELETON_MECHANICAL)
GAME(1992, lw3_200, lw3_208, de_3_dmd2, de_3, de_3_state, de_3, ROT0, "Data East", "Lethal Weapon 3 (2.00)", MACHINE_IS_SKELETON_MECHANICAL)
GAME(1992, trek_201, 0, de_3_dmd1, de_3, de_3_state, de_3, ROT0, "Data East", "Star Trek 25th Anniversary (2.01)", MACHINE_IS_SKELETON_MECHANICAL)

1
src/mame/mame.lst
View File

@ -10637,6 +10637,7 @@ lah_l108 //
lw3_200 //
lw3_205 //
lw3_207 //
lw3_207c //
lw3_208 //
rab_103 //
rab_130 //