diff options
author | Angelo Salese <angelosa@users.noreply.github.com> | 2009-06-04 22:53:10 +0000 |
---|---|---|
committer | Angelo Salese <angelosa@users.noreply.github.com> | 2009-06-04 22:53:10 +0000 |
commit | 1d909542156efe0f29b790b47b09229692da35be (patch) | |
tree | 710e5f39baf79cc15e9e7c2fa18cc3404561b263 | |
parent | 78d775b889c3787b5c9ae84c4246ec8f0dd456bd (diff) |
Hooked up 2nd player mahjong panel in mjkjidai.
-rw-r--r-- | src/mame/drivers/mjkjidai.c | 104 |
1 files changed, 64 insertions, 40 deletions
diff --git a/src/mame/drivers/mjkjidai.c b/src/mame/drivers/mjkjidai.c index 79029f45623..ca118403590 100644 --- a/src/mame/drivers/mjkjidai.c +++ b/src/mame/drivers/mjkjidai.c @@ -119,7 +119,7 @@ static int keyb,nvram_init_count; static READ8_HANDLER( keyboard_r ) { int res = 0x3f,i; - static const char *const keynames[] = { "KEY0", "KEY1", "KEY2", "KEY3", "KEY4", "KEY5", "KEY6", "KEY7", "KEY8", "KEY9", "KEY10", "KEY11" }; + static const char *const keynames[] = { "PL2_1", "PL2_2", "PL2_3", "PL2_4", "PL2_5", "PL2_6", "PL1_1", "PL1_2", "PL1_3", "PL1_4", "PL1_5", "PL1_6" }; // logerror("%04x: keyboard_r\n", cpu_get_pc(space->cpu)); @@ -264,56 +264,80 @@ static INPUT_PORTS_START( mjkjidai ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_TILT ) // reinitialize NVRAM and reset the game PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) - /* player 2 inputs (same as player 1) */ - PORT_START("KEY0") - PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START("KEY1") - PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START("KEY2") - PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START("KEY3") - PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START("KEY4") - PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START("KEY5") - PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNUSED ) - - PORT_START("KEY6") + PORT_START("PL1_1") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x3e, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START("KEY7") - PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_KAN ) - PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_REACH ) - PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) + PORT_START("PL1_2") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_KAN ) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_REACH ) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) PORT_BIT( 0x38, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START("KEY8") - PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_M ) - PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_N ) - PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_CHI ) - PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON ) + PORT_START("PL1_3") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_M ) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_N ) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_CHI ) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON ) PORT_BIT( 0x30, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START("KEY9") - PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_I ) - PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_J ) - PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K ) - PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_L ) + PORT_START("PL1_4") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_I ) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_J ) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K ) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_L ) PORT_BIT( 0x30, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START("KEY10") - PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_E ) - PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F ) - PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_G ) - PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_H ) + PORT_START("PL1_5") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_E ) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F ) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_G ) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_H ) PORT_BIT( 0x30, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START("KEY11") - PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A ) - PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_MAHJONG_B ) - PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_MAHJONG_C ) - PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_MAHJONG_D ) + PORT_START("PL1_6") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A ) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_B ) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_C ) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_D ) + PORT_BIT( 0x30, IP_ACTIVE_LOW, IPT_UNUSED ) + + PORT_START("PL2_1") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START2 ) + PORT_BIT( 0x3e, IP_ACTIVE_LOW, IPT_UNUSED ) + + PORT_START("PL2_2") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_KAN ) PORT_PLAYER(2) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_REACH ) PORT_PLAYER(2) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_RON ) PORT_PLAYER(2) + PORT_BIT( 0x38, IP_ACTIVE_LOW, IPT_UNUSED ) + + PORT_START("PL2_3") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_M ) PORT_PLAYER(2) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_N ) PORT_PLAYER(2) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_CHI ) PORT_PLAYER(2) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_PON ) PORT_PLAYER(2) + PORT_BIT( 0x30, IP_ACTIVE_LOW, IPT_UNUSED ) + + PORT_START("PL2_4") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_I ) PORT_PLAYER(2) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_J ) PORT_PLAYER(2) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_K ) PORT_PLAYER(2) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_L ) PORT_PLAYER(2) + PORT_BIT( 0x30, IP_ACTIVE_LOW, IPT_UNUSED ) + + PORT_START("PL2_5") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_E ) PORT_PLAYER(2) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_F ) PORT_PLAYER(2) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_G ) PORT_PLAYER(2) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_H ) PORT_PLAYER(2) + PORT_BIT( 0x30, IP_ACTIVE_LOW, IPT_UNUSED ) + + PORT_START("PL2_6") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_MAHJONG_A ) PORT_PLAYER(2) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_MAHJONG_B ) PORT_PLAYER(2) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_MAHJONG_C ) PORT_PLAYER(2) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_MAHJONG_D ) PORT_PLAYER(2) PORT_BIT( 0x30, IP_ACTIVE_LOW, IPT_UNUSED ) INPUT_PORTS_END |