diff options
author | Vas Crabb <vas@vastheman.com> | 2018-11-01 04:52:47 +1100 |
---|---|---|
committer | Vas Crabb <vas@vastheman.com> | 2018-11-01 04:52:47 +1100 |
commit | a2e7f4f5f6d968e96db52b31cf2f0e3c4a0b8994 (patch) | |
tree | 72400b1d53f69153e69ebc9f1766e5c1cc260a99 | |
parent | b8af9ccb43e479511834b9c1480404ce6b0d54a3 (diff) | |
parent | b57a14010100641094b0a16b090cf51cae5bafe9 (diff) |
Merge tag 'mame0203'
MAME 0.203
-rw-r--r-- | android-project/app/src/main/AndroidManifest.xml | 4 | ||||
-rw-r--r-- | hash/mac_hdflop.xml | 2 | ||||
-rw-r--r-- | hash/x68k_flop.xml | 2 | ||||
-rw-r--r-- | makefile | 4 | ||||
-rw-r--r-- | src/devices/machine/smioc.cpp | 2 | ||||
-rw-r--r-- | src/mame/drivers/alg.cpp | 2 | ||||
-rw-r--r-- | src/mame/drivers/crystal.cpp | 9 | ||||
-rw-r--r-- | src/mame/video/namco_c355spr.cpp | 4 | ||||
-rw-r--r-- | src/mame/video/namco_c355spr.h | 3 |
9 files changed, 15 insertions, 17 deletions
diff --git a/android-project/app/src/main/AndroidManifest.xml b/android-project/app/src/main/AndroidManifest.xml index 413f1d5e478..02b31b3af14 100644 --- a/android-project/app/src/main/AndroidManifest.xml +++ b/android-project/app/src/main/AndroidManifest.xml @@ -4,8 +4,8 @@ --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.mamedev.mame" - android:versionCode="202" - android:versionName="0.202" + android:versionCode="203" + android:versionName="0.203" android:installLocation="auto"> <!-- Android 5.0 --> diff --git a/hash/mac_hdflop.xml b/hash/mac_hdflop.xml index dc729e4dc12..8c3e5241f60 100644 --- a/hash/mac_hdflop.xml +++ b/hash/mac_hdflop.xml @@ -3,7 +3,7 @@ <softwarelist name="mac_hdflop" description="Macintosh High Density Disk images"> <!-- S/N: Z93350-001A --> - <software name="clarisw"> + <software name="clarisw" supported="no"> <description>ClarisWorks (Swedish)</description> <year>1993</year> <publisher>Claris</publisher> diff --git a/hash/x68k_flop.xml b/hash/x68k_flop.xml index 1dd2246ffd5..54330d89eba 100644 --- a/hash/x68k_flop.xml +++ b/hash/x68k_flop.xml @@ -3043,7 +3043,7 @@ Most info on release dates and Jpn titles come from the following (wonderful) re <!-- Offset front layer, but playable --> <software name="cuberunr"> - <description>Cueb Runner</description> + <description>Cube Runner</description> <year>1990</year> <publisher>SPS</publisher> <info name="alt_title" value="キューブランナー" /> @@ -1584,14 +1584,14 @@ endif ifeq (posix,$(SHELLTYPE)) $(GENDIR)/version.cpp: $(GENDIR)/git_desc | $(GEN_FOLDERS) - @echo '#define BARE_BUILD_VERSION "0.202"' > $@ + @echo '#define BARE_BUILD_VERSION "0.203"' > $@ @echo 'extern const char bare_build_version[];' >> $@ @echo 'extern const char build_version[];' >> $@ @echo 'const char bare_build_version[] = BARE_BUILD_VERSION;' >> $@ @echo 'const char build_version[] = BARE_BUILD_VERSION " ($(NEW_GIT_VERSION))";' >> $@ else $(GENDIR)/version.cpp: $(GENDIR)/git_desc - @echo #define BARE_BUILD_VERSION "0.202" > $@ + @echo #define BARE_BUILD_VERSION "0.203" > $@ @echo extern const char bare_build_version[]; >> $@ @echo extern const char build_version[]; >> $@ @echo const char bare_build_version[] = BARE_BUILD_VERSION; >> $@ diff --git a/src/devices/machine/smioc.cpp b/src/devices/machine/smioc.cpp index dee1b7d751a..3a426e8405b 100644 --- a/src/devices/machine/smioc.cpp +++ b/src/devices/machine/smioc.cpp @@ -158,7 +158,7 @@ void smioc_device::device_add_mconfig(machine_config &config) scc2698b_device &scc2698b(SCC2698B(config, "scc2698b", XTAL(3'686'400))); scc2698b.tx_callback<'a'>().set("rs232_p1", FUNC(rs232_port_device::write_txd)); scc2698b.mpp1_callback<'a'>().set("dma8237_2", FUNC(am9517a_device::dreq1_w)).invert(); - scc2698b.mpp1_callback<'a'>().set("dma8237_2", FUNC(am9517a_device::dreq0_w)).invert(); + scc2698b.mpp2_callback<'a'>().set("dma8237_2", FUNC(am9517a_device::dreq0_w)).invert(); scc2698b.tx_callback<'b'>().set("rs232_p2", FUNC(rs232_port_device::write_txd)); scc2698b.mpp1_callback<'b'>().set("dma8237_2", FUNC(am9517a_device::dreq3_w)).invert(); scc2698b.mpp2_callback<'b'>().set("dma8237_2", FUNC(am9517a_device::dreq2_w)).invert(); diff --git a/src/mame/drivers/alg.cpp b/src/mame/drivers/alg.cpp index 3f9a997c96c..96578f72bfa 100644 --- a/src/mame/drivers/alg.cpp +++ b/src/mame/drivers/alg.cpp @@ -877,5 +877,5 @@ GAME( 199?, aplatoon, alg_bios, alg_r2, alg, alg_state, init_aplatoon, /* Web Picmatic games PAL tv standard, own rom board */ GAME( 1994, zortonbr, alg_bios, picmatic, alg, alg_state, init_pal, ROT0, "Web Picmatic", "Zorton Brothers v1.01 (Los Justicieros)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_IMPERFECT_GRAPHICS ) -GAME( 1993, zortonbr_100, alg_bios, picmatic, alg, alg_state, init_pal, ROT0, "Web Picmatic", "Zorton Brothers v1.00 (Los Justicieros)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_IMPERFECT_GRAPHICS ) +GAME( 1993, zortonbr_100, zortonbr, picmatic, alg, alg_state, init_pal, ROT0, "Web Picmatic", "Zorton Brothers v1.00 (Los Justicieros)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_IMPERFECT_GRAPHICS ) GAME( 1994, marvice, alg_bios, picmatic, alg, alg_state, init_pal, ROT0, "Web Picmatic", "Marbella Vice", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_IMPERFECT_GRAPHICS ) diff --git a/src/mame/drivers/crystal.cpp b/src/mame/drivers/crystal.cpp index 13eea7fa338..7f8e8326e6f 100644 --- a/src/mame/drivers/crystal.cpp +++ b/src/mame/drivers/crystal.cpp @@ -541,7 +541,7 @@ READ32_MEMBER(crystal_state::crtc_r) switch (offset) { case 0: // CRTC Status / Mode - if ((m_crtcregs[0x30 / 4] & 1) == 0) // Interrace + if ((m_crtcregs[0x30 / 4] & 1) == 0) // Interlace vdisp <<= 1; if (m_screen->vpos() <= vdisp) // Vertical display enable status @@ -635,12 +635,11 @@ void crystal_state::crtc_update() // TODO : Implement other CRTC parameters uint32_t hdisp = m_crtcregs[0x0c / 4] + 1; uint32_t vdisp = m_crtcregs[0x1c / 4] + 1; - if ((m_crtcregs[0x30 / 4] & 1) == 0) // Interrace + if ((m_crtcregs[0x30 / 4] & 1) == 0) // Interlace vdisp <<= 1; - rectangle visarea; - visarea.set(0, hdisp - 1, 0, vdisp - 1); - m_screen->configure(hdisp, vdisp, visarea, m_screen->frame_period().attoseconds() ); + rectangle const visarea(0, hdisp - 1, 0, vdisp - 1); + m_screen->configure(hdisp, vdisp, visarea, m_screen->frame_period().attoseconds()); } void crystal_state::internal_map(address_map &map) diff --git a/src/mame/video/namco_c355spr.cpp b/src/mame/video/namco_c355spr.cpp index c1e67d2dac1..13519e184ec 100644 --- a/src/mame/video/namco_c355spr.cpp +++ b/src/mame/video/namco_c355spr.cpp @@ -444,8 +444,8 @@ void namco_c355spr_device::get_sprites() get_list(1, &m_spriteram[buffer][0x14000/2], &m_spriteram[buffer][0x10000/2]); } -template<class _BitmapClass> -void namco_c355spr_device::draw_sprites(screen_device &screen, _BitmapClass &bitmap, const rectangle &cliprect, int pri) +template<class BitmapClass> +void namco_c355spr_device::draw_sprites(screen_device &screen, BitmapClass &bitmap, const rectangle &cliprect, int pri) { // int offs = spriteram16[0x18000/2]; /* end-of-sprite-list */ if (pri == 0) diff --git a/src/mame/video/namco_c355spr.h b/src/mame/video/namco_c355spr.h index 4856733c1af..97e618596b8 100644 --- a/src/mame/video/namco_c355spr.h +++ b/src/mame/video/namco_c355spr.h @@ -73,7 +73,7 @@ private: void get_single_sprite(const uint16_t *pSource, c355_sprite *sprite_ptr); void get_list(int no, const uint16_t *pSpriteList16, const uint16_t *pSpriteTable); void get_sprites(); - template<class _BitmapClass> void draw_sprites(screen_device &screen, _BitmapClass &bitmap, const rectangle &cliprect, int pri); + template<class BitmapClass> void draw_sprites(screen_device &screen, BitmapClass &bitmap, const rectangle &cliprect, int pri); std::unique_ptr<c355_sprite []> m_spritelist[2]; const c355_sprite *m_sprite_end[2]; @@ -94,4 +94,3 @@ private: DECLARE_DEVICE_TYPE(NAMCO_C355SPR, namco_c355spr_device) #endif // MAME_VIDEO_NAMCO_C355SPR_H - |