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

less legacy (nw)

Browse Source
This commit is contained in:
David Haywood 2014-09-24 03:23:43 +00:00
parent c64b999bbd
commit 12d3afe3a3
3 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mame/drivers/legionna.c
View File

@ -146,8 +146,7 @@ static ADDRESS_MAP_START( legionna_cop_mem, AS_PROGRAM, 16, legionna_state )
AM_RANGE(0x100500, 0x100505) AM_DEVWRITE("raiden2cop", raiden2cop_device,LEGACY_cop_cmd_w) // REMOVE ME
AM_RANGE(0x100580, 0x100581) AM_DEVREAD("raiden2cop", raiden2cop_device, cop_collision_status_r)
// AM_RANGE(0x100582, 0x100587) AM_READ(cop_collision_status_val_r) // ADD ME
AM_RANGE(0x100582, 0x100587) AM_DEVREAD("raiden2cop", raiden2cop_device, LEGACY_cop_collision_status_val_r) // REMOVE ME
AM_RANGE(0x100582, 0x100587) AM_DEVREAD("raiden2cop", raiden2cop_device, cop_collision_status_val_r)
AM_RANGE(0x100588, 0x100589) AM_DEVREAD("raiden2cop", raiden2cop_device, cop_collision_status_stat_r)

21
src/mame/machine/raiden2cop.c
View File

@ -56,9 +56,6 @@ raiden2cop_device::raiden2cop_device(const machine_config &mconfig, const char *
m_cop_sprite_dma_abs_x(0),
m_cop_sprite_dma_abs_y(0),
m_LEGACY_cop_hit_val_x(0),
m_LEGACY_cop_hit_val_y(0),
m_LEGACY_m_cop_hit_val_z(0),
m_LEGACY_r0(0),
m_LEGACY_r1(0),
@ -161,9 +158,6 @@ void raiden2cop_device::device_start()
save_item(NAME(m_cop_sprite_dma_abs_y));
// legacy
save_item(NAME(m_LEGACY_cop_hit_val_x));
save_item(NAME(m_LEGACY_cop_hit_val_y));
save_item(NAME(m_LEGACY_m_cop_hit_val_z));
save_item(NAME(m_LEGACY_r0));
save_item(NAME(m_LEGACY_r1));
@ -1203,13 +1197,6 @@ WRITE16_MEMBER(raiden2cop_device::cop_sprite_dma_abs_x_w)
READ16_MEMBER( raiden2cop_device::LEGACY_cop_collision_status_val_r)
{
/* these two controls facing direction in Godzilla opponents (only vs.) - x value compare? */
if (offset==0) return (m_LEGACY_cop_hit_val_y);
else if (offset==1) return (m_LEGACY_cop_hit_val_x);
else return (m_LEGACY_m_cop_hit_val_z);
}
/*
@ -1267,12 +1254,12 @@ UINT8 raiden2cop_device::LEGACY_cop_calculate_collsion_detection()
if(m_LEGACY_cop_collision_info[1].max_y >= m_LEGACY_cop_collision_info[0].min_y && m_LEGACY_cop_collision_info[1].min_y <= m_LEGACY_cop_collision_info[0].max_y)
res &= ~1;
m_LEGACY_cop_hit_val_x = (m_LEGACY_cop_collision_info[0].x - m_LEGACY_cop_collision_info[1].x) >> 16;
m_LEGACY_cop_hit_val_y = (m_LEGACY_cop_collision_info[0].y - m_LEGACY_cop_collision_info[1].y) >> 16;
m_LEGACY_m_cop_hit_val_z = 1;
cop_hit_val[1] = (m_LEGACY_cop_collision_info[0].x - m_LEGACY_cop_collision_info[1].x) >> 16;
cop_hit_val[0] = (m_LEGACY_cop_collision_info[0].y - m_LEGACY_cop_collision_info[1].y) >> 16;
cop_hit_val[2] = 1;
cop_hit_val_stat = res; // TODO: there's also bit 2 and 3 triggered in the tests, no known meaning
//popmessage("%d %d %04x %04x %04x %04x",m_LEGACY_cop_hit_val_x,m_LEGACY_cop_hit_val_y,m_LEGACY_cop_collision_info[0].hitbox_x,m_LEGACY_cop_collision_info[0].hitbox_y,m_LEGACY_cop_collision_info[1].hitbox_x,m_LEGACY_cop_collision_info[1].hitbox_y);
//popmessage("%d %d %04x %04x %04x %04x",cop_hit_val[1],cop_hit_val[0],m_LEGACY_cop_collision_info[0].hitbox_x,m_LEGACY_cop_collision_info[0].hitbox_y,m_LEGACY_cop_collision_info[1].hitbox_x,m_LEGACY_cop_collision_info[1].hitbox_y);
//if(res == 0)
//popmessage("0:%08x %08x %08x 1:%08x %08x %08x\n",m_LEGACY_cop_collision_info[0].x,m_LEGACY_cop_collision_info[0].y,m_LEGACY_cop_collision_info[0].hitbox,m_LEGACY_cop_collision_info[1].x,m_LEGACY_cop_collision_info[1].y,m_LEGACY_cop_collision_info[1].hitbox);

2
src/mame/machine/raiden2cop.h
View File

@ -177,9 +177,7 @@ public:
DECLARE_WRITE16_MEMBER(cop_sprite_dma_abs_x_w);
// legacy code, to be removed / refactored into above
INT16 m_LEGACY_cop_hit_val_x,m_LEGACY_cop_hit_val_y,m_LEGACY_m_cop_hit_val_z;
int m_LEGACY_r0, m_LEGACY_r1;
DECLARE_READ16_MEMBER(LEGACY_cop_collision_status_val_r);
DECLARE_WRITE16_MEMBER(LEGACY_cop_cmd_w);
struct LEGACY_collision_info