mirror of
https://github.com/holub/mame
synced 2025-06-06 21:03:47 +03:00
Merge tag 'mame0198'
MAME 0.198
This commit is contained in:
Vas Crabb
commit
2ea751e028
21
3rdparty/softfloat3/build/MAME/platform.h
vendored
21
3rdparty/softfloat3/build/MAME/platform.h
vendored
@ -54,21 +54,28 @@ Softfloat 3 MAME modifications
|
||||
/*----------------------------------------------------------------------------
|
||||
*----------------------------------------------------------------------------*/
|
||||
|
||||
// true for GCC and Clang on Intel and ARM, and MSVC on Intel.
|
||||
#define SOFTFLOAT_BUILTIN_CLZ 1
|
||||
#if defined(_MSC_VER)
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#define _INC_MALLOC 0
|
||||
#include <intrin.h>
|
||||
|
||||
// MSVC has __lzcnt16 as well, but opts-GCC.h expects __lzcnt for uint16_t and uint32_t
|
||||
#if defined(_M_IX86) || defined(_M_AMD64)
|
||||
#define __builtin_clz __lzcnt
|
||||
#endif // defined(_M_IX86) || defined(_M_AMD64)
|
||||
#if defined(_M_AMD64)
|
||||
#define SOFTFLOAT_BUILTIN_CLZ 1
|
||||
#define __builtin_clzll __lzcnt64
|
||||
#else
|
||||
#endif // defined(_M_AMD64)
|
||||
|
||||
#else // defined(_MSC_VER)
|
||||
|
||||
// true for GCC and Clang on Intel and ARM, and MSVC on Intel.
|
||||
#define SOFTFLOAT_BUILTIN_CLZ 1
|
||||
#if defined(PTR64)
|
||||
#define SOFTFLOAT_INTRINSIC_INT128 1
|
||||
#endif
|
||||
#endif
|
||||
#endif // defined(PTR64)
|
||||
|
||||
#endif // defined(_MSC_VER)
|
||||
|
||||
#include "opts-GCC.h"
|
||||
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
-->
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="org.mamedev.mame"
|
||||
android:versionCode="197"
|
||||
android:versionName="0.197"
|
||||
android:versionCode="198"
|
||||
android:versionName="0.198"
|
||||
android:installLocation="auto">
|
||||
|
||||
<!-- Android 5.0 -->
|
||||
|
||||
4
makefile
4
makefile
@ -1571,14 +1571,14 @@ endif
|
||||
|
||||
ifeq (posix,$(SHELLTYPE))
|
||||
$(GENDIR)/version.cpp: $(GENDIR)/git_desc | $(GEN_FOLDERS)
|
||||
@echo '#define BARE_BUILD_VERSION "0.197"' > $@
|
||||
@echo '#define BARE_BUILD_VERSION "0.198"' > $@
|
||||
@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.197" > $@
|
||||
@echo #define BARE_BUILD_VERSION "0.198" > $@
|
||||
@echo extern const char bare_build_version[]; >> $@
|
||||
@echo extern const char build_version[]; >> $@
|
||||
@echo const char bare_build_version[] = BARE_BUILD_VERSION; >> $@
|
||||
|
||||
@ -4718,8 +4718,8 @@ ROM_START( spkrform )
|
||||
ROM_END
|
||||
|
||||
|
||||
GAME( 1996, iqblocka, iqblock, iqblocka, iqblocka, igs017_state, init_iqblocka, ROT0, "IGS", "Shuzi Leyuan (V127M, Gambling)", 0 )
|
||||
GAME( 1997, iqblockf, iqblock, iqblockf, iqblockf, igs017_state, init_iqblocka, ROT0, "IGS", "IQ Block (V113FR, Gambling)", 0 )
|
||||
GAME( 1996, iqblocka, iqblock, iqblocka, iqblocka, igs017_state, init_iqblocka, ROT0, "IGS", "Shuzi Leyuan (V127M, gambling)", 0 )
|
||||
GAME( 1997, iqblockf, iqblock, iqblockf, iqblockf, igs017_state, init_iqblocka, ROT0, "IGS", "IQ Block (V113FR, gambling)", 0 )
|
||||
GAME( 1997, mgdh, 0, mgdha, mgdh, igs017_state, init_mgdh, ROT0, "IGS", "Mahjong Man Guan Daheng (Taiwan, V125T1)", MACHINE_IMPERFECT_COLORS ) // wrong colors in betting screen
|
||||
GAME( 1997, mgdha, mgdh, mgdha, mgdh , igs017_state, init_mgdha, ROT0, "IGS", "Mahjong Man Guan Daheng (Taiwan, V123T1)", 0 )
|
||||
GAME( 1997, sdmg2, 0, sdmg2, sdmg2, igs017_state, init_sdmg2, ROT0, "IGS", "Mahjong Super Da Man Guan II (China, V754C)", 0 )
|
||||
|
||||
@ -3492,6 +3492,7 @@ ROM_START( shabdama )
|
||||
ROM_END
|
||||
|
||||
// PCB pics are rather blurry, might better fit in another driver
|
||||
// LD QUIZ 第4弾 答えたもん勝ち!
|
||||
ROM_START( ldquiz4 )
|
||||
ROM_REGION( 0x10000, "maincpu", 0 ) // 27512
|
||||
ROM_LOAD( "1.e3", 0x00000, 0x10000, CRC(49255f66) SHA1(bdd01987331c2aadea7f588d39c48c70cd43fc71) )
|
||||
@ -3558,4 +3559,4 @@ GAME( 1994, mjegolf, 0, mjegolf, mjegolf, nbmj9195_state, init_nbmj919
|
||||
|
||||
GAME( 1991, shabdama, 0, shabdama, mjuraden, nbmj9195_state, init_nbmj9195, ROT0, "Nichibutsu", "LD Mahjong #4 Shabon-Dama", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
|
||||
|
||||
GAME( 1992, ldquiz4, 0, shabdama, mjuraden, nbmj9195_state, init_nbmj9195, ROT0, "Nichibutsu", "LD Quiz 4 - Kotaemon Gachi (Japan)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
|
||||
GAME( 1992, ldquiz4, 0, shabdama, mjuraden, nbmj9195_state, init_nbmj9195, ROT0, "Nichibutsu", "LD Quiz dai 4-dan - Kotaetamon Gachi! (Japan)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
|
||||
|
||||
@ -4364,7 +4364,7 @@ GAME( 2001, wschamp, 0, samshoot, wschamp, seta2_state, empty_init,
|
||||
GAME( 2001, wschampa, wschamp, samshoot, wschamp, seta2_state, empty_init, ROT0, "Sammy USA Corporation", "Wing Shooting Championship V1.01", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
|
||||
GAME( 2001, wschampb, wschamp, samshoot, wschamp, seta2_state, empty_init, ROT0, "Sammy USA Corporation", "Wing Shooting Championship V1.00", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
|
||||
GAME( 2002, trophyh, 0, samshoot, trophyh, seta2_state, empty_init, ROT0, "Sammy USA Corporation", "Trophy Hunting - Bear & Moose V1.0", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
|
||||
GAME( 2002, trophyht, trophyh, samshoot, trophyht, seta2_state, empty_init, ROT0, "Sammy USA Corporation", "Trophy Hunting - Bear & Moose V1.0 (Location Test)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
|
||||
GAME( 2002, trophyht, trophyh, samshoot, trophyht, seta2_state, empty_init, ROT0, "Sammy USA Corporation", "Trophy Hunting - Bear & Moose V1.0 (location test)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
|
||||
GAME( 2000, funcube, 0, funcube, funcube, funcube_state, init_funcube, ROT0, "Namco", "Funcube (v1.5)", MACHINE_NO_COCKTAIL )
|
||||
GAME( 2001, funcube2, 0, funcube2, funcube, funcube_state, init_funcube2, ROT0, "Namco", "Funcube 2 (v1.1)", MACHINE_NO_COCKTAIL )
|
||||
GAME( 2001, funcube3, 0, funcube3, funcube, funcube_state, init_funcube3, ROT0, "Namco", "Funcube 3 (v1.1)", MACHINE_NO_COCKTAIL )
|
||||
|
||||
@ -648,7 +648,7 @@ static INPUT_PORTS_START( cyclwarr )
|
||||
PORT_DIPSETTING( 0x04, "10000" )
|
||||
PORT_DIPSETTING( 0x00, "15000" )
|
||||
PORT_DIPNAME( 0x18, 0x08, "Machine Type" ) PORT_DIPLOCATION("SW2:4,5")
|
||||
// PORT_DIPSETTING( 0x00, "2 Players" ) // same as 4 players but text layout is 2p (invalid setting)
|
||||
// PORT_DIPSETTING( 0x00, "2 Players" ) // same as 4 players but text layout is 2p (invalid setting)
|
||||
PORT_DIPSETTING( 0x08, "2 Players" )
|
||||
PORT_DIPSETTING( 0x10, "3 Players" )
|
||||
PORT_DIPSETTING( 0x18, "4 Players" )
|
||||
|
||||
@ -127,11 +127,11 @@ TILE_GET_INFO_MEMBER(cyclwarr_state::get_tile_info_bigfight)
|
||||
|
||||
template<int Bank>
|
||||
TILE_GET_INFO_MEMBER(cyclwarr_state::get_tile_info_cyclwarr_road)
|
||||
{
|
||||
{
|
||||
int tile=m_cyclwarr_videoram[Bank][(tile_index+0x400)&0x7fff];
|
||||
int bank = (m_bigfight_a40000[0] >> (((tile&0xc00)>>10)*4))&0xf;
|
||||
SET_TILE_INFO_MEMBER(1,(tile&0x3ff)|(bank<<10),((tile>>12)&0xf) | m_cyclwarr_color_bank,0);
|
||||
// TODO: enables transparent pen on sideways
|
||||
// TODO: enables transparent pen on sideways
|
||||
tileinfo.mask_data = &m_mask[((tile&0x3ff)|(bank<<10))<<3];
|
||||
}
|
||||
|
||||
@ -976,14 +976,14 @@ void cyclwarr_state::draw_bg(screen_device &screen, bitmap_rgb32 &bitmap, const
|
||||
int y_base = rowscroll_enable ? y : 0;
|
||||
int src_x = scrollx[y_base] + xscroll_offset;
|
||||
int src_y = scrolly[y_base] + yscroll_offset;
|
||||
// special handling for cycle warriors road: it reads in scrolly table bits 15-13 an
|
||||
// special handling for cycle warriors road: it reads in scrolly table bits 15-13 an
|
||||
// additional tile color bank and per scanline.
|
||||
if(is_road == true && scrolly[y_base] & 0x8000)
|
||||
{
|
||||
m_cyclwarr_color_bank = (scrolly[y_base] >> 13) & 3;
|
||||
src->mark_all_dirty();
|
||||
}
|
||||
|
||||
|
||||
src->set_scrollx(0,src_x);
|
||||
src->set_scrolly(0,src_y);
|
||||
src->draw(screen, bitmap, clip, 0, 0);
|
||||
@ -1154,14 +1154,14 @@ uint32_t cyclwarr_state::screen_update_cyclwarr(screen_device &screen, bitmap_rg
|
||||
}
|
||||
|
||||
bitmap.fill(m_palette->pen(0), cliprect);
|
||||
|
||||
|
||||
draw_bg(screen, bitmap, cliprect, m_layer[3], &m_cyclwarr_videoram[1][0x000], &m_cyclwarr_videoram[1][0x100], 8, -0x80,false, false);
|
||||
draw_bg(screen, bitmap, cliprect, m_layer[2], &m_cyclwarr_videoram[1][0x200], &m_cyclwarr_videoram[1][0x300], 8, -0x80,false, false);
|
||||
draw_bg(screen, bitmap, cliprect, m_layer[1], &m_cyclwarr_videoram[0][0x000], &m_cyclwarr_videoram[0][0x100], 8, -0x40,true, true);
|
||||
update_cluts(8192, 4096, 8192);
|
||||
draw_sprites(bitmap,cliprect,0,(m_sprite_control_ram[0xe0]&0x1000) ? 0x1000 : 0);
|
||||
draw_bg(screen, bitmap, cliprect, m_layer[0], &m_cyclwarr_videoram[0][0x200], &m_cyclwarr_videoram[0][0x300], 0x10, -0x80,false, false);
|
||||
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user