summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2020-02-27 03:58:25 +1100
committer Vas Crabb <vas@vastheman.com>2020-02-27 03:58:25 +1100
commit6abb2dd8646ff4306eefdaea3144282ba5b4b665 (patch)
tree2d5be506a791da4dd991044bcb8ebe5e02244d4c /src/mame
parent5ed9f4c1aa56757f611e74b41c057969806b1c64 (diff)
parent62ac3d1173199c1528a822e9f41a0b7f7f8caf4c (diff)
Merge branch 'release0219' into mainline-master
Diffstat (limited to 'src/mame')
-rw-r--r--src/mame/drivers/nes_sh6578.cpp2
-rw-r--r--src/mame/layout/hp86b.lay24
-rw-r--r--src/mame/machine/gunsense.cpp4
-rw-r--r--src/mame/video/twin16.cpp4
4 files changed, 17 insertions, 17 deletions
diff --git a/src/mame/drivers/nes_sh6578.cpp b/src/mame/drivers/nes_sh6578.cpp
index 0ed46e380c7..fc1bdb757b8 100644
--- a/src/mame/drivers/nes_sh6578.cpp
+++ b/src/mame/drivers/nes_sh6578.cpp
@@ -131,7 +131,7 @@ ROM_START( ablwikid )
ROM_END
-CONS( 1997, bandgpad, 0, 0, nes_sh6578, nes_sh6578, nes_sh6578_state, init_nes_sh6578, "Bandai", "Gamppad (Bandai)", MACHINE_NOT_WORKING )
+CONS( 1997, bandgpad, 0, 0, nes_sh6578, nes_sh6578, nes_sh6578_state, init_nes_sh6578, "Bandai", "Multi Game Player Gamepad", MACHINE_NOT_WORKING )
// possibly newer than 2001
CONS( 2001, ts_handy11, 0, 0, nes_sh6578, nes_sh6578, nes_sh6578_state, init_nes_sh6578, "Techno Source", "Handy Boy 11-in-1 (TV Play Power)", MACHINE_NOT_WORKING )
diff --git a/src/mame/layout/hp86b.lay b/src/mame/layout/hp86b.lay
index c79f54047e6..621472bf7a8 100644
--- a/src/mame/layout/hp86b.lay
+++ b/src/mame/layout/hp86b.lay
@@ -13,19 +13,19 @@ Layout of Hewlett-Packard 86B with 82913A monitor (and run light)
<color red="1.0" green="1.0" blue="0" />
</disk>
</element>
- <element name="power_s"> <text string="POWER" align="1"> <color red="1.0" green="1.0" blue="1.0" /></text></element>
+ <element name="power_s"><text string="POWER" align="1"><color red="1.0" green="1.0" blue="1.0" /></text></element>
<view name="82913A monitor">
- <!-- dimensions in mm -->
- <bounds x="0" y="0" width="230" height="160"/>
- <bezel element="power_s">
- <bounds x="134" y="152" width="20" height="5"/>
- </bezel>
- <bezel name="run_light" element="run_light">
- <bounds x="130" y="153" width="3" height="3"/>
- </bezel>
- <screen index="0">
- <bounds left="0" top="0" right="230" bottom="150" />
- </screen>
+ <!-- dimensions in mm -->
+ <bounds x="0" y="0" width="230" height="160"/>
+ <bezel element="power_s">
+ <bounds x="134" y="152" width="20" height="5"/>
+ </bezel>
+ <bezel name="run_light" element="run_light">
+ <bounds x="130" y="153" width="3" height="3"/>
+ </bezel>
+ <screen index="0">
+ <bounds left="0" top="0" right="230" bottom="150" />
+ </screen>
</view>
</mamelayout>
diff --git a/src/mame/machine/gunsense.cpp b/src/mame/machine/gunsense.cpp
index 9f7ccd1e39c..5bd2c2c79d3 100644
--- a/src/mame/machine/gunsense.cpp
+++ b/src/mame/machine/gunsense.cpp
@@ -42,8 +42,8 @@ void sega_gunsense_board_device::device_add_mconfig(machine_config &config)
ROM_START(gunsense)
ROM_REGION( 0x10000, "gunmcu", 0 )
- ROM_LOAD( "epr-20006a.ic2",0x00000, 0x10000, CRC(45f310dc) SHA1(b7cf40a1671dc351b607d8d6bba0d51ea128eb75) ) \
- ROM_LOAD( "epr-21262.ic2", 0x00000, 0x10000, CRC(c9adf9b6) SHA1(fc2a331430ef2f009f653b242220599c824cd1d2) ) \
+ ROM_LOAD( "epr-20006a.ic2",0x00000, 0x10000, CRC(45f310dc) SHA1(b7cf40a1671dc351b607d8d6bba0d51ea128eb75) )
+ ROM_LOAD( "epr-21262.ic2", 0x00000, 0x10000, CRC(c9adf9b6) SHA1(fc2a331430ef2f009f653b242220599c824cd1d2) )
ROM_LOAD( "tg12.ic2", 0x00000, 0x10000, CRC(2c9600b1) SHA1(91813a43851c48d400fde41b1198dabf55bade2d) )
ROM_END
diff --git a/src/mame/video/twin16.cpp b/src/mame/video/twin16.cpp
index a5bf2e24fa7..ebba2d53d93 100644
--- a/src/mame/video/twin16.cpp
+++ b/src/mame/video/twin16.cpp
@@ -331,8 +331,8 @@ void twin16_state::draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, co
xpos = 320-xpos-width;
flipx = !flipx;
}
- if( xpos>cliprect.max_x ) xpos -= 65536;
- if( ypos>cliprect.max_y ) ypos -= 65536;
+ if( xpos>=320 ) xpos -= 65536;
+ if( ypos>=256 ) ypos -= 65536;
/* slow slow slow, but it's ok for now */
for( y=0; y<height; y++, pen_data += width/4 )