summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Couriersud <couriersud@users.noreply.github.com>2008-02-25 23:01:59 +0000
committer Couriersud <couriersud@users.noreply.github.com>2008-02-25 23:01:59 +0000
commit3bd4143eb6c6a8bbddbf397e469df66bd43c1b64 (patch)
tree5b58aacad60280bc6064ff242e1af67712dcf357
parent32713a7e9ef786a61aefbe9e2b700b3351c2ad60 (diff)
* remove flip_screen macro
* flip_screen_x and flip_screen_y made static * add flip_screen_x_get() and flip_screen_y_get() * change writes to flip_screen_x from last commit to flip_screen_set_no_update() * added save state calls for flip_screen_x and flip_screen_y
-rw-r--r--src/emu/video/generic.c40
-rw-r--r--src/emu/video/generic.h7
-rw-r--r--src/mame/audio/n8080.c3
-rw-r--r--src/mame/drivers/acommand.c6
-rw-r--r--src/mame/drivers/backfire.c5
-rw-r--r--src/mame/drivers/calorie.c2
-rw-r--r--src/mame/drivers/citycon.c2
-rw-r--r--src/mame/drivers/dacholer.c2
-rw-r--r--src/mame/drivers/dblewing.c2
-rw-r--r--src/mame/drivers/deco156.c5
-rw-r--r--src/mame/drivers/dominob.c10
-rw-r--r--src/mame/drivers/enigma2.c4
-rw-r--r--src/mame/drivers/gpworld.c2
-rw-r--r--src/mame/drivers/hanaroku.c2
-rw-r--r--src/mame/drivers/laserbat.c3
-rw-r--r--src/mame/drivers/looping.c8
-rw-r--r--src/mame/drivers/mirage.c2
-rw-r--r--src/mame/drivers/missb2.c2
-rw-r--r--src/mame/drivers/olibochu.c6
-rw-r--r--src/mame/drivers/pacland.c6
-rw-r--r--src/mame/drivers/psychic5.c2
-rw-r--r--src/mame/drivers/pturn.c4
-rw-r--r--src/mame/drivers/sbowling.c2
-rw-r--r--src/mame/drivers/warpwarp.c4
-rw-r--r--src/mame/drivers/wilytowr.c6
-rw-r--r--src/mame/video/1942.c4
-rw-r--r--src/mame/video/1943.c6
-rw-r--r--src/mame/video/aeroboto.c6
-rw-r--r--src/mame/video/ambush.c10
-rw-r--r--src/mame/video/amspdwy.c2
-rw-r--r--src/mame/video/appoooh.c8
-rw-r--r--src/mame/video/arkanoid.c14
-rw-r--r--src/mame/video/armedf.c2
-rw-r--r--src/mame/video/bagman.c6
-rw-r--r--src/mame/video/bankp.c2
-rw-r--r--src/mame/video/baraduke.c10
-rw-r--r--src/mame/video/battlane.c4
-rw-r--r--src/mame/video/battlex.c4
-rw-r--r--src/mame/video/bionicc.c2
-rw-r--r--src/mame/video/bking.c13
-rw-r--r--src/mame/video/blktiger.c4
-rw-r--r--src/mame/video/blueprnt.c4
-rw-r--r--src/mame/video/bogeyman.c4
-rw-r--r--src/mame/video/bombjack.c4
-rw-r--r--src/mame/video/boogwing.c2
-rw-r--r--src/mame/video/bosco.c8
-rw-r--r--src/mame/video/btime.c24
-rw-r--r--src/mame/video/bublbobl.c2
-rw-r--r--src/mame/video/buggychl.c16
-rw-r--r--src/mame/video/cabal.c2
-rw-r--r--src/mame/video/cbuster.c2
-rw-r--r--src/mame/video/cclimber.c66
-rw-r--r--src/mame/video/champbas.c2
-rw-r--r--src/mame/video/cheekyms.c6
-rw-r--r--src/mame/video/circusc.c2
-rw-r--r--src/mame/video/citycon.c4
-rw-r--r--src/mame/video/cloak.c2
-rw-r--r--src/mame/video/clshroad.c2
-rw-r--r--src/mame/video/cninja.c6
-rw-r--r--src/mame/video/commando.c2
-rw-r--r--src/mame/video/cop01.c2
-rw-r--r--src/mame/video/cosmic.c10
-rw-r--r--src/mame/video/cps1.c8
-rw-r--r--src/mame/video/crbaloon.c2
-rw-r--r--src/mame/video/cvs.c4
-rw-r--r--src/mame/video/dassault.c2
-rw-r--r--src/mame/video/ddragon.c2
-rw-r--r--src/mame/video/ddragon3.c6
-rw-r--r--src/mame/video/deadang.c2
-rw-r--r--src/mame/video/dec0.c6
-rw-r--r--src/mame/video/dec8.c10
-rw-r--r--src/mame/video/deco32.c4
-rw-r--r--src/mame/video/decocass.c8
-rw-r--r--src/mame/video/dietgo.c2
-rw-r--r--src/mame/video/digdug.c6
-rw-r--r--src/mame/video/dkong.c2
-rw-r--r--src/mame/video/docastle.c2
-rw-r--r--src/mame/video/dogfgt.c8
-rw-r--r--src/mame/video/dooyong.c4
-rw-r--r--src/mame/video/dynduke.c2
-rw-r--r--src/mame/video/esd16.c4
-rw-r--r--src/mame/video/exctsccr.c2
-rw-r--r--src/mame/video/exprraid.c6
-rw-r--r--src/mame/video/exzisus.c8
-rw-r--r--src/mame/video/fastfred.c18
-rw-r--r--src/mame/video/firetrap.c4
-rw-r--r--src/mame/video/flower.c4
-rw-r--r--src/mame/video/freekick.c12
-rw-r--r--src/mame/video/funkybee.c12
-rw-r--r--src/mame/video/funkyjet.c2
-rw-r--r--src/mame/video/fuukifg2.c6
-rw-r--r--src/mame/video/fuukifg3.c6
-rw-r--r--src/mame/video/gaiden.c4
-rw-r--r--src/mame/video/galaga.c6
-rw-r--r--src/mame/video/galaxian.c6
-rw-r--r--src/mame/video/gaplus.c2
-rw-r--r--src/mame/video/gberet.c4
-rw-r--r--src/mame/video/gladiatr.c6
-rw-r--r--src/mame/video/gng.c2
-rw-r--r--src/mame/video/goindol.c8
-rw-r--r--src/mame/video/gottlieb.c10
-rw-r--r--src/mame/video/gotya.c12
-rw-r--r--src/mame/video/gunsmoke.c2
-rw-r--r--src/mame/video/hanaawas.c6
-rw-r--r--src/mame/video/hexa.c4
-rw-r--r--src/mame/video/higemaru.c4
-rw-r--r--src/mame/video/holeland.c8
-rw-r--r--src/mame/video/hyperspt.c8
-rw-r--r--src/mame/video/hyprduel.c2
-rw-r--r--src/mame/video/ironhors.c8
-rw-r--r--src/mame/video/jack.c4
-rw-r--r--src/mame/video/jackal.c8
-rw-r--r--src/mame/video/jailbrek.c2
-rw-r--r--src/mame/video/kan_panb.c10
-rw-r--r--src/mame/video/kan_pand.c2
-rw-r--r--src/mame/video/kchamp.c4
-rw-r--r--src/mame/video/kingobox.c6
-rw-r--r--src/mame/video/ladybug.c16
-rw-r--r--src/mame/video/lasso.c18
-rw-r--r--src/mame/video/lastduel.c2
-rw-r--r--src/mame/video/liberate.c6
-rw-r--r--src/mame/video/lkage.c4
-rw-r--r--src/mame/video/lsasquad.c18
-rw-r--r--src/mame/video/lwings.c4
-rw-r--r--src/mame/video/m52.c16
-rw-r--r--src/mame/video/m58.c10
-rw-r--r--src/mame/video/m72.c4
-rw-r--r--src/mame/video/m92.c2
-rw-r--r--src/mame/video/mappy.c4
-rw-r--r--src/mame/video/markham.c8
-rw-r--r--src/mame/video/mermaid.c6
-rw-r--r--src/mame/video/metlclsh.c4
-rw-r--r--src/mame/video/metro.c2
-rw-r--r--src/mame/video/mikie.c4
-rw-r--r--src/mame/video/mjkjidai.c2
-rw-r--r--src/mame/video/mouser.c14
-rw-r--r--src/mame/video/mrjong.c4
-rw-r--r--src/mame/video/mustache.c8
-rw-r--r--src/mame/video/mystston.c2
-rw-r--r--src/mame/video/n8080.c19
-rw-r--r--src/mame/video/namcos1.c10
-rw-r--r--src/mame/video/namcos86.c10
-rw-r--r--src/mame/video/ninjakd2.c2
-rw-r--r--src/mame/video/nmk16.c10
-rw-r--r--src/mame/video/nova2001.c4
-rw-r--r--src/mame/video/othldrby.c4
-rw-r--r--src/mame/video/pacland.c6
-rw-r--r--src/mame/video/paradise.c4
-rw-r--r--src/mame/video/pbaction.c6
-rw-r--r--src/mame/video/pcktgal.c4
-rw-r--r--src/mame/video/pitnrun.c10
-rw-r--r--src/mame/video/pktgaldx.c2
-rw-r--r--src/mame/video/pokechmp.c4
-rw-r--r--src/mame/video/popeye.c12
-rw-r--r--src/mame/video/powerins.c2
-rw-r--r--src/mame/video/prehisle.c2
-rw-r--r--src/mame/video/psikyo.c2
-rw-r--r--src/mame/video/psychic5.c4
-rw-r--r--src/mame/video/rallyx.c18
-rw-r--r--src/mame/video/realbrk.c8
-rw-r--r--src/mame/video/redclash.c2
-rw-r--r--src/mame/video/renegade.c10
-rw-r--r--src/mame/video/retofinv.c2
-rw-r--r--src/mame/video/rockola.c4
-rw-r--r--src/mame/video/rocnrope.c2
-rw-r--r--src/mame/video/rohga.c6
-rw-r--r--src/mame/video/sauro.c10
-rw-r--r--src/mame/video/sbasketb.c4
-rw-r--r--src/mame/video/scotrsht.c2
-rw-r--r--src/mame/video/senjyo.c14
-rw-r--r--src/mame/video/sf.c4
-rw-r--r--src/mame/video/shangha3.c2
-rw-r--r--src/mame/video/shaolins.c4
-rw-r--r--src/mame/video/shootout.c6
-rw-r--r--src/mame/video/simpl156.c4
-rw-r--r--src/mame/video/skykid.c11
-rw-r--r--src/mame/video/snk68.c12
-rw-r--r--src/mame/video/solomon.c4
-rw-r--r--src/mame/video/sonson.c4
-rw-r--r--src/mame/video/spcforce.c4
-rw-r--r--src/mame/video/spdodgeb.c4
-rw-r--r--src/mame/video/speedbal.c2
-rw-r--r--src/mame/video/srumbler.c4
-rw-r--r--src/mame/video/sshangha.c7
-rw-r--r--src/mame/video/ssozumo.c2
-rw-r--r--src/mame/video/stfight.c4
-rw-r--r--src/mame/video/strnskil.c8
-rw-r--r--src/mame/video/suna16.c2
-rw-r--r--src/mame/video/suna8.c4
-rw-r--r--src/mame/video/supbtime.c2
-rw-r--r--src/mame/video/superqix.c8
-rw-r--r--src/mame/video/suprloco.c6
-rw-r--r--src/mame/video/system1.c52
-rw-r--r--src/mame/video/tagteam.c6
-rw-r--r--src/mame/video/tecmo.c2
-rw-r--r--src/mame/video/tehkanwc.c4
-rw-r--r--src/mame/video/terracre.c2
-rw-r--r--src/mame/video/thedeep.c2
-rw-r--r--src/mame/video/tigeroad.c4
-rw-r--r--src/mame/video/toki.c2
-rw-r--r--src/mame/video/trackfld.c6
-rw-r--r--src/mame/video/travrusa.c4
-rw-r--r--src/mame/video/tryout.c4
-rw-r--r--src/mame/video/tsamurai.c2
-rw-r--r--src/mame/video/tumblep.c2
-rw-r--r--src/mame/video/vaportra.c2
-rw-r--r--src/mame/video/vastar.c6
-rw-r--r--src/mame/video/vball.c2
-rw-r--r--src/mame/video/vulgus.c6
-rw-r--r--src/mame/video/wwfsstar.c4
-rw-r--r--src/mame/video/wwfwfest.c4
-rw-r--r--src/mame/video/xain.c10
-rw-r--r--src/mame/video/xevious.c6
-rw-r--r--src/mame/video/yiear.c4
-rw-r--r--src/mame/video/yunsun16.c2
-rw-r--r--src/mame/video/zaccaria.c10
-rw-r--r--src/mame/video/zaxxon.c19
-rw-r--r--src/mame/video/zodiack.c8
218 files changed, 685 insertions, 663 deletions
diff --git a/src/emu/video/generic.c b/src/emu/video/generic.c
index c5f6e9efb0e..9189a910264 100644
--- a/src/emu/video/generic.c
+++ b/src/emu/video/generic.c
@@ -60,7 +60,7 @@ UINT8 *paletteram_2; /* use when palette RAM is split in two parts */
UINT16 *paletteram16_2;
mame_bitmap *tmpbitmap;
-int flip_screen_x, flip_screen_y;
+static int flip_screen_x, flip_screen_y;
@@ -295,6 +295,8 @@ void generic_video_init(running_machine *machine)
spriteram_3_size = 0;
tmpbitmap = NULL;
flip_screen_x = flip_screen_y = 0;
+ state_save_register_item("video", 0, flip_screen_x);
+ state_save_register_item("video", 0, flip_screen_y);
}
@@ -497,6 +499,22 @@ void flip_screen_set(int on)
/*-------------------------------------------------
+ flip_screen_set_no_update - set global flip
+ do not call update_flip.
+-------------------------------------------------*/
+
+void flip_screen_set_no_update(int on)
+{
+ /* flip_screen_y is not updated on purpose
+ * this function is for drivers which
+ * where writing to flip_screen_x to
+ * bypass update_flip
+ */
+ flip_screen_x = on;
+}
+
+
+/*-------------------------------------------------
flip_screen_x_set - set global horizontal flip
-------------------------------------------------*/
@@ -536,6 +554,26 @@ int flip_screen_get(void)
}
+/*-------------------------------------------------
+ flip_screen_x_get - get global x flip
+-------------------------------------------------*/
+
+int flip_screen_x_get(void)
+{
+ return flip_screen_x;
+}
+
+
+/*-------------------------------------------------
+ flip_screen_get - get global y flip
+-------------------------------------------------*/
+
+int flip_screen_y_get(void)
+{
+ return flip_screen_y;
+}
+
+
/***************************************************************************
COMMON PALETTE INITIALIZATION
***************************************************************************/
diff --git a/src/emu/video/generic.h b/src/emu/video/generic.h
index 027b76870b4..d1cdd32657d 100644
--- a/src/emu/video/generic.h
+++ b/src/emu/video/generic.h
@@ -64,8 +64,6 @@ extern UINT16 *paletteram16_2;
extern mame_bitmap *tmpbitmap;
-extern int flip_screen_x, flip_screen_y;
-
/***************************************************************************
@@ -123,11 +121,14 @@ void buffer_spriteram_2(UINT8 *ptr, int length);
/* set global attributes */
void flip_screen_set(int on);
+void flip_screen_set_no_update(int on); /* will not call update_flip */
void flip_screen_x_set(int on);
void flip_screen_y_set(int on);
int flip_screen_get(void);
+int flip_screen_x_get(void);
+int flip_screen_y_get(void);
-#define flip_screen flip_screen_get()
+//#define flip_screen flip_screen_get()
diff --git a/src/mame/audio/n8080.c b/src/mame/audio/n8080.c
index db1468c4251..4e2d9b078ae 100644
--- a/src/mame/audio/n8080.c
+++ b/src/mame/audio/n8080.c
@@ -323,8 +323,7 @@ static void delayed_sound_2(int data)
if (n8080_hardware == 1)
{
- /* FIXME: flip_screen_x should not be written. */
- flip_screen_x = data & 0x20;
+ flip_screen_set_no_update(data & 0x20);
}
if (n8080_hardware == 3)
{
diff --git a/src/mame/drivers/acommand.c b/src/mame/drivers/acommand.c
index 420b03a061c..978d4c73f89 100644
--- a/src/mame/drivers/acommand.c
+++ b/src/mame/drivers/acommand.c
@@ -109,12 +109,12 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
int xx,yy,x;
int delta = 16;
- flipx ^= flip_screen;
- flipy ^= flip_screen;
+ flipx ^= flip_screen_get();
+ flipy ^= flip_screen_get();
if ((pri&pri_mask)!=priority) continue;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 368 - sx;
sy = 240 - sy;
diff --git a/src/mame/drivers/backfire.c b/src/mame/drivers/backfire.c
index 4757bf8e1f9..dfb3db9c466 100644
--- a/src/mame/drivers/backfire.c
+++ b/src/mame/drivers/backfire.c
@@ -94,8 +94,7 @@ static void draw_sprites(running_machine *machine,mame_bitmap *bitmap,const rect
{
int offs;
- //FIXME: flip_screen_x should not be written!
- flip_screen_x = 1;
+ flip_screen_set_no_update(1);
for (offs = (0x1400/4)-4;offs >= 0;offs -= 4) // 0x1400 for charlien
{
@@ -145,7 +144,7 @@ static void draw_sprites(running_machine *machine,mame_bitmap *bitmap,const rect
inc = 1;
}
- if (flip_screen_x)
+ if (flip_screen_x_get())
{
y=240-y;
x=304-x;
diff --git a/src/mame/drivers/calorie.c b/src/mame/drivers/calorie.c
index fd7b5860907..6dcc747e99a 100644
--- a/src/mame/drivers/calorie.c
+++ b/src/mame/drivers/calorie.c
@@ -141,7 +141,7 @@ static VIDEO_UPDATE( calorie )
ypos = 0xff - calorie_sprites[x+2];
xpos = calorie_sprites[x+3];
- if(flip_screen)
+ if(flip_screen_get())
{
if( calorie_sprites[x+1] & 0x10 )
ypos = 0xff - ypos + 32;
diff --git a/src/mame/drivers/citycon.c b/src/mame/drivers/citycon.c
index 4aac4ca5a12..660bd98280e 100644
--- a/src/mame/drivers/citycon.c
+++ b/src/mame/drivers/citycon.c
@@ -21,7 +21,7 @@ VIDEO_START( citycon );
static READ8_HANDLER( citycon_in_r )
{
- return readinputport(flip_screen ? 1 : 0);
+ return readinputport(flip_screen_get() ? 1 : 0);
}
diff --git a/src/mame/drivers/dacholer.c b/src/mame/drivers/dacholer.c
index 95808d1b437..c6b6f121b32 100644
--- a/src/mame/drivers/dacholer.c
+++ b/src/mame/drivers/dacholer.c
@@ -276,7 +276,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
sx = (spriteram[offs+3] - 128) + 256 * (attr & 0x01);
sy = 248 - spriteram[offs];
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 240 - sy;
diff --git a/src/mame/drivers/dblewing.c b/src/mame/drivers/dblewing.c
index b115e39329c..9c446425b7c 100644
--- a/src/mame/drivers/dblewing.c
+++ b/src/mame/drivers/dblewing.c
@@ -99,7 +99,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap,const rec
inc = 1;
}
- if (flip_screen)
+ if (flip_screen_get())
{
y=240-y;
x=304-x;
diff --git a/src/mame/drivers/deco156.c b/src/mame/drivers/deco156.c
index 2ddc27c4794..2b3a7f2f799 100644
--- a/src/mame/drivers/deco156.c
+++ b/src/mame/drivers/deco156.c
@@ -64,8 +64,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap,const rec
{
int offs;
- //FIXME: flip_screen_x should not be written!
- flip_screen_x = 1;
+ flip_screen_set_no_update(1);
for (offs = (0x1400/4)-4;offs >= 0;offs -= 4) // 0x1400 for charlien
{
@@ -111,7 +110,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap,const rec
inc = 1;
}
- if (flip_screen_x)
+ if (flip_screen_x_get())
{
y=240-y;
x=304-x;
diff --git a/src/mame/drivers/dominob.c b/src/mame/drivers/dominob.c
index bf003ba50dd..eed0ac17f99 100644
--- a/src/mame/drivers/dominob.c
+++ b/src/mame/drivers/dominob.c
@@ -50,21 +50,21 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
sx = spriteram[offs];
sy = 248 - spriteram[offs + 1];
- if (flip_screen_x) sx = 248 - sx;
- if (flip_screen_y) sy = 248 - sy;
+ if (flip_screen_x_get()) sx = 248 - sx;
+ if (flip_screen_y_get()) sy = 248 - sy;
code = spriteram[offs + 3] + ((spriteram[offs + 2] & 0x03) << 8) ;
drawgfx(bitmap,machine->gfx[0],
2 * code,
((spriteram[offs + 2] & 0xf8) >> 3) ,
- flip_screen_x,flip_screen_y,
- sx,sy + (flip_screen_y ? 8 : -8),
+ flip_screen_x_get(),flip_screen_y_get(),
+ sx,sy + (flip_screen_y_get() ? 8 : -8),
cliprect,TRANSPARENCY_PEN,0);
drawgfx(bitmap,machine->gfx[0],
2 * code + 1,
((spriteram[offs + 2] & 0xf8) >> 3) ,
- flip_screen_x,flip_screen_y,
+ flip_screen_x_get(),flip_screen_y_get(),
sx,sy,
cliprect,TRANSPARENCY_PEN,0);
}
diff --git a/src/mame/drivers/enigma2.c b/src/mame/drivers/enigma2.c
index 0b3ebecff4a..17816c22fc2 100644
--- a/src/mame/drivers/enigma2.c
+++ b/src/mame/drivers/enigma2.c
@@ -192,8 +192,8 @@ static VIDEO_UPDATE( enigma2 )
offs_t color_map_address = (y >> 3 << 5) | (x >> 3);
/* the schematics shows it like this, but it doesn't work as this would
produce no stars, due to the contents of the PROM -- maybe there is
- a star disabled bit somewhere that's connected here instead of flip_screen */
- /* star_map_address = (y >> 4 << 6) | (engima2_flip_screen << 5) | (x >> 3); */
+ a star disabled bit somewhere that's connected here instead of flip_screen_get() */
+ /* star_map_address = (y >> 4 << 6) | (engima2_flip_screen_get() << 5) | (x >> 3); */
offs_t star_map_address = (y >> 4 << 6) | 0x20 | (x >> 3);
offs_t videoram_address = (y << 5) | (x >> 3);
diff --git a/src/mame/drivers/gpworld.c b/src/mame/drivers/gpworld.c
index 4be3ef80274..7e970b3488f 100644
--- a/src/mame/drivers/gpworld.c
+++ b/src/mame/drivers/gpworld.c
@@ -78,7 +78,7 @@ static void gpworld_draw_tiles(running_machine *machine, mame_bitmap *bitmap,con
INLINE void draw_pixel(mame_bitmap *bitmap,const rectangle *cliprect,int x,int y,int color)
{
- if (flip_screen)
+ if (flip_screen_get())
{
x = bitmap->width - x - 1;
y = bitmap->height - y - 1;
diff --git a/src/mame/drivers/hanaroku.c b/src/mame/drivers/hanaroku.c
index 342d64aa4a3..387040f309f 100644
--- a/src/mame/drivers/hanaroku.c
+++ b/src/mame/drivers/hanaroku.c
@@ -53,7 +53,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
int sx = hanaroku_spriteram1[i + 0x200] | ((hanaroku_spriteram2[i + 0x200] & 0x07) << 8);
int sy = 242 - hanaroku_spriteram3[i];
- if (flip_screen)
+ if (flip_screen_get())
{
sy = 242 - sy;
flipx = !flipx;
diff --git a/src/mame/drivers/laserbat.c b/src/mame/drivers/laserbat.c
index 294e14f3da7..e573be36dd2 100644
--- a/src/mame/drivers/laserbat.c
+++ b/src/mame/drivers/laserbat.c
@@ -80,8 +80,7 @@ static WRITE8_HANDLER( laserbat_input_mux_w )
{
laserbat_input_mux = (data & 0x30) >> 4;
- /* FIXME: flip_screen_x should not be written. */
- flip_screen_x = data & 0x08;
+ flip_screen_set_no_update(data & 0x08);
coin_counter_w(0,data & 1);
diff --git a/src/mame/drivers/looping.c b/src/mame/drivers/looping.c
index 11b74a7b8cd..b0a9cb9b998 100644
--- a/src/mame/drivers/looping.c
+++ b/src/mame/drivers/looping.c
@@ -192,7 +192,7 @@ static WRITE8_HANDLER( flip_screen_x_w )
{
looping_state *state = Machine->driver_data;
flip_screen_x_set(~data & 0x01);
- tilemap_set_scrollx(state->bg_tilemap, 0, flip_screen ? 128 : 0);
+ tilemap_set_scrollx(state->bg_tilemap, 0, flip_screen_get() ? 128 : 0);
}
@@ -200,7 +200,7 @@ static WRITE8_HANDLER( flip_screen_y_w )
{
looping_state *state = Machine->driver_data;
flip_screen_y_set(~data & 0x01);
- tilemap_set_scrollx(state->bg_tilemap, 0, flip_screen ? 128 : 0);
+ tilemap_set_scrollx(state->bg_tilemap, 0, flip_screen_get() ? 128 : 0);
}
@@ -255,13 +255,13 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
int code = source[1] & 0x3f;
int color = source[2];
- if (flip_screen_x)
+ if (flip_screen_x_get())
{
sx = 240 - sx;
flipx = !flipx;
}
- if (flip_screen_y)
+ if (flip_screen_y_get())
{
sy = 240 - sy;
flipy = !flipy;
diff --git a/src/mame/drivers/mirage.c b/src/mame/drivers/mirage.c
index afae5978c76..3debcbad04f 100644
--- a/src/mame/drivers/mirage.c
+++ b/src/mame/drivers/mirage.c
@@ -79,7 +79,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap,const rec
inc = 1;
}
- if (flip_screen)
+ if (flip_screen_get())
{
y=240-y;
x=304-x;
diff --git a/src/mame/drivers/missb2.c b/src/mame/drivers/missb2.c
index 1a0d247fcb5..9fe5c338e71 100644
--- a/src/mame/drivers/missb2.c
+++ b/src/mame/drivers/missb2.c
@@ -107,7 +107,7 @@ static VIDEO_UPDATE( missb2 )
x = sx + xc * 8;
y = (sy + yc * 8) & 0xff;
- if (flip_screen)
+ if (flip_screen_get())
{
x = 248 - x;
y = 248 - y;
diff --git a/src/mame/drivers/olibochu.c b/src/mame/drivers/olibochu.c
index a6f8ecd3352..60f4e09c102 100644
--- a/src/mame/drivers/olibochu.c
+++ b/src/mame/drivers/olibochu.c
@@ -67,7 +67,7 @@ static WRITE8_HANDLER( olibochu_colorram_w )
static WRITE8_HANDLER( olibochu_flipscreen_w )
{
- if (flip_screen != (data & 0x80))
+ if (flip_screen_get() != (data & 0x80))
{
flip_screen_set(data & 0x80);
tilemap_mark_all_tiles_dirty(ALL_TILEMAPS);
@@ -108,7 +108,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
int sx = spriteram[offs+3];
int sy = ((spriteram[offs+2] + 8) & 0xff) - 8;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 240 - sy;
@@ -136,7 +136,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
int sx = spriteram_2[offs+3];
int sy = spriteram_2[offs+2];
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 248 - sx;
sy = 248 - sy;
diff --git a/src/mame/drivers/pacland.c b/src/mame/drivers/pacland.c
index 239a9e43934..e9e2516804a 100644
--- a/src/mame/drivers/pacland.c
+++ b/src/mame/drivers/pacland.c
@@ -201,10 +201,8 @@ static WRITE8_HANDLER( pacland_flipscreen_w )
{
int bit = !BIT(offset,11);
/* can't use flip_screen_set() because the visible area is asymmetrical */
- /* FIXME: flip_screen_x should not be written. The above issue needs */
- /* some other solution */
- flip_screen_x = bit;
- tilemap_set_flip(ALL_TILEMAPS,flip_screen ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0);
+ flip_screen_set_no_update(bit);
+ tilemap_set_flip(ALL_TILEMAPS,flip_screen_get() ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0);
}
diff --git a/src/mame/drivers/psychic5.c b/src/mame/drivers/psychic5.c
index b24bc0adf67..0337a7286a2 100644
--- a/src/mame/drivers/psychic5.c
+++ b/src/mame/drivers/psychic5.c
@@ -355,7 +355,7 @@ static WRITE8_HANDLER( psychic5_coin_counter_w )
// bit 7 toggles flip screen
if (data & 0x80)
{
- flip_screen_set(!flip_screen);
+ flip_screen_set(!flip_screen_get());
}
}
diff --git a/src/mame/drivers/pturn.c b/src/mame/drivers/pturn.c
index 6efb820df19..92b2bddfca2 100644
--- a/src/mame/drivers/pturn.c
+++ b/src/mame/drivers/pturn.c
@@ -142,13 +142,13 @@ static VIDEO_UPDATE(pturn)
flipy=spriteram[offs+1]&0x80;
- if (flip_screen_x)
+ if (flip_screen_x_get())
{
sx = 224 - sx;
flipx ^= 0x40;
}
- if (flip_screen_y)
+ if (flip_screen_y_get())
{
flipy ^= 0x80;
sy = 224 - sy;
diff --git a/src/mame/drivers/sbowling.c b/src/mame/drivers/sbowling.c
index ee039b8eafb..959d9ecf47c 100644
--- a/src/mame/drivers/sbowling.c
+++ b/src/mame/drivers/sbowling.c
@@ -61,7 +61,7 @@ static TILE_GET_INFO( get_sb_tile_info )
static void plot_pixel_sbw(int x, int y, int col)
{
- if (flip_screen)
+ if (flip_screen_get())
{
y = 255-y;
x = 247-x;
diff --git a/src/mame/drivers/warpwarp.c b/src/mame/drivers/warpwarp.c
index 4570033ad0e..f8b458c7929 100644
--- a/src/mame/drivers/warpwarp.c
+++ b/src/mame/drivers/warpwarp.c
@@ -150,7 +150,7 @@ static READ8_HANDLER( geebee_in_r )
res = readinputport(offset);
if (offset == 3)
{
- res = readinputport(3 + (flip_screen & 1)); // read player 2 input in cocktail mode
+ res = readinputport(3 + (flip_screen_get() & 1)); // read player 2 input in cocktail mode
if (handle_joystick)
{
/* map digital two-way joystick to two fixed VOLIN values */
@@ -232,7 +232,7 @@ static READ8_HANDLER( warpwarp_vol_r )
{
int res;
- res = readinputport(2 + (flip_screen & 1));
+ res = readinputport(2 + (flip_screen_get() & 1));
if (handle_joystick)
{
if (res & 1) return 0x0f;
diff --git a/src/mame/drivers/wilytowr.c b/src/mame/drivers/wilytowr.c
index fcb1370cf5a..c22795d4d0f 100644
--- a/src/mame/drivers/wilytowr.c
+++ b/src/mame/drivers/wilytowr.c
@@ -122,7 +122,7 @@ static WRITE8_HANDLER( wilytwr_palbank_w )
static WRITE8_HANDLER( wilytwr_flipscreen_w )
{
- if (flip_screen != (~data & 0x01))
+ if (flip_screen_get() != (~data & 0x01))
{
flip_screen_set(~data & 0x01);
tilemap_mark_all_tiles_dirty(ALL_TILEMAPS);
@@ -132,7 +132,7 @@ static WRITE8_HANDLER( wilytwr_flipscreen_w )
static WRITE8_HANDLER( fghtbskt_flipscreen_w )
{
flip_screen_set(data);
- fg_flag = flip_screen ? TILE_FLIPX : 0;
+ fg_flag = flip_screen_get() ? TILE_FLIPX : 0;
}
@@ -179,7 +179,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
int sx = spriteram[offs + 3];
int sy = sy_offset - spriteram[offs];
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = sy_offset - sy;
diff --git a/src/mame/video/1942.c b/src/mame/video/1942.c
index 6f2c0f40696..2bb2e9eeb82 100644
--- a/src/mame/video/1942.c
+++ b/src/mame/video/1942.c
@@ -214,7 +214,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap,const rec
sx = spriteram[offs + 3] - 0x10 * (spriteram[offs + 1] & 0x10);
sy = spriteram[offs + 2];
dir = 1;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 240 - sy;
@@ -229,7 +229,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap,const rec
{
drawgfx(bitmap,machine->gfx[2],
code + i,col,
- flip_screen,flip_screen,
+ flip_screen_get(),flip_screen_get(),
sx,sy + 16 * i * dir,
cliprect,TRANSPARENCY_PEN,15);
diff --git a/src/mame/video/1943.c b/src/mame/video/1943.c
index c2086d86e3d..4137e961b90 100644
--- a/src/mame/video/1943.c
+++ b/src/mame/video/1943.c
@@ -205,7 +205,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
int sx = spriteram[offs + 3] - ((attr & 0x10) << 4);
int sy = spriteram[offs + 2];
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 240 - sy;
@@ -216,7 +216,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
{
if (color != 0x0a && color != 0x0b)
{
- drawgfx(bitmap, machine->gfx[3], code, color, flip_screen, flip_screen,
+ drawgfx(bitmap, machine->gfx[3], code, color, flip_screen_get(), flip_screen_get(),
sx, sy, cliprect, TRANSPARENCY_PEN, 0);
}
}
@@ -224,7 +224,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
{
if (color == 0x0a || color == 0x0b)
{
- drawgfx(bitmap, machine->gfx[3], code, color, flip_screen, flip_screen,
+ drawgfx(bitmap, machine->gfx[3], code, color, flip_screen_get(), flip_screen_get(),
sx, sy, cliprect, TRANSPARENCY_PEN, 0);
}
}
diff --git a/src/mame/video/aeroboto.c b/src/mame/video/aeroboto.c
index 2f3c8e82723..61df84016a5 100644
--- a/src/mame/video/aeroboto.c
+++ b/src/mame/video/aeroboto.c
@@ -75,7 +75,7 @@ VIDEO_START( aeroboto )
READ8_HANDLER( aeroboto_in0_r )
{
- return readinputport(flip_screen ? 1 : 0);
+ return readinputport(flip_screen_get() ? 1 : 0);
}
WRITE8_HANDLER( aeroboto_3000_w )
@@ -126,7 +126,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
int x = spriteram[offs+3];
int y = 240 - spriteram[offs];
- if (flip_screen)
+ if (flip_screen_get())
{
x = 248 - x;
y = 240 - y;
@@ -135,7 +135,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
drawgfx(bitmap, machine->gfx[1],
spriteram[offs+1],
spriteram[offs+2] & 0x07,
- flip_screen, flip_screen,
+ flip_screen_get(), flip_screen_get(),
((x + 8) & 0xff) - 8, y,
cliprect, TRANSPARENCY_PEN, 0);
}
diff --git a/src/mame/video/ambush.c b/src/mame/video/ambush.c
index 262b2119832..84ae381a146 100644
--- a/src/mame/video/ambush.c
+++ b/src/mame/video/ambush.c
@@ -73,7 +73,7 @@ static void draw_chars(running_machine *machine, mame_bitmap *bitmap, const rect
code = videoram[offs] | ((col & 0x60) << 3);
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 31 - sx;
sy = 31 - sy;
@@ -83,7 +83,7 @@ static void draw_chars(running_machine *machine, mame_bitmap *bitmap, const rect
drawgfx(bitmap,machine->gfx[0],
code,
(col & 0x0f) | ((*ambush_colorbank & 0x03) << 4),
- flip_screen,flip_screen,
+ flip_screen_get(),flip_screen_get(),
8*sx, (8*sy + scroll) & 0xff,
cliprect,transparency,0);
}
@@ -124,7 +124,7 @@ VIDEO_UPDATE( ambush )
/* 16x16 sprites */
gfx = 1;
- if (!flip_screen)
+ if (!flip_screen_get())
{
sy = 240 - sy;
}
@@ -139,7 +139,7 @@ VIDEO_UPDATE( ambush )
gfx = 0;
code <<= 2;
- if (!flip_screen)
+ if (!flip_screen_get())
{
sy = 248 - sy;
}
@@ -153,7 +153,7 @@ VIDEO_UPDATE( ambush )
flipx = spriteram[offs + 1] & 0x40;
flipy = spriteram[offs + 1] & 0x80;
- if (flip_screen)
+ if (flip_screen_get())
{
flipx = !flipx;
flipy = !flipy;
diff --git a/src/mame/video/amspdwy.c b/src/mame/video/amspdwy.c
index ba51acff88f..4c2820dcc2a 100644
--- a/src/mame/video/amspdwy.c
+++ b/src/mame/video/amspdwy.c
@@ -117,7 +117,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap,const rec
int flipx = attr & 0x80;
int flipy = attr & 0x40;
- if (flip_screen)
+ if (flip_screen_get())
{
x = max_x - x - 8; y = max_y - y - 8;
flipx = !flipx; flipy = !flipy;
diff --git a/src/mame/video/appoooh.c b/src/mame/video/appoooh.c
index 7ab560c9191..b811df680d5 100644
--- a/src/mame/video/appoooh.c
+++ b/src/mame/video/appoooh.c
@@ -220,7 +220,7 @@ static void appoooh_draw_sprites(mame_bitmap *dest_bmp,
if(sx>=248) sx -= 256;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 239 - sx;
sy = 239 - sy;
@@ -229,7 +229,7 @@ static void appoooh_draw_sprites(mame_bitmap *dest_bmp,
drawgfx( dest_bmp, gfx,
code,
color,
- flipx,flip_screen,
+ flipx,flip_screen_get(),
sx, sy,
cliprect,
TRANSPARENCY_PEN , 0);
@@ -253,7 +253,7 @@ static void robowres_draw_sprites(mame_bitmap *dest_bmp,
if(sx>=248) sx -= 256;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 239 - sx;
sy = 239 - sy;
@@ -262,7 +262,7 @@ static void robowres_draw_sprites(mame_bitmap *dest_bmp,
drawgfx( dest_bmp, gfx,
code,
color,
- flipx,flip_screen,
+ flipx,flip_screen_get(),
sx, sy,
cliprect,
TRANSPARENCY_PEN , 0);
diff --git a/src/mame/video/arkanoid.c b/src/mame/video/arkanoid.c
index 0334e9e9207..d0875729f65 100644
--- a/src/mame/video/arkanoid.c
+++ b/src/mame/video/arkanoid.c
@@ -26,12 +26,12 @@ WRITE8_HANDLER( arkanoid_d008_w )
int bank;
/* bits 0 and 1 flip X and Y, I don't know which is which */
- if (flip_screen_x != (data & 0x01)) {
+ if (flip_screen_x_get() != (data & 0x01)) {
flip_screen_x_set(data & 0x01);
tilemap_mark_all_tiles_dirty(bg_tilemap);
}
- if (flip_screen_y != (data & 0x02)) {
+ if (flip_screen_y_get() != (data & 0x02)) {
flip_screen_y_set(data & 0x02);
tilemap_mark_all_tiles_dirty(bg_tilemap);
}
@@ -99,21 +99,21 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
sx = spriteram[offs];
sy = 248 - spriteram[offs + 1];
- if (flip_screen_x) sx = 248 - sx;
- if (flip_screen_y) sy = 248 - sy;
+ if (flip_screen_x_get()) sx = 248 - sx;
+ if (flip_screen_y_get()) sy = 248 - sy;
code = spriteram[offs + 3] + ((spriteram[offs + 2] & 0x03) << 8) + 1024 * gfxbank;
drawgfx(bitmap,machine->gfx[0],
2 * code,
((spriteram[offs + 2] & 0xf8) >> 3) + 32 * palettebank,
- flip_screen_x,flip_screen_y,
- sx,sy + (flip_screen_y ? 8 : -8),
+ flip_screen_x_get(),flip_screen_y_get(),
+ sx,sy + (flip_screen_y_get() ? 8 : -8),
cliprect,TRANSPARENCY_PEN,0);
drawgfx(bitmap,machine->gfx[0],
2 * code + 1,
((spriteram[offs + 2] & 0xf8) >> 3) + 32 * palettebank,
- flip_screen_x,flip_screen_y,
+ flip_screen_x_get(),flip_screen_y_get(),
sx,sy,
cliprect,TRANSPARENCY_PEN,0);
}
diff --git a/src/mame/video/armedf.c b/src/mame/video/armedf.c
index cfb80f24027..3e9deb9973f 100644
--- a/src/mame/video/armedf.c
+++ b/src/mame/video/armedf.c
@@ -241,7 +241,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
int sx = buffered_spriteram16[offs+3];
int sy = sprite_offy+240-(buffered_spriteram16[offs+0]&0x1ff);
- if (flip_screen) {
+ if (flip_screen_get()) {
sx = 320 - sx + 176; /* don't ask where 176 comes from, just tried it out */
sy = 240 - sy + 1; /* don't ask where 1 comes from, just tried it out */
flipx = !flipx; /* the values seem to result in pixel-correct placement */
diff --git a/src/mame/video/bagman.c b/src/mame/video/bagman.c
index 1dfa53a4cbe..ab0dd2b8773 100644
--- a/src/mame/video/bagman.c
+++ b/src/mame/video/bagman.c
@@ -85,7 +85,7 @@ PALETTE_INIT( bagman )
WRITE8_HANDLER( bagman_flipscreen_w )
{
- if (flip_screen != (data & 0x01))
+ if (flip_screen_get() != (data & 0x01))
{
flip_screen_set(data & 0x01);
tilemap_mark_all_tiles_dirty(bg_tilemap);
@@ -120,12 +120,12 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
sy = 240 - spriteram[offs + 2];
flipx = spriteram[offs] & 0x40;
flipy = spriteram[offs] & 0x80;
- if (flip_screen_x)
+ if (flip_screen_x_get())
{
sx = 240 - sx +1; /* compensate misplacement */
flipx = !flipx;
}
- if (flip_screen_y)
+ if (flip_screen_y_get())
{
sy = 240 - sy;
flipy = !flipy;
diff --git a/src/mame/video/bankp.c b/src/mame/video/bankp.c
index 9dbeefe8643..43e70197bd2 100644
--- a/src/mame/video/bankp.c
+++ b/src/mame/video/bankp.c
@@ -166,7 +166,7 @@ VIDEO_START( bankp )
VIDEO_UPDATE( bankp )
{
- if (flip_screen)
+ if (flip_screen_get())
{
tilemap_set_scrollx(fg_tilemap, 0, -scroll_x);
tilemap_set_scrollx(bg_tilemap, 0, 0);
diff --git a/src/mame/video/baraduke.c b/src/mame/video/baraduke.c
index e0bbff95c7b..0d57b9884f3 100644
--- a/src/mame/video/baraduke.c
+++ b/src/mame/video/baraduke.c
@@ -261,7 +261,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
sy -= 16 * sizey;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 496+3 - 16 * sizex - sx;
sy = 240 - 16 * sizey - sy;
@@ -296,7 +296,7 @@ static void set_scroll(int layer)
scrollx = xscroll[layer] + xdisp[layer];
scrolly = yscroll[layer] + 9;
- if (flip_screen)
+ if (flip_screen_get())
{
scrollx = -scrollx + 3;
scrolly = -scrolly;
@@ -313,10 +313,8 @@ VIDEO_UPDATE( baraduke )
/* flip screen is embedded in the sprite control registers */
/* can't use flip_screen_set() because the visible area is asymmetrical */
- /* FIXME: flip_screen_x should not be written. The above issue needs */
- /* some other solution */
- flip_screen_x = spriteram[0x07f6] & 0x01;
- tilemap_set_flip(ALL_TILEMAPS,flip_screen ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0);
+ flip_screen_set_no_update(spriteram[0x07f6] & 0x01);
+ tilemap_set_flip(ALL_TILEMAPS,flip_screen_get() ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0);
set_scroll(0);
set_scroll(1);
diff --git a/src/mame/video/battlane.c b/src/mame/video/battlane.c
index f437d2f3523..206fe862be3 100644
--- a/src/mame/video/battlane.c
+++ b/src/mame/video/battlane.c
@@ -183,7 +183,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
flipx = attr & 0x04;
flipy = attr & 0x02;
- if (!flip_screen)
+ if (!flip_screen_get())
{
sx = 240 - sx;
sy = 240 - sy;
@@ -227,7 +227,7 @@ static void draw_fg_bitmap(running_machine *machine, mame_bitmap *bitmap )
if (data)
{
- if (flip_screen)
+ if (flip_screen_get())
*BITMAP_ADDR16(bitmap, 255 - y, 255 - x) = data;
else
*BITMAP_ADDR16(bitmap, y, x) = data;
diff --git a/src/mame/video/battlex.c b/src/mame/video/battlex.c
index 7f1b273a988..45103fe15d9 100644
--- a/src/mame/video/battlex.c
+++ b/src/mame/video/battlex.c
@@ -61,7 +61,7 @@ WRITE8_HANDLER( battlex_flipscreen_w )
/* bit 7 is flip screen */
- if (flip_screen != (data & 0x80))
+ if (flip_screen_get() != (data & 0x80))
{
flip_screen_set(data & 0x80);
tilemap_mark_all_tiles_dirty(ALL_TILEMAPS);
@@ -97,7 +97,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
int flipy = source[1] & 0x80;
int flipx = source[1] & 0x40;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/bionicc.c b/src/mame/video/bionicc.c
index 20c7b19b15e..abf62ae4e2e 100644
--- a/src/mame/video/bionicc.c
+++ b/src/mame/video/bionicc.c
@@ -199,7 +199,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
int sx = (INT16)buffered_spriteram16[offs+3]; /* signed */
int sy = (INT16)buffered_spriteram16[offs+2]; /* signed */
if(sy>512-16) sy-=512;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/bking.c b/src/mame/video/bking.c
index 7770c8a91ba..d9a84d53f1e 100644
--- a/src/mame/video/bking.c
+++ b/src/mame/video/bking.c
@@ -149,10 +149,9 @@ WRITE8_HANDLER( bking_cont1_w )
coin_lockout_global_w(~data & 0x01);
- /* FIXME: flip_screen_x should not be written. */
- flip_screen_x = data & 0x04;
+ flip_screen_set_no_update(data & 0x04);
- tilemap_set_flip(ALL_TILEMAPS, flip_screen ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0);
+ tilemap_set_flip(ALL_TILEMAPS, flip_screen_get() ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0);
controller = data & 0x02;
@@ -324,8 +323,8 @@ VIDEO_EOF( bking )
latch = 0x0400;
}
- tilemap_set_scrollx(bg_tilemap, 0, flip_screen ? -xld : xld);
- tilemap_set_scrolly(bg_tilemap, 0, flip_screen ? -yld : yld);
+ tilemap_set_scrollx(bg_tilemap, 0, flip_screen_get() ? -xld : xld);
+ tilemap_set_scrolly(bg_tilemap, 0, flip_screen_get() ? -yld : yld);
tilemap_draw(helper0, &rect, bg_tilemap, 0, 0);
@@ -351,8 +350,8 @@ VIDEO_EOF( bking )
int col = (xld + x) / 8 + 1;
int row = (yld + y) / 8 + 0;
- latch |= (flip_screen ? 31 - col : col) << 0;
- latch |= (flip_screen ? 31 - row : row) << 5;
+ latch |= (flip_screen_get() ? 31 - col : col) << 0;
+ latch |= (flip_screen_get() ? 31 - row : row) << 5;
pc3259_output[0] = (latch >> 0x0) & 0xf;
pc3259_output[1] = (latch >> 0x4) & 0xf;
diff --git a/src/mame/video/blktiger.c b/src/mame/video/blktiger.c
index 150f3154a20..aa68477a92c 100644
--- a/src/mame/video/blktiger.c
+++ b/src/mame/video/blktiger.c
@@ -209,7 +209,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
int color = attr & 0x07;
int flipx = attr & 0x08;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 240 - sy;
@@ -219,7 +219,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
drawgfx(bitmap,machine->gfx[2],
code,
color,
- flipx,flip_screen,
+ flipx,flip_screen_get(),
sx,sy,
cliprect,TRANSPARENCY_PEN,15);
}
diff --git a/src/mame/video/blueprnt.c b/src/mame/video/blueprnt.c
index 068246b842e..29db221461d 100644
--- a/src/mame/video/blueprnt.c
+++ b/src/mame/video/blueprnt.c
@@ -97,7 +97,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
int flipx = spriteram[offs + 2] & 0x40;
int flipy = spriteram[offs + 2 - 4] & 0x80; // -4? Awkward, isn't it?
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 248 - sx;
sy = 240 - sy;
@@ -115,7 +115,7 @@ VIDEO_UPDATE( blueprnt )
{
int i;
- if (flip_screen)
+ if (flip_screen_get())
for (i = 0; i < 32; i++)
tilemap_set_scrolly(bg_tilemap, i, blueprnt_scrollram[32 - i]);
else
diff --git a/src/mame/video/bogeyman.c b/src/mame/video/bogeyman.c
index a5579ed9296..248928aefb7 100644
--- a/src/mame/video/bogeyman.c
+++ b/src/mame/video/bogeyman.c
@@ -118,7 +118,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
if (multi) sy -= 16;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 240 - sy;
@@ -138,7 +138,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
drawgfx(bitmap,machine->gfx[2],
code + 1, color,
flipx, flipy,
- sx, sy + (flip_screen ? -16 : 16),
+ sx, sy + (flip_screen_get() ? -16 : 16),
cliprect,
TRANSPARENCY_PEN, 0);
}
diff --git a/src/mame/video/bombjack.c b/src/mame/video/bombjack.c
index aedb3704093..03b22021be5 100644
--- a/src/mame/video/bombjack.c
+++ b/src/mame/video/bombjack.c
@@ -35,7 +35,7 @@ WRITE8_HANDLER( bombjack_background_w )
WRITE8_HANDLER( bombjack_flipscreen_w )
{
- if (flip_screen != (data & 0x01))
+ if (flip_screen_get() != (data & 0x01))
{
flip_screen_set(data & 0x01);
tilemap_mark_all_tiles_dirty(ALL_TILEMAPS);
@@ -106,7 +106,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
sy = 241-spriteram[offs+2];
flipx = spriteram[offs+1] & 0x40;
flipy = spriteram[offs+1] & 0x80;
- if (flip_screen)
+ if (flip_screen_get())
{
if (spriteram[offs+1] & 0x20)
{
diff --git a/src/mame/video/boogwing.c b/src/mame/video/boogwing.c
index e12e55ecbf2..1e00b72b2ea 100644
--- a/src/mame/video/boogwing.c
+++ b/src/mame/video/boogwing.c
@@ -5,7 +5,7 @@
static void draw_sprites(running_machine *machine, mame_bitmap *bitmap,const rectangle *cliprect, UINT16* spriteram_base, int gfx_region)
{
int offs;
- int flipscreen=!flip_screen;
+ int flipscreen=!flip_screen_get();
for (offs = 0x400-4;offs >= 0;offs -= 4)
{
diff --git a/src/mame/video/bosco.c b/src/mame/video/bosco.c
index 5dcd96a0569..bba38429f1c 100644
--- a/src/mame/video/bosco.c
+++ b/src/mame/video/bosco.c
@@ -222,7 +222,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
int flipx = spriteram[offs] & 1;
int flipy = spriteram[offs] & 2;
int color = spriteram_2[offs + 1] & 0x3f;
- if (flip_screen) sx += 32-2;
+ if (flip_screen_get()) sx += 32-2;
drawgfx(bitmap,machine->gfx[1],
(spriteram[offs] & 0xfc) >> 2,
@@ -245,7 +245,7 @@ static void draw_bullets(running_machine *machine, mame_bitmap *bitmap, const re
x = bosco_radarx[offs] + ((~bosco_radarattr[offs] & 0x01) << 8);
y = 253 - bosco_radary[offs];
- if (flip_screen) x -= 3;
+ if (flip_screen_get()) x -= 3;
drawgfx(bitmap,machine->gfx[2],
((bosco_radarattr[offs] & 0x0e) >> 1) ^ 0x07,
@@ -280,7 +280,7 @@ static void draw_stars(running_machine *machine, mame_bitmap *bitmap, const rect
/* dont draw the stars that are off the screen */
if ( x < 224 && y < 224 )
{
- if (flip_screen) x += 64;
+ if (flip_screen_get()) x += 64;
if (y >= machine->screen[0].visarea.min_y && y <= machine->screen[0].visarea.max_y)
*BITMAP_ADDR16(bitmap, y, x) = STARS_COLOR_BASE + star_seed_tab[star_cntr].col;
@@ -297,7 +297,7 @@ VIDEO_UPDATE( bosco )
the screen, and clip it to only the position where it is supposed to be shown */
rectangle fg_clip = *cliprect;
rectangle bg_clip = *cliprect;
- if (flip_screen)
+ if (flip_screen_get())
{
bg_clip.min_x = 8*8;
fg_clip.max_x = 8*8-1;
diff --git a/src/mame/video/btime.c b/src/mame/video/btime.c
index 94dad1cd00d..018efd02b04 100644
--- a/src/mame/video/btime.c
+++ b/src/mame/video/btime.c
@@ -334,7 +334,7 @@ static void draw_chars(running_machine *machine, mame_bitmap *bitmap, const rect
/* check priority */
if ((priority != -1) && (priority != ((code >> 7) & 0x01))) continue;
- if (flip_screen)
+ if (flip_screen_get())
{
x = 31 - x;
y = 31 - y;
@@ -343,7 +343,7 @@ static void draw_chars(running_machine *machine, mame_bitmap *bitmap, const rect
drawgfx(bitmap,machine->gfx[0],
code,
color,
- flip_screen,flip_screen,
+ flip_screen_get(),flip_screen_get(),
8*x,8*y,
cliprect,transparency,0);
}
@@ -370,7 +370,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
flipx = sprite_ram[offs + 0] & 0x04;
flipy = sprite_ram[offs + 0] & 0x02;
- if (flip_screen)
+ if (flip_screen_get())
{
x = 240 - x;
y = 240 - y + sprite_y_adjust_flip_screen;
@@ -388,7 +388,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
x, y,
cliprect,TRANSPARENCY_PEN,0);
- y = y + (flip_screen ? -256 : 256);
+ y = y + (flip_screen_get() ? -256 : 256);
// Wrap around
drawgfx(bitmap,machine->gfx[1],
@@ -422,7 +422,7 @@ static void draw_background(running_machine *machine, mame_bitmap *bitmap, const
int x = 240 - (16 * (offs / 16) + scroll);
int y = 16 * (offs % 16);
- if (flip_screen)
+ if (flip_screen_get())
{
x = 240 - x;
y = 240 - y;
@@ -431,7 +431,7 @@ static void draw_background(running_machine *machine, mame_bitmap *bitmap, const
drawgfx(bitmap, machine->gfx[2],
memory_region(REGION_GFX3)[tileoffset + offs],
color,
- flip_screen,flip_screen,
+ flip_screen_get(),flip_screen_get(),
x,y,
cliprect,TRANSPARENCY_NONE,0);
}
@@ -485,7 +485,7 @@ VIDEO_UPDATE( btime )
// Generate tile map
static UINT8 btime_tilemap[4];
- if (flip_screen)
+ if (flip_screen_get())
start = 0;
else
start = 1;
@@ -566,7 +566,7 @@ VIDEO_UPDATE( bnj )
sy = 16 * (((offs % 0x100) < 0x80) ? offs % 8 : (offs % 8) + 8);
sx = 496 - sx;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 496 - sx;
sy = 240 - sy;
@@ -575,14 +575,14 @@ VIDEO_UPDATE( bnj )
drawgfx(background_bitmap, machine->gfx[2],
(bnj_backgroundram[offs] >> 4) + ((offs & 0x80) >> 3) + 32,
0,
- flip_screen, flip_screen,
+ flip_screen_get(), flip_screen_get(),
sx, sy,
0, TRANSPARENCY_NONE, 0);
}
/* copy the background bitmap to the screen */
scroll = (bnj_scroll1 & 0x02) * 128 + 511 - bnj_scroll2;
- if (!flip_screen)
+ if (!flip_screen_get())
scroll = 767-scroll;
copyscrollbitmap (bitmap, background_bitmap, 1, &scroll, 0, 0, cliprect);
@@ -613,7 +613,7 @@ VIDEO_UPDATE( cookrace )
sx = 31 - (offs / 32);
sy = offs % 32;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 31 - sx;
sy = 31 - sy;
@@ -622,7 +622,7 @@ VIDEO_UPDATE( cookrace )
drawgfx(bitmap, machine->gfx[2],
bnj_backgroundram[offs],
0,
- flip_screen, flip_screen,
+ flip_screen_get(), flip_screen_get(),
8*sx,8*sy,
cliprect, TRANSPARENCY_NONE, 0);
}
diff --git a/src/mame/video/bublbobl.c b/src/mame/video/bublbobl.c
index 84c886e53ec..b140936a9fe 100644
--- a/src/mame/video/bublbobl.c
+++ b/src/mame/video/bublbobl.c
@@ -75,7 +75,7 @@ VIDEO_UPDATE( bublbobl )
x = sx + xc * 8;
y = (sy + yc * 8) & 0xff;
- if (flip_screen)
+ if (flip_screen_get())
{
x = 248 - x;
y = 248 - y;
diff --git a/src/mame/video/buggychl.c b/src/mame/video/buggychl.c
index 20554726df2..d42d590a107 100644
--- a/src/mame/video/buggychl.c
+++ b/src/mame/video/buggychl.c
@@ -111,13 +111,13 @@ static void draw_bg(running_machine *machine, mame_bitmap *bitmap, const rectang
int sx = offs % 32;
int sy = offs / 32;
- if (flip_screen_x) sx = 31 - sx;
- if (flip_screen_y) sy = 31 - sy;
+ if (flip_screen_x_get()) sx = 31 - sx;
+ if (flip_screen_y_get()) sy = 31 - sy;
drawgfx(tmpbitmap1,machine->gfx[0],
code,
2,
- flip_screen_x,flip_screen_y,
+ flip_screen_x_get(),flip_screen_y_get(),
8*sx,8*sy,
NULL,TRANSPARENCY_NONE,0);
}
@@ -150,13 +150,13 @@ static void draw_fg(running_machine *machine, mame_bitmap *bitmap, const rectang
int code = videoram[offs];
- if (flip_screen_x) sx = 31 - sx;
- if (flip_screen_y) sy = 31 - sy;
+ if (flip_screen_x_get()) sx = 31 - sx;
+ if (flip_screen_y_get()) sy = 31 - sy;
drawgfx(bitmap,machine->gfx[0],
code,
0,
- flip_screen_x,flip_screen_y,
+ flip_screen_x_get(),flip_screen_y_get(),
8*sx,8*sy,
cliprect,transp,0);
}
@@ -187,7 +187,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
for (y = 0;y < 64;y++)
{
- int dy = flip_screen_y ? (255 - sy - y) : (sy + y);
+ int dy = flip_screen_y_get() ? (255 - sy - y) : (sy + y);
if ((dy & ~0xff) == 0)
{
@@ -216,7 +216,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
col = pendata[x];
if (col)
{
- int dx = flip_screen_x ? (255 - sx - px) : (sx + px);
+ int dx = flip_screen_x_get() ? (255 - sx - px) : (sx + px);
if ((dx & ~0xff) == 0)
*BITMAP_ADDR16(bitmap, dy, dx) = sprite_color_base + col;
}
diff --git a/src/mame/video/cabal.c b/src/mame/video/cabal.c
index 5a4931b4c76..d3ff7fb86f7 100644
--- a/src/mame/video/cabal.c
+++ b/src/mame/video/cabal.c
@@ -119,7 +119,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
if ( sx>256 ) sx -= 512;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/cbuster.c b/src/mame/video/cbuster.c
index 50443e0f5ab..9b433375356 100644
--- a/src/mame/video/cbuster.c
+++ b/src/mame/video/cbuster.c
@@ -111,7 +111,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
inc = 1;
}
- if (flip_screen) {
+ if (flip_screen_get()) {
y=240-y;
x=240-x;
if (fx) fx=0; else fx=1;
diff --git a/src/mame/video/cclimber.c b/src/mame/video/cclimber.c
index 205f7717d94..f7f3ef86ca0 100644
--- a/src/mame/video/cclimber.c
+++ b/src/mame/video/cclimber.c
@@ -278,7 +278,7 @@ static void cclimber_draw_big_sprite(running_machine *machine, mame_bitmap *bitm
oy = 128 - cclimber_bigspriteram[2];
flipx = cclimber_bigspriteram[1] & 0x10;
flipy = cclimber_bigspriteram[1] & 0x20;
- if (flip_screen_y) /* only the Y direction has to be flipped */
+ if (flip_screen_y_get()) /* only the Y direction has to be flipped */
{
oy = 128 - oy;
flipy = !flipy;
@@ -328,12 +328,12 @@ VIDEO_UPDATE( cclimber )
/* vertical flipping flips two adjacent characters */
if (flipy) sy ^= 1;
- if (flip_screen_x)
+ if (flip_screen_x_get())
{
sx = 31 - sx;
flipx = !flipx;
}
- if (flip_screen_y)
+ if (flip_screen_y_get())
{
sy = 31 - sy;
flipy = !flipy;
@@ -353,12 +353,12 @@ VIDEO_UPDATE( cclimber )
int scroll[32];
- if (flip_screen_x)
+ if (flip_screen_x_get())
{
for (offs = 0;offs < 32;offs++)
{
scroll[offs] = -cclimber_column_scroll[31 - offs];
- if (flip_screen_y) scroll[offs] = -scroll[offs];
+ if (flip_screen_y_get()) scroll[offs] = -scroll[offs];
}
}
else
@@ -366,7 +366,7 @@ VIDEO_UPDATE( cclimber )
for (offs = 0;offs < 32;offs++)
{
scroll[offs] = -cclimber_column_scroll[offs];
- if (flip_screen_y) scroll[offs] = -scroll[offs];
+ if (flip_screen_y_get()) scroll[offs] = -scroll[offs];
}
}
@@ -390,12 +390,12 @@ VIDEO_UPDATE( cclimber )
sy = 240 - spriteram[offs + 2];
flipx = spriteram[offs] & 0x40;
flipy = spriteram[offs] & 0x80;
- if (flip_screen_x)
+ if (flip_screen_x_get())
{
sx = 240 - sx;
flipx = !flipx;
}
- if (flip_screen_y)
+ if (flip_screen_y_get())
{
sy = 240 - sy;
flipy = !flipy;
@@ -435,12 +435,12 @@ VIDEO_UPDATE( cannonb )
/* vertical flipping flips two adjacent characters */
if (flipy) sy ^= 1;
- if (flip_screen_x)
+ if (flip_screen_x_get())
{
sx = 31 - sx;
flipx = !flipx;
}
- if (flip_screen_y)
+ if (flip_screen_y_get())
{
sy = 31 - sy;
flipy = !flipy;
@@ -460,12 +460,12 @@ VIDEO_UPDATE( cannonb )
int scroll[32];
- if (flip_screen_x)
+ if (flip_screen_x_get())
{
for (offs = 0;offs < 32;offs++)
{
scroll[offs] = -cclimber_column_scroll[31 - offs];
- if (flip_screen_y) scroll[offs] = -scroll[offs];
+ if (flip_screen_y_get()) scroll[offs] = -scroll[offs];
}
}
else
@@ -473,7 +473,7 @@ VIDEO_UPDATE( cannonb )
for (offs = 0;offs < 32;offs++)
{
scroll[offs] = -cclimber_column_scroll[offs];
- if (flip_screen_y) scroll[offs] = -scroll[offs];
+ if (flip_screen_y_get()) scroll[offs] = -scroll[offs];
}
}
@@ -498,12 +498,12 @@ VIDEO_UPDATE( cannonb )
sy = 240 - spriteram[offs + 2];
flipx = spriteram[offs] & 0x40;
flipy = spriteram[offs] & 0x80;
- if (flip_screen_x)
+ if (flip_screen_x_get())
{
sx = 240 - sx;
flipx = !flipx;
}
- if (flip_screen_y)
+ if (flip_screen_y_get())
{
sy = 240 - sy;
flipy = !flipy;
@@ -547,12 +547,12 @@ VIDEO_UPDATE( swimmer )
color += 32;
}
- if (flip_screen_x)
+ if (flip_screen_x_get())
{
sx = 31 - sx;
flipx = !flipx;
}
- if (flip_screen_y)
+ if (flip_screen_y_get())
{
sy = 31 - sy;
flipy = !flipy;
@@ -572,7 +572,7 @@ VIDEO_UPDATE( swimmer )
int scroll[32];
- if (flip_screen_y)
+ if (flip_screen_y_get())
{
for (offs = 0;offs < 32;offs++)
scroll[offs] = cclimber_column_scroll[31 - offs];
@@ -603,12 +603,12 @@ VIDEO_UPDATE( swimmer )
sy = 240 - spriteram[offs + 2];
flipx = spriteram[offs] & 0x40;
flipy = spriteram[offs] & 0x80;
- if (flip_screen_x)
+ if (flip_screen_x_get())
{
sx = 240 - sx;
flipx = !flipx;
}
- if (flip_screen_y)
+ if (flip_screen_y_get())
{
sy = 240 - sy;
flipy = !flipy;
@@ -639,7 +639,7 @@ VIDEO_UPDATE( yamato )
for(i=8;i<256;i++)
{
- pen_t pen = 16*4+8*4 + memory_region(REGION_USER1)[(flip_screen_x?0x1280:0x1200)+(i>>1)];
+ pen_t pen = 16*4+8*4 + memory_region(REGION_USER1)[(flip_screen_x_get()?0x1280:0x1200)+(i>>1)];
for(j=0;j<256;j++)
{
@@ -661,12 +661,12 @@ VIDEO_UPDATE( yamato )
/* vertical flipping flips two adjacent characters */
if (flipy) sy ^= 1;
- if (flip_screen_x)
+ if (flip_screen_x_get())
{
sx = 31 - sx;
flipx = !flipx;
}
- if (flip_screen_y)
+ if (flip_screen_y_get())
{
sy = 31 - sy;
flipy = !flipy;
@@ -686,12 +686,12 @@ VIDEO_UPDATE( yamato )
int scroll[32];
- if (flip_screen_x)
+ if (flip_screen_x_get())
{
for (offs = 0;offs < 32;offs++)
{
scroll[offs] = -cclimber_column_scroll[31 - offs];
- if (flip_screen_y) scroll[offs] = -scroll[offs];
+ if (flip_screen_y_get()) scroll[offs] = -scroll[offs];
}
}
else
@@ -699,7 +699,7 @@ VIDEO_UPDATE( yamato )
for (offs = 0;offs < 32;offs++)
{
scroll[offs] = -cclimber_column_scroll[offs];
- if (flip_screen_y) scroll[offs] = -scroll[offs];
+ if (flip_screen_y_get()) scroll[offs] = -scroll[offs];
}
}
@@ -723,12 +723,12 @@ VIDEO_UPDATE( yamato )
sy = 240 - spriteram[offs + 2];
flipx = spriteram[offs] & 0x40;
flipy = spriteram[offs] & 0x80;
- if (flip_screen_x)
+ if (flip_screen_x_get())
{
sx = 240 - sx;
flipx = !flipx;
}
- if (flip_screen_y)
+ if (flip_screen_y_get())
{
sy = 240 - sy;
flipy = !flipy;
@@ -807,7 +807,7 @@ static void toprollr_draw_big_sprite(running_machine *machine, mame_bitmap *bitm
return;
}
- if (flip_screen_x)
+ if (flip_screen_x_get())
{
flipx^=1;
}
@@ -858,12 +858,12 @@ VIDEO_UPDATE( toprollr )
sy = 240 - spriteram[offs + 2];
flipx = spriteram[offs] & 0x40;
flipy = spriteram[offs] & 0x80;
- if (flip_screen_x)
+ if (flip_screen_x_get())
{
sx = 240 - sx;
flipx = !flipx;
}
- if (flip_screen_y)
+ if (flip_screen_y_get())
{
sy = 240 - sy;
flipy = !flipy;
@@ -893,12 +893,12 @@ VIDEO_UPDATE( toprollr )
int attr=(x>16)?(toprollr_videoram2[(y&0xfe)*32+x]):(toprollr_videoram2[y*32+x]);
int palette;
- if (flip_screen_x)
+ if (flip_screen_x_get())
{
sx = 240 - sx;
flipx^=1;
}
- if (flip_screen_y)
+ if (flip_screen_y_get())
{
sy = 240 - sy;
flipy^=1;
diff --git a/src/mame/video/champbas.c b/src/mame/video/champbas.c
index 1be9f42df4b..070d19f1501 100644
--- a/src/mame/video/champbas.c
+++ b/src/mame/video/champbas.c
@@ -117,7 +117,7 @@ WRITE8_HANDLER( champbas_palette_bank_w )
WRITE8_HANDLER( champbas_flipscreen_w )
{
- if (flip_screen != data)
+ if (flip_screen_get() != data)
{
flip_screen_set(data);
tilemap_mark_all_tiles_dirty(ALL_TILEMAPS);
diff --git a/src/mame/video/cheekyms.c b/src/mame/video/cheekyms.c
index 235984bf554..d950690f1c8 100644
--- a/src/mame/video/cheekyms.c
+++ b/src/mame/video/cheekyms.c
@@ -105,7 +105,7 @@ VIDEO_UPDATE( cheekyms )
if (v1 & 0x80)
{
- if (!flip_screen)
+ if (!flip_screen_get())
code++;
drawgfx(bitmap,machine->gfx[1],
@@ -160,7 +160,7 @@ VIDEO_UPDATE( cheekyms )
color = 0xc + char_palette;
}
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 31 - sx;
sy = 31 - sy;
@@ -169,7 +169,7 @@ VIDEO_UPDATE( cheekyms )
drawgfx(bitmap,machine->gfx[0],
videoram[offs],
color,
- flip_screen,flip_screen,
+ flip_screen_get(),flip_screen_get(),
8*sx, 8*sy - (man_area ? man_scroll : 0),
cliprect,TRANSPARENCY_PEN,0);
}
diff --git a/src/mame/video/circusc.c b/src/mame/video/circusc.c
index 75d705a7dd1..7e4388301d4 100644
--- a/src/mame/video/circusc.c
+++ b/src/mame/video/circusc.c
@@ -185,7 +185,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
int flipx = sr[offs + 1] & 0x40;
int flipy = sr[offs + 1] & 0x80;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/citycon.c b/src/mame/video/citycon.c
index 2d9904e82b6..cd0b7bf299d 100644
--- a/src/mame/video/citycon.c
+++ b/src/mame/video/citycon.c
@@ -120,7 +120,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
sx = spriteram[offs + 3];
sy = 239 - spriteram[offs];
flipx = ~spriteram[offs + 2] & 0x10;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 238 - sy;
@@ -130,7 +130,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
drawgfx(bitmap,machine->gfx[spriteram[offs + 1] & 0x80 ? 2 : 1],
spriteram[offs + 1] & 0x7f,
spriteram[offs + 2] & 0x0f,
- flipx,flip_screen,
+ flipx,flip_screen_get(),
sx,sy,
cliprect,TRANSPARENCY_PEN,0);
}
diff --git a/src/mame/video/cloak.c b/src/mame/video/cloak.c
index 445ffede982..e55e59b993c 100644
--- a/src/mame/video/cloak.c
+++ b/src/mame/video/cloak.c
@@ -210,7 +210,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
int sx = spriteram[offs + 192];
int sy = 240 - spriteram[offs];
- if (flip_screen)
+ if (flip_screen_get())
{
sx -= 9;
sy = 240 - sy;
diff --git a/src/mame/video/clshroad.c b/src/mame/video/clshroad.c
index a6fa1e6a237..17defcb98f4 100644
--- a/src/mame/video/clshroad.c
+++ b/src/mame/video/clshroad.c
@@ -305,7 +305,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
int flipy = 0;
x -= 0x4a/2;
- if (flip_screen)
+ if (flip_screen_get())
{
y = 240 - y;
flipx = !flipx;
diff --git a/src/mame/video/cninja.c b/src/mame/video/cninja.c
index 0651d5613b4..5103277d8b8 100644
--- a/src/mame/video/cninja.c
+++ b/src/mame/video/cninja.c
@@ -197,7 +197,7 @@ static void cninja_draw_sprites(running_machine *machine, mame_bitmap *bitmap, c
inc = 1;
}
- if (flip_screen) {
+ if (flip_screen_get()) {
y=240-y;
x=240-x;
if (fx) fx=0; else fx=1;
@@ -265,7 +265,7 @@ static void robocop2_draw_sprites(running_machine *machine, mame_bitmap *bitmap,
inc = 1;
}
- if (flip_screen) {
+ if (flip_screen_get()) {
y=240-y;
x=304-x;
if (fx) fx=0; else fx=1;
@@ -355,7 +355,7 @@ static void mutantf_draw_sprites(running_machine *machine, mame_bitmap *bitmap,
fx = (spriteptr[offs+0]&0x4000);
fy = (spriteptr[offs+0]&0x8000);
- if (flip_screen) {
+ if (flip_screen_get()) {
if (fx) fx=0; else fx=1;
if (fy) fy=0; else fy=1;
diff --git a/src/mame/video/commando.c b/src/mame/video/commando.c
index 0faab0f69ba..6cfd6895b47 100644
--- a/src/mame/video/commando.c
+++ b/src/mame/video/commando.c
@@ -113,7 +113,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
int sx = buffered_spriteram[offs + 3] - ((attr & 0x01) << 8);
int sy = buffered_spriteram[offs + 2];
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/cop01.c b/src/mame/video/cop01.c
index 877865a3afd..6d89328b112 100644
--- a/src/mame/video/cop01.c
+++ b/src/mame/video/cop01.c
@@ -185,7 +185,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
sx = (spriteram[offs+3] - 0x80) + 256 * (attr & 0x01);
sy = 240 - spriteram[offs];
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/cosmic.c b/src/mame/video/cosmic.c
index 023e2511efa..501c215de25 100644
--- a/src/mame/video/cosmic.c
+++ b/src/mame/video/cosmic.c
@@ -267,7 +267,7 @@ static void draw_bitmap(mame_bitmap *bitmap, const rectangle *cliprect)
{
if (data & 0x80)
{
- if (flip_screen)
+ if (flip_screen_get())
*BITMAP_ADDR16(bitmap, 255-y, 255-x) = pen;
else
*BITMAP_ADDR16(bitmap, y, x) = pen;
@@ -333,7 +333,7 @@ static void cosmica_draw_starfield(mame_bitmap *bitmap, const rectangle *cliprec
UINT8 x1;
int hc, hb_;
- if (flip_screen)
+ if (flip_screen_get())
x1 = x - cpu_getcurrentframe();
else
x1 = x + cpu_getcurrentframe();
@@ -404,7 +404,7 @@ static void devzone_draw_grid(mame_bitmap *bitmap, const rectangle *cliprect)
if (!(vert_data & horz_data & 0x80)) /* NAND gate */
{
/* blue */
- if (flip_screen)
+ if (flip_screen_get())
*BITMAP_ADDR16(bitmap, 255-y, 255-x) = 4;
else
*BITMAP_ADDR16(bitmap, y, x) = 4;
@@ -489,7 +489,7 @@ static void nomnlnd_draw_background(mame_bitmap *bitmap, const rectangle *clipre
if (!hd_ & hc_ & !hb_)
{
offs_t offs = ((x >> 3) & 0x03) | ((y & 0x1f) << 2) |
- (flip_screen ? 0x80 : 0);
+ (flip_screen_get() ? 0x80 : 0);
UINT8 plane1 = PROM[offs ] << (x & 0x07);
UINT8 plane2 = PROM[offs | 0x0400] << (x & 0x07);
@@ -523,7 +523,7 @@ static void nomnlnd_draw_background(mame_bitmap *bitmap, const rectangle *clipre
if (color != 0)
{
- if (flip_screen)
+ if (flip_screen_get())
*BITMAP_ADDR16(bitmap, 255-y, 255-x) = color;
else
*BITMAP_ADDR16(bitmap, y, x) = color;
diff --git a/src/mame/video/cps1.c b/src/mame/video/cps1.c
index 434b861c2fb..a487ba40d5d 100644
--- a/src/mame/video/cps1.c
+++ b/src/mame/video/cps1.c
@@ -1306,7 +1306,7 @@ static void cps1_render_sprites(running_machine *machine, mame_bitmap *bitmap, c
{
#define DRAWSPRITE(CODE,COLOR,FLIPX,FLIPY,SX,SY) \
{ \
- if (flip_screen) \
+ if (flip_screen_get()) \
pdrawgfx(bitmap,machine->gfx[2], \
CODE, \
COLOR, \
@@ -1549,7 +1549,7 @@ static void cps2_render_sprites(running_machine *machine, mame_bitmap *bitmap,co
{
#define DRAWSPRITE(CODE,COLOR,FLIPX,FLIPY,SX,SY) \
{ \
- if (flip_screen) \
+ if (flip_screen_get()) \
pdrawgfx(bitmap,machine->gfx[2], \
CODE, \
COLOR, \
@@ -1716,7 +1716,7 @@ static void cps1_render_stars(mame_bitmap *bitmap,const rectangle *cliprect)
int sy = (offs % 256);
sx = (sx - stars2x + (col & 0x1f)) & 0x1ff;
sy = (sy - stars2y) & 0xff;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 511 - sx;
sy = 255 - sy;
@@ -1742,7 +1742,7 @@ static void cps1_render_stars(mame_bitmap *bitmap,const rectangle *cliprect)
int sy = (offs % 256);
sx = (sx - stars1x + (col & 0x1f)) & 0x1ff;
sy = (sy - stars1y) & 0xff;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 511 - sx;
sy = 255 - sy;
diff --git a/src/mame/video/crbaloon.c b/src/mame/video/crbaloon.c
index 9ab4ef574c3..70be95c5c32 100644
--- a/src/mame/video/crbaloon.c
+++ b/src/mame/video/crbaloon.c
@@ -108,7 +108,7 @@ static void draw_sprite_and_check_collision(running_machine *machine, mame_bitma
UINT8 *gfx = memory_region(REGION_GFX2) + (code << 7);
- if (flip_screen)
+ if (flip_screen_get())
sy += 32;
/* assume no collision */
diff --git a/src/mame/video/cvs.c b/src/mame/video/cvs.c
index 45f98d1359c..67cbbc481bd 100644
--- a/src/mame/video/cvs.c
+++ b/src/mame/video/cvs.c
@@ -362,10 +362,10 @@ VIDEO_UPDATE( cvs )
{
if ((y & 1) ^ ((x >> 4) & 1))
{
- if (flip_screen_x)
+ if (flip_screen_x_get())
x = ~x;
- if (flip_screen_y)
+ if (flip_screen_y_get())
y = ~y;
if (colortable_entry_get_value(machine->colortable, *BITMAP_ADDR16(bitmap, y, x)) == 0)
diff --git a/src/mame/video/dassault.c b/src/mame/video/dassault.c
index eb17a11d652..001afa61dbd 100644
--- a/src/mame/video/dassault.c
+++ b/src/mame/video/dassault.c
@@ -72,7 +72,7 @@ static void draw_sprites(running_machine* machine, mame_bitmap *bitmap, const re
inc = 1;
}
- if (flip_screen) {
+ if (flip_screen_get()) {
y=240-y;
x=304-x;
if (fx) fx=0; else fx=1;
diff --git a/src/mame/video/ddragon.c b/src/mame/video/ddragon.c
index fe372213c17..c3db01bffcd 100644
--- a/src/mame/video/ddragon.c
+++ b/src/mame/video/ddragon.c
@@ -203,7 +203,7 @@ static void draw_sprites(running_machine* machine, mame_bitmap *bitmap,const rec
which = src[i+3] + ( ( src[i+2] & 0x0f ) << 8 );
}
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 256 - sy;
diff --git a/src/mame/video/ddragon3.c b/src/mame/video/ddragon3.c
index 1aa69293cbb..ad8b55d758f 100644
--- a/src/mame/video/ddragon3.c
+++ b/src/mame/video/ddragon3.c
@@ -45,7 +45,7 @@ READ16_HANDLER( ddragon3_scroll16_r )
case 1: return ddragon3_fg_scrolly;
case 2: return ddragon3_bg_scrollx;
case 3: return ddragon3_bg_scrolly;
- case 5: return flip_screen;
+ case 5: return flip_screen_get();
case 6: return ddragon3_bg_tilebase;
}
@@ -153,7 +153,7 @@ static void draw_sprites(running_machine* machine, mame_bitmap *bitmap, const re
if (attr & 0x02) sy = 239 + (0x100 - sy); else sy = 240 - sy;
if (sx > 0x17f) sx = 0 - (0x200 - sx);
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 304 - sx;
sy = 224 - sy;
@@ -164,7 +164,7 @@ static void draw_sprites(running_machine* machine, mame_bitmap *bitmap, const re
for (i = 0; i <= height; i++)
{
drawgfx(bitmap, machine->gfx[1], code + i, color, flipx, flipy,
- sx, sy + (flip_screen ? (i * 16) : (-i * 16)), cliprect,
+ sx, sy + (flip_screen_get() ? (i * 16) : (-i * 16)), cliprect,
TRANSPARENCY_PEN, 0);
}
}
diff --git a/src/mame/video/deadang.c b/src/mame/video/deadang.c
index 0b0e874413d..1eb06bdf67d 100644
--- a/src/mame/video/deadang.c
+++ b/src/mame/video/deadang.c
@@ -108,7 +108,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
color = (spriteram16[offs+1]>>12)&0xf;
sprite = spriteram16[offs+1]&0xfff;
- if (flip_screen) {
+ if (flip_screen_get()) {
x=240-x;
y=240-y;
if (fx) fx=0; else fx=1;
diff --git a/src/mame/video/dec0.c b/src/mame/video/dec0.c
index dc1e68040b4..ec7c07ae699 100644
--- a/src/mame/video/dec0.c
+++ b/src/mame/video/dec0.c
@@ -191,7 +191,7 @@ static void draw_sprites(running_machine* machine, mame_bitmap *bitmap,const rec
inc = 1;
}
- if (flip_screen) {
+ if (flip_screen_get()) {
y=240-y;
x=240-x;
if (fx) fx=0; else fx=1;
@@ -256,7 +256,7 @@ static void custom_tilemap_draw(mame_bitmap *bitmap,
doesn't affect any games.
*/
- if (flip_screen)
+ if (flip_screen_get())
src_y = (src_bitmap->height - 256) - scrolly;
else
src_y = scrolly;
@@ -267,7 +267,7 @@ static void custom_tilemap_draw(mame_bitmap *bitmap,
else
src_x=scrollx;
- if (flip_screen)
+ if (flip_screen_get())
src_x=(src_bitmap->width - 256) - src_x;
for (x=0; x<=cliprect->max_x; x++) {
diff --git a/src/mame/video/dec8.c b/src/mame/video/dec8.c
index 65332935ebf..3703088e8b1 100644
--- a/src/mame/video/dec8.c
+++ b/src/mame/video/dec8.c
@@ -276,7 +276,7 @@ static void draw_sprites1(running_machine* machine, mame_bitmap *bitmap, const r
y=(y+16)%0x200;
x=256 - x;
y=256 - y;
- if (flip_screen) {
+ if (flip_screen_get()) {
y=240-y;
x=240-x;
if (fx) fx=0; else fx=1;
@@ -348,7 +348,7 @@ static void draw_sprites2(running_machine* machine, mame_bitmap *bitmap, const r
inc = 1;
}
- if (flip_screen) {
+ if (flip_screen_get()) {
y=240-y;
x=240-x;
if (fx) fx=0; else fx=1;
@@ -394,7 +394,7 @@ static void srdarwin_draw_sprites(running_machine* machine, mame_bitmap *bitmap,
fx = buffered_spriteram[offs+1] & 0x04;
multi = buffered_spriteram[offs+1] & 0x10;
- if (flip_screen) {
+ if (flip_screen_get()) {
sy=240-sy;
sx=240-sx;
if (fx) fx=0; else fx=1;
@@ -405,14 +405,14 @@ static void srdarwin_draw_sprites(running_machine* machine, mame_bitmap *bitmap,
drawgfx(bitmap,machine->gfx[1],
code,
color,
- fx,flip_screen,
+ fx,flip_screen_get(),
sx,sy,
cliprect,TRANSPARENCY_PEN,0);
if (multi)
drawgfx(bitmap,machine->gfx[1],
code+1,
color,
- fx,flip_screen,
+ fx,flip_screen_get(),
sx,sy2,
cliprect,TRANSPARENCY_PEN,0);
}
diff --git a/src/mame/video/deco32.c b/src/mame/video/deco32.c
index 20782a6498e..3a83f7849c7 100644
--- a/src/mame/video/deco32.c
+++ b/src/mame/video/deco32.c
@@ -241,7 +241,7 @@ static void captaven_draw_sprites(running_machine* machine, mame_bitmap *bitmap,
fx = !(spritedata[offs+0]&0x4000);
fy = !(spritedata[offs+0]&0x8000);
- if (!flip_screen) {
+ if (!flip_screen_get()) {
sx = sx & 0x01ff;
sy = sy & 0x01ff;
if (sx>0x180) sx=-(0x200 - sx);
@@ -1213,7 +1213,7 @@ VIDEO_UPDATE( captaven )
static int last_pf3_bank;
flip_screen_set(deco32_pf12_control[0]&0x80);
- tilemap_set_flip(ALL_TILEMAPS,flip_screen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
+ tilemap_set_flip(ALL_TILEMAPS,flip_screen_get() ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
deco32_setup_scroll(pf1_tilemap, 256,(deco32_pf12_control[5]>>0)&0xff,(deco32_pf12_control[6]>>0)&0xff,deco32_pf12_control[2],deco32_pf12_control[1],deco32_pf1_rowscroll,deco32_pf1_rowscroll+0x200);
deco32_setup_scroll(pf1a_tilemap,512,(deco32_pf12_control[5]>>0)&0xff,(deco32_pf12_control[6]>>0)&0xff,deco32_pf12_control[2],deco32_pf12_control[1],deco32_pf1_rowscroll,deco32_pf1_rowscroll+0x200);
diff --git a/src/mame/video/decocass.c b/src/mame/video/decocass.c
index fc541dd04ea..78dcb4ed5a8 100644
--- a/src/mame/video/decocass.c
+++ b/src/mame/video/decocass.c
@@ -428,7 +428,7 @@ static void draw_sprites(running_machine* machine, mame_bitmap *bitmap, const re
flipx = sprite_ram[offs + 0] & 0x04;
flipy = sprite_ram[offs + 0] & 0x02;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 240 - sy + sprite_y_adjust_flip_screen;
@@ -446,7 +446,7 @@ static void draw_sprites(running_machine* machine, mame_bitmap *bitmap, const re
sx,sy,
cliprect, TRANSPARENCY_PEN, 0);
- sy += (flip_screen ? -256 : 256);
+ sy += (flip_screen_get() ? -256 : 256);
// Wrap around
drawgfx(bitmap,machine->gfx[1],
@@ -473,7 +473,7 @@ static void draw_missiles(mame_bitmap *bitmap, const rectangle *cliprect,
sy = 255 - missile_ram[offs + 0*interleave];
sx = 255 - missile_ram[offs + 2*interleave];
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 240 - sy + missile_y_adjust_flip_screen;
@@ -489,7 +489,7 @@ static void draw_missiles(mame_bitmap *bitmap, const rectangle *cliprect,
sy = 255 - missile_ram[offs + 1*interleave];
sx = 255 - missile_ram[offs + 3*interleave];
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 240 - sy + missile_y_adjust_flip_screen;
diff --git a/src/mame/video/dietgo.c b/src/mame/video/dietgo.c
index fd84f41ad1c..d473999289c 100644
--- a/src/mame/video/dietgo.c
+++ b/src/mame/video/dietgo.c
@@ -42,7 +42,7 @@ static void draw_sprites(running_machine* machine, mame_bitmap *bitmap,const rec
inc = 1;
}
- if (flip_screen)
+ if (flip_screen_get())
{
y=240-y;
x=304-x;
diff --git a/src/mame/video/digdug.c b/src/mame/video/digdug.c
index 305d26d4a1f..e219d696d87 100644
--- a/src/mame/video/digdug.c
+++ b/src/mame/video/digdug.c
@@ -134,9 +134,9 @@ static TILE_GET_INFO( tx_get_tile_info )
characters when screen is flipped, we have to flip them back. */
SET_TILE_INFO(
0,
- (code & 0x7f) | (flip_screen ? 0x80 : 0),
+ (code & 0x7f) | (flip_screen_get() ? 0x80 : 0),
color,
- flip_screen ? TILE_FLIPX : 0);
+ flip_screen_get() ? TILE_FLIPX : 0);
}
@@ -277,7 +277,7 @@ static void draw_sprites(running_machine* machine, mame_bitmap *bitmap, const re
if (size)
sprite = (sprite & 0xc0) | ((sprite & ~0xc0) << 2);
- if (flip_screen)
+ if (flip_screen_get())
{
flipx ^= 1;
flipy ^= 1;
diff --git a/src/mame/video/dkong.c b/src/mame/video/dkong.c
index 9ecbf052dca..931b2f59cf9 100644
--- a/src/mame/video/dkong.c
+++ b/src/mame/video/dkong.c
@@ -882,7 +882,7 @@ static VIDEO_START( dkong_base )
state_save_register_global(state->flip);
/* this must be registered here - hmmm */
- //state_save_register_global(flip_screen);
+ //state_save_register_global(flip_screen_get());
}
diff --git a/src/mame/video/docastle.c b/src/mame/video/docastle.c
index eb98b2e904b..1f486942cbf 100644
--- a/src/mame/video/docastle.c
+++ b/src/mame/video/docastle.c
@@ -188,7 +188,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
flipy = spriteram[offs + 2] & 0x80;
}
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/dogfgt.c b/src/mame/video/dogfgt.c
index 3a336e11bbf..71fa0bc4d11 100644
--- a/src/mame/video/dogfgt.c
+++ b/src/mame/video/dogfgt.c
@@ -128,7 +128,7 @@ static WRITE8_HANDLER( internal_bitmapram_w )
for (i = 0;i < 3;i++)
color |= ((bitmapram[offset + BITMAPRAM_SIZE/3 * i] >> subx) & 1) << i;
- if (flip_screen)
+ if (flip_screen_get())
*BITMAP_ADDR16(pixbitmap, y^0xff, (x+subx)^0xff) = PIXMAP_COLOR_BASE + 8*pixcolor + color;
else
*BITMAP_ADDR16(pixbitmap, y, x+subx) = PIXMAP_COLOR_BASE + 8*pixcolor + color;
@@ -199,7 +199,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap,const rec
sy = (240 - spriteram[offs+2]) & 0xff;
flipx = spriteram[offs] & 0x04;
flipy = spriteram[offs] & 0x02;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 240 - sy;
@@ -224,9 +224,9 @@ VIDEO_UPDATE( dogfgt )
int offs;
- if (lastflip != flip_screen || lastpixcolor != pixcolor)
+ if (lastflip != flip_screen_get() || lastpixcolor != pixcolor)
{
- lastflip = flip_screen;
+ lastflip = flip_screen_get();
lastpixcolor = pixcolor;
for (offs = 0;offs < BITMAPRAM_SIZE;offs++)
diff --git a/src/mame/video/dooyong.c b/src/mame/video/dooyong.c
index f701386a094..f1ae3e5b02a 100644
--- a/src/mame/video/dooyong.c
+++ b/src/mame/video/dooyong.c
@@ -413,7 +413,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
}
}
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 498 - sx;
sy = 240 - (16 * height) - sy;
@@ -475,7 +475,7 @@ static void rshark_draw_sprites(running_machine *machine, mame_bitmap *bitmap, c
width = buffered_spriteram16[offs+1] & 0x000f;
height = (buffered_spriteram16[offs+1] & 0x00f0) >> 4;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 498 - (16 * width) - sx;
sy = 240 - (16 * height) - sy;
diff --git a/src/mame/video/dynduke.c b/src/mame/video/dynduke.c
index 4e4e3d7338e..72fc7c6102e 100644
--- a/src/mame/video/dynduke.c
+++ b/src/mame/video/dynduke.c
@@ -155,7 +155,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap,const rec
sprite = buffered_spriteram16[offs+1];
sprite &= 0x3fff;
- if (flip_screen) {
+ if (flip_screen_get()) {
x=240-x;
y=240-y;
if (fx) fx=0; else fx=1;
diff --git a/src/mame/video/esd16.c b/src/mame/video/esd16.c
index dc54246e222..6953e711754 100644
--- a/src/mame/video/esd16.c
+++ b/src/mame/video/esd16.c
@@ -215,7 +215,7 @@ static void esd16_draw_sprites(running_machine *machine, mame_bitmap *bitmap, co
sy = 0x100 - ((sy & 0xff) - (sy & 0x100));
sy -= dimy*16;
- if (flip_screen)
+ if (flip_screen_get())
{ flipx = !flipx; sx = max_x - sx - 1 * 16 + 2; // small offset
flipy = !flipy; sy = max_y - sy - dimy * 16; }
@@ -274,7 +274,7 @@ static void hedpanic_draw_sprites(running_machine *machine, mame_bitmap *bitmap,
sy = 0x1ff-sy;
- if (flip_screen)
+ if (flip_screen_get())
{ flipx = !flipx; sx = max_x - sx - 1 * 16 + 2; // small offset
flipy = !flipy; sy = max_y - sy - dimy * 16; }
diff --git a/src/mame/video/exctsccr.c b/src/mame/video/exctsccr.c
index bff77df3703..bff30dbaf94 100644
--- a/src/mame/video/exctsccr.c
+++ b/src/mame/video/exctsccr.c
@@ -122,7 +122,7 @@ WRITE8_HANDLER( exctsccr_gfx_bank_w )
WRITE8_HANDLER( exctsccr_flipscreen_w )
{
- if (flip_screen != data)
+ if (flip_screen_get() != data)
{
flip_screen_set(data);
tilemap_mark_all_tiles_dirty(ALL_TILEMAPS);
diff --git a/src/mame/video/exprraid.c b/src/mame/video/exprraid.c
index b7b31afff70..7cba9d554a2 100644
--- a/src/mame/video/exprraid.c
+++ b/src/mame/video/exprraid.c
@@ -18,7 +18,7 @@ WRITE8_HANDLER( exprraid_colorram_w )
WRITE8_HANDLER( exprraid_flipscreen_w )
{
- if (flip_screen != (data & 0x01))
+ if (flip_screen_get() != (data & 0x01))
{
flip_screen_set(data & 0x01);
tilemap_mark_all_tiles_dirty(ALL_TILEMAPS);
@@ -106,7 +106,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
int sx = ((248 - spriteram[offs + 2]) & 0xff) - 8;
int sy = spriteram[offs];
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 240 - sy;
@@ -127,7 +127,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
drawgfx(bitmap,machine->gfx[1],
code + 1, color,
flipx, flipy,
- sx, sy + (flip_screen ? -16 : 16),
+ sx, sy + (flip_screen_get() ? -16 : 16),
cliprect, TRANSPARENCY_PEN, 0);
}
}
diff --git a/src/mame/video/exzisus.c b/src/mame/video/exzisus.c
index ebf098a5321..ffc9fbcf06c 100644
--- a/src/mame/video/exzisus.c
+++ b/src/mame/video/exzisus.c
@@ -138,7 +138,7 @@ VIDEO_UPDATE( exzisus )
x = (sx + (xc << 3)) & 0xff;
y = (sy + (yc << 3)) & 0xff;
- if (flip_screen)
+ if (flip_screen_get())
{
x = 248 - x;
y = 248 - y;
@@ -147,7 +147,7 @@ VIDEO_UPDATE( exzisus )
drawgfx(bitmap, machine->gfx[0],
code & 0x3fff,
color,
- flip_screen, flip_screen,
+ flip_screen_get(), flip_screen_get(),
x, y,
cliprect, TRANSPARENCY_PEN, 15);
goffs += 2;
@@ -208,7 +208,7 @@ VIDEO_UPDATE( exzisus )
x = (sx + (xc << 3)) & 0xff;
y = (sy + (yc << 3)) & 0xff;
- if (flip_screen)
+ if (flip_screen_get())
{
x = 248 - x;
y = 248 - y;
@@ -217,7 +217,7 @@ VIDEO_UPDATE( exzisus )
drawgfx(bitmap, machine->gfx[1],
code & 0x3fff,
color,
- flip_screen, flip_screen,
+ flip_screen_get(), flip_screen_get(),
x, y,
cliprect, TRANSPARENCY_PEN, 15);
goffs += 2;
diff --git a/src/mame/video/fastfred.c b/src/mame/video/fastfred.c
index 89ca824515a..6f7a6fbb1c1 100644
--- a/src/mame/video/fastfred.c
+++ b/src/mame/video/fastfred.c
@@ -223,21 +223,21 @@ WRITE8_HANDLER( fastfred_colorbank2_w )
WRITE8_HANDLER( fastfred_flip_screen_x_w )
{
- if (flip_screen_x != (data & 0x01))
+ if (flip_screen_x_get() != (data & 0x01))
{
- flip_screen_x = data & 0x01;
+ flip_screen_x_set(data & 0x01);
- tilemap_set_flip(bg_tilemap, (flip_screen_x ? TILEMAP_FLIPX : 0) | (flip_screen_y ? TILEMAP_FLIPY : 0));
+ tilemap_set_flip(bg_tilemap, (flip_screen_x_get() ? TILEMAP_FLIPX : 0) | (flip_screen_y_get() ? TILEMAP_FLIPY : 0));
}
}
WRITE8_HANDLER( fastfred_flip_screen_y_w )
{
- if (flip_screen_y != (data & 0x01))
+ if (flip_screen_y_get() != (data & 0x01))
{
- flip_screen_y = data & 0x01;
+ flip_screen_y_set(data & 0x01);
- tilemap_set_flip(bg_tilemap, (flip_screen_x ? TILEMAP_FLIPX : 0) | (flip_screen_y ? TILEMAP_FLIPY : 0));
+ tilemap_set_flip(bg_tilemap, (flip_screen_x_get() ? TILEMAP_FLIPX : 0) | (flip_screen_y_get() ? TILEMAP_FLIPY : 0));
}
}
@@ -303,12 +303,12 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
}
- if (flip_screen_x)
+ if (flip_screen_x_get())
{
sx = 240 - sx;
flipx = !flipx;
}
- if (flip_screen_y)
+ if (flip_screen_y_get())
{
sy = 240 - sy;
flipy = !flipy;
@@ -319,7 +319,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
colorbank | (fastfred_spriteram[offs + 2] & 0x07),
flipx,flipy,
sx,sy,
- flip_screen_x ? &spritevisibleareaflipx : &spritevisiblearea,TRANSPARENCY_PEN,0);
+ flip_screen_x_get() ? &spritevisibleareaflipx : &spritevisiblearea,TRANSPARENCY_PEN,0);
}
}
diff --git a/src/mame/video/firetrap.c b/src/mame/video/firetrap.c
index 18abf857da9..a0a5739b7a1 100644
--- a/src/mame/video/firetrap.c
+++ b/src/mame/video/firetrap.c
@@ -227,7 +227,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
color = ((spriteram[offs + 1] & 0x08) >> 2) | (spriteram[offs + 1] & 0x01);
flipx = spriteram[offs + 1] & 0x04;
flipy = spriteram[offs + 1] & 0x02;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 240 - sy;
@@ -237,7 +237,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
if (spriteram[offs + 1] & 0x10) /* double width */
{
- if (flip_screen) sy -= 16;
+ if (flip_screen_get()) sy -= 16;
drawgfx(bitmap,machine->gfx[3],
code & ~1,
diff --git a/src/mame/video/flower.c b/src/mame/video/flower.c
index c83c3068e91..5455a622e52 100644
--- a/src/mame/video/flower.c
+++ b/src/mame/video/flower.c
@@ -79,7 +79,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
code |= ((source[2] & 0x01) << 6);
code |= ((source[2] & 0x08) << 4);
- if(flip_screen)
+ if(flip_screen_get())
{
flipx = !flipx;
flipy = !flipy;
@@ -173,7 +173,7 @@ VIDEO_UPDATE( flower )
draw_sprites(machine,bitmap,cliprect);
- if(flip_screen)
+ if(flip_screen_get())
{
myclip.min_x = cliprect->min_x;
myclip.max_x = cliprect->min_x + 15;
diff --git a/src/mame/video/freekick.c b/src/mame/video/freekick.c
index 79948d5fd07..4706b4a65d5 100644
--- a/src/mame/video/freekick.c
+++ b/src/mame/video/freekick.c
@@ -44,12 +44,12 @@ static void gigas_draw_sprites(running_machine *machine, mame_bitmap *bitmap, co
int flipy = 0;
int color = spriteram[offs + 1] & 0x1f;
- if (flip_screen_x)
+ if (flip_screen_x_get())
{
xpos = 240 - xpos;
flipx = !flipx;
}
- if (flip_screen_y)
+ if (flip_screen_y_get())
{
ypos = 256 - ypos;
flipy = !flipy;
@@ -79,12 +79,12 @@ static void pbillrd_draw_sprites(running_machine *machine, mame_bitmap *bitmap,
int flipy = 0;//spriteram[offs + 0] & 0x40;
int color = spriteram[offs + 1] & 0x0f;
- if (flip_screen_x)
+ if (flip_screen_x_get())
{
xpos = 240 - xpos;
flipx = !flipx;
}
- if (flip_screen_y)
+ if (flip_screen_y_get())
{
ypos = 256 - ypos;
flipy = !flipy;
@@ -115,12 +115,12 @@ static void freekick_draw_sprites(running_machine *machine, mame_bitmap *bitmap,
int flipy = spriteram[offs + 2] & 0x40;
int color = spriteram[offs + 2] & 0x1f;
- if (flip_screen_x)
+ if (flip_screen_x_get())
{
xpos = 240 - xpos;
flipx = !flipx;
}
- if (flip_screen_y)
+ if (flip_screen_y_get())
{
ypos = 256 - ypos;
flipy = !flipy;
diff --git a/src/mame/video/funkybee.c b/src/mame/video/funkybee.c
index db7e1f181fc..46e821b4eae 100644
--- a/src/mame/video/funkybee.c
+++ b/src/mame/video/funkybee.c
@@ -65,7 +65,7 @@ WRITE8_HANDLER( funkybee_gfx_bank_w )
WRITE8_HANDLER( funkybee_scroll_w )
{
- tilemap_set_scrollx(bg_tilemap, 0, flip_screen ? -data : data);
+ tilemap_set_scrollx(bg_tilemap, 0, flip_screen_get() ? -data : data);
}
WRITE8_HANDLER( funkybee_flipscreen_w )
@@ -108,7 +108,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
int sx = videoram[offs2 + 0x10];
int sy = 224 - colorram[offs2];
- if (flip_screen)
+ if (flip_screen_get())
{
sy += 32;
flipx = !flipx;
@@ -133,7 +133,7 @@ static void draw_columns(running_machine *machine, mame_bitmap *bitmap, const re
int sx = videoram[0x1f10];
int sy = offs * 8;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 248 - sx;
sy = 248 - sy;
@@ -141,7 +141,7 @@ static void draw_columns(running_machine *machine, mame_bitmap *bitmap, const re
drawgfx(bitmap,machine->gfx[gfx_bank],
code, color,
- flip_screen, flip_screen,
+ flip_screen_get(), flip_screen_get(),
sx, sy,
cliprect,TRANSPARENCY_PEN,0);
@@ -150,7 +150,7 @@ static void draw_columns(running_machine *machine, mame_bitmap *bitmap, const re
sx = videoram[0x1f11];
sy = offs * 8;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 248 - sx;
sy = 248 - sy;
@@ -158,7 +158,7 @@ static void draw_columns(running_machine *machine, mame_bitmap *bitmap, const re
drawgfx(bitmap,machine->gfx[gfx_bank],
code, color,
- flip_screen, flip_screen,
+ flip_screen_get(), flip_screen_get(),
sx, sy,
cliprect,TRANSPARENCY_PEN,0);
}
diff --git a/src/mame/video/funkyjet.c b/src/mame/video/funkyjet.c
index 7cb17a3d782..fa1e845dace 100644
--- a/src/mame/video/funkyjet.c
+++ b/src/mame/video/funkyjet.c
@@ -54,7 +54,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
inc = 1;
}
- if (flip_screen)
+ if (flip_screen_get())
{
y=240-y;
x=304-x;
diff --git a/src/mame/video/fuukifg2.c b/src/mame/video/fuukifg2.c
index c9ce289b4d2..c92a0aae2ac 100644
--- a/src/mame/video/fuukifg2.c
+++ b/src/mame/video/fuukifg2.c
@@ -186,7 +186,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
sx = (sx & 0x1ff) - (sx & 0x200);
sy = (sy & 0x1ff) - (sy & 0x200);
- if (flip_screen)
+ if (flip_screen_get())
{ flipx = !flipx; sx = max_x - sx - xnum * 16;
flipy = !flipy; sy = max_y - sy - ynum * 16; }
@@ -313,8 +313,8 @@ VIDEO_UPDATE( fuuki16 )
/* Layers scrolling */
- scrolly_offs = fuuki16_vregs[0xc/2] - (flip_screen ? 0x103 : 0x1f3);
- scrollx_offs = fuuki16_vregs[0xe/2] - (flip_screen ? 0x2a7 : 0x3f6);
+ scrolly_offs = fuuki16_vregs[0xc/2] - (flip_screen_get() ? 0x103 : 0x1f3);
+ scrollx_offs = fuuki16_vregs[0xe/2] - (flip_screen_get() ? 0x2a7 : 0x3f6);
layer0_scrolly = fuuki16_vregs[0x0/2] + scrolly_offs;
layer0_scrollx = fuuki16_vregs[0x2/2] + scrollx_offs;
diff --git a/src/mame/video/fuukifg3.c b/src/mame/video/fuukifg3.c
index 789b2256002..a01be32c219 100644
--- a/src/mame/video/fuukifg3.c
+++ b/src/mame/video/fuukifg3.c
@@ -210,7 +210,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
sx = (sx & 0x1ff) - (sx & 0x200);
sy = (sy & 0x1ff) - (sy & 0x200);
- if (flip_screen)
+ if (flip_screen_get())
{ flipx = !flipx; sx = max_x - sx - xnum * 16;
flipy = !flipy; sy = max_y - sy - ynum * 16; }
@@ -344,8 +344,8 @@ VIDEO_UPDATE( fuuki32 )
/* Layers scrolling */
- scrolly_offs = ((fuuki32_vregs[0xc/4]&0xffff0000)>>16) - (flip_screen ? 0x103 : 0x1f3);
- scrollx_offs = (fuuki32_vregs[0xc/4]&0x0000ffff) - (flip_screen ? 0x2c7 : 0x3f6);
+ scrolly_offs = ((fuuki32_vregs[0xc/4]&0xffff0000)>>16) - (flip_screen_get() ? 0x103 : 0x1f3);
+ scrollx_offs = (fuuki32_vregs[0xc/4]&0x0000ffff) - (flip_screen_get() ? 0x2c7 : 0x3f6);
layer0_scrolly = ((fuuki32_vregs[0x0/4]&0xffff0000)>>16) + scrolly_offs;
layer0_scrollx = ((fuuki32_vregs[0x0/4]&0x0000ffff)) + scrollx_offs;
diff --git a/src/mame/video/gaiden.c b/src/mame/video/gaiden.c
index bd30042a6da..05292cbe7ec 100644
--- a/src/mame/video/gaiden.c
+++ b/src/mame/video/gaiden.c
@@ -328,7 +328,7 @@ static void gaiden_draw_sprites(running_machine *machine, mame_bitmap *bitmap, c
if (ypos >= 256)
ypos -= 512;
- if (flip_screen)
+ if (flip_screen_get())
{
flipx = !flipx;
flipy = !flipy;
@@ -424,7 +424,7 @@ static void raiga_draw_sprites(running_machine *machine, mame_bitmap *bitmap_bg,
if (ypos >= 256)
ypos -= 512;
- if (flip_screen)
+ if (flip_screen_get())
{
flipx = !flipx;
flipy = !flipy;
diff --git a/src/mame/video/galaga.c b/src/mame/video/galaga.c
index f4662c66d4e..9f281a0fbf5 100644
--- a/src/mame/video/galaga.c
+++ b/src/mame/video/galaga.c
@@ -424,9 +424,9 @@ static TILE_GET_INFO( get_tile_info )
int color = galaga_videoram[tile_index + 0x400] & 0x3f;
SET_TILE_INFO(
0,
- (galaga_videoram[tile_index] & 0x7f) | (flip_screen ? 0x80 : 0) | (galaga_gfxbank << 8),
+ (galaga_videoram[tile_index] & 0x7f) | (flip_screen_get() ? 0x80 : 0) | (galaga_gfxbank << 8),
color,
- flip_screen ? TILE_FLIPX : 0);
+ flip_screen_get() ? TILE_FLIPX : 0);
tileinfo->group = color;
}
@@ -516,7 +516,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
int sizey = (spriteram_3[offs] & 0x08) >> 3;
int x,y;
- if (flip_screen)
+ if (flip_screen_get())
{
flipx ^= 1;
flipy ^= 1;
diff --git a/src/mame/video/galaxian.c b/src/mame/video/galaxian.c
index 13e679159db..d13aeb293af 100644
--- a/src/mame/video/galaxian.c
+++ b/src/mame/video/galaxian.c
@@ -1480,7 +1480,7 @@ static void dambustr_draw_bullets(running_machine *machine, mame_bitmap *bitmap,
{
int i, color;
- if (flip_screen_x) x++;
+ if (flip_screen_x_get()) x++;
x = x - 6;
@@ -1664,7 +1664,7 @@ static void dambustr_draw_background(running_machine *machine, mame_bitmap *bitm
int col1 = BACKGROUND_COLOR_BASE + dambustr_bg_color_1;
int col2 = BACKGROUND_COLOR_BASE + dambustr_bg_color_2;
- if (flip_screen_x)
+ if (flip_screen_x_get())
{
plot_box(bitmap, 0, 0, 256-dambustr_bg_split_line, 256, col2);
plot_box(bitmap, 256-dambustr_bg_split_line, 0, dambustr_bg_split_line, 256, col1);
@@ -1681,7 +1681,7 @@ static void dambustr_draw_upper_background(mame_bitmap *bitmap)
{
static rectangle clip = { 0, 0, 0, 0 };
- if (flip_screen_x)
+ if (flip_screen_x_get())
{
clip.min_x = 254 - dambustr_bg_split_line;
clip.max_x = dambustr_bg_split_line;
diff --git a/src/mame/video/gaplus.c b/src/mame/video/gaplus.c
index b757ebecad8..004fb1937cb 100644
--- a/src/mame/video/gaplus.c
+++ b/src/mame/video/gaplus.c
@@ -291,7 +291,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
int duplicate = spriteram_3[offs] & 0x80;
int x,y;
- if (flip_screen)
+ if (flip_screen_get())
{
flipx ^= 1;
flipy ^= 1;
diff --git a/src/mame/video/gberet.c b/src/mame/video/gberet.c
index 58b0e6e8882..19eca472d1e 100644
--- a/src/mame/video/gberet.c
+++ b/src/mame/video/gberet.c
@@ -153,7 +153,7 @@ static void gberet_draw_sprites(running_machine *machine, mame_bitmap *bitmap, c
int flipx = attr & 0x10;
int flipy = attr & 0x20;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 240 - sy;
@@ -206,7 +206,7 @@ static void gberetb_draw_sprites(running_machine *machine, mame_bitmap *bitmap,
int flipx = attr & 0x10;
int flipy = attr & 0x20;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/gladiatr.c b/src/mame/video/gladiatr.c
index a900dc096f9..3ffc836cd16 100644
--- a/src/mame/video/gladiatr.c
+++ b/src/mame/video/gladiatr.c
@@ -222,7 +222,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
int color = src[1] & 0x1f;
int x,y;
- if (flip_screen)
+ if (flip_screen_get())
{
xflip = !xflip;
yflip = !yflip;
@@ -292,9 +292,9 @@ VIDEO_UPDATE( gladiatr )
int scroll;
scroll = bg_scrollx + ((video_attributes & 0x04) << 6);
- tilemap_set_scrollx(bg_tilemap, 0, scroll ^ (flip_screen ? 0x0f : 0));
+ tilemap_set_scrollx(bg_tilemap, 0, scroll ^ (flip_screen_get() ? 0x0f : 0));
scroll = fg_scrollx + ((video_attributes & 0x08) << 5);
- tilemap_set_scrollx(fg_tilemap, 0, scroll ^ (flip_screen ? 0x0f : 0));
+ tilemap_set_scrollx(fg_tilemap, 0, scroll ^ (flip_screen_get() ? 0x0f : 0));
// always 0 anyway
tilemap_set_scrolly(bg_tilemap, 0, bg_scrolly);
diff --git a/src/mame/video/gng.c b/src/mame/video/gng.c
index c000b60b181..7608a245441 100644
--- a/src/mame/video/gng.c
+++ b/src/mame/video/gng.c
@@ -128,7 +128,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
int flipx = attributes & 0x04;
int flipy = attributes & 0x08;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/goindol.c b/src/mame/video/goindol.c
index f71cc75f03c..050ce845082 100644
--- a/src/mame/video/goindol.c
+++ b/src/mame/video/goindol.c
@@ -100,7 +100,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
sx = sprite_ram[offs];
sy = 240-sprite_ram[offs+1];
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 248 - sx;
sy = 248 - sy;
@@ -115,15 +115,15 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
drawgfx(bitmap,machine->gfx[gfxbank],
tile,
palette,
- flip_screen,flip_screen,
+ flip_screen_get(),flip_screen_get(),
sx,sy,
cliprect,
TRANSPARENCY_PEN, 0);
drawgfx(bitmap,machine->gfx[gfxbank],
tile+1,
palette,
- flip_screen,flip_screen,
- sx,sy + (flip_screen ? -8 : 8),
+ flip_screen_get(),flip_screen_get(),
+ sx,sy + (flip_screen_get() ? -8 : 8),
cliprect,
TRANSPARENCY_PEN, 0);
}
diff --git a/src/mame/video/gottlieb.c b/src/mame/video/gottlieb.c
index d6619982f9a..f8c7397f7b5 100644
--- a/src/mame/video/gottlieb.c
+++ b/src/mame/video/gottlieb.c
@@ -95,13 +95,13 @@ WRITE8_HANDLER( gottlieb_video_outputs_w )
background_priority = data & 0x01;
- if (flip_screen_x != (data & 0x02))
+ if (flip_screen_x_get() != (data & 0x02))
{
flip_screen_x_set(data & 0x02);
tilemap_mark_all_tiles_dirty(ALL_TILEMAPS);
}
- if (flip_screen_y != (data & 0x04))
+ if (flip_screen_y_get() != (data & 0x04))
{
flip_screen_y_set(data & 0x04);
tilemap_mark_all_tiles_dirty(ALL_TILEMAPS);
@@ -187,13 +187,13 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
int sy = (spriteram[offs]) - 13;
int code = (255 ^ spriteram[offs + 2]) + 256 * spritebank;
- if (flip_screen_x) sx = 233 - sx;
- if (flip_screen_y) sy = 244 - sy;
+ if (flip_screen_x_get()) sx = 233 - sx;
+ if (flip_screen_y_get()) sy = 244 - sy;
if (spriteram[offs] || spriteram[offs + 1]) /* needed to avoid garbage on screen */
drawgfx(bitmap, machine->gfx[1],
code, 0,
- flip_screen_x, flip_screen_y,
+ flip_screen_x_get(), flip_screen_y_get(),
sx,sy,
cliprect,
TRANSPARENCY_PEN, 0);
diff --git a/src/mame/video/gotya.c b/src/mame/video/gotya.c
index 82fbffc09af..02a1814a6cb 100644
--- a/src/mame/video/gotya.c
+++ b/src/mame/video/gotya.c
@@ -85,7 +85,7 @@ WRITE8_HANDLER( gotya_video_control_w )
scroll_bit_8 = data & 0x01;
- if (flip_screen != (data & 0x02))
+ if (flip_screen_get() != (data & 0x02))
{
flip_screen_set(data & 0x02);
tilemap_mark_all_tiles_dirty(ALL_TILEMAPS);
@@ -118,7 +118,7 @@ static void draw_status_row(running_machine *machine, mame_bitmap *bitmap, const
{
int row;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 35 - sx;
}
@@ -127,7 +127,7 @@ static void draw_status_row(running_machine *machine, mame_bitmap *bitmap, const
{
int sy;
- if (flip_screen)
+ if (flip_screen_get())
{
sy = row;
}
@@ -139,7 +139,7 @@ static void draw_status_row(running_machine *machine, mame_bitmap *bitmap, const
drawgfx(bitmap,machine->gfx[0],
gotya_videoram2[row * 32 + col],
gotya_videoram2[row * 32 + col + 0x10] & 0x0f,
- flip_screen_x, flip_screen_y,
+ flip_screen_x_get(), flip_screen_y_get(),
8 * sx, 8 * sy,
cliprect,
TRANSPARENCY_NONE, 0);
@@ -157,14 +157,14 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
int sx = 256 - spriteram[offs + 0x10] + (spriteram[offs + 0x01] & 0x01) * 256;
int sy = spriteram[offs + 0x00];
- if (flip_screen)
+ if (flip_screen_get())
{
sy = 240 - sy;
}
drawgfx(bitmap,machine->gfx[1],
code, color,
- flip_screen_x, flip_screen_y,
+ flip_screen_x_get(), flip_screen_y_get(),
sx, sy,
cliprect,
TRANSPARENCY_PEN, 0);
diff --git a/src/mame/video/gunsmoke.c b/src/mame/video/gunsmoke.c
index 6ed84829ae7..a69b2a71a5a 100644
--- a/src/mame/video/gunsmoke.c
+++ b/src/mame/video/gunsmoke.c
@@ -167,7 +167,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
if (bank == 3) bank += sprite3bank;
code += 256 * bank;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/hanaawas.c b/src/mame/video/hanaawas.c
index d1c769cd616..4b9b43b4892 100644
--- a/src/mame/video/hanaawas.c
+++ b/src/mame/video/hanaawas.c
@@ -75,13 +75,13 @@ WRITE8_HANDLER( hanaawas_colorram_w )
/* dirty both current and next offsets */
tilemap_mark_tile_dirty(bg_tilemap, offset);
- tilemap_mark_tile_dirty(bg_tilemap, (offset + (flip_screen ? -1 : 1)) & 0x03ff);
+ tilemap_mark_tile_dirty(bg_tilemap, (offset + (flip_screen_get() ? -1 : 1)) & 0x03ff);
}
WRITE8_HANDLER( hanaawas_portB_w )
{
/* bit 7 is flip screen */
- if (flip_screen != (~data & 0x80))
+ if (flip_screen_get() != (~data & 0x80))
{
flip_screen_set(~data & 0x80);
tilemap_mark_all_tiles_dirty(ALL_TILEMAPS);
@@ -91,7 +91,7 @@ WRITE8_HANDLER( hanaawas_portB_w )
static TILE_GET_INFO( get_bg_tile_info )
{
/* the color is determined by the current color byte, but the bank is via the previous one!!! */
- int offset = (tile_index + (flip_screen ? 1 : -1)) & 0x3ff;
+ int offset = (tile_index + (flip_screen_get() ? 1 : -1)) & 0x3ff;
int attr = colorram[offset];
int gfxbank = (attr & 0x40) >> 6;
int code = videoram[tile_index] + ((attr & 0x20) << 3);
diff --git a/src/mame/video/hexa.c b/src/mame/video/hexa.c
index 68549b2599d..45b48da130c 100644
--- a/src/mame/video/hexa.c
+++ b/src/mame/video/hexa.c
@@ -23,14 +23,14 @@ WRITE8_HANDLER( hexa_d008_w )
int bankaddress;
/* bit 0 = flipx (or y?) */
- if (flip_screen_x != (data & 0x01))
+ if (flip_screen_x_get() != (data & 0x01))
{
flip_screen_x_set(data & 0x01);
tilemap_mark_all_tiles_dirty(bg_tilemap);
}
/* bit 1 = flipy (or x?) */
- if (flip_screen_y != (data & 0x02))
+ if (flip_screen_y_get() != (data & 0x02))
{
flip_screen_y_set(data & 0x02);
tilemap_mark_all_tiles_dirty(bg_tilemap);
diff --git a/src/mame/video/higemaru.c b/src/mame/video/higemaru.c
index c964dab4fb1..15fafa61c2f 100644
--- a/src/mame/video/higemaru.c
+++ b/src/mame/video/higemaru.c
@@ -80,7 +80,7 @@ WRITE8_HANDLER( higemaru_c800_w )
coin_counter_w(1,data & 1);
/* bit 7 flips screen */
- if (flip_screen != (data & 0x80))
+ if (flip_screen_get() != (data & 0x80))
{
flip_screen_set(data & 0x80);
tilemap_mark_all_tiles_dirty(bg_tilemap);
@@ -114,7 +114,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
sy = spriteram[offs + 8];
flipx = spriteram[offs + 4] & 0x10;
flipy = spriteram[offs + 4] & 0x20;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/holeland.c b/src/mame/video/holeland.c
index ab5c75bf721..0ae90bed5be 100644
--- a/src/mame/video/holeland.c
+++ b/src/mame/video/holeland.c
@@ -120,13 +120,13 @@ static void holeland_draw_sprites(running_machine *machine, mame_bitmap *bitmap,
flipx = spriteram[offs+3] & 0x04;
flipy = spriteram[offs+3] & 0x08;
- if (flip_screen_x)
+ if (flip_screen_x_get())
{
flipx = !flipx;
sx = 240 - sx;
}
- if (flip_screen_y)
+ if (flip_screen_y_get())
{
flipy = !flipy;
sy = 240 - sy;
@@ -158,13 +158,13 @@ static void crzrally_draw_sprites(running_machine *machine, mame_bitmap *bitmap,
flipx = spriteram[offs+3] & 0x04;
flipy = spriteram[offs+3] & 0x08;
- if (flip_screen_x)
+ if (flip_screen_x_get())
{
flipx = !flipx;
sx = 240 - sx;
}
- if (flip_screen_y)
+ if (flip_screen_y_get())
{
flipy = !flipy;
sy = 240 - sy;
diff --git a/src/mame/video/hyperspt.c b/src/mame/video/hyperspt.c
index 488203a47b7..b18ec1794c1 100644
--- a/src/mame/video/hyperspt.c
+++ b/src/mame/video/hyperspt.c
@@ -105,7 +105,7 @@ WRITE8_HANDLER( hyperspt_colorram_w )
WRITE8_HANDLER( hyperspt_flipscreen_w )
{
- if (flip_screen != (data & 0x01))
+ if (flip_screen_get() != (data & 0x01))
{
flip_screen_set(data & 0x01);
tilemap_mark_all_tiles_dirty(ALL_TILEMAPS);
@@ -141,13 +141,13 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
int flipx = ~spriteram[offs] & 0x40;
int flipy = spriteram[offs] & 0x80;
- if (flip_screen)
+ if (flip_screen_get())
{
sy = 240 - sy;
flipy = !flipy;
}
- /* Note that this adjustment must be done AFTER handling flip_screen, thus */
+ /* Note that this adjustment must be done AFTER handling flip_screen_get(), thus */
/* proving that this is a hardware related "feature" */
sy += 1;
@@ -179,7 +179,7 @@ VIDEO_UPDATE( hyperspt )
for (row = 0; row < 32; row++)
{
int scrollx = hyperspt_scroll[row * 2] + (hyperspt_scroll[(row * 2) + 1] & 0x01) * 256;
- if (flip_screen) scrollx = -scrollx;
+ if (flip_screen_get()) scrollx = -scrollx;
tilemap_set_scrollx(bg_tilemap, row, scrollx);
}
diff --git a/src/mame/video/hyprduel.c b/src/mame/video/hyprduel.c
index b6c0af6ea3c..cde72abedb2 100644
--- a/src/mame/video/hyprduel.c
+++ b/src/mame/video/hyprduel.c
@@ -459,7 +459,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
gfxdata = base_gfx + (8*8*4/8) * (((attr & 0x000f) << 16) + code);
- if (flip_screen)
+ if (flip_screen_get())
{
flipx = !flipx; x = max_x - x - width;
flipy = !flipy; y = max_y - y - height;
diff --git a/src/mame/video/ironhors.c b/src/mame/video/ironhors.c
index 1cf40f496f9..5a689d99f17 100644
--- a/src/mame/video/ironhors.c
+++ b/src/mame/video/ironhors.c
@@ -124,7 +124,7 @@ WRITE8_HANDLER( ironhors_palettebank_w )
WRITE8_HANDLER( ironhors_flipscreen_w )
{
- if (flip_screen != (~data & 0x08))
+ if (flip_screen_get() != (~data & 0x08))
{
flip_screen_set(~data & 0x08);
tilemap_mark_all_tiles_dirty(ALL_TILEMAPS);
@@ -170,9 +170,9 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
int flipy = sr[offs+4] & 0x40;
int code = (sr[offs] << 2) + ((sr[offs+1] & 0x03) << 10) + ((sr[offs+1] & 0x0c) >> 2);
int color = ((sr[offs+1] & 0xf0)>>4) + 16 * palettebank;
- // int mod = flip_screen ? -8 : 8;
+ // int mod = flip_screen_get() ? -8 : 8;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 240 - sy;
@@ -193,7 +193,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
case 0x04: /* 16x8 */
{
- if (flip_screen) sy += 8; // this fixes the train wheels' position
+ if (flip_screen_get()) sy += 8; // this fixes the train wheels' position
drawgfx(bitmap,machine->gfx[2],
code & ~1,
diff --git a/src/mame/video/jack.c b/src/mame/video/jack.c
index e752d1811a5..51a3b578086 100644
--- a/src/mame/video/jack.c
+++ b/src/mame/video/jack.c
@@ -73,7 +73,7 @@ static void jack_draw_sprites(running_machine *machine, mame_bitmap *bitmap, con
flipx = (spriteram[offs + 3] & 0x80);
flipy = (spriteram[offs + 3] & 0x40);
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 248 - sx;
sy = 248 - sy;
@@ -154,7 +154,7 @@ static void joinem_draw_sprites(running_machine *machine, mame_bitmap *bitmap, c
flipx = (spriteram[offs + 3] & 0x80);
flipy = (spriteram[offs + 3] & 0x40);
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 248 - sx;
sy = 248 - sy;
diff --git a/src/mame/video/jackal.c b/src/mame/video/jackal.c
index 8efb8cca1ce..43ed483be8e 100644
--- a/src/mame/video/jackal.c
+++ b/src/mame/video/jackal.c
@@ -142,7 +142,7 @@ static void draw_sprites_region(running_machine *machine, mame_bitmap *bitmap, c
if (attr & 0x01) sx = sx - 256;
if (sy > 0xf0) sy = sy - 256;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 240 - sy;
@@ -155,7 +155,7 @@ static void draw_sprites_region(running_machine *machine, mame_bitmap *bitmap, c
int spritenum = sn1*4 + ((sn2 & (8+4)) >> 2) + ((sn2 & (2+1)) << 10);
int mod = -8;
- if (flip_screen)
+ if (flip_screen_get())
{
sx += 8;
sy -= 8;
@@ -164,7 +164,7 @@ static void draw_sprites_region(running_machine *machine, mame_bitmap *bitmap, c
if ((attr & 0x0C) == 0x0C)
{
- if (flip_screen) sy += 16;
+ if (flip_screen_get()) sy += 16;
DRAW_SPRITE(bank + 1, spritenum, sx, sy)
}
@@ -187,7 +187,7 @@ static void draw_sprites_region(running_machine *machine, mame_bitmap *bitmap, c
if (attr & 0x10)
{
- if (flip_screen)
+ if (flip_screen_get())
{
sx -= 16;
sy -= 16;
diff --git a/src/mame/video/jailbrek.c b/src/mame/video/jailbrek.c
index 41a53a8c74d..6f108e1eb5d 100644
--- a/src/mame/video/jailbrek.c
+++ b/src/mame/video/jailbrek.c
@@ -80,7 +80,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
int sx = spriteram[i + 2] - ((attr & 0x80) << 1);
int sy = spriteram[i + 3];
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/kan_panb.c b/src/mame/video/kan_panb.c
index b6575a6d19d..90fc9b3bd87 100644
--- a/src/mame/video/kan_panb.c
+++ b/src/mame/video/kan_panb.c
@@ -30,7 +30,7 @@ VIDEO_UPDATE( honeydol )
x = dx;
y = dy;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - x;
sy = 240 - y;
@@ -62,7 +62,7 @@ VIDEO_UPDATE( honeydol )
x = dx;
y = dy;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - x;
sy = 240 - y;
@@ -117,7 +117,7 @@ VIDEO_UPDATE( twinadv )
x = dx;
y = dy;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - x;
sy = 240 - y;
@@ -165,7 +165,7 @@ VIDEO_UPDATE( wintbob )
if (wrapr == 8) xpos -= 256;
- if (flip_screen)
+ if (flip_screen_get())
{
xpos = 240 - xpos;
ypos = 240 - ypos;
@@ -245,7 +245,7 @@ VIDEO_UPDATE( snowbro3 )
if (x > 511) x &= 0x1ff;
if (y > 511) y &= 0x1ff;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - x;
sy = 240 - y;
diff --git a/src/mame/video/kan_pand.c b/src/mame/video/kan_pand.c
index b9ab4d58d5a..3a5e97bc7d1 100644
--- a/src/mame/video/kan_pand.c
+++ b/src/mame/video/kan_pand.c
@@ -120,7 +120,7 @@ static void pandora_draw(running_machine *machine, mame_bitmap *bitmap, const re
y = dy;
}
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - x;
sy = 240 - y;
diff --git a/src/mame/video/kchamp.c b/src/mame/video/kchamp.c
index 9db7be340a3..5fd56c1b300 100644
--- a/src/mame/video/kchamp.c
+++ b/src/mame/video/kchamp.c
@@ -80,7 +80,7 @@ static void kchamp_draw_sprites(running_machine *machine, mame_bitmap *bitmap, c
int sx = spriteram[offs + 3] - 8;
int sy = 247 - spriteram[offs];
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 240 - sy;
@@ -108,7 +108,7 @@ static void kchampvs_draw_sprites(running_machine *machine, mame_bitmap *bitmap,
int sx = spriteram[offs + 3];
int sy = 240 - spriteram[offs];
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/kingobox.c b/src/mame/video/kingobox.c
index f3433776b78..3b282cbcf12 100644
--- a/src/mame/video/kingobox.c
+++ b/src/mame/video/kingobox.c
@@ -174,7 +174,7 @@ WRITE8_HANDLER( kingofb_f800_w )
tilemap_mark_all_tiles_dirty(bg_tilemap);
}
- if (flip_screen != (data & 0x80))
+ if (flip_screen_get() != (data & 0x80))
{
flip_screen_set(data & 0x80);
tilemap_mark_all_tiles_dirty(ALL_TILEMAPS);
@@ -229,7 +229,7 @@ static void kingofb_draw_sprites(running_machine *machine, mame_bitmap *bitmap,
sx = spriteram[roffs+1];
sy = spriteram[roffs];
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 240 - sy;
@@ -289,7 +289,7 @@ static void ringking_draw_sprites(running_machine *machine, mame_bitmap *bitmap,
int sx = spriteram[offs+2];
int sy = spriteram[offs];
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/ladybug.c b/src/mame/video/ladybug.c
index dc3781164bf..2939cb63d38 100644
--- a/src/mame/video/ladybug.c
+++ b/src/mame/video/ladybug.c
@@ -161,7 +161,7 @@ WRITE8_HANDLER( ladybug_colorram_w )
WRITE8_HANDLER( ladybug_flipscreen_w )
{
- if (flip_screen != (data & 0x01))
+ if (flip_screen_get() != (data & 0x01))
{
flip_screen_set(data & 0x01);
tilemap_mark_all_tiles_dirty(ALL_TILEMAPS);
@@ -250,7 +250,7 @@ WRITE8_HANDLER( sraider_io_w )
// bit3 = enable stars
// bit210 = stars speed/dir
- if (flip_screen != (data & 0x80))
+ if (flip_screen_get() != (data & 0x80))
{
flip_screen_set(data & 0x80);
tilemap_mark_all_tiles_dirty(ALL_TILEMAPS);
@@ -370,7 +370,7 @@ VIDEO_UPDATE( ladybug )
int sx = offs % 4;
int sy = offs / 4;
- if (flip_screen)
+ if (flip_screen_get())
tilemap_set_scrollx(bg_tilemap, offs, -videoram[32 * sx + sy]);
else
tilemap_set_scrollx(bg_tilemap, offs, videoram[32 * sx + sy]);
@@ -399,7 +399,7 @@ VIDEO_UPDATE( sraider )
int sx = offs % 4;
int sy = offs / 4;
- if (flip_screen)
+ if (flip_screen_get())
tilemap_set_scrollx(bg_tilemap, offs, -videoram[32 * sx + sy]);
else
tilemap_set_scrollx(bg_tilemap, offs, videoram[32 * sx + sy]);
@@ -409,7 +409,7 @@ VIDEO_UPDATE( sraider )
fillbitmap(bitmap,0,cliprect);
// draw the stars
- if (flip_screen)
+ if (flip_screen_get())
redclash_draw_stars(bitmap,cliprect,0x60,1,0x27,0xff);
else
redclash_draw_stars(bitmap,cliprect,0x60,1,0x00,0xd8);
@@ -418,7 +418,7 @@ VIDEO_UPDATE( sraider )
colortable_palette_set_color(machine->colortable, 0x40, MAKE_RGB(sraider_grid_color & 0x40 ? 0xff : 0,
sraider_grid_color & 0x20 ? 0xff : 0,
sraider_grid_color & 0x10 ? 0xff : 0));
- tilemap_draw(bitmap, cliprect, grid_tilemap, 0, flip_screen);
+ tilemap_draw(bitmap, cliprect, grid_tilemap, 0, flip_screen_get());
for (i = 0; i < 0x100; i++)
{
@@ -428,7 +428,7 @@ VIDEO_UPDATE( sraider )
int height = cliprect->max_y - cliprect->min_y + 1;
- if (flip_screen)
+ if (flip_screen_get())
x = ~x;
plot_box(bitmap, x, cliprect->min_y, 1, height, 0x81);
@@ -436,7 +436,7 @@ VIDEO_UPDATE( sraider )
}
// now the chars
- tilemap_draw(bitmap, cliprect, bg_tilemap, 0, flip_screen);
+ tilemap_draw(bitmap, cliprect, bg_tilemap, 0, flip_screen_get());
// now the sprites
draw_sprites(machine, bitmap, cliprect);
diff --git a/src/mame/video/lasso.c b/src/mame/video/lasso.c
index 139195949b8..7a82ba44976 100644
--- a/src/mame/video/lasso.c
+++ b/src/mame/video/lasso.c
@@ -231,11 +231,11 @@ WRITE8_HANDLER( lasso_colorram_w )
static WRITE8_HANDLER( lasso_flip_screen_w )
{
/* don't know which is which, but they are always set together */
- flip_screen_x = data & 0x01;
- flip_screen_y = data & 0x02;
+ flip_screen_x_set(data & 0x01);
+ flip_screen_y_set( data & 0x02);
- tilemap_set_flip(ALL_TILEMAPS, (flip_screen_x ? TILEMAP_FLIPX : 0) |
- (flip_screen_y ? TILEMAP_FLIPY : 0));
+ tilemap_set_flip(ALL_TILEMAPS, (flip_screen_x_get() ? TILEMAP_FLIPX : 0) |
+ (flip_screen_y_get() ? TILEMAP_FLIPY : 0));
}
@@ -309,13 +309,13 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
flipx = source[1] & 0x40;
flipy = source[1] & 0x80;
- if (flip_screen_x)
+ if (flip_screen_x_get())
{
sx = 240 - sx;
flipx = !flipx;
}
- if (flip_screen_y)
+ if (flip_screen_y_get())
{
flipy = !flipy;
}
@@ -352,7 +352,7 @@ static void draw_lasso(mame_bitmap *bitmap, const rectangle *cliprect)
UINT8 x;
UINT8 y = offs >> 5;
- if (flip_screen_y)
+ if (flip_screen_y_get())
y = ~y;
if ((y < cliprect->min_y) || (y > cliprect->max_y))
@@ -361,7 +361,7 @@ static void draw_lasso(mame_bitmap *bitmap, const rectangle *cliprect)
x = (offs & 0x1f) << 3;
data = lasso_bitmap_ram[offs];
- if (flip_screen_x)
+ if (flip_screen_x_get())
x = ~x;
for (bit = 0; bit < 8; bit++)
@@ -369,7 +369,7 @@ static void draw_lasso(mame_bitmap *bitmap, const rectangle *cliprect)
if ((data & 0x80) && (x >= cliprect->min_x) && (x <= cliprect->max_x))
*BITMAP_ADDR16(bitmap, y, x) = pen;
- if (flip_screen_x)
+ if (flip_screen_x_get())
x = x - 1;
else
x = x + 1;
diff --git a/src/mame/video/lastduel.c b/src/mame/video/lastduel.c
index 5bbf09a5e2e..2126eef5db7 100644
--- a/src/mame/video/lastduel.c
+++ b/src/mame/video/lastduel.c
@@ -214,7 +214,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
flipy = attr & sprite_flipy_mask; /* 0x40 for lastduel, 0x80 for madgear */
color = attr & 0x0f;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 496 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/liberate.c b/src/mame/video/liberate.c
index f2cf7083b15..9edac534c05 100644
--- a/src/mame/video/liberate.c
+++ b/src/mame/video/liberate.c
@@ -215,7 +215,7 @@ static void liberate_draw_sprites(running_machine *machine, mame_bitmap *bitmap,
if (multi && fy==0) sy-=16;
- if (flip_screen) {
+ if (flip_screen_get()) {
sy=240-sy;
sx=240-sx;
if (fy)
@@ -276,7 +276,7 @@ static void prosport_draw_sprites(running_machine *machine, mame_bitmap *bitmap,
// if (multi) sy-=16;
if (fy && multi) { code2=code; code++; }
- if (flip_screen) {
+ if (flip_screen_get()) {
sy=240-sy;
sx=240-sx;
if (fx) fx=0; else fx=1;
@@ -332,7 +332,7 @@ static void boomrang_draw_sprites(running_machine *machine, mame_bitmap *bitmap,
// if (multi) sy-=16;
if (fy && multi) { code2=code; code++; }
- if (flip_screen) {
+ if (flip_screen_get()) {
sy=240-sy;
sx=240-sx;
if (fx) fx=0; else fx=1;
diff --git a/src/mame/video/lkage.c b/src/mame/video/lkage.c
index b2aa6f67966..881165b61f3 100644
--- a/src/mame/video/lkage.c
+++ b/src/mame/video/lkage.c
@@ -127,12 +127,12 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
priority_mask = (0xf0);
}
- if (flip_screen_x)
+ if (flip_screen_x_get())
{
sx = 239 - sx - 24;
flipx = !flipx;
}
- if( flip_screen_y )
+ if( flip_screen_y_get() )
{
sy = 254 - 16*height - sy;
flipy = !flipy;
diff --git a/src/mame/video/lsasquad.c b/src/mame/video/lsasquad.c
index fa4be922a85..aeb6fd6d598 100644
--- a/src/mame/video/lsasquad.c
+++ b/src/mame/video/lsasquad.c
@@ -18,7 +18,7 @@ static void draw_layer(running_machine *machine, mame_bitmap *bitmap, const rect
base = 64 * scrollram[offs+1];
sx = 8*(offs/4) + scrollx;
- if (flip_screen) sx = 248 - sx;
+ if (flip_screen_get()) sx = 248 - sx;
sx &= 0xff;
for (y = 0;y < 32;y++)
@@ -26,7 +26,7 @@ static void draw_layer(running_machine *machine, mame_bitmap *bitmap, const rect
int attr;
sy = 8*y + scrolly;
- if (flip_screen) sy = 248 - sy;
+ if (flip_screen_get()) sy = 248 - sy;
sy &= 0xff;
attr = videoram[base + 2*y + 1];
@@ -36,14 +36,14 @@ static void draw_layer(running_machine *machine, mame_bitmap *bitmap, const rect
drawgfx(bitmap,machine->gfx[0],
code,
color,
- flip_screen,flip_screen,
+ flip_screen_get(),flip_screen_get(),
sx,sy,
cliprect,TRANSPARENCY_PEN,15);
if (sx > 248) /* wraparound */
drawgfx(bitmap,machine->gfx[0],
code,
color,
- flip_screen,flip_screen,
+ flip_screen_get(),flip_screen_get(),
sx-256,sy,
cliprect,TRANSPARENCY_PEN,15);
}
@@ -103,7 +103,7 @@ static int draw_layer_daikaiju(running_machine *machine, mame_bitmap *bitmap, co
base = 64 * lsasquad_scrollram[offs+1];
sx = scrollx+stepx;
- if (flip_screen) sx = 248 - sx;
+ if (flip_screen_get()) sx = 248 - sx;
sx &= 0xff;
for (y = 0;y < 32;y++)
@@ -111,7 +111,7 @@ static int draw_layer_daikaiju(running_machine *machine, mame_bitmap *bitmap, co
int attr;
sy = 8*y + scrolly;
- if (flip_screen) sy = 248 - sy;
+ if (flip_screen_get()) sy = 248 - sy;
sy &= 0xff;
attr = videoram[base + 2*y + 1];
@@ -124,14 +124,14 @@ static int draw_layer_daikaiju(running_machine *machine, mame_bitmap *bitmap, co
drawgfx(bitmap,machine->gfx[0],
code,
color,
- flip_screen,flip_screen,
+ flip_screen_get(),flip_screen_get(),
sx,sy,
cliprect,TRANSPARENCY_PEN,15);
if (sx > 248) /* wraparound */
drawgfx(bitmap,machine->gfx[0],
code,
color,
- flip_screen,flip_screen,
+ flip_screen_get(),flip_screen_get(),
sx-256,sy,
cliprect,TRANSPARENCY_PEN,15);
}
@@ -175,7 +175,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
flipx = attr & 0x40;
flipy = attr & 0x80;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/lwings.c b/src/mame/video/lwings.c
index b61c408954c..8a684d8e584 100644
--- a/src/mame/video/lwings.c
+++ b/src/mame/video/lwings.c
@@ -203,7 +203,7 @@ static void lwings_draw_sprites(running_machine *machine, mame_bitmap *bitmap, c
flipx = buffered_spriteram[offs + 1] & 0x02;
flipy = buffered_spriteram[offs + 1] & 0x04;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 240 - sy;
@@ -252,7 +252,7 @@ static void trojan_draw_sprites(running_machine *machine, mame_bitmap *bitmap, c
flipy = 1;
}
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/m52.c b/src/mame/video/m52.c
index e107cb05a88..9f22e432862 100644
--- a/src/mame/video/m52.c
+++ b/src/mame/video/m52.c
@@ -302,7 +302,7 @@ static void draw_background(running_machine *machine, mame_bitmap *bitmap, const
{
rectangle rect;
- if (flip_screen)
+ if (flip_screen_get())
{
xpos = 255 - xpos;
ypos = 255 - ypos - BGHEIGHT;
@@ -315,8 +315,8 @@ static void draw_background(running_machine *machine, mame_bitmap *bitmap, const
drawgfx(bitmap, machine->gfx[image],
0, 0,
- flip_screen,
- flip_screen,
+ flip_screen_get(),
+ flip_screen_get(),
xpos,
ypos,
cliprect,
@@ -324,8 +324,8 @@ static void draw_background(running_machine *machine, mame_bitmap *bitmap, const
drawgfx(bitmap, machine->gfx[image],
0, 0,
- flip_screen,
- flip_screen,
+ flip_screen_get(),
+ flip_screen_get(),
xpos - 256,
ypos,
cliprect,
@@ -334,7 +334,7 @@ static void draw_background(running_machine *machine, mame_bitmap *bitmap, const
rect.min_x = machine->screen[0].visarea.min_x;
rect.max_x = machine->screen[0].visarea.max_x;
- if (flip_screen)
+ if (flip_screen_get())
{
rect.min_y = ypos - BGHEIGHT;
rect.max_y = ypos - 1;
@@ -374,7 +374,7 @@ VIDEO_UPDATE( m52 )
draw_background(machine, bitmap, cliprect, bg1xpos, bg1ypos, 4); /* cityscape */
}
- tilemap_set_flip(bg_tilemap, flip_screen ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0);
+ tilemap_set_flip(bg_tilemap, flip_screen_get() ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0);
tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0);
@@ -398,7 +398,7 @@ VIDEO_UPDATE( m52 )
clip.min_y = 128, clip.max_y = 255;
/* adjust for flipping */
- if (flip_screen)
+ if (flip_screen_get())
{
int temp = clip.min_y;
clip.min_y = 255 - clip.max_y;
diff --git a/src/mame/video/m58.c b/src/mame/video/m58.c
index 7de6a43a474..01a02b7c1d5 100644
--- a/src/mame/video/m58.c
+++ b/src/mame/video/m58.c
@@ -241,7 +241,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
code2 = code1 + 0x40;
}
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy2 = 192 - sy1;
@@ -281,14 +281,14 @@ static void draw_panel( running_machine *machine, mame_bitmap *bitmap, const rec
0*8, 6*8-1,
1*8, 31*8-1
};
- rectangle clip = flip_screen ? clippanelflip : clippanel;
- int sx = flip_screen ? cliprect->min_x - 8 : cliprect->max_x + 1 - SCROLL_PANEL_WIDTH;
- int yoffs = flip_screen ? -40 : -16;
+ rectangle clip = flip_screen_get() ? clippanelflip : clippanel;
+ int sx = flip_screen_get() ? cliprect->min_x - 8 : cliprect->max_x + 1 - SCROLL_PANEL_WIDTH;
+ int yoffs = flip_screen_get() ? -40 : -16;
clip.min_y += machine->screen[0].visarea.min_y + yoffs;
clip.max_y += machine->screen[0].visarea.max_y + yoffs;
- copybitmap(bitmap, scroll_panel_bitmap, flip_screen, flip_screen,
+ copybitmap(bitmap, scroll_panel_bitmap, flip_screen_get(), flip_screen_get(),
sx, machine->screen[0].visarea.min_y + yoffs, &clip);
}
}
diff --git a/src/mame/video/m72.c b/src/mame/video/m72.c
index e575ef1779d..185b3fdb3f9 100644
--- a/src/mame/video/m72.c
+++ b/src/mame/video/m72.c
@@ -422,7 +422,7 @@ static void m72_draw_sprites(running_machine *machine, mame_bitmap *bitmap,const
h = 1 << ((m72_spriteram[offs+2] & 0x3000) >> 12);
sy -= 16 * h;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 512 - 16*w - sx;
sy = 284 - 16*h - sy;
@@ -474,7 +474,7 @@ static void majtitle_draw_sprites(running_machine *machine, mame_bitmap *bitmap,
h = 1 << ((spriteram16_2[offs+2] & 0x3000) >> 12);
sy -= 16 * h;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 512 - 16*w - sx;
sy = 256 - 16*h - sy;
diff --git a/src/mame/video/m92.c b/src/mame/video/m92.c
index a446ae721c4..76a7ee181c1 100644
--- a/src/mame/video/m92.c
+++ b/src/mame/video/m92.c
@@ -340,7 +340,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
x &= 0x1ff;
for (i=0; i<y_multi; i++)
{
- if (flip_screen) {
+ if (flip_screen_get()) {
pdrawgfx(bitmap,machine->gfx[1],
sprite + s_ptr,
colour,
diff --git a/src/mame/video/mappy.c b/src/mame/video/mappy.c
index adc4dc09697..a7f3821e298 100644
--- a/src/mame/video/mappy.c
+++ b/src/mame/video/mappy.c
@@ -427,7 +427,7 @@ void mappy_draw_sprites(running_machine *machine, mame_bitmap *bitmap, const rec
sprite &= ~sizex;
sprite &= ~(sizey << 1);
- if (flip_screen)
+ if (flip_screen_get())
{
flipx ^= 1;
flipy ^= 1;
@@ -502,7 +502,7 @@ static void phozon_draw_sprites(running_machine *machine, mame_bitmap *bitmap, c
int sizey = size[(spriteram_3[offs] & 0x30) >> 4];
int x,y;
- if (flip_screen)
+ if (flip_screen_get())
{
flipx ^= 1;
flipy ^= 1;
diff --git a/src/mame/video/markham.c b/src/mame/video/markham.c
index f893934809f..362913a156f 100644
--- a/src/mame/video/markham.c
+++ b/src/mame/video/markham.c
@@ -51,7 +51,7 @@ WRITE8_HANDLER( markham_videoram_w )
WRITE8_HANDLER( markham_flipscreen_w )
{
- if (flip_screen != (data & 0x01))
+ if (flip_screen_get() != (data & 0x01))
{
flip_screen_set(data & 0x01);
tilemap_mark_all_tiles_dirty(ALL_TILEMAPS);
@@ -84,15 +84,15 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
int chr = spriteram[offs+1];
int col = spriteram[offs+2];
- int fx = flip_screen;
- int fy = flip_screen;
+ int fx = flip_screen_get();
+ int fy = flip_screen_get();
int x = spriteram[offs+3];
int y = spriteram[offs+0];
int px,py;
col &= 0x3f ;
- if (flip_screen==0)
+ if (flip_screen_get()==0)
{
px = x-2;
py = 240-y;
diff --git a/src/mame/video/mermaid.c b/src/mame/video/mermaid.c
index 519069a0323..3ae368430f1 100644
--- a/src/mame/video/mermaid.c
+++ b/src/mame/video/mermaid.c
@@ -167,20 +167,20 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
code |= rougien_gfxbank1 * 0x2800;
code |= rougien_gfxbank2 * 0x2400;
- if (flip_screen_x)
+ if (flip_screen_x_get())
{
flipx = !flipx;
sx = 240 - sx;
}
- if (flip_screen_y)
+ if (flip_screen_y_get())
{
flipy = !flipy;
sy = 240 - sy;
}
drawgfx(bitmap, machine->gfx[1], code, color, flipx, flipy, sx, sy,
- (flip_screen_x ? &flip_spritevisiblearea : &spritevisiblearea),
+ (flip_screen_x_get() ? &flip_spritevisiblearea : &spritevisiblearea),
TRANSPARENCY_PEN, 0);
}
}
diff --git a/src/mame/video/metlclsh.c b/src/mame/video/metlclsh.c
index 5eb38373502..746bf7e3540 100644
--- a/src/mame/video/metlclsh.c
+++ b/src/mame/video/metlclsh.c
@@ -194,7 +194,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap,const rec
if (sx < -7) sx += 256;
sy = 240 - spriteram[offs+2];
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx; flipx = !flipx;
sy = 240 - sy; flipy = !flipy; if (sizey) sy+=16;
@@ -243,7 +243,7 @@ VIDEO_UPDATE( metlclsh )
if (metlclsh_scrollx[0] & 0x08) // background (if enabled)
{
/* The background seems to be always flipped along x */
- tilemap_set_flip(bg_tilemap, (flip_screen ? (TILEMAP_FLIPX|TILEMAP_FLIPY) : 0) ^ TILEMAP_FLIPX);
+ tilemap_set_flip(bg_tilemap, (flip_screen_get() ? (TILEMAP_FLIPX|TILEMAP_FLIPY) : 0) ^ TILEMAP_FLIPX);
tilemap_set_scrollx(bg_tilemap, 0,metlclsh_scrollx[1] + ((metlclsh_scrollx[0]&0x02)<<7) );
tilemap_draw(bitmap,cliprect,bg_tilemap,0,0);
}
diff --git a/src/mame/video/metro.c b/src/mame/video/metro.c
index 44dc8a7bdef..70d526b76ec 100644
--- a/src/mame/video/metro.c
+++ b/src/mame/video/metro.c
@@ -640,7 +640,7 @@ void metro_draw_sprites(running_machine *machine, mame_bitmap *bitmap, const rec
gfxdata = base_gfx + (8*8*4/8) * (((attr & 0x000f) << 16) + code);
- if (flip_screen)
+ if (flip_screen_get())
{
flipx = !flipx; x = max_x - x - width;
flipy = !flipy; y = max_y - y - height;
diff --git a/src/mame/video/mikie.c b/src/mame/video/mikie.c
index ab0e50a13f6..f391b0e79ba 100644
--- a/src/mame/video/mikie.c
+++ b/src/mame/video/mikie.c
@@ -113,7 +113,7 @@ WRITE8_HANDLER( mikie_palettebank_w )
WRITE8_HANDLER( mikie_flipscreen_w )
{
- if (flip_screen != (data & 0x01))
+ if (flip_screen_get() != (data & 0x01))
{
flip_screen_set(data & 0x01);
tilemap_mark_all_tiles_dirty(ALL_TILEMAPS);
@@ -149,7 +149,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
int flipx = ~spriteram[offs] & 0x10;
int flipy = spriteram[offs] & 0x20;
- if (flip_screen)
+ if (flip_screen_get())
{
sy = 242 - sy;
flipy = !flipy;
diff --git a/src/mame/video/mjkjidai.c b/src/mame/video/mjkjidai.c
index b23f6b163cf..d5a4ff872af 100644
--- a/src/mame/video/mjkjidai.c
+++ b/src/mame/video/mjkjidai.c
@@ -104,7 +104,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap,const rec
sx += (spriteram_2[offs] & 0x20) >> 5; // not sure about this
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 496 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/mouser.c b/src/mame/video/mouser.c
index a5940542803..7af0f585525 100644
--- a/src/mame/video/mouser.c
+++ b/src/mame/video/mouser.c
@@ -68,12 +68,12 @@ VIDEO_UPDATE( mouser )
sx = offs % 32;
sy = offs / 32;
- if (flip_screen_x)
+ if (flip_screen_x_get())
{
sx = 31 - sx;
}
- if (flip_screen_y)
+ if (flip_screen_y_get())
{
sy = 31 - sy;
}
@@ -90,7 +90,7 @@ VIDEO_UPDATE( mouser )
drawgfx(bitmap,machine->gfx[0],
videoram[offs] | (colorram[color_offs]>>5)*256 | ((colorram[color_offs]>>4)&1)*512,
colorram[color_offs]%16,
- flip_screen_x,flip_screen_y,
+ flip_screen_x_get(),flip_screen_y_get(),
8*sx,scrolled_y_position,
cliprect,TRANSPARENCY_NONE,0);
}
@@ -106,13 +106,13 @@ VIDEO_UPDATE( mouser )
flipx = (spriteram[offs]&0x40)>>6;
flipy = (spriteram[offs]&0x80)>>7;
- if (flip_screen_x)
+ if (flip_screen_x_get())
{
flipx = !flipx;
sx = 240 - sx;
}
- if (flip_screen_y)
+ if (flip_screen_y_get())
{
flipy = !flipy;
sy = 238 - sy;
@@ -136,13 +136,13 @@ VIDEO_UPDATE( mouser )
flipx = (spriteram[offs]&0x40)>>6;
flipy = (spriteram[offs]&0x80)>>7;
- if (flip_screen_x)
+ if (flip_screen_x_get())
{
flipx = !flipx;
sx = 240 - sx;
}
- if (flip_screen_y)
+ if (flip_screen_y_get())
{
flipy = !flipy;
sy = 238 - sy;
diff --git a/src/mame/video/mrjong.c b/src/mame/video/mrjong.c
index 83cc4c885e3..841d28af73c 100644
--- a/src/mame/video/mrjong.c
+++ b/src/mame/video/mrjong.c
@@ -80,7 +80,7 @@ WRITE8_HANDLER( mrjong_colorram_w )
WRITE8_HANDLER( mrjong_flipscreen_w )
{
- if (flip_screen != (data & 0x01))
+ if (flip_screen_get() != (data & 0x01))
{
flip_screen_set(data & 0x01);
tilemap_mark_all_tiles_dirty(ALL_TILEMAPS);
@@ -119,7 +119,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
sx = 224 - spriteram[offs + 2];
sy = spriteram[offs + 0];
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 208 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/mustache.c b/src/mame/video/mustache.c
index b204960d10f..cfa660c2a49 100644
--- a/src/mame/video/mustache.c
+++ b/src/mame/video/mustache.c
@@ -52,7 +52,7 @@ WRITE8_HANDLER( mustache_videoram_w )
WRITE8_HANDLER (mustache_video_control_w)
{
- if (flip_screen != (data & 0x01))
+ if (flip_screen_get() != (data & 0x01))
{
flip_screen_set(data & 0x01);
tilemap_mark_all_tiles_dirty(ALL_TILEMAPS);
@@ -115,12 +115,12 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
if ((control_byte & 0xa))
clip.max_y = machine->screen[0].visarea.max_y;
else
- if (flip_screen)
+ if (flip_screen_get())
clip.min_y = machine->screen[0].visarea.min_y + 56;
else
clip.max_y = machine->screen[0].visarea.max_y - 56;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 240 - sy;
@@ -129,7 +129,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
drawgfx(bitmap,gfx,
code,
color,
- flip_screen,flip_screen,
+ flip_screen_get(),flip_screen_get(),
sx,sy,
&clip,TRANSPARENCY_PEN,0);
}
diff --git a/src/mame/video/mystston.c b/src/mame/video/mystston.c
index 6462286c01b..8570e236a2b 100644
--- a/src/mame/video/mystston.c
+++ b/src/mame/video/mystston.c
@@ -149,7 +149,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
int sx = 240 - spriteram[offs + 3];
int sy = (240 - spriteram[offs + 2]) & 0xff;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/n8080.c b/src/mame/video/n8080.c
index 1929975c632..aba3a781fef 100644
--- a/src/mame/video/n8080.c
+++ b/src/mame/video/n8080.c
@@ -29,8 +29,7 @@ WRITE8_HANDLER( n8080_video_control_w )
sheriff_color_mode = (data >> 3) & 3;
sheriff_color_data = (data >> 0) & 7;
- /* FIXME: flip_screen_x should not be written. */
- flip_screen_x = data & 0x20;
+ flip_screen_set_no_update(data & 0x20);
}
@@ -88,7 +87,7 @@ static void helifire_next_line(void)
}
else
{
- if (flip_screen)
+ if (flip_screen_get())
{
helifire_mv %= 255;
}
@@ -109,8 +108,7 @@ VIDEO_START( spacefev )
{
cannon_timer = timer_alloc(spacefev_stop_red_cannon, NULL);
- /* FIXME: flip_screen_x should not be written. */
- flip_screen_x = 0;
+ flip_screen_set_no_update(0);
spacefev_red_screen = 0;
spacefev_red_cannon = 0;
@@ -119,8 +117,7 @@ VIDEO_START( spacefev )
VIDEO_START( sheriff )
{
- /* FIXME: flip_screen_x should not be written. */
- flip_screen_x = 0;
+ flip_screen_set_no_update(0);
sheriff_color_mode = 0;
sheriff_color_data = 0;
@@ -147,7 +144,7 @@ VIDEO_START( helifire )
helifire_LSFR[i] = data;
}
- flip_screen_x = 0;
+ flip_screen_set_no_update(0);
helifire_flash = 0;
}
@@ -155,7 +152,7 @@ VIDEO_START( helifire )
VIDEO_UPDATE( spacefev )
{
- UINT8 mask = flip_screen ? 0xff : 0x00;
+ UINT8 mask = flip_screen_get() ? 0xff : 0x00;
int x;
int y;
@@ -225,7 +222,7 @@ VIDEO_UPDATE( spacefev )
VIDEO_UPDATE( sheriff )
{
- UINT8 mask = flip_screen ? 0xff : 0x00;
+ UINT8 mask = flip_screen_get() ? 0xff : 0x00;
const UINT8* pPROM = memory_region(REGION_PROMS);
@@ -342,7 +339,7 @@ VIDEO_UPDATE( helifire )
for (n = 0; n < 8; n++)
{
- if (flip_screen)
+ if (flip_screen_get())
{
if ((videoram[offset ^ 0x1fff] << n) & 0x80)
{
diff --git a/src/mame/video/namcos1.c b/src/mame/video/namcos1.c
index 8fff33b504b..88f70888d15 100644
--- a/src/mame/video/namcos1.c
+++ b/src/mame/video/namcos1.c
@@ -309,7 +309,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
sx += sprite_xoffs;
sy -= sprite_yoffs;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = -sx - sizex;
sy = -sy - sizey;
@@ -345,10 +345,8 @@ VIDEO_UPDATE( namcos1 )
/* flip screen is embedded in the sprite control registers */
/* can't use flip_screen_set() because the visible area is asymmetrical */
- /* FIXME: flip_screen_x should not be written. The above issue needs */
- /* some other solution */
- flip_screen_x = spriteram[0x07f6] & 1;
- tilemap_set_flip(ALL_TILEMAPS,flip_screen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
+ flip_screen_set_no_update(spriteram[0x07f6] & 1);
+ tilemap_set_flip(ALL_TILEMAPS,flip_screen_get() ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
/* background color */
@@ -380,7 +378,7 @@ VIDEO_UPDATE( namcos1 )
scrollx = ( namcos1_playfield_control[j+1] + (namcos1_playfield_control[j+0]<<8) ) - disp_x[i];
scrolly = ( namcos1_playfield_control[j+3] + (namcos1_playfield_control[j+2]<<8) ) + 8;
- if (flip_screen)
+ if (flip_screen_get())
{
scrollx = -scrollx;
scrolly = -scrolly;
diff --git a/src/mame/video/namcos86.c b/src/mame/video/namcos86.c
index 6e48be712f9..eab2ecacea7 100644
--- a/src/mame/video/namcos86.c
+++ b/src/mame/video/namcos86.c
@@ -300,7 +300,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
sx += sprite_xoffs;
sy -= sprite_yoffs;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = -sx - sizex;
sy = -sy - sizey;
@@ -335,7 +335,7 @@ static void set_scroll(int layer)
scrollx = xscroll[layer] - xdisp[layer];
scrolly = yscroll[layer] + 9;
- if (flip_screen)
+ if (flip_screen_get())
{
scrollx = -scrollx;
scrolly = -scrolly;
@@ -351,10 +351,8 @@ VIDEO_UPDATE( namcos86 )
/* flip screen is embedded in the sprite control registers */
/* can't use flip_screen_set() because the visible area is asymmetrical */
- /* FIXME: flip_screen_x should not be written. The above issue needs */
- /* some other solution */
- flip_screen_x = spriteram[0x07f6] & 1;
- tilemap_set_flip(ALL_TILEMAPS,flip_screen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
+ flip_screen_set_no_update(spriteram[0x07f6] & 1);
+ tilemap_set_flip(ALL_TILEMAPS,flip_screen_get() ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
set_scroll(0);
set_scroll(1);
set_scroll(2);
diff --git a/src/mame/video/ninjakd2.c b/src/mame/video/ninjakd2.c
index 1e93fc25b87..c8dd86a9dc3 100644
--- a/src/mame/video/ninjakd2.c
+++ b/src/mame/video/ninjakd2.c
@@ -367,7 +367,7 @@ static void draw_sprites(running_machine* const machine, mame_bitmap* const bitm
int const big = (sprptr[2] & 0x04) >> 2;
int x,y;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - 16*big - sx;
sy = 240 - 16*big - sy;
diff --git a/src/mame/video/nmk16.c b/src/mame/video/nmk16.c
index ed7f986bd24..1ed0a161959 100644
--- a/src/mame/video/nmk16.c
+++ b/src/mame/video/nmk16.c
@@ -444,7 +444,7 @@ static void nmk16_draw_sprites(running_machine *machine, mame_bitmap *bitmap, co
if(pri != priority)
continue;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 368 - sx;
sy = 240 - sy;
@@ -461,7 +461,7 @@ static void nmk16_draw_sprites(running_machine *machine, mame_bitmap *bitmap, co
drawgfx(bitmap,machine->gfx[2],
code,
color,
- flip_screen, flip_screen,
+ flip_screen_get(), flip_screen_get(),
((x + 16) & 0x1ff) - 16,sy & 0x1ff,
cliprect,TRANSPARENCY_PEN,15);
code++;
@@ -498,10 +498,10 @@ static void nmk16_draw_sprites_flipsupported(running_machine *machine, mame_bitm
if(pri != priority)
continue;
- flipx ^= flip_screen;
- flipy ^= flip_screen;
+ flipx ^= flip_screen_get();
+ flipy ^= flip_screen_get();
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 368 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/nova2001.c b/src/mame/video/nova2001.c
index fc4e990d299..06bc24b4b71 100644
--- a/src/mame/video/nova2001.c
+++ b/src/mame/video/nova2001.c
@@ -277,7 +277,7 @@ static void nova2001_draw_sprites(running_machine *machine, mame_bitmap *bitmap,
continue;
}
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 240 - sy;
@@ -314,7 +314,7 @@ static void pkunwar_draw_sprites(running_machine *machine, mame_bitmap *bitmap,
continue;
}
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/othldrby.c b/src/mame/video/othldrby.c
index 606ccc0db69..bb84db030dd 100644
--- a/src/mame/video/othldrby.c
+++ b/src/mame/video/othldrby.c
@@ -153,7 +153,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap,const rec
sizex = (buf_spriteram[offs+2] & 0x000f) + 1;
sizey = (buf_spriteram[offs+3] & 0x000f) + 1;
- if (flip_screen)
+ if (flip_screen_get())
{
flipx = !flipx;
flipy = !flipy;
@@ -185,7 +185,7 @@ VIDEO_UPDATE( othldrby )
for (layer = 0;layer < 3;layer++)
{
- if (flip_screen)
+ if (flip_screen_get())
{
tilemap_set_scrollx(bg_tilemap[layer],0,vreg[2*layer]+59);
tilemap_set_scrolly(bg_tilemap[layer],0,vreg[2*layer+1]+248);
diff --git a/src/mame/video/pacland.c b/src/mame/video/pacland.c
index f850d3eecb9..b0dc6e81e61 100644
--- a/src/mame/video/pacland.c
+++ b/src/mame/video/pacland.c
@@ -310,7 +310,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
sprite &= ~sizex;
sprite &= ~(sizey << 1);
- if (flip_screen)
+ if (flip_screen_get())
{
flipx ^= 1;
flipy ^= 1;
@@ -380,8 +380,8 @@ VIDEO_UPDATE( pacland )
int row;
for (row = 5; row < 29; row++)
- tilemap_set_scrollx(fg_tilemap, row, flip_screen ? scroll0-7 : scroll0);
- tilemap_set_scrollx(bg_tilemap, 0, flip_screen ? scroll1-4 : scroll1-3);
+ tilemap_set_scrollx(fg_tilemap, row, flip_screen_get() ? scroll0-7 : scroll0);
+ tilemap_set_scrollx(bg_tilemap, 0, flip_screen_get() ? scroll1-4 : scroll1-3);
/* draw high priority sprite pixels, setting priority bitmap to non-zero
wherever there is a high-priority pixel; note that we draw to the bitmap
diff --git a/src/mame/video/paradise.c b/src/mame/video/paradise.c
index 4ac169d41de..72ab49544d5 100644
--- a/src/mame/video/paradise.c
+++ b/src/mame/video/paradise.c
@@ -198,7 +198,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap,const rec
int flipx = 0; // ?
int flipy = 0;
- if (flip_screen) { x = 0xf0 - x; flipx = !flipx;
+ if (flip_screen_get()) { x = 0xf0 - x; flipx = !flipx;
y = 0xf0 - y; flipy = !flipy; }
drawgfx(bitmap,machine->gfx[0],
@@ -259,7 +259,7 @@ if (input_code_pressed(KEYCODE_Z))
if (layers_ctrl&1) tilemap_draw(bitmap,cliprect, tilemap_0, 0,0);
if (layers_ctrl&2) tilemap_draw(bitmap,cliprect, tilemap_1, 0,0);
- if (layers_ctrl&4) copybitmap_trans(bitmap,tmpbitmap,flip_screen,flip_screen,0,0,cliprect, 0x80f);
+ if (layers_ctrl&4) copybitmap_trans(bitmap,tmpbitmap,flip_screen_get(),flip_screen_get(),0,0,cliprect, 0x80f);
if (paradise_priority & 2)
{
diff --git a/src/mame/video/pbaction.c b/src/mame/video/pbaction.c
index 659a78f647d..ff196ce7448 100644
--- a/src/mame/video/pbaction.c
+++ b/src/mame/video/pbaction.c
@@ -41,7 +41,7 @@ WRITE8_HANDLER( pbaction_colorram2_w )
WRITE8_HANDLER( pbaction_scroll_w )
{
scroll = data - 3;
- if (flip_screen) scroll = -scroll;
+ if (flip_screen_get()) scroll = -scroll;
tilemap_set_scrollx(bg_tilemap, 0, scroll);
tilemap_set_scrollx(fg_tilemap, 0, scroll);
}
@@ -100,7 +100,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
sy = 241-spriteram[offs+2];
flipx = spriteram[offs+1] & 0x40;
flipy = spriteram[offs+1] & 0x80;
- if (flip_screen)
+ if (flip_screen_get())
{
if (spriteram[offs] & 0x80)
{
@@ -120,7 +120,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
spriteram[offs],
spriteram[offs + 1] & 0x0f,
flipx,flipy,
- sx + (flip_screen ? scroll : -scroll), sy,
+ sx + (flip_screen_get() ? scroll : -scroll), sy,
cliprect,TRANSPARENCY_PEN,0);
}
}
diff --git a/src/mame/video/pcktgal.c b/src/mame/video/pcktgal.c
index 90b6c620ff1..c86c82eb5d5 100644
--- a/src/mame/video/pcktgal.c
+++ b/src/mame/video/pcktgal.c
@@ -38,7 +38,7 @@ WRITE8_HANDLER( pcktgal_videoram_w )
WRITE8_HANDLER( pcktgal_flipscreen_w )
{
- if (flip_screen != (data & 0x80))
+ if (flip_screen_get() != (data & 0x80))
{
flip_screen_set(data & 0x80);
tilemap_mark_all_tiles_dirty(ALL_TILEMAPS);
@@ -75,7 +75,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
flipx = spriteram[offs+1] & 0x04;
flipy = spriteram[offs+1] & 0x02;
- if (flip_screen) {
+ if (flip_screen_get()) {
sx=240-sx;
sy=240-sy;
if (flipx) flipx=0; else flipx=1;
diff --git a/src/mame/video/pitnrun.c b/src/mame/video/pitnrun.c
index 900e34f9639..49230a1b548 100644
--- a/src/mame/video/pitnrun.c
+++ b/src/mame/video/pitnrun.c
@@ -201,12 +201,12 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
flipy = (spriteram[offs+1]&0x80)>>7;
flipx = (spriteram[offs+1]&0x40)>>6;
- if (flip_screen_x)
+ if (flip_screen_x_get())
{
sx = 256 - sx;
flipx = !flipx;
}
- if (flip_screen_y)
+ if (flip_screen_y_get())
{
sy = 240 - sy;
flipy = !flipy;
@@ -256,10 +256,10 @@ VIDEO_UPDATE( pitnrun )
dx=128-pitnrun_h_heed+((pitnrun_ha&8)<<5)+3;
dy=128-pitnrun_v_heed+((pitnrun_ha&0x10)<<4);
- if (flip_screen_x)
+ if (flip_screen_x_get())
dx=128-dx+16;
- if (flip_screen_y)
+ if (flip_screen_y_get())
dy=128-dy;
myclip.min_x=dx;
@@ -280,7 +280,7 @@ VIDEO_UPDATE( pitnrun )
draw_sprites(machine,bitmap,&myclip);
if(pitnrun_ha&4)
- copybitmap_trans(bitmap,tmp_bitmap[pitnrun_ha&3],flip_screen_x,flip_screen_y,dx,dy,&myclip, 1);
+ copybitmap_trans(bitmap,tmp_bitmap[pitnrun_ha&3],flip_screen_x_get(),flip_screen_y_get(),dx,dy,&myclip, 1);
tilemap_draw(bitmap,cliprect,fg, 0,0);
return 0;
}
diff --git a/src/mame/video/pktgaldx.c b/src/mame/video/pktgaldx.c
index 8e476153a67..b99673fa863 100644
--- a/src/mame/video/pktgaldx.c
+++ b/src/mame/video/pktgaldx.c
@@ -9,7 +9,7 @@ UINT16* pcktgaldb_sprites;
static void draw_sprites(running_machine *machine, mame_bitmap *bitmap,const rectangle *cliprect)
{
int offs;
- int flipscreen=!flip_screen;
+ int flipscreen=!flip_screen_get();
for (offs = 0;offs < 0x400;offs += 4)
{
diff --git a/src/mame/video/pokechmp.c b/src/mame/video/pokechmp.c
index 4d60f9f7595..ff3427971b3 100644
--- a/src/mame/video/pokechmp.c
+++ b/src/mame/video/pokechmp.c
@@ -12,7 +12,7 @@ WRITE8_HANDLER( pokechmp_videoram_w )
WRITE8_HANDLER( pokechmp_flipscreen_w )
{
- if (flip_screen != (data & 0x80))
+ if (flip_screen_get() != (data & 0x80))
{
flip_screen_set(data & 0x80);
tilemap_mark_all_tiles_dirty(ALL_TILEMAPS);
@@ -49,7 +49,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
flipx = spriteram[offs+1] & 0x04;
flipy = spriteram[offs+1] & 0x02;
- if (flip_screen) {
+ if (flip_screen_get()) {
sx=240-sx;
sy=240-sy;
if (flipx) flipx=0; else flipx=1;
diff --git a/src/mame/video/popeye.c b/src/mame/video/popeye.c
index 4f54a330cb2..0fefb1847e5 100644
--- a/src/mame/video/popeye.c
+++ b/src/mame/video/popeye.c
@@ -196,7 +196,7 @@ WRITE8_HANDLER( popeye_bitmap_w )
sx = 8 * (offset % 128);
sy = 8 * (offset / 128);
- if (flip_screen)
+ if (flip_screen_get())
sy = 512-8 - sy;
colour = data & 0x0f;
@@ -213,7 +213,7 @@ WRITE8_HANDLER( popeye_bitmap_w )
sx = 8 * (offset % 64);
sy = 4 * (offset / 64);
- if (flip_screen)
+ if (flip_screen_get())
sy = 512-4 - sy;
colour = data & 0x0f;
@@ -277,12 +277,12 @@ static void draw_background(running_machine *machine, mame_bitmap *bitmap, const
int offs;
static int lastflip = 0;
- if (lastflip != flip_screen)
+ if (lastflip != flip_screen_get())
{
for (offs = 0;offs < popeye_bitmapram_size;offs++)
popeye_bitmap_w(offs,popeye_bitmapram[offs]);
- lastflip = flip_screen;
+ lastflip = flip_screen_get();
}
set_background_palette(machine, (*popeye_palettebank & 0x08) >> 3);
@@ -298,7 +298,7 @@ static void draw_background(running_machine *machine, mame_bitmap *bitmap, const
if (bitmap_type == TYPE_SKYSKIPR)
scrollx = 2*scrollx - 512;
- if (flip_screen)
+ if (flip_screen_get())
{
if (bitmap_type == TYPE_POPEYE)
scrollx = -scrollx;
@@ -344,7 +344,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
sx = 2*(spriteram[offs])-8;
sy = 2*(256-spriteram[offs + 1]);
- if (flip_screen)
+ if (flip_screen_get())
{
flipx = !flipx;
flipy = !flipy;
diff --git a/src/mame/video/powerins.c b/src/mame/video/powerins.c
index af73940d3c7..059d1561aad 100644
--- a/src/mame/video/powerins.c
+++ b/src/mame/video/powerins.c
@@ -299,7 +299,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap,const rec
/* Handle flip_screen. Apply a global offset of 32 pixels along x too */
- if (flip_screen)
+ if (flip_screen_get())
{ sx = screen_w - sx - dimx*16 - 32; flipx = !flipx;
sy = screen_h - sy - dimy*16; flipy = !flipy;
code += dimx*dimy-1; inc = -1; }
diff --git a/src/mame/video/prehisle.c b/src/mame/video/prehisle.c
index d28fdab83d7..e8bd4a23fb3 100644
--- a/src/mame/video/prehisle.c
+++ b/src/mame/video/prehisle.c
@@ -127,7 +127,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
if (sx & 0x200) sx = -(0xff - (sx & 0xff)); // wraparound
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/psikyo.c b/src/mame/video/psikyo.c
index 249b8e8bc97..2fbb09893c5 100644
--- a/src/mame/video/psikyo.c
+++ b/src/mame/video/psikyo.c
@@ -359,7 +359,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
zoomy = 32 - zoomy;
- if (flip_screen)
+ if (flip_screen_get())
{
x = width - x - (nx * zoomx)/2;
y = height - y - (ny * zoomy)/2;
diff --git a/src/mame/video/psychic5.c b/src/mame/video/psychic5.c
index 8cfc6205a27..b745e24094e 100644
--- a/src/mame/video/psychic5.c
+++ b/src/mame/video/psychic5.c
@@ -318,7 +318,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
if (attr & 0x01) sx -= 256;
if (attr & 0x04) sy -= 256;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 224 - sx;
sy = 224 - sy;
@@ -354,7 +354,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
}
else
{
- if (flip_screen)
+ if (flip_screen_get())
DRAW_SPRITE(code, sx + 16, sy + 16)
else
DRAW_SPRITE(code, sx, sy)
diff --git a/src/mame/video/rallyx.c b/src/mame/video/rallyx.c
index 6cca2487a10..b50454bb852 100644
--- a/src/mame/video/rallyx.c
+++ b/src/mame/video/rallyx.c
@@ -490,10 +490,10 @@ static void plot_star(running_machine *machine, mame_bitmap *bitmap, const recta
x > cliprect->max_x)
return;
- if (flip_screen_x)
+ if (flip_screen_x_get())
x = 255 - x;
- if (flip_screen_y)
+ if (flip_screen_y_get())
y = 255 - y;
if (colortable_entry_get_value(machine->colortable, *BITMAP_ADDR16(bitmap, y, x) % 0x144) == 0)
@@ -526,7 +526,7 @@ static void rallyx_draw_sprites(running_machine *machine, mame_bitmap *bitmap, c
int color = spriteram_2[offs + 1] & 0x3f;
int flipx = spriteram[offs] & 1;
int flipy = spriteram[offs] & 2;
- if (flip_screen) sx -= 2*displacement;
+ if (flip_screen_get()) sx -= 2*displacement;
pdrawgfx(bitmap,machine->gfx[1],
(spriteram[offs] & 0xfc) >> 2,
@@ -551,7 +551,7 @@ static void locomotn_draw_sprites(running_machine *machine, mame_bitmap *bitmap,
int flip = spriteram[offs] & 2;
/* handle reduced visible area in some games */
- if (flip_screen && machine->screen[0].visarea.max_x == 32*8-1) sx += 32;
+ if (flip_screen_get() && machine->screen[0].visarea.max_x == 32*8-1) sx += 32;
pdrawgfx(bitmap,machine->gfx[1],
((spriteram[offs] & 0x7c) >> 2) + 0x20*(spriteram[offs] & 0x01) + ((spriteram[offs] & 0x80) >> 1),
@@ -574,7 +574,7 @@ static void rallyx_draw_bullets(running_machine *machine, mame_bitmap *bitmap, c
x = rallyx_radarx[offs] + ((~rallyx_radarattr[offs & 0x0f] & 0x01) << 8);
y = 253 - rallyx_radary[offs];
- if (flip_screen) x -= 3;
+ if (flip_screen_get()) x -= 3;
drawgfx(bitmap,machine->gfx[2],
((rallyx_radarattr[offs & 0x0f] & 0x0e) >> 1) ^ 0x07,
@@ -625,7 +625,7 @@ static void locomotn_draw_bullets(running_machine *machine, mame_bitmap *bitmap,
y = 252 - rallyx_radary[offs];
/* handle reduced visible area in some games */
- if (flip_screen && machine->screen[0].visarea.max_x == 32*8-1) x += 32;
+ if (flip_screen_get() && machine->screen[0].visarea.max_x == 32*8-1) x += 32;
drawgfx(bitmap,machine->gfx[2],
(rallyx_radarattr[offs & 0x0f] & 0x07) ^ 0x07,
@@ -643,7 +643,7 @@ VIDEO_UPDATE( rallyx )
the screen, and clip it to only the position where it is supposed to be shown */
rectangle fg_clip = *cliprect;
rectangle bg_clip = *cliprect;
- if (flip_screen)
+ if (flip_screen_get())
{
bg_clip.min_x = 8*8;
fg_clip.max_x = 8*8-1;
@@ -675,7 +675,7 @@ VIDEO_UPDATE( jungler )
the screen, and clip it to only the position where it is supposed to be shown */
rectangle fg_clip = *cliprect;
rectangle bg_clip = *cliprect;
- if (flip_screen)
+ if (flip_screen_get())
{
bg_clip.min_x = 8*8;
fg_clip.max_x = 8*8-1;
@@ -711,7 +711,7 @@ VIDEO_UPDATE( locomotn )
the screen, and clip it to only the position where it is supposed to be shown */
rectangle fg_clip = *cliprect;
rectangle bg_clip = *cliprect;
- if (flip_screen)
+ if (flip_screen_get())
{
bg_clip.min_x = 8*8;
fg_clip.max_x = 8*8-1;
diff --git a/src/mame/video/realbrk.c b/src/mame/video/realbrk.c
index 3ef4a6245d3..a3363b4664b 100644
--- a/src/mame/video/realbrk.c
+++ b/src/mame/video/realbrk.c
@@ -278,8 +278,8 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap,const rec
xdim = ((zoom & 0x00ff) >> 0) << (16-6+4);
ydim = ((zoom & 0xff00) >> 8) << (16-6+4);
- if (flip_screen_x) { flipx = !flipx; sx = (max_x << 16) - sx - xnum * xdim; }
- if (flip_screen_y) { flipy = !flipy; sy = (max_y << 16) - sy - ynum * ydim; }
+ if (flip_screen_x_get()) { flipx = !flipx; sx = (max_x << 16) - sx - xnum * xdim; }
+ if (flip_screen_y_get()) { flipy = !flipy; sy = (max_y << 16) - sy - ynum * ydim; }
if (flipx) { xstart = xnum-1; xend = -1; xinc = -1; }
else { xstart = 0; xend = xnum; xinc = +1; }
@@ -440,8 +440,8 @@ static void dai2kaku_draw_sprites( mame_bitmap *bitmap,const rectangle *cliprect
xdim = ((zoom & 0x00ff) >> 0) << (16-6+4);
ydim = ((zoom & 0xff00) >> 8) << (16-6+4);
- if (flip_screen_x) { flipx = !flipx; sx = (max_x << 16) - sx - xnum * xdim; }
- if (flip_screen_y) { flipy = !flipy; sy = (max_y << 16) - sy - ynum * ydim; }
+ if (flip_screen_x_get()) { flipx = !flipx; sx = (max_x << 16) - sx - xnum * xdim; }
+ if (flip_screen_y_get()) { flipy = !flipy; sy = (max_y << 16) - sy - ynum * ydim; }
if (flipx) { xstart = xnum-1; xend = -1; xinc = -1; }
else { xstart = 0; xend = xnum; xinc = +1; }
diff --git a/src/mame/video/redclash.c b/src/mame/video/redclash.c
index 0e136ec067b..e06231f34dd 100644
--- a/src/mame/video/redclash.c
+++ b/src/mame/video/redclash.c
@@ -270,7 +270,7 @@ static void draw_bullets(mame_bitmap *bitmap, const rectangle *cliprect )
int sx = 8 * offs + (videoram[offs] & 0x07); /* ?? */
int sy = 0xff - videoram[offs + 0x20];
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
}
diff --git a/src/mame/video/renegade.c b/src/mame/video/renegade.c
index a27548c8066..1f5623ff333 100644
--- a/src/mame/video/renegade.c
+++ b/src/mame/video/renegade.c
@@ -101,7 +101,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
if (sx > 248)
sx -= 256;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 240 - sy;
@@ -114,18 +114,18 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
drawgfx(bitmap, machine->gfx[sprite_bank],
sprite_number + 1,
color,
- xflip, flip_screen,
- sx, sy + (flip_screen ? -16 : 16),
+ xflip, flip_screen_get(),
+ sx, sy + (flip_screen_get() ? -16 : 16),
cliprect, TRANSPARENCY_PEN, 0);
}
else
{
- sy += (flip_screen ? -16 : 16);
+ sy += (flip_screen_get() ? -16 : 16);
}
drawgfx(bitmap, machine->gfx[sprite_bank],
sprite_number,
color,
- xflip, flip_screen,
+ xflip, flip_screen_get(),
sx, sy,
cliprect, TRANSPARENCY_PEN, 0);
}
diff --git a/src/mame/video/retofinv.c b/src/mame/video/retofinv.c
index c5423338c42..a33073c99fa 100644
--- a/src/mame/video/retofinv.c
+++ b/src/mame/video/retofinv.c
@@ -205,7 +205,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap)
sprite &= ~sizex;
sprite &= ~(sizey << 1);
- if (flip_screen)
+ if (flip_screen_get())
{
flipx ^= 1;
flipy ^= 1;
diff --git a/src/mame/video/rockola.c b/src/mame/video/rockola.c
index 3f70ce44d82..01d204669a9 100644
--- a/src/mame/video/rockola.c
+++ b/src/mame/video/rockola.c
@@ -155,7 +155,7 @@ WRITE8_HANDLER( rockola_flipscreen_w )
/* bit 7 flips screen */
- if (flip_screen != (data & 0x80))
+ if (flip_screen_get() != (data & 0x80))
{
flip_screen_set(data & 0x80);
tilemap_mark_all_tiles_dirty(ALL_TILEMAPS);
@@ -265,7 +265,7 @@ WRITE8_HANDLER( satansat_b002_w )
{
/* bit 0 flips screen */
- if (flip_screen != (data & 0x01))
+ if (flip_screen_get() != (data & 0x01))
{
flip_screen_set(data & 0x01);
tilemap_mark_all_tiles_dirty(ALL_TILEMAPS);
diff --git a/src/mame/video/rocnrope.c b/src/mame/video/rocnrope.c
index d263171ba43..2a31346559c 100644
--- a/src/mame/video/rocnrope.c
+++ b/src/mame/video/rocnrope.c
@@ -96,7 +96,7 @@ WRITE8_HANDLER( rocnrope_colorram_w )
WRITE8_HANDLER( rocnrope_flipscreen_w )
{
- if (flip_screen != (~data & 0x01))
+ if (flip_screen_get() != (~data & 0x01))
{
flip_screen_set(~data & 0x01);
tilemap_mark_all_tiles_dirty(ALL_TILEMAPS);
diff --git a/src/mame/video/rohga.c b/src/mame/video/rohga.c
index da8dece3215..a5344af0ef1 100644
--- a/src/mame/video/rohga.c
+++ b/src/mame/video/rohga.c
@@ -124,7 +124,7 @@ static void rohga_draw_sprites(running_machine *machine, mame_bitmap *bitmap, co
inc = 1;
}
- if (flip_screen) {
+ if (flip_screen_get()) {
x=304-x;
y=240-y;
if (fx) fx=0; else fx=1;
@@ -217,7 +217,7 @@ static void wizdfire_draw_sprites(running_machine *machine, mame_bitmap *bitmap,
inc = 1;
}
- if (flip_screen) {
+ if (flip_screen_get()) {
x=304-x;
y=240-y;
if (fx) fx=0; else fx=1;
@@ -395,7 +395,7 @@ sprite 2:
fx = (spriteptr[offs+0]&0x4000);
fy = (spriteptr[offs+0]&0x8000);
- if (!flip_screen) { /* Inverted from Mutant Fighter! */
+ if (!flip_screen_get()) { /* Inverted from Mutant Fighter! */
if (fx) fx=0; else fx=1;
if (fy) fy=0; else fy=1;
diff --git a/src/mame/video/sauro.c b/src/mame/video/sauro.c
index 59a16ade43a..f8d29d7f9a7 100644
--- a/src/mame/video/sauro.c
+++ b/src/mame/video/sauro.c
@@ -78,7 +78,7 @@ WRITE8_HANDLER( sauro_palette_bank_w )
WRITE8_HANDLER( sauro_scroll_fg_w )
{
- const int *map = (flip_screen ? scroll2_map_flip : scroll2_map);
+ const int *map = (flip_screen_get() ? scroll2_map_flip : scroll2_map);
int scroll = (data & 0xf8) | map[data & 7];
tilemap_set_scrollx(fg_tilemap, 0, scroll);
@@ -126,7 +126,7 @@ static void sauro_draw_sprites(running_machine *machine, mame_bitmap *bitmap, co
flipx = spriteram[offs+3] & 0x04;
- if (flip_screen)
+ if (flip_screen_get())
{
flipx = !flipx;
sx = (235 - sx) & 0xff; // The &0xff is not 100% percent correct
@@ -136,7 +136,7 @@ static void sauro_draw_sprites(running_machine *machine, mame_bitmap *bitmap, co
drawgfx(bitmap, machine->gfx[2],
code,
color,
- flipx,flip_screen,
+ flipx,flip_screen_get(),
sx,sy,
cliprect,TRANSPARENCY_PEN,0);
}
@@ -201,7 +201,7 @@ static void trckydoc_draw_sprites(running_machine *machine, mame_bitmap *bitmap,
flipx = spriteram[offs+3] & 0x04;
- if (flip_screen)
+ if (flip_screen_get())
{
flipx = !flipx;
sx = (235 - sx) & 0xff; /* The &0xff is not 100% percent correct */
@@ -211,7 +211,7 @@ static void trckydoc_draw_sprites(running_machine *machine, mame_bitmap *bitmap,
drawgfx(bitmap, machine->gfx[1],
code,
color,
- flipx,flip_screen,
+ flipx,flip_screen_get(),
sx,sy,
cliprect,TRANSPARENCY_PEN,0);
}
diff --git a/src/mame/video/sbasketb.c b/src/mame/video/sbasketb.c
index 14740982805..2c0a4f3eecf 100644
--- a/src/mame/video/sbasketb.c
+++ b/src/mame/video/sbasketb.c
@@ -112,7 +112,7 @@ WRITE8_HANDLER( sbasketb_colorram_w )
WRITE8_HANDLER( sbasketb_flipscreen_w )
{
- if (flip_screen != data)
+ if (flip_screen_get() != data)
{
flip_screen_set(data);
tilemap_mark_all_tiles_dirty(ALL_TILEMAPS);
@@ -152,7 +152,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
int flipx = spriteram[offs + 1] & 0x40;
int flipy = spriteram[offs + 1] & 0x80;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/scotrsht.c b/src/mame/video/scotrsht.c
index 73eab4795ff..9fcfe1ce329 100644
--- a/src/mame/video/scotrsht.c
+++ b/src/mame/video/scotrsht.c
@@ -108,7 +108,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
int sx = spriteram[i + 2] - ((attr & 0x80) << 1);
int sy = spriteram[i + 3];
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/senjyo.c b/src/mame/video/senjyo.c
index b39dfe24ac1..0828fd4be49 100644
--- a/src/mame/video/senjyo.c
+++ b/src/mame/video/senjyo.c
@@ -198,11 +198,11 @@ static void draw_bgbitmap(running_machine *machine, mame_bitmap *bitmap,const re
count = 0;
strwid = senjyo_bgstripes;
if (strwid == 0) strwid = 0x100;
- if (flip_screen) strwid ^= 0xff;
+ if (flip_screen_get()) strwid ^= 0xff;
for (x = 0;x < 256;x++)
{
- if (flip_screen)
+ if (flip_screen_get())
for (y = 0;y < 256;y++)
*BITMAP_ADDR16(bitmap, y, 255 - x) = 384 + pen;
else
@@ -232,7 +232,7 @@ static void draw_radar(mame_bitmap *bitmap,const rectangle *cliprect)
sx = (8 * (offs % 8) + x) + 256-64;
sy = ((offs & 0x1ff) / 8) + 96;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 255 - sx;
sy = 255 - sy;
@@ -267,7 +267,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap,const rec
flipx = spriteram[offs+1] & 0x40;
flipy = spriteram[offs+1] & 0x80;
- if (flip_screen)
+ if (flip_screen_get())
{
flipx = !flipx;
flipy = !flipy;
@@ -312,7 +312,7 @@ VIDEO_UPDATE( senjyo )
scrollx = senjyo_scrollx1[0];
scrolly = senjyo_scrolly1[0] + 256 * senjyo_scrolly1[1];
- if (flip_screen)
+ if (flip_screen_get())
scrollx = -scrollx;
tilemap_set_scrollx(bg1_tilemap,0,scrollx);
tilemap_set_scrolly(bg1_tilemap,0,scrolly);
@@ -324,14 +324,14 @@ VIDEO_UPDATE( senjyo )
scrollx = senjyo_scrollx1[0];
scrolly = senjyo_scrolly1[0] + 256 * senjyo_scrolly1[1];
}
- if (flip_screen)
+ if (flip_screen_get())
scrollx = -scrollx;
tilemap_set_scrollx(bg2_tilemap,0,scrollx);
tilemap_set_scrolly(bg2_tilemap,0,scrolly);
scrollx = senjyo_scrollx3[0];
scrolly = senjyo_scrolly3[0] + 256 * senjyo_scrolly3[1];
- if (flip_screen)
+ if (flip_screen_get())
scrollx = -scrollx;
tilemap_set_scrollx(bg3_tilemap,0,scrollx);
tilemap_set_scrolly(bg3_tilemap,0,scrolly);
diff --git a/src/mame/video/sf.c b/src/mame/video/sf.c
index 8357e40e261..b431dbaa2d2 100644
--- a/src/mame/video/sf.c
+++ b/src/mame/video/sf.c
@@ -148,7 +148,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap,const rec
{
int c1,c2,c3,c4,t;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 480 - sx;
sy = 224 - sy;
@@ -203,7 +203,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap,const rec
}
else
{
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 496 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/shangha3.c b/src/mame/video/shangha3.c
index 27981d39ff0..6a62b1f8c96 100644
--- a/src/mame/video/shangha3.c
+++ b/src/mame/video/shangha3.c
@@ -134,7 +134,7 @@ WRITE16_HANDLER( shangha3_blitter_go_w )
zoomx = shangha3_ram[offs+10];
zoomy = shangha3_ram[offs+13];
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 383 - sx - sizex;
sy = 255 - sy - sizey;
diff --git a/src/mame/video/shaolins.c b/src/mame/video/shaolins.c
index 59dc3c224fd..0a67b33df76 100644
--- a/src/mame/video/shaolins.c
+++ b/src/mame/video/shaolins.c
@@ -124,7 +124,7 @@ WRITE8_HANDLER( shaolins_nmi_w )
{
shaolins_nmi_enable = data;
- if (flip_screen != (data & 0x01))
+ if (flip_screen_get() != (data & 0x01))
{
flip_screen_set(data & 0x01);
tilemap_mark_all_tiles_dirty(ALL_TILEMAPS);
@@ -164,7 +164,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
int sx = 240 - spriteram[offs + 6];
int sy = 248 - spriteram[offs + 4];
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 248 - sy;
diff --git a/src/mame/video/shootout.c b/src/mame/video/shootout.c
index 3cc448d62c0..54e4e0bac99 100644
--- a/src/mame/video/shootout.c
+++ b/src/mame/video/shootout.c
@@ -106,7 +106,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
int flipx = (attributes & 0x04);
int flipy = 0;
- if (flip_screen) {
+ if (flip_screen_get()) {
flipx = !flipx;
flipy = !flipy;
}
@@ -117,7 +117,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
vx = sx;
vy = sy;
- if (flip_screen) {
+ if (flip_screen_get()) {
vx = 240 - vx;
vy = 240 - vy;
}
@@ -136,7 +136,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
vx = sx;
vy = sy;
- if (flip_screen) {
+ if (flip_screen_get()) {
vx = 240 - vx;
vy = 240 - vy;
}
diff --git a/src/mame/video/simpl156.c b/src/mame/video/simpl156.c
index d0712f455b5..777d3a7178e 100644
--- a/src/mame/video/simpl156.c
+++ b/src/mame/video/simpl156.c
@@ -41,7 +41,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap,const rec
int offs;
//FIXME: flip_screen_x should not be written!
- flip_screen_x = 1;
+ flip_screen_set_no_update(1);
for (offs = (0x1400/4)-4;offs >= 0;offs -= 4) // 0x1400 for charlien
{
@@ -87,7 +87,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap,const rec
inc = 1;
}
- if (flip_screen)
+ if (flip_screen_get())
{
y=240-y;
x=304-x;
diff --git a/src/mame/video/skykid.c b/src/mame/video/skykid.c
index af88bad3a8f..ad21dba80d5 100644
--- a/src/mame/video/skykid.c
+++ b/src/mame/video/skykid.c
@@ -83,9 +83,9 @@ static TILE_GET_INFO( tx_get_tile_info )
characters when screen is flipped, we have to flip them back. */
SET_TILE_INFO(
0,
- skykid_textram[tile_index] | (flip_screen ? 0x100 : 0),
+ skykid_textram[tile_index] | (flip_screen_get() ? 0x100 : 0),
skykid_textram[tile_index + 0x400] & 0x3f,
- flip_screen ? (TILE_FLIPY | TILE_FLIPX) : 0);
+ flip_screen_get() ? (TILE_FLIPY | TILE_FLIPX) : 0);
}
@@ -123,7 +123,8 @@ VIDEO_START( skykid )
state_save_register_global(priority);
state_save_register_global(scroll_x);
state_save_register_global(scroll_y);
- state_save_register_global(flip_screen_x);
+ //FIXME: flip_screen
+ //state_save_register_global(flip_screen_x_get());
}
@@ -205,7 +206,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap,const rec
sprite &= ~sizex;
sprite &= ~(sizey << 1);
- if (flip_screen)
+ if (flip_screen_get())
{
flipx ^= 1;
flipy ^= 1;
@@ -233,7 +234,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap,const rec
VIDEO_UPDATE( skykid )
{
- if (flip_screen)
+ if (flip_screen_get())
{
tilemap_set_scrollx(bg_tilemap, 0, 189 - (scroll_x ^ 1));
tilemap_set_scrolly(bg_tilemap, 0, 7 - scroll_y);
diff --git a/src/mame/video/snk68.c b/src/mame/video/snk68.c
index c3e1a97db69..4099355ce36 100644
--- a/src/mame/video/snk68.c
+++ b/src/mame/video/snk68.c
@@ -160,7 +160,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
my=0x200 - my;
my-=0x200;
- if (flip_screen) {
+ if (flip_screen_get()) {
mx=240-mx;
my=240-my;
}
@@ -174,7 +174,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
fx=tile&0x4000;
tile&=0x3fff;
- if (flip_screen) {
+ if (flip_screen_get()) {
if (fx) fx=0; else fx=1;
if (fy) fy=0; else fy=1;
}
@@ -187,7 +187,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
cliprect,TRANSPARENCY_PEN,0);
}
- if (flip_screen) {
+ if (flip_screen_get()) {
my-=16;
if (my < -0x100) my+=0x200;
}
@@ -237,7 +237,7 @@ static void draw_sprites2(running_machine *machine, mame_bitmap *bitmap, const r
my=0x200 - my;
my-=0x200;
- if (flip_screen) {
+ if (flip_screen_get()) {
mx=240-mx;
my=240-my;
}
@@ -254,7 +254,7 @@ static void draw_sprites2(running_machine *machine, mame_bitmap *bitmap, const r
fx=tile&0x8000;
}
- if (flip_screen) {
+ if (flip_screen_get()) {
if (fx) fx=0; else fx=1;
if (fy) fy=0; else fy=1;
}
@@ -269,7 +269,7 @@ static void draw_sprites2(running_machine *machine, mame_bitmap *bitmap, const r
mx,my,
cliprect,TRANSPARENCY_PEN,0);
}
- if (flip_screen) {
+ if (flip_screen_get()) {
my-=16;
if (my < -0x100) my+=0x200;
}
diff --git a/src/mame/video/solomon.c b/src/mame/video/solomon.c
index fbe46e8cac0..d9def1a6686 100644
--- a/src/mame/video/solomon.c
+++ b/src/mame/video/solomon.c
@@ -31,7 +31,7 @@ WRITE8_HANDLER( solomon_colorram2_w )
WRITE8_HANDLER( solomon_flipscreen_w )
{
- if (flip_screen != (data & 0x01))
+ if (flip_screen_get() != (data & 0x01))
{
flip_screen_set(data & 0x01);
tilemap_mark_all_tiles_dirty(ALL_TILEMAPS);
@@ -81,7 +81,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
int sx = spriteram[offs + 3];
int sy = 241 - spriteram[offs + 2];
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 242 - sy;
diff --git a/src/mame/video/sonson.c b/src/mame/video/sonson.c
index 7c436964526..6b14b251797 100644
--- a/src/mame/video/sonson.c
+++ b/src/mame/video/sonson.c
@@ -109,7 +109,7 @@ WRITE8_HANDLER( sonson_colorram_w )
WRITE8_HANDLER( sonson_flipscreen_w )
{
- if (flip_screen != (~data & 0x01))
+ if (flip_screen_get() != (~data & 0x01))
{
flip_screen_set(~data & 0x01);
tilemap_mark_all_tiles_dirty(ALL_TILEMAPS);
@@ -145,7 +145,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
int sx = spriteram[offs + 3];
int sy = spriteram[offs + 0];
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/spcforce.c b/src/mame/video/spcforce.c
index d9939d50e65..e5627baf614 100644
--- a/src/mame/video/spcforce.c
+++ b/src/mame/video/spcforce.c
@@ -39,7 +39,7 @@ VIDEO_UPDATE( spcforce )
code = videoram[offs] + ((colorram[offs] & 0x01) << 8);
col = (~colorram[offs] >> 4) & 0x07;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 248 - sx;
sy = 248 - sy;
@@ -47,7 +47,7 @@ VIDEO_UPDATE( spcforce )
drawgfx(bitmap,machine->gfx[0],
code, col,
- flip_screen, flip_screen,
+ flip_screen_get(), flip_screen_get(),
sx, sy,
&machine->screen[0].visarea,TRANSPARENCY_PEN,0);
}
diff --git a/src/mame/video/spdodgeb.c b/src/mame/video/spdodgeb.c
index e0569fa29e9..29242beb068 100644
--- a/src/mame/video/spdodgeb.c
+++ b/src/mame/video/spdodgeb.c
@@ -179,7 +179,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
int dy = -16;
int cy;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 240 - sy;
@@ -198,7 +198,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
break;
case 1: /* double y */
- if (flip_screen) { if (sy > 240) sy -= 256; } else { if (sy < 0) sy += 256; }
+ if (flip_screen_get()) { if (sy > 240) sy -= 256; } else { if (sy < 0) sy += 256; }
cy = sy + dy;
which &= ~1;
DRAW_SPRITE(0,sx,cy);
diff --git a/src/mame/video/speedbal.c b/src/mame/video/speedbal.c
index 7e4679fc264..6cee4b3fc18 100644
--- a/src/mame/video/speedbal.c
+++ b/src/mame/video/speedbal.c
@@ -102,7 +102,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
flipx = flipy = 0;
- if(flip_screen)
+ if(flip_screen_get())
{
x = 246 - x;
y = 238 - y;
diff --git a/src/mame/video/srumbler.c b/src/mame/video/srumbler.c
index 7c19ff3080e..bba9aac5100 100644
--- a/src/mame/video/srumbler.c
+++ b/src/mame/video/srumbler.c
@@ -142,7 +142,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
sx = buffered_spriteram[offs + 3] + 0x100 * ( attr & 0x01);
flipy = attr & 0x02;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 496 - sx;
sy = 240 - sy;
@@ -152,7 +152,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
drawgfx(bitmap,machine->gfx[2],
code,
colour,
- flip_screen,flipy,
+ flip_screen_get(),flipy,
sx, sy,
cliprect,TRANSPARENCY_PEN,15);
}
diff --git a/src/mame/video/sshangha.c b/src/mame/video/sshangha.c
index 9506ba5a122..a1c6d83e976 100644
--- a/src/mame/video/sshangha.c
+++ b/src/mame/video/sshangha.c
@@ -87,7 +87,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
sprite &= ~multi;
- if (flip_screen)
+ if (flip_screen_get())
{
y=240-y;
x=304-x;
@@ -188,9 +188,8 @@ VIDEO_UPDATE( sshangha )
static int last_pf1_bank,last_pf2_bank;
int offs;
- //FIXME: flip_screen_x should not be written!
- flip_screen_x=sshangha_control_0[0]&0x80;
- tilemap_set_flip(ALL_TILEMAPS,flip_screen_x ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
+ flip_screen_set_no_update(sshangha_control_0[0]&0x80);
+ tilemap_set_flip(ALL_TILEMAPS,flip_screen_x_get() ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
tilemap_set_enable( pf2_tilemap, sshangha_control_0[5]&0x8000);
tilemap_set_enable( pf1_8x8_tilemap, sshangha_control_0[5]&0x0080);
diff --git a/src/mame/video/ssozumo.c b/src/mame/video/ssozumo.c
index 9593e26ce4c..7d66ff24688 100644
--- a/src/mame/video/ssozumo.c
+++ b/src/mame/video/ssozumo.c
@@ -155,7 +155,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
int sx = 239 - spriteram[offs + 3];
int sy = (240 - spriteram[offs + 2]) & 0xff;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/stfight.c b/src/mame/video/stfight.c
index 150537b0fb7..87df88e5b6e 100644
--- a/src/mame/video/stfight.c
+++ b/src/mame/video/stfight.c
@@ -271,7 +271,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
sx -= 0x100;
}
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 240 - sy;
@@ -283,7 +283,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
pdrawgfx(bitmap,machine->gfx[4],
code,
color,
- flipx,flip_screen,
+ flipx,flip_screen_get(),
sx,sy,
cliprect,TRANSPARENCY_PEN,0x0f,
pri ? 0x02 : 0);
diff --git a/src/mame/video/strnskil.c b/src/mame/video/strnskil.c
index c8ceee1f08a..bd726d78b47 100644
--- a/src/mame/video/strnskil.c
+++ b/src/mame/video/strnskil.c
@@ -56,7 +56,7 @@ WRITE8_HANDLER( strnskil_scrl_ctrl_w )
{
strnskil_scrl_ctrl = data >> 5;
- if (flip_screen != (data & 0x08))
+ if (flip_screen_get() != (data & 0x08))
{
flip_screen_set(data & 0x08);
tilemap_mark_all_tiles_dirty(ALL_TILEMAPS);
@@ -88,14 +88,14 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
{
int code = spriteram[offs + 1];
int color = spriteram[offs + 2] & 0x3f;
- int flipx = flip_screen_x;
- int flipy = flip_screen_y;
+ int flipx = flip_screen_x_get();
+ int flipy = flip_screen_y_get();
int sx = spriteram[offs + 3];
int sy = spriteram[offs];
int px, py;
- if (flip_screen)
+ if (flip_screen_get())
{
px = 240 - sx + 0; /* +2 or +0 ? */
py = sy;
diff --git a/src/mame/video/suna16.c b/src/mame/video/suna16.c
index 1d3ae79fea5..e2778356720 100644
--- a/src/mame/video/suna16.c
+++ b/src/mame/video/suna16.c
@@ -183,7 +183,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
if (flipx) tile_flipx = !tile_flipx;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = max_x - sx;
sy = max_y - sy;
diff --git a/src/mame/video/suna8.c b/src/mame/video/suna8.c
index 25ad9952ed4..bdf47435d85 100644
--- a/src/mame/video/suna8.c
+++ b/src/mame/video/suna8.c
@@ -318,7 +318,7 @@ static void draw_normal_sprites(running_machine *machine, mame_bitmap *bitmap,co
if (flipx) tile_flipx = !tile_flipx;
if (flipy) tile_flipy = !tile_flipy;
- if (flip_screen)
+ if (flip_screen_get())
{ sx = max_x - sx; tile_flipx = !tile_flipx;
sy = max_y - sy; tile_flipy = !tile_flipy; }
@@ -383,7 +383,7 @@ static void draw_text_sprites(running_machine *machine, mame_bitmap *bitmap,cons
int sx = x + tx * 8;
int sy = (y + real_ty * 8) & 0xff;
- if (flip_screen)
+ if (flip_screen_get())
{ sx = max_x - sx; flipx = !flipx;
sy = max_y - sy; flipy = !flipy; }
diff --git a/src/mame/video/supbtime.c b/src/mame/video/supbtime.c
index d0dbc130fa2..a628cd3a27e 100644
--- a/src/mame/video/supbtime.c
+++ b/src/mame/video/supbtime.c
@@ -58,7 +58,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap,const rec
inc = 1;
}
- if (flip_screen)
+ if (flip_screen_get())
{
y=240-y;
x=304-x;
diff --git a/src/mame/video/superqix.c b/src/mame/video/superqix.c
index 5416080d32b..d0011bf5fd7 100644
--- a/src/mame/video/superqix.c
+++ b/src/mame/video/superqix.c
@@ -177,7 +177,7 @@ static void pbillian_draw_sprites(running_machine *machine, mame_bitmap *bitmap,
int sx = spriteram[offs + 1] + 256 * (spriteram[offs] & 0x01);
int sy = spriteram[offs + 2];
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 240 - sy;
@@ -186,7 +186,7 @@ static void pbillian_draw_sprites(running_machine *machine, mame_bitmap *bitmap,
drawgfx(bitmap,machine->gfx[1],
code,
color,
- flip_screen, flip_screen,
+ flip_screen_get(), flip_screen_get(),
sx, sy,
cliprect, TRANSPARENCY_PEN, 0);
}
@@ -206,7 +206,7 @@ static void superqix_draw_sprites(running_machine *machine, mame_bitmap *bitmap,
int sx = spriteram[offs + 1];
int sy = spriteram[offs + 2];
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 240 - sy;
@@ -253,7 +253,7 @@ VIDEO_UPDATE( pbillian )
VIDEO_UPDATE( superqix )
{
tilemap_draw(bitmap, cliprect, bg_tilemap, TILEMAP_DRAW_LAYER1, 0);
- copybitmap_trans(bitmap,fg_bitmap[show_bitmap],flip_screen,flip_screen,0,0,cliprect,0);
+ copybitmap_trans(bitmap,fg_bitmap[show_bitmap],flip_screen_get(),flip_screen_get(),0,0,cliprect,0);
superqix_draw_sprites(machine, bitmap,cliprect);
tilemap_draw(bitmap, cliprect, bg_tilemap, TILEMAP_DRAW_LAYER0, 0);
return 0;
diff --git a/src/mame/video/suprloco.c b/src/mame/video/suprloco.c
index db63b35bc2b..cdbccf30ebd 100644
--- a/src/mame/video/suprloco.c
+++ b/src/mame/video/suprloco.c
@@ -119,7 +119,7 @@ WRITE8_HANDLER( suprloco_videoram_w )
WRITE8_HANDLER( suprloco_scrollram_w )
{
- int adj = flip_screen ? -8 : 8;
+ int adj = flip_screen_get() ? -8 : 8;
suprloco_scrollram[offset] = data;
tilemap_set_scrollx(bg_tilemap,offset, data - adj);
@@ -160,7 +160,7 @@ READ8_HANDLER( suprloco_control_r )
INLINE void draw_pixel(mame_bitmap *bitmap,const rectangle *cliprect,int x,int y,int color)
{
- if (flip_screen)
+ if (flip_screen_get())
{
x = bitmap->width - x - 1;
y = bitmap->height - y - 1;
@@ -194,7 +194,7 @@ static void draw_sprite(mame_bitmap *bitmap,const rectangle *cliprect,int spr_nu
sx = spr_reg[SPR_X];
sy = spr_reg[SPR_Y_TOP] + 1;
- if (!flip_screen)
+ if (!flip_screen_get())
{
adjy = sy;
dy = 1;
diff --git a/src/mame/video/system1.c b/src/mame/video/system1.c
index 4ee35af03ae..45edb861069 100644
--- a/src/mame/video/system1.c
+++ b/src/mame/video/system1.c
@@ -288,7 +288,7 @@ static void draw_sprite(mame_bitmap *bitmap,int spr_number)
x_flipped = x;
y = y_flipped = sy+row;
- if (flip_screen)
+ if (flip_screen_get())
{
y_flipped = 258 - sy - height + row;
x_flipped = (252*2) - x;
@@ -322,13 +322,13 @@ static void draw_sprite(mame_bitmap *bitmap,int spr_number)
if (color1)
draw_pixel(bitmap,x,y,x_flipped,y_flipped,spr_number,sprite_palette_base+color1);
x++;
- x_flipped += flip_screen ? -1 : 1;
+ x_flipped += flip_screen_get() ? -1 : 1;
if (color2 == 15) break;
if (color2)
draw_pixel(bitmap,x,y,x_flipped,y_flipped,spr_number,sprite_palette_base+color2);
x++;
- x_flipped += flip_screen ? -1 : 1;
+ x_flipped += flip_screen_get() ? -1 : 1;
}
}
}
@@ -382,7 +382,7 @@ static int system1_draw_fg(running_machine *machine, mame_bitmap *bitmap, const
sx = (offs/2) % 32;
sy = (offs/2) / 32;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 31 - sx;
sy = 31 - sy;
@@ -396,7 +396,7 @@ static int system1_draw_fg(running_machine *machine, mame_bitmap *bitmap, const
drawgfx(bitmap,machine->gfx[0],
code,
color,
- flip_screen,flip_screen,
+ flip_screen_get(),flip_screen_get(),
8*sx + blockgal_kludgeoffset,8*sy,
cliprect,TRANSPARENCY_PEN,0);
}
@@ -441,7 +441,7 @@ static void system1_draw_bg(running_machine *machine, mame_bitmap *bitmap, const
sx = (offs/2) % 32;
sy = (offs/2) / 32;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 31 - sx;
sy = 31 - sy;
@@ -450,14 +450,14 @@ static void system1_draw_bg(running_machine *machine, mame_bitmap *bitmap, const
drawgfx(tmp_bitmap,machine->gfx[0],
code,
color,
- flip_screen,flip_screen,
+ flip_screen_get(),flip_screen_get(),
8*sx,8*sy,
0,TRANSPARENCY_NONE,0);
}
}
/* copy the temporary bitmap to the screen */
- if (flip_screen)
+ if (flip_screen_get())
copyscrollbitmap(bitmap,tmp_bitmap,1,&background_scrollx_flip,1,&background_scrolly_flip,cliprect);
else
copyscrollbitmap(bitmap,tmp_bitmap,1,&background_scrollx,1,&background_scrolly,cliprect);
@@ -479,7 +479,7 @@ static void system1_draw_bg(running_machine *machine, mame_bitmap *bitmap, const
sx = (offs/2) % 32;
sy = (offs/2) / 32;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 8*(31-sx) + background_scrollx_flip;
sy = 8*(31-sy) + background_scrolly_flip;
@@ -494,25 +494,25 @@ static void system1_draw_bg(running_machine *machine, mame_bitmap *bitmap, const
drawgfx(bitmap,machine->gfx[0],
code,
color,
- flip_screen,flip_screen,
+ flip_screen_get(),flip_screen_get(),
sx,sy,
cliprect,TRANSPARENCY_PEN,0);
drawgfx(bitmap,machine->gfx[0],
code,
color,
- flip_screen,flip_screen,
+ flip_screen_get(),flip_screen_get(),
sx-256,sy,
cliprect,TRANSPARENCY_PEN,0);
drawgfx(bitmap,machine->gfx[0],
code,
color,
- flip_screen,flip_screen,
+ flip_screen_get(),flip_screen_get(),
sx,sy-256,
cliprect,TRANSPARENCY_PEN,0);
drawgfx(bitmap,machine->gfx[0],
code,
color,
- flip_screen,flip_screen,
+ flip_screen_get(),flip_screen_get(),
sx-256,sy-256,
cliprect,TRANSPARENCY_PEN,0);
}
@@ -583,7 +583,7 @@ static void chplft_draw_bg(running_machine *machine, mame_bitmap *bitmap, const
sx = (offs/2) % 32;
sy = (offs/2) / 32;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 31 - sx;
sy = 31 - sy;
@@ -592,7 +592,7 @@ static void chplft_draw_bg(running_machine *machine, mame_bitmap *bitmap, const
drawgfx(tmp_bitmap,machine->gfx[0],
code,
color,
- flip_screen,flip_screen,
+ flip_screen_get(),flip_screen_get(),
8*sx,8*sy,
0,TRANSPARENCY_NONE,0);
}
@@ -601,7 +601,7 @@ static void chplft_draw_bg(running_machine *machine, mame_bitmap *bitmap, const
/* copy the temporary bitmap to the screen */
if (choplifter_scroll_x_on)
{
- if (flip_screen)
+ if (flip_screen_get())
{
int scrollx_row_flip[32],i;
@@ -633,7 +633,7 @@ static void chplft_draw_bg(running_machine *machine, mame_bitmap *bitmap, const
sx = (offs/2) % 32;
sy = (offs/2) / 32;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 8*(31-sx);
@@ -653,7 +653,7 @@ static void chplft_draw_bg(running_machine *machine, mame_bitmap *bitmap, const
drawgfx(bitmap,machine->gfx[0],
code,
color,
- flip_screen,flip_screen,
+ flip_screen_get(),flip_screen_get(),
sx,8*sy,
cliprect,TRANSPARENCY_PEN,0);
}
@@ -736,7 +736,7 @@ static void wbml_draw_bg(running_machine *machine, mame_bitmap *bitmap, const re
if (x > 256) x -= 512;
if (y > 224) y -= 512;
- if (flip_screen)
+ if (flip_screen_get())
{
x = 248 - x;
y = 248 - y;
@@ -750,14 +750,14 @@ static void wbml_draw_bg(running_machine *machine, mame_bitmap *bitmap, const re
drawgfx(bitmap,machine->gfx[0],
code,
((code >> 5) & 0x3f) + 64,
- flip_screen,flip_screen,
+ flip_screen_get(),flip_screen_get(),
x,y,
cliprect, TRANSPARENCY_NONE, 0);
else if (priority)
drawgfx(bitmap,machine->gfx[0],
code,
((code >> 5) & 0x3f) + 64,
- flip_screen,flip_screen,
+ flip_screen_get(),flip_screen_get(),
x,y,
cliprect, TRANSPARENCY_PEN, 0);
@@ -782,7 +782,7 @@ static void wbml_draw_fg(running_machine *machine, mame_bitmap *bitmap, const re
code = wbml_paged_videoram[offs] | (wbml_paged_videoram[offs+1] << 8);
code = ((code >> 4) & 0x800) | (code & 0x7ff);
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 31 - sx;
sy = 31 - sy;
@@ -791,7 +791,7 @@ static void wbml_draw_fg(running_machine *machine, mame_bitmap *bitmap, const re
drawgfx(bitmap,machine->gfx[0],
code,
(code >> 5) & 0x3f,
- flip_screen,flip_screen,
+ flip_screen_get(),flip_screen_get(),
8*sx,8*sy,
cliprect,TRANSPARENCY_PEN,0);
}
@@ -837,7 +837,7 @@ static void ufosensi_draw_bg(running_machine *machine, mame_bitmap *bitmap, cons
if (x > 256) x -= 512;
if (y > 224) y -= 512;
- if (flip_screen)
+ if (flip_screen_get())
{
x = 248 - x;
y = 248 - y;
@@ -851,14 +851,14 @@ static void ufosensi_draw_bg(running_machine *machine, mame_bitmap *bitmap, cons
drawgfx(bitmap,machine->gfx[0],
code,
((code >> 5) & 0x3f) + 64,
- flip_screen,flip_screen,
+ flip_screen_get(),flip_screen_get(),
x,y,
cliprect, TRANSPARENCY_NONE, 0);
else if (priority)
drawgfx(bitmap,machine->gfx[0],
code,
((code >> 5) & 0x3f) + 64,
- flip_screen,flip_screen,
+ flip_screen_get(),flip_screen_get(),
x,y,
cliprect, TRANSPARENCY_PEN, 0);
diff --git a/src/mame/video/tagteam.c b/src/mame/video/tagteam.c
index 7c9b4d61489..e4cce3c68cb 100644
--- a/src/mame/video/tagteam.c
+++ b/src/mame/video/tagteam.c
@@ -112,7 +112,7 @@ logerror("%04x: control = %02x\n",activecpu_get_pc(),data);
WRITE8_HANDLER( tagteam_flipscreen_w )
{
- if (flip_screen != (data &0x01))
+ if (flip_screen_get() != (data &0x01))
{
flip_screen_set(data & 0x01);
tilemap_mark_all_tiles_dirty(ALL_TILEMAPS);
@@ -149,7 +149,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
if (!(videoram[offs] & 0x01)) continue;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 240 - sy;
@@ -168,7 +168,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
code = videoram[offs + 0x20] + 256 * spritebank;
color = palettebank;
- sy += (flip_screen ? -256 : 256);
+ sy += (flip_screen_get() ? -256 : 256);
drawgfx(bitmap, machine->gfx[1],
code, color,
diff --git a/src/mame/video/tecmo.c b/src/mame/video/tecmo.c
index 1fd47befc04..13beb269d1d 100644
--- a/src/mame/video/tecmo.c
+++ b/src/mame/video/tecmo.c
@@ -201,7 +201,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap,const rec
flipx = bank & 1;
flipy = bank & 2;
- if (flip_screen)
+ if (flip_screen_get())
{
xpos = 256 - (8 * size) - xpos;
ypos = 256 - (8 * size) - ypos;
diff --git a/src/mame/video/tehkanwc.c b/src/mame/video/tehkanwc.c
index 32f4c1c4473..60a4c50ded2 100644
--- a/src/mame/video/tehkanwc.c
+++ b/src/mame/video/tehkanwc.c
@@ -169,13 +169,13 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
int sx = spriteram[offs + 2] + ((attr & 0x20) << 3) - 128;
int sy = spriteram[offs + 3];
- if (flip_screen_x)
+ if (flip_screen_x_get())
{
sx = 240 - sx;
flipx = !flipx;
}
- if (flip_screen_y)
+ if (flip_screen_y_get())
{
sy = 240 - sy;
flipy = !flipy;
diff --git a/src/mame/video/terracre.c b/src/mame/video/terracre.c
index 6d13791ed9f..87b7bde2e02 100644
--- a/src/mame/video/terracre.c
+++ b/src/mame/video/terracre.c
@@ -78,7 +78,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
color += 16 * (spritepalettebank[(tile>>1)&0xff] & 0x0f);
}
- if (flip_screen)
+ if (flip_screen_get())
{
sx=240-sx;
sy=240-sy;
diff --git a/src/mame/video/thedeep.c b/src/mame/video/thedeep.c
index ff701c9f43e..a46e4e63f6d 100644
--- a/src/mame/video/thedeep.c
+++ b/src/mame/video/thedeep.c
@@ -176,7 +176,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
if (color & 1) sx -= 256;
if (attr & 1) sy -= 256;
- if (flip_screen)
+ if (flip_screen_get())
{
flipx = !flipx;
flipy = !flipy;
diff --git a/src/mame/video/tigeroad.c b/src/mame/video/tigeroad.c
index a2dd4c1dc13..1b8151ed46b 100644
--- a/src/mame/video/tigeroad.c
+++ b/src/mame/video/tigeroad.c
@@ -19,7 +19,7 @@ WRITE16_HANDLER( tigeroad_videoctrl_w )
/* bit 1 flips screen */
- if (flip_screen != (data & 0x02))
+ if (flip_screen_get() != (data & 0x02))
{
flip_screen_set(data & 0x02);
tilemap_mark_all_tiles_dirty(ALL_TILEMAPS);
@@ -88,7 +88,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
if (sx > 0x100) sx -= 0x200;
if (sy > 0x100) sy -= 0x200;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/toki.c b/src/mame/video/toki.c
index bb09bbd1fca..3e7c542f05c 100644
--- a/src/mame/video/toki.c
+++ b/src/mame/video/toki.c
@@ -202,7 +202,7 @@ static void toki_draw_sprites(running_machine *machine, mame_bitmap *bitmap,cons
flipy = 0;
tile = (sprite_word[1] & 0xfff) + ((sprite_word[2] & 0x8000) >> 3);
- if (flip_screen) {
+ if (flip_screen_get()) {
x=240-x;
y=240-y;
if (flipx) flipx=0; else flipx=1;
diff --git a/src/mame/video/trackfld.c b/src/mame/video/trackfld.c
index 3da26f20fdf..bd35dec9b83 100644
--- a/src/mame/video/trackfld.c
+++ b/src/mame/video/trackfld.c
@@ -107,7 +107,7 @@ WRITE8_HANDLER( trackfld_colorram_w )
WRITE8_HANDLER( trackfld_flipscreen_w )
{
- if (flip_screen != data)
+ if (flip_screen_get() != data)
{
flip_screen_set(data);
tilemap_mark_all_tiles_dirty(ALL_TILEMAPS);
@@ -202,7 +202,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
int sx = spriteram[offs] - 1;
int sy = 240 - spriteram_2[offs + 1];
- if (flip_screen)
+ if (flip_screen_get())
{
sy = 240 - sy;
flipy = !flipy;
@@ -238,7 +238,7 @@ VIDEO_UPDATE( trackfld )
for (row = 0; row < 32; row++)
{
scrollx = trackfld_scroll[row] + 256 * (trackfld_scroll2[row] & 0x01);
- if (flip_screen) scrollx = -scrollx;
+ if (flip_screen_get()) scrollx = -scrollx;
tilemap_set_scrollx(bg_tilemap, row, scrollx);
}
diff --git a/src/mame/video/travrusa.c b/src/mame/video/travrusa.c
index 3a5aa91c550..4f9fad2aee1 100644
--- a/src/mame/video/travrusa.c
+++ b/src/mame/video/travrusa.c
@@ -304,7 +304,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap,const rec
8*8, 32*8-1
};
rectangle clip = *cliprect;
- if (flip_screen)
+ if (flip_screen_get())
sect_rect(&clip, &spritevisibleareaflip);
else
sect_rect(&clip, &spritevisiblearea);
@@ -319,7 +319,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap,const rec
int flipx = attr & 0x40;
int flipy = attr & 0x80;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/tryout.c b/src/mame/video/tryout.c
index cdb96ad1e46..a0ea206b2c6 100644
--- a/src/mame/video/tryout.c
+++ b/src/mame/video/tryout.c
@@ -200,7 +200,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap,const rec
fy = 0;
inc = 16;
- if (flip_screen)
+ if (flip_screen_get())
{
x = 240 - x;
fx = !fx;
@@ -240,7 +240,7 @@ VIDEO_UPDATE( tryout )
int scrollx;
- if (!flip_screen)
+ if (!flip_screen_get())
tilemap_set_scrollx(fg_tilemap, 0, 16); /* Assumed hard-wired */
else
tilemap_set_scrollx(fg_tilemap, 0, -8); /* Assumed hard-wired */
diff --git a/src/mame/video/tsamurai.c b/src/mame/video/tsamurai.c
index cc41e6dfc97..8435a7747b7 100644
--- a/src/mame/video/tsamurai.c
+++ b/src/mame/video/tsamurai.c
@@ -173,7 +173,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
/* So I'm using this specific check. -kal 11 jul 2002 */
// if(sprite_type == 1) sy=sy+2;
- if( flip_screen )
+ if( flip_screen_get() )
{
drawgfx( bitmap,gfx,
sprite_number&0x7f,
diff --git a/src/mame/video/tumblep.c b/src/mame/video/tumblep.c
index 8b6aeb77204..7ddf1f923ec 100644
--- a/src/mame/video/tumblep.c
+++ b/src/mame/video/tumblep.c
@@ -57,7 +57,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap,const rec
inc = 1;
}
- if (flip_screen)
+ if (flip_screen_get())
{
y=240-y;
x=304-x;
diff --git a/src/mame/video/vaportra.c b/src/mame/video/vaportra.c
index eac35c2c9e2..6aaf22d4f30 100644
--- a/src/mame/video/vaportra.c
+++ b/src/mame/video/vaportra.c
@@ -122,7 +122,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
inc = 1;
}
- if (flip_screen)
+ if (flip_screen_get())
{
y=240-y;
x=240-x;
diff --git a/src/mame/video/vastar.c b/src/mame/video/vastar.c
index 194e45073bd..b0d937702ce 100644
--- a/src/mame/video/vastar.c
+++ b/src/mame/video/vastar.c
@@ -146,7 +146,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap,const rec
flipx = spriteram_3[offs] & 0x02;
flipy = spriteram_3[offs] & 0x01;
- if (flip_screen)
+ if (flip_screen_get())
{
flipx = !flipx;
flipy = !flipy;
@@ -154,7 +154,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap,const rec
if (spriteram_2[offs] & 0x08) /* double width */
{
- if (!flip_screen)
+ if (!flip_screen_get())
sy = 224 - sy;
drawgfx(bitmap,machine->gfx[2],
@@ -173,7 +173,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap,const rec
}
else
{
- if (!flip_screen)
+ if (!flip_screen_get())
sy = 240 - sy;
drawgfx(bitmap,machine->gfx[1],
diff --git a/src/mame/video/vball.c b/src/mame/video/vball.c
index aa1ea4345b4..dd01757b42a 100644
--- a/src/mame/video/vball.c
+++ b/src/mame/video/vball.c
@@ -135,7 +135,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
int flipy = 0;
int dy = -16;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 240 - sy;
diff --git a/src/mame/video/vulgus.c b/src/mame/video/vulgus.c
index 936cebf9b4e..4d0a77844aa 100644
--- a/src/mame/video/vulgus.c
+++ b/src/mame/video/vulgus.c
@@ -185,7 +185,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap,const rec
sx = spriteram[offs + 3];
sy = spriteram[offs + 2];
dir = 1;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 240 - sx;
sy = 240 - sy;
@@ -200,7 +200,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap,const rec
drawgfx(bitmap,machine->gfx[2],
code + i,
col,
- flip_screen,flip_screen,
+ flip_screen_get(),flip_screen_get(),
sx, sy + 16 * i * dir,
cliprect,TRANSPARENCY_PEN,15);
@@ -208,7 +208,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap,const rec
drawgfx(bitmap,machine->gfx[2],
code + i,
col,
- flip_screen,flip_screen,
+ flip_screen_get(),flip_screen_get(),
sx, sy + 16 * i * dir - dir * 256,
cliprect,TRANSPARENCY_PEN,15);
i--;
diff --git a/src/mame/video/wwfsstar.c b/src/mame/video/wwfsstar.c
index cdb0f95a466..b3e856c9a56 100644
--- a/src/mame/video/wwfsstar.c
+++ b/src/mame/video/wwfsstar.c
@@ -154,7 +154,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
number &= ~(chain - 1);
- if (flip_screen)
+ if (flip_screen_get())
{
flipy = !flipy;
flipx = !flipx;
@@ -164,7 +164,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
for (count=0;count<chain;count++)
{
- if (flip_screen)
+ if (flip_screen_get())
{
if (!flipy)
{
diff --git a/src/mame/video/wwfwfest.c b/src/mame/video/wwfwfest.c
index bbf0a4254af..bcea4fd66d9 100644
--- a/src/mame/video/wwfwfest.c
+++ b/src/mame/video/wwfwfest.c
@@ -189,7 +189,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
number = (source[2] & 0x00ff) | (source[3] & 0x00ff) << 8;
colourbank = (source[4] & 0x000f);
- if (flip_screen) {
+ if (flip_screen_get()) {
if (flipy) flipy=0; else flipy=1;
if (flipx) flipx=0; else flipx=1;
ypos=240-ypos-sprite_xoff;
@@ -197,7 +197,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
}
for (count=0;count<chain;count++) {
- if (flip_screen) {
+ if (flip_screen_get()) {
if (!flipy) {
drawgfx(bitmap,gfx,number+count,colourbank,flipx,flipy,xpos,ypos+(16*(chain-1))-(16*count),cliprect,TRANSPARENCY_PEN,0);
} else {
diff --git a/src/mame/video/xain.c b/src/mame/video/xain.c
index abbd99cc5f2..b0892956006 100644
--- a/src/mame/video/xain.c
+++ b/src/mame/video/xain.c
@@ -184,7 +184,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap,const rec
sy = 240 - spriteram[offs];
if (sy <= -7) sy += 256;
flipx = attr & 0x40;
- if (flip_screen)
+ if (flip_screen_get())
{
sx = 239 - sx;
sy = 240 - sy;
@@ -196,13 +196,13 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap,const rec
drawgfx(bitmap,machine->gfx[3],
numtile,
color,
- flipx,flip_screen,
- sx-1,flip_screen?sy+16:sy-16,
+ flipx,flip_screen_get(),
+ sx-1,flip_screen_get() ? sy+16:sy-16,
cliprect,TRANSPARENCY_PEN,0);
drawgfx(bitmap,machine->gfx[3],
numtile+1,
color,
- flipx,flip_screen,
+ flipx,flip_screen_get(),
sx-1,sy,
cliprect,TRANSPARENCY_PEN,0);
}
@@ -211,7 +211,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap,const rec
drawgfx(bitmap,machine->gfx[3],
numtile,
color,
- flipx,flip_screen,
+ flipx,flip_screen_get(),
sx,sy,
cliprect,TRANSPARENCY_PEN,0);
}
diff --git a/src/mame/video/xevious.c b/src/mame/video/xevious.c
index 0e8b0d93fe1..27484070100 100644
--- a/src/mame/video/xevious.c
+++ b/src/mame/video/xevious.c
@@ -194,9 +194,9 @@ static TILE_GET_INFO( get_fg_tile_info )
UINT8 color = ((attr & 0x03) << 4) | ((attr & 0x3c) >> 2);
SET_TILE_INFO(
0,
- xevious_fg_videoram[tile_index] | (flip_screen ? 0x100 : 0),
+ xevious_fg_videoram[tile_index] | (flip_screen_get() ? 0x100 : 0),
color,
- TILE_FLIPYX((attr & 0xc0) >> 6) ^ (flip_screen ? TILE_FLIPX : 0));
+ TILE_FLIPYX((attr & 0xc0) >> 6) ^ (flip_screen_get() ? TILE_FLIPX : 0));
}
static TILE_GET_INFO( get_bg_tile_info )
@@ -450,7 +450,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap,const rec
color = spriteram[offs + 1] & 0x7f;
flipx = spriteram_3[offs] & 4;
flipy = spriteram_3[offs] & 8;
- if (flip_screen)
+ if (flip_screen_get())
{
flipx = !flipx;
flipy = !flipy;
diff --git a/src/mame/video/yiear.c b/src/mame/video/yiear.c
index e5ed3bcc2ca..fdae6b21081 100644
--- a/src/mame/video/yiear.c
+++ b/src/mame/video/yiear.c
@@ -71,7 +71,7 @@ WRITE8_HANDLER( yiear_control_w )
{
/* bit 0 flips screen */
- if (flip_screen != (data & 0x01))
+ if (flip_screen_get() != (data & 0x01))
{
flip_screen_set(data & 0x01);
tilemap_mark_all_tiles_dirty(ALL_TILEMAPS);
@@ -122,7 +122,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
int sy = 240 - spriteram[offs + 1];
int sx = spriteram_2[offs];
- if (flip_screen)
+ if (flip_screen_get())
{
sy = 240 - sy;
flipy = !flipy;
diff --git a/src/mame/video/yunsun16.c b/src/mame/video/yunsun16.c
index 673b058ce14..173043d5854 100644
--- a/src/mame/video/yunsun16.c
+++ b/src/mame/video/yunsun16.c
@@ -175,7 +175,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap,const rec
x += sprites_scrolldx;
y += sprites_scrolldy;
- if (flip_screen) // not used?
+ if (flip_screen_get()) // not used?
{
flipx = !flipx; x = max_x - x - 16;
flipy = !flipy; y = max_y - y - 16;
diff --git a/src/mame/video/zaccaria.c b/src/mame/video/zaccaria.c
index 06ee639bfd9..e866627f06e 100644
--- a/src/mame/video/zaccaria.c
+++ b/src/mame/video/zaccaria.c
@@ -209,7 +209,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap,const rec
int offs;
rectangle clip = *cliprect;
- if (flip_screen_x)
+ if (flip_screen_x_get())
sect_rect(&clip, &spritevisiblearea_flipx);
else
sect_rect(&clip, &spritevisiblearea);
@@ -235,12 +235,12 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap,const rec
int flipx = spriteram_2[offs + 2] & 0x40;
int flipy = spriteram_2[offs + 2] & 0x80;
- if (flip_screen_x)
+ if (flip_screen_x_get())
{
sx = 240 - sx;
flipx = !flipx;
}
- if (flip_screen_y)
+ if (flip_screen_y_get())
{
sy = 240 - sy;
flipy = !flipy;
@@ -261,12 +261,12 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap,const rec
int flipx = spriteram[offs + 1] & 0x40;
int flipy = spriteram[offs + 1] & 0x80;
- if (flip_screen_x)
+ if (flip_screen_x_get())
{
sx = 240 - sx;
flipx = !flipx;
}
- if (flip_screen_y)
+ if (flip_screen_y_get())
{
sy = 240 - sy;
flipy = !flipy;
diff --git a/src/mame/video/zaxxon.c b/src/mame/video/zaxxon.c
index 6ad09931fa7..d2f6d7c17b8 100644
--- a/src/mame/video/zaxxon.c
+++ b/src/mame/video/zaxxon.c
@@ -189,9 +189,8 @@ VIDEO_START( congo )
WRITE8_HANDLER( zaxxon_flipscreen_w )
{
/* low bit controls flip; background and sprite flip are handled at render time */
- /* FIXME: flip_screen_x should not be written. */
- flip_screen_x = ~data & 1;
- tilemap_set_flip(fg_tilemap, flip_screen ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0);
+ flip_screen_set_no_update(~data & 1);
+ tilemap_set_flip(fg_tilemap, flip_screen_get() ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0);
}
@@ -314,13 +313,13 @@ static void draw_background(running_machine *machine, mame_bitmap *bitmap, const
int colorbase = bg_color + (congo_color_bank << 8);
int xmask = pixmap->width - 1;
int ymask = pixmap->height - 1;
- int flipmask = flip_screen ? 0xff : 0x00;
- int flipoffs = flip_screen ? 0x38 : 0x40;
+ int flipmask = flip_screen_get() ? 0xff : 0x00;
+ int flipoffs = flip_screen_get() ? 0x38 : 0x40;
int x, y;
/* the starting X value is offset by 1 pixel (normal) or 7 pixels */
/* (flipped) due to a delay in the loading */
- if (!flip_screen)
+ if (!flip_screen_get())
flipoffs -= 1;
else
flipoffs += 7;
@@ -378,8 +377,8 @@ static void draw_background(running_machine *machine, mame_bitmap *bitmap, const
INLINE int find_minimum_y(UINT8 value)
{
- int flipmask = flip_screen ? 0xff : 0x00;
- int flipconst = flip_screen ? 0xef : 0xf1;
+ int flipmask = flip_screen_get() ? 0xff : 0x00;
+ int flipconst = flip_screen_get() ? 0xef : 0xf1;
int y;
/* the sum of the Y position plus a constant based on the flip state */
@@ -409,7 +408,7 @@ INLINE int find_minimum_y(UINT8 value)
INLINE int find_minimum_x(UINT8 value)
{
- int flipmask = flip_screen ? 0xff : 0x00;
+ int flipmask = flip_screen_get() ? 0xff : 0x00;
int x;
/* the sum of the X position plus a constant specifies the address within */
@@ -423,7 +422,7 @@ INLINE int find_minimum_x(UINT8 value)
static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const rectangle *cliprect, UINT16 flipxmask, UINT16 flipymask)
{
- int flipmask = flip_screen ? 0xff : 0x00;
+ int flipmask = flip_screen_get() ? 0xff : 0x00;
int offs;
/* only the lower half of sprite RAM is read during rendering */
diff --git a/src/mame/video/zodiack.c b/src/mame/video/zodiack.c
index f8351cf0983..ff24a86b22e 100644
--- a/src/mame/video/zodiack.c
+++ b/src/mame/video/zodiack.c
@@ -46,7 +46,7 @@ WRITE8_HANDLER( zodiack_attributes_w )
WRITE8_HANDLER( zodiack_flipscreen_w )
{
- if (flip_screen != (~data & 0x01))
+ if (flip_screen_get() != (~data & 0x01))
{
flip_screen_set(~data & 0x01);
tilemap_mark_all_tiles_dirty(ALL_TILEMAPS);
@@ -131,7 +131,7 @@ VIDEO_START( zodiack )
tilemap_set_scroll_cols(fg_tilemap, 32);
/* FIXME: flip_screen_x should not be written. */
- flip_screen_x = 0;
+ flip_screen_set_no_update(0);
}
static void draw_bullets(running_machine *machine, mame_bitmap *bitmap, const rectangle *cliprect)
@@ -145,7 +145,7 @@ static void draw_bullets(running_machine *machine, mame_bitmap *bitmap, const re
x = zodiack_bulletsram[offs + 3] + 7;
y = 255 - zodiack_bulletsram[offs + 1];
- if (flip_screen && percuss_hardware)
+ if (flip_screen_get() && percuss_hardware)
{
y = 255 - y;
}
@@ -175,7 +175,7 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const re
flipy = spriteram[offs + 1] & 0x80;
spritecode = spriteram[offs + 1] & 0x3f;
- if (flip_screen && percuss_hardware)
+ if (flip_screen_get() && percuss_hardware)
{
sy = 240 - sy;
flipy = !flipy;