From 6e1e62bc471b584dbc78f7b8e8fd8d4ba37e7da4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Banaan=20Ananas?= Date: Sun, 31 Jul 2011 17:32:17 +0000 Subject: [PATCH] fixed cocktail mode (MT bug 4444) and a diplocs error --- src/mame/drivers/warpwarp.c | 4 ++-- src/mame/video/warpwarp.c | 13 ++++++++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/mame/drivers/warpwarp.c b/src/mame/drivers/warpwarp.c index ad37160fda2..d8d22fb22cc 100644 --- a/src/mame/drivers/warpwarp.c +++ b/src/mame/drivers/warpwarp.c @@ -645,12 +645,12 @@ static INPUT_PORTS_START( warpwarp ) PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) ) PORT_DIPSETTING( 0x02, DEF_STR( 1C_2C ) ) PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) ) - PORT_DIPNAME( 0x0c, 0x04, DEF_STR( Lives ) ) PORT_DIPLOCATION("DSW1:3") + PORT_DIPNAME( 0x0c, 0x04, DEF_STR( Lives ) ) PORT_DIPLOCATION("DSW1:3,4") PORT_DIPSETTING( 0x00, "2" ) PORT_DIPSETTING( 0x04, "3" ) PORT_DIPSETTING( 0x08, "4" ) PORT_DIPSETTING( 0x0c, "5" ) - PORT_DIPNAME( 0x30, 0x00, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("DSW1:4,5,6") + PORT_DIPNAME( 0x30, 0x00, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("DSW1:5,6") PORT_DIPSETTING( 0x00, "8k 30k 30k+" ) PORT_CONDITION("DSW1", 0x0c, PORTCOND_NOTEQUALS, 0x0c) PORT_DIPSETTING( 0x10, "10k 40k 40k+" ) PORT_CONDITION("DSW1", 0x0c, PORTCOND_NOTEQUALS, 0x0c) PORT_DIPSETTING( 0x20, "15k 60k 60k+" ) PORT_CONDITION("DSW1", 0x0c, PORTCOND_NOTEQUALS, 0x0c) diff --git a/src/mame/video/warpwarp.c b/src/mame/video/warpwarp.c index 5021e6cb7c3..86ab56d3375 100644 --- a/src/mame/video/warpwarp.c +++ b/src/mame/video/warpwarp.c @@ -226,9 +226,16 @@ static void draw_ball(running_machine &machine, bitmap_t *bitmap, const rectangl warpwarp_state *state = machine.driver_data(); if (state->m_ball_on) { - int x = 256+8 - state->m_ball_h; - int y = 240 - state->m_ball_v; - int i,j; + int x,y,i,j; + + if (flip_screen_get(machine) & 1) { + x = 376 - state->m_ball_h; + y = 280 - state->m_ball_v; + } + else { + x = 264 - state->m_ball_h; + y = 240 - state->m_ball_v; + } for (i = state->m_ball_sizey;i > 0;i--) for (j = state->m_ball_sizex;j > 0;j--)