summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2012-09-18 08:43:04 +0000
committer Miodrag Milanovic <mmicko@gmail.com>2012-09-18 08:43:04 +0000
commit7e40ce54f21d854327fbe56a5c989014602462ff (patch)
tree310b268b8424a7eb6b8bffd5b87e808b8c7ccb5e /src/mame/drivers
parent8196b6177882559f277b0688f4f210e352cce6be (diff)
changed most of screen.machine() to machine() (no whatsnew)
Diffstat (limited to 'src/mame/drivers')
-rw-r--r--src/mame/drivers/1945kiii.c2
-rw-r--r--src/mame/drivers/ace.c8
-rw-r--r--src/mame/drivers/acefruit.c4
-rw-r--r--src/mame/drivers/acommand.c2
-rw-r--r--src/mame/drivers/adp.c2
-rw-r--r--src/mame/drivers/albazc.c2
-rw-r--r--src/mame/drivers/amaticmg.c4
-rw-r--r--src/mame/drivers/aristmk4.c4
-rw-r--r--src/mame/drivers/aristmk6.c22
-rw-r--r--src/mame/drivers/astinvad.c4
-rw-r--r--src/mame/drivers/astrocorp.c2
-rw-r--r--src/mame/drivers/astrof.c8
-rw-r--r--src/mame/drivers/atarisy4.c4
-rw-r--r--src/mame/drivers/avt.c2
-rw-r--r--src/mame/drivers/backfire.c12
-rw-r--r--src/mame/drivers/berzerk.c2
-rw-r--r--src/mame/drivers/bestleag.c4
-rw-r--r--src/mame/drivers/bfcobra.c8
-rw-r--r--src/mame/drivers/bingor.c10
-rw-r--r--src/mame/drivers/blackt96.c8
-rw-r--r--src/mame/drivers/blitz68k.c10
-rw-r--r--src/mame/drivers/bmcbowl.c2
-rw-r--r--src/mame/drivers/bmcpokr.c2
-rw-r--r--src/mame/drivers/bnstars.c12
-rw-r--r--src/mame/drivers/boxer.c4
-rw-r--r--src/mame/drivers/buster.c2
-rw-r--r--src/mame/drivers/cabaret.c2
-rw-r--r--src/mame/drivers/calorie.c4
-rw-r--r--src/mame/drivers/cardline.c8
-rw-r--r--src/mame/drivers/carrera.c2
-rw-r--r--src/mame/drivers/cb2001.c6
-rw-r--r--src/mame/drivers/cball.c2
-rw-r--r--src/mame/drivers/cham24.c2
-rw-r--r--src/mame/drivers/champbas.c2
-rw-r--r--src/mame/drivers/champbwl.c16
-rw-r--r--src/mame/drivers/chanbara.c2
-rw-r--r--src/mame/drivers/chihiro.c2
-rw-r--r--src/mame/drivers/chinsan.c2
-rw-r--r--src/mame/drivers/cmmb.c2
-rw-r--r--src/mame/drivers/cntsteer.c8
-rw-r--r--src/mame/drivers/cobra.c2
-rw-r--r--src/mame/drivers/coinmvga.c2
-rw-r--r--src/mame/drivers/coolridr.c18
-rw-r--r--src/mame/drivers/cps3.c16
-rw-r--r--src/mame/drivers/crystal.c4
-rw-r--r--src/mame/drivers/cshooter.c8
-rw-r--r--src/mame/drivers/cubeqst.c4
-rw-r--r--src/mame/drivers/dacholer.c2
-rw-r--r--src/mame/drivers/dblewing.c4
-rw-r--r--src/mame/drivers/ddayjlc.c6
-rw-r--r--src/mame/drivers/ddealer.c12
-rw-r--r--src/mame/drivers/ddenlovr.c50
-rw-r--r--src/mame/drivers/dec8.c2
-rw-r--r--src/mame/drivers/deco156.c4
-rw-r--r--src/mame/drivers/deco_ld.c6
-rw-r--r--src/mame/drivers/destroyr.c8
-rw-r--r--src/mame/drivers/discoboy.c8
-rw-r--r--src/mame/drivers/diverboy.c4
-rw-r--r--src/mame/drivers/dlair.c2
-rw-r--r--src/mame/drivers/dmndrby.c8
-rw-r--r--src/mame/drivers/dominob.c6
-rw-r--r--src/mame/drivers/dreamwld.c2
-rw-r--r--src/mame/drivers/drtomy.c2
-rw-r--r--src/mame/drivers/dunhuang.c8
-rw-r--r--src/mame/drivers/dwarfd.c4
-rw-r--r--src/mame/drivers/egghunt.c2
-rw-r--r--src/mame/drivers/esh.c2
-rw-r--r--src/mame/drivers/expro02.c6
-rw-r--r--src/mame/drivers/famibox.c2
-rw-r--r--src/mame/drivers/fcrash.c44
-rw-r--r--src/mame/drivers/feversoc.c4
-rw-r--r--src/mame/drivers/firefox.c4
-rw-r--r--src/mame/drivers/flipjack.c8
-rw-r--r--src/mame/drivers/flyball.c2
-rw-r--r--src/mame/drivers/fortecar.c2
-rw-r--r--src/mame/drivers/funkball.c2
-rw-r--r--src/mame/drivers/gal3.c6
-rw-r--r--src/mame/drivers/galaxi.c14
-rw-r--r--src/mame/drivers/galgame.c2
-rw-r--r--src/mame/drivers/galpani3.c16
-rw-r--r--src/mame/drivers/galpanic.c2
-rw-r--r--src/mame/drivers/gamecstl.c2
-rw-r--r--src/mame/drivers/go2000.c10
-rw-r--r--src/mame/drivers/gpworld.c4
-rw-r--r--src/mame/drivers/gstream.c2
-rw-r--r--src/mame/drivers/guab.c6
-rw-r--r--src/mame/drivers/halleys.c4
-rw-r--r--src/mame/drivers/highvdeo.c4
-rw-r--r--src/mame/drivers/hitme.c2
-rw-r--r--src/mame/drivers/hitpoker.c2
-rw-r--r--src/mame/drivers/hornet.c12
-rw-r--r--src/mame/drivers/hotblock.c4
-rw-r--r--src/mame/drivers/hvyunit.c2
-rw-r--r--src/mame/drivers/igs009.c12
-rw-r--r--src/mame/drivers/igs011.c20
-rw-r--r--src/mame/drivers/igs017.c14
-rw-r--r--src/mame/drivers/igs_m027.c2
-rw-r--r--src/mame/drivers/igspoker.c2
-rw-r--r--src/mame/drivers/intrscti.c6
-rw-r--r--src/mame/drivers/istellar.c2
-rw-r--r--src/mame/drivers/itgambl2.c20
-rw-r--r--src/mame/drivers/itgambl3.c20
-rw-r--r--src/mame/drivers/itgamble.c2
-rw-r--r--src/mame/drivers/jackie.c2
-rw-r--r--src/mame/drivers/jackpool.c2
-rw-r--r--src/mame/drivers/jalmah.c14
-rw-r--r--src/mame/drivers/jangou.c4
-rw-r--r--src/mame/drivers/jantotsu.c2
-rw-r--r--src/mame/drivers/jchan.c8
-rw-r--r--src/mame/drivers/jclub2.c16
-rw-r--r--src/mame/drivers/jollyjgr.c6
-rw-r--r--src/mame/drivers/jpmsys5.c6
-rw-r--r--src/mame/drivers/kingdrby.c2
-rw-r--r--src/mame/drivers/laserbat.c2
-rw-r--r--src/mame/drivers/lastfght.c12
-rw-r--r--src/mame/drivers/lgp.c4
-rw-r--r--src/mame/drivers/limenko.c4
-rw-r--r--src/mame/drivers/looping.c2
-rw-r--r--src/mame/drivers/luckgrln.c6
-rw-r--r--src/mame/drivers/m63.c2
-rw-r--r--src/mame/drivers/magicard.c16
-rw-r--r--src/mame/drivers/majorpkr.c2
-rw-r--r--src/mame/drivers/marinedt.c4
-rw-r--r--src/mame/drivers/mastboy.c6
-rw-r--r--src/mame/drivers/maygayv1.c4
-rw-r--r--src/mame/drivers/mazerbla.c24
-rw-r--r--src/mame/drivers/mediagx.c4
-rw-r--r--src/mame/drivers/meritm.c6
-rw-r--r--src/mame/drivers/mgolf.c4
-rw-r--r--src/mame/drivers/midas.c8
-rw-r--r--src/mame/drivers/mirage.c8
-rw-r--r--src/mame/drivers/mirax.c6
-rw-r--r--src/mame/drivers/missb2.c6
-rw-r--r--src/mame/drivers/mjsister.c6
-rw-r--r--src/mame/drivers/mlanding.c4
-rw-r--r--src/mame/drivers/monzagp.c12
-rw-r--r--src/mame/drivers/mpoker.c2
-rw-r--r--src/mame/drivers/mpu4dealem.c2
-rw-r--r--src/mame/drivers/mpu4vid.c2
-rw-r--r--src/mame/drivers/multfish.c2
-rw-r--r--src/mame/drivers/multigam.c2
-rw-r--r--src/mame/drivers/murogem.c2
-rw-r--r--src/mame/drivers/murogmbl.c2
-rw-r--r--src/mame/drivers/mwarr.c4
-rw-r--r--src/mame/drivers/namcos23.c6
-rw-r--r--src/mame/drivers/neoprint.c10
-rw-r--r--src/mame/drivers/nightgal.c4
-rw-r--r--src/mame/drivers/nmg5.c20
-rw-r--r--src/mame/drivers/norautp.c6
-rw-r--r--src/mame/drivers/nwk-tr.c6
-rw-r--r--src/mame/drivers/olibochu.c2
-rw-r--r--src/mame/drivers/panicr.c4
-rw-r--r--src/mame/drivers/pcxt.c2
-rw-r--r--src/mame/drivers/photon.c2
-rw-r--r--src/mame/drivers/pinkiri8.c12
-rw-r--r--src/mame/drivers/poker72.c2
-rw-r--r--src/mame/drivers/poo.c2
-rw-r--r--src/mame/drivers/popobear.c10
-rw-r--r--src/mame/drivers/powerbal.c2
-rw-r--r--src/mame/drivers/progolf.c6
-rw-r--r--src/mame/drivers/pturn.c2
-rw-r--r--src/mame/drivers/pzletime.c4
-rw-r--r--src/mame/drivers/quizpun2.c10
-rw-r--r--src/mame/drivers/r2dx_v33.c12
-rw-r--r--src/mame/drivers/rabbit.c16
-rw-r--r--src/mame/drivers/raiden2.c14
-rw-r--r--src/mame/drivers/rbmk.c4
-rw-r--r--src/mame/drivers/rgum.c2
-rw-r--r--src/mame/drivers/sandscrp.c8
-rw-r--r--src/mame/drivers/sbrkout.c2
-rw-r--r--src/mame/drivers/segac2.c4
-rw-r--r--src/mame/drivers/segald.c4
-rw-r--r--src/mame/drivers/seta.c2
-rw-r--r--src/mame/drivers/sfbonus.c6
-rw-r--r--src/mame/drivers/shanghai.c4
-rw-r--r--src/mame/drivers/sigmab52.c8
-rw-r--r--src/mame/drivers/sigmab98.c20
-rw-r--r--src/mame/drivers/silvmil.c2
-rw-r--r--src/mame/drivers/skyarmy.c2
-rw-r--r--src/mame/drivers/snowbros.c4
-rw-r--r--src/mame/drivers/speglsht.c2
-rw-r--r--src/mame/drivers/spoker.c2
-rw-r--r--src/mame/drivers/srmp5.c2
-rw-r--r--src/mame/drivers/srmp6.c8
-rw-r--r--src/mame/drivers/statriv2.c4
-rw-r--r--src/mame/drivers/sub.c4
-rw-r--r--src/mame/drivers/subsino2.c8
-rw-r--r--src/mame/drivers/summit.c2
-rw-r--r--src/mame/drivers/supdrapo.c2
-rw-r--r--src/mame/drivers/superwng.c2
-rw-r--r--src/mame/drivers/suprgolf.c6
-rw-r--r--src/mame/drivers/taitotz.c2
-rw-r--r--src/mame/drivers/taitowlf.c6
-rw-r--r--src/mame/drivers/tasman.c10
-rw-r--r--src/mame/drivers/tmaster.c8
-rw-r--r--src/mame/drivers/tmmjprd.c16
-rw-r--r--src/mame/drivers/trvmadns.c2
-rw-r--r--src/mame/drivers/ttchamp.c2
-rw-r--r--src/mame/drivers/tugboat.c4
-rw-r--r--src/mame/drivers/twins.c8
-rw-r--r--src/mame/drivers/umipoker.c2
-rw-r--r--src/mame/drivers/vega.c6
-rw-r--r--src/mame/drivers/viper.c2
-rw-r--r--src/mame/drivers/vmetal.c6
-rw-r--r--src/mame/drivers/vpoker.c2
-rw-r--r--src/mame/drivers/vroulet.c2
-rw-r--r--src/mame/drivers/witch.c2
-rw-r--r--src/mame/drivers/zr107.c12
208 files changed, 631 insertions, 631 deletions
diff --git a/src/mame/drivers/1945kiii.c b/src/mame/drivers/1945kiii.c
index 6bfb4734df5..d7db5410a69 100644
--- a/src/mame/drivers/1945kiii.c
+++ b/src/mame/drivers/1945kiii.c
@@ -127,7 +127,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
UINT32 k3_state::screen_update_k3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/drivers/ace.c b/src/mame/drivers/ace.c
index 3c0bf68debc..b6c4275d01b 100644
--- a/src/mame/drivers/ace.c
+++ b/src/mame/drivers/ace.c
@@ -99,19 +99,19 @@ UINT32 aceal_state::screen_update_ace(screen_device &screen, bitmap_ind16 &bitma
/* first of all, fill the screen with the background color */
bitmap.fill(0, cliprect);
- drawgfx_opaque(bitmap, cliprect, screen.machine().gfx[1],
+ drawgfx_opaque(bitmap, cliprect, machine().gfx[1],
0,
0,
0, 0,
m_objpos[0], m_objpos[1]);
- drawgfx_opaque(bitmap, cliprect, screen.machine().gfx[2],
+ drawgfx_opaque(bitmap, cliprect, machine().gfx[2],
0,
0,
0, 0,
m_objpos[2], m_objpos[3]);
- drawgfx_opaque(bitmap, cliprect, screen.machine().gfx[3],
+ drawgfx_opaque(bitmap, cliprect, machine().gfx[3],
0,
0,
0, 0,
@@ -120,7 +120,7 @@ UINT32 aceal_state::screen_update_ace(screen_device &screen, bitmap_ind16 &bitma
for (offs = 0; offs < 8; offs++)
{
drawgfx_opaque(bitmap,/* ?? */
- cliprect, screen.machine().gfx[4],
+ cliprect, machine().gfx[4],
offs,
0,
0, 0,
diff --git a/src/mame/drivers/acefruit.c b/src/mame/drivers/acefruit.c
index e65674e952b..65d4c568396 100644
--- a/src/mame/drivers/acefruit.c
+++ b/src/mame/drivers/acefruit.c
@@ -111,7 +111,7 @@ UINT32 acefruit_state::screen_update_acefruit(screen_device &screen, bitmap_ind1
if( color < 0x4 )
{
- drawgfx_opaque( bitmap, cliprect, screen.machine().gfx[ 1 ], code, color, 0, 0, col * 16, row * 8 );
+ drawgfx_opaque( bitmap, cliprect, machine().gfx[ 1 ], code, color, 0, 0, col * 16, row * 8 );
}
else if( color >= 0x5 && color <= 0x7 )
{
@@ -119,7 +119,7 @@ UINT32 acefruit_state::screen_update_acefruit(screen_device &screen, bitmap_ind1
int x;
static const int spriteskip[] = { 1, 2, 4 };
int spritesize = spriteskip[ color - 5 ];
- gfx_element *gfx = screen.machine().gfx[ 0 ];
+ gfx_element *gfx = machine().gfx[ 0 ];
for( x = 0; x < 16; x++ )
{
diff --git a/src/mame/drivers/acommand.c b/src/mame/drivers/acommand.c
index 6ceaee97c7b..a808171ab35 100644
--- a/src/mame/drivers/acommand.c
+++ b/src/mame/drivers/acommand.c
@@ -253,7 +253,7 @@ static void draw_led(bitmap_ind16 &bitmap, int x, int y,UINT8 value)
UINT32 acommand_state::screen_update_acommand(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
m_bg_tilemap->draw(bitmap, cliprect, 0,0);
- draw_sprites(screen.machine(),bitmap,cliprect,0,0);
+ draw_sprites(machine(),bitmap,cliprect,0,0);
m_tx_tilemap->draw(bitmap, cliprect, 0,0);
/*Order might be wrong,but these for sure are the led numbers tested*/
diff --git a/src/mame/drivers/adp.c b/src/mame/drivers/adp.c
index 806149d9d4f..2af8f93c836 100644
--- a/src/mame/drivers/adp.c
+++ b/src/mame/drivers/adp.c
@@ -227,7 +227,7 @@ UINT32 adp_state::screen_update_adp(screen_device &screen, bitmap_ind16 &bitmap,
b++;
}
}
-if (!screen.machine().input().code_pressed(KEYCODE_O)) // debug: toggle window
+if (!machine().input().code_pressed(KEYCODE_O)) // debug: toggle window
if ((hd63484_regs_r(m_hd63484, 0x06/2, 0xffff) & 0x0300) == 0x0300)
{
int sy = (hd63484_regs_r(m_hd63484, 0x94/2, 0xffff) & 0x0fff) - (hd63484_regs_r(m_hd63484, 0x88/2, 0xffff) >> 8);
diff --git a/src/mame/drivers/albazc.c b/src/mame/drivers/albazc.c
index 7eae69ccf9e..c53b08cf9bf 100644
--- a/src/mame/drivers/albazc.c
+++ b/src/mame/drivers/albazc.c
@@ -91,7 +91,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
UINT32 albazc_state::screen_update_hanaroku(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
bitmap.fill(0x1f0, cliprect); // ???
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/drivers/amaticmg.c b/src/mame/drivers/amaticmg.c
index fed5a063276..990f9f398dc 100644
--- a/src/mame/drivers/amaticmg.c
+++ b/src/mame/drivers/amaticmg.c
@@ -467,7 +467,7 @@ void amaticmg_state::video_start()
UINT32 amaticmg_state::screen_update_amaticmg(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- gfx_element *gfx = screen.machine().gfx[0];
+ gfx_element *gfx = machine().gfx[0];
int y,x;
int count = 0;
@@ -492,7 +492,7 @@ UINT32 amaticmg_state::screen_update_amaticmg(screen_device &screen, bitmap_ind1
UINT32 amaticmg_state::screen_update_amaticmg2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- gfx_element *gfx = screen.machine().gfx[0];
+ gfx_element *gfx = machine().gfx[0];
int y,x;
int count = 16;
diff --git a/src/mame/drivers/aristmk4.c b/src/mame/drivers/aristmk4.c
index d31bbdd52ec..2da557e44ca 100644
--- a/src/mame/drivers/aristmk4.c
+++ b/src/mame/drivers/aristmk4.c
@@ -373,7 +373,7 @@ INLINE void uBackgroundColour(running_machine &machine)
UINT32 aristmk4_state::screen_update_aristmk4(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- gfx_element *gfx = screen.machine().gfx[0];
+ gfx_element *gfx = machine().gfx[0];
int x,y;
int count = 0;
int color;
@@ -389,7 +389,7 @@ UINT32 aristmk4_state::screen_update_aristmk4(screen_device &screen, bitmap_ind1
color = ((m_mkiv_vram[count]) & 0xe0) >> 5;
tile = (m_mkiv_vram[count+1]|m_mkiv_vram[count]<<8) & 0x3ff;
bgtile = (m_mkiv_vram[count+1]|m_mkiv_vram[count]<<8) & 0xff; // first 256 tiles
- uBackgroundColour(screen.machine()); // read sw7
+ uBackgroundColour(machine()); // read sw7
gfx->decode(bgtile); // force the machine to update only the first 256 tiles.
// as we only update the background, not the entire display.
flipx = ((m_mkiv_vram[count]) & 0x04);
diff --git a/src/mame/drivers/aristmk6.c b/src/mame/drivers/aristmk6.c
index 196d25b8163..625c9a74f4f 100644
--- a/src/mame/drivers/aristmk6.c
+++ b/src/mame/drivers/aristmk6.c
@@ -32,36 +32,36 @@ UINT32 aristmk6_state::screen_update_aristmk6(screen_device &screen, bitmap_rgb3
int x,y,count;
const UINT8 *blit_ram = memregion("maincpu")->base();
- if(screen.machine().input().code_pressed(KEYCODE_Z))
+ if(machine().input().code_pressed(KEYCODE_Z))
m_test_x++;
- if(screen.machine().input().code_pressed(KEYCODE_X))
+ if(machine().input().code_pressed(KEYCODE_X))
m_test_x--;
- if(screen.machine().input().code_pressed(KEYCODE_A))
+ if(machine().input().code_pressed(KEYCODE_A))
m_test_y++;
- if(screen.machine().input().code_pressed(KEYCODE_S))
+ if(machine().input().code_pressed(KEYCODE_S))
m_test_y--;
- if(screen.machine().input().code_pressed(KEYCODE_Q))
+ if(machine().input().code_pressed(KEYCODE_Q))
m_start_offs+=0x2000;
- if(screen.machine().input().code_pressed(KEYCODE_W))
+ if(machine().input().code_pressed(KEYCODE_W))
m_start_offs-=0x2000;
- if(screen.machine().input().code_pressed(KEYCODE_E))
+ if(machine().input().code_pressed(KEYCODE_E))
m_start_offs++;
- if(screen.machine().input().code_pressed(KEYCODE_R))
+ if(machine().input().code_pressed(KEYCODE_R))
m_start_offs--;
- if(screen.machine().input().code_pressed_once(KEYCODE_L))
+ if(machine().input().code_pressed_once(KEYCODE_L))
m_type^=1;
popmessage("%d %d %04x %d",m_test_x,m_test_y,m_start_offs,m_type);
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
count = (m_start_offs);
@@ -96,7 +96,7 @@ UINT32 aristmk6_state::screen_update_aristmk6(screen_device &screen, bitmap_rgb3
color = blit_ram[count];
if(cliprect.contains(x, y))
- bitmap.pix32(y, x) = screen.machine().pens[color];
+ bitmap.pix32(y, x) = machine().pens[color];
count++;
}
diff --git a/src/mame/drivers/astinvad.c b/src/mame/drivers/astinvad.c
index f74835e4a43..4e02c41746f 100644
--- a/src/mame/drivers/astinvad.c
+++ b/src/mame/drivers/astinvad.c
@@ -181,7 +181,7 @@ UINT32 astinvad_state::screen_update_astinvad(screen_device &screen, bitmap_rgb3
{
UINT8 color = color_prom[((y & 0xf8) << 2) | (x >> 3)] >> (m_screen_flip ? 0 : 4);
UINT8 data = m_videoram[(((y ^ m_screen_flip) + yoffs) << 5) | ((x ^ m_screen_flip) >> 3)];
- plot_byte(screen.machine(), bitmap, y, x, data, m_screen_red ? 1 : color);
+ plot_byte(machine(), bitmap, y, x, data, m_screen_red ? 1 : color);
}
return 0;
@@ -205,7 +205,7 @@ UINT32 astinvad_state::screen_update_spaceint(screen_device &screen, bitmap_rgb3
offs_t n = ((offs >> 5) & 0xf0) | color;
color = color_prom[n] & 0x07;
- plot_byte(screen.machine(), bitmap, y, x, data, color);
+ plot_byte(machine(), bitmap, y, x, data, color);
}
return 0;
diff --git a/src/mame/drivers/astrocorp.c b/src/mame/drivers/astrocorp.c
index 84198b42790..84376d98d29 100644
--- a/src/mame/drivers/astrocorp.c
+++ b/src/mame/drivers/astrocorp.c
@@ -157,7 +157,7 @@ UINT32 astrocorp_state::screen_update_astrocorp(screen_device &screen, bitmap_in
if (m_screen_enable & 1)
copybitmap(bitmap, m_bitmap, 0,0,0,0, cliprect);
else
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
return 0;
}
diff --git a/src/mame/drivers/astrof.c b/src/mame/drivers/astrof.c
index 07d09b1e736..a620a9a21cf 100644
--- a/src/mame/drivers/astrof.c
+++ b/src/mame/drivers/astrof.c
@@ -417,9 +417,9 @@ UINT32 astrof_state::screen_update_astrof(screen_device &screen, bitmap_rgb32 &b
{
pen_t pens[ASTROF_NUM_PENS];
- astrof_get_pens(screen.machine(), pens);
+ astrof_get_pens(machine(), pens);
- video_update_common(screen.machine(), bitmap, cliprect, pens);
+ video_update_common(machine(), bitmap, cliprect, pens);
return 0;
}
@@ -429,9 +429,9 @@ UINT32 astrof_state::screen_update_tomahawk(screen_device &screen, bitmap_rgb32
{
pen_t pens[TOMAHAWK_NUM_PENS];
- tomahawk_get_pens(screen.machine(), pens);
+ tomahawk_get_pens(machine(), pens);
- video_update_common(screen.machine(), bitmap, cliprect, pens);
+ video_update_common(machine(), bitmap, cliprect, pens);
return 0;
}
diff --git a/src/mame/drivers/atarisy4.c b/src/mame/drivers/atarisy4.c
index af85a7cb49e..392c1e45e98 100644
--- a/src/mame/drivers/atarisy4.c
+++ b/src/mame/drivers/atarisy4.c
@@ -182,8 +182,8 @@ UINT32 atarisy4_state::screen_update_atarisy4(screen_device &screen, bitmap_rgb3
{
UINT16 data = *src++;
- *dest++ = screen.machine().pens[data & 0xff];
- *dest++ = screen.machine().pens[data >> 8];
+ *dest++ = machine().pens[data & 0xff];
+ *dest++ = machine().pens[data >> 8];
}
}
return 0;
diff --git a/src/mame/drivers/avt.c b/src/mame/drivers/avt.c
index 08fe2374178..393c2da6dae 100644
--- a/src/mame/drivers/avt.c
+++ b/src/mame/drivers/avt.c
@@ -509,7 +509,7 @@ UINT32 avt_state::screen_update_avt(screen_device &screen, bitmap_ind16 &bitmap,
{
int x,y;
int count;
- gfx_element *gfx = screen.machine().gfx[0];
+ gfx_element *gfx = machine().gfx[0];
count = 0;
diff --git a/src/mame/drivers/backfire.c b/src/mame/drivers/backfire.c
index 341497d942c..441cd3c9b94 100644
--- a/src/mame/drivers/backfire.c
+++ b/src/mame/drivers/backfire.c
@@ -121,20 +121,20 @@ UINT32 backfire_state::screen_update_backfire_left(screen_device &screen, bitmap
deco16ic_pf_update(m_deco_tilegen1, m_pf1_rowscroll, m_pf2_rowscroll);
deco16ic_pf_update(m_deco_tilegen2, m_pf3_rowscroll, m_pf4_rowscroll);
- screen.machine().priority_bitmap.fill(0);
+ machine().priority_bitmap.fill(0);
bitmap.fill(0x100, cliprect);
if (m_left_priority[0] == 0)
{
deco16ic_tilemap_1_draw(m_deco_tilegen2, bitmap, cliprect, 0, 1);
deco16ic_tilemap_1_draw(m_deco_tilegen1, bitmap, cliprect, 0, 2);
- screen.machine().device<decospr_device>("spritegen")->draw_sprites(bitmap, cliprect, m_spriteram_1, 0x800);
+ machine().device<decospr_device>("spritegen")->draw_sprites(bitmap, cliprect, m_spriteram_1, 0x800);
}
else if (m_left_priority[0] == 2)
{
deco16ic_tilemap_1_draw(m_deco_tilegen1, bitmap, cliprect, 0, 2);
deco16ic_tilemap_1_draw(m_deco_tilegen2, bitmap, cliprect, 0, 4);
- screen.machine().device<decospr_device>("spritegen")->draw_sprites(bitmap, cliprect, m_spriteram_1, 0x800);
+ machine().device<decospr_device>("spritegen")->draw_sprites(bitmap, cliprect, m_spriteram_1, 0x800);
}
else
popmessage( "unknown left priority %08x", m_left_priority[0]);
@@ -153,20 +153,20 @@ UINT32 backfire_state::screen_update_backfire_right(screen_device &screen, bitma
deco16ic_pf_update(m_deco_tilegen1, m_pf1_rowscroll, m_pf2_rowscroll);
deco16ic_pf_update(m_deco_tilegen2, m_pf3_rowscroll, m_pf4_rowscroll);
- screen.machine().priority_bitmap.fill(0);
+ machine().priority_bitmap.fill(0);
bitmap.fill(0x500, cliprect);
if (m_right_priority[0] == 0)
{
deco16ic_tilemap_2_draw(m_deco_tilegen2, bitmap, cliprect, 0, 1);
deco16ic_tilemap_2_draw(m_deco_tilegen1, bitmap, cliprect, 0, 2);
- screen.machine().device<decospr_device>("spritegen2")->draw_sprites(bitmap, cliprect, m_spriteram_2, 0x800);
+ machine().device<decospr_device>("spritegen2")->draw_sprites(bitmap, cliprect, m_spriteram_2, 0x800);
}
else if (m_right_priority[0] == 2)
{
deco16ic_tilemap_2_draw(m_deco_tilegen1, bitmap, cliprect, 0, 2);
deco16ic_tilemap_2_draw(m_deco_tilegen2, bitmap, cliprect, 0, 4);
- screen.machine().device<decospr_device>("spritegen2")->draw_sprites(bitmap, cliprect, m_spriteram_2, 0x800);
+ machine().device<decospr_device>("spritegen2")->draw_sprites(bitmap, cliprect, m_spriteram_2, 0x800);
}
else
popmessage( "unknown right priority %08x", m_right_priority[0]);
diff --git a/src/mame/drivers/berzerk.c b/src/mame/drivers/berzerk.c
index 60a7df61104..9caf42c5a6b 100644
--- a/src/mame/drivers/berzerk.c
+++ b/src/mame/drivers/berzerk.c
@@ -461,7 +461,7 @@ UINT32 berzerk_state::screen_update_berzerk(screen_device &screen, bitmap_rgb32
pen_t pens[NUM_PENS];
offs_t offs;
- get_pens(screen.machine(), pens);
+ get_pens(machine(), pens);
for (offs = 0; offs < m_videoram.bytes(); offs++)
{
diff --git a/src/mame/drivers/bestleag.c b/src/mame/drivers/bestleag.c
index 5ee5209fb3f..a40698d8926 100644
--- a/src/mame/drivers/bestleag.c
+++ b/src/mame/drivers/bestleag.c
@@ -185,7 +185,7 @@ UINT32 bestleag_state::screen_update_bestleag(screen_device &screen, bitmap_ind1
m_bg_tilemap->draw(bitmap, cliprect, 0,0);
m_fg_tilemap->draw(bitmap, cliprect, 0,0);
- draw_sprites(screen.machine(),bitmap,cliprect);
+ draw_sprites(machine(),bitmap,cliprect);
m_tx_tilemap->draw(bitmap, cliprect, 0,0);
return 0;
}
@@ -201,7 +201,7 @@ UINT32 bestleag_state::screen_update_bestleaw(screen_device &screen, bitmap_ind1
m_bg_tilemap->draw(bitmap, cliprect, 0,0);
m_fg_tilemap->draw(bitmap, cliprect, 0,0);
- draw_sprites(screen.machine(),bitmap,cliprect);
+ draw_sprites(machine(),bitmap,cliprect);
m_tx_tilemap->draw(bitmap, cliprect, 0,0);
return 0;
}
diff --git a/src/mame/drivers/bfcobra.c b/src/mame/drivers/bfcobra.c
index 887d3510992..f82c62af0a4 100644
--- a/src/mame/drivers/bfcobra.c
+++ b/src/mame/drivers/bfcobra.c
@@ -412,13 +412,13 @@ UINT32 bfcobra_state::screen_update_bfcobra(screen_device &screen, bitmap_rgb32
if ( ( m_videomode & 0x81 ) == 1 || (m_videomode & 0x80 && pen & 0x80) )
{
- *dest++ = screen.machine().pens[hirescol[pen & 0x0f]];
- *dest++ = screen.machine().pens[hirescol[(pen >> 4) & 0x0f]];
+ *dest++ = machine().pens[hirescol[pen & 0x0f]];
+ *dest++ = machine().pens[hirescol[(pen >> 4) & 0x0f]];
}
else
{
- *dest++ = screen.machine().pens[lorescol[pen]];
- *dest++ = screen.machine().pens[lorescol[pen]];
+ *dest++ = machine().pens[lorescol[pen]];
+ *dest++ = machine().pens[lorescol[pen]];
}
}
}
diff --git a/src/mame/drivers/bingor.c b/src/mame/drivers/bingor.c
index 50d11ad684e..e7e3d3d873a 100644
--- a/src/mame/drivers/bingor.c
+++ b/src/mame/drivers/bingor.c
@@ -466,7 +466,7 @@ UINT32 bingor_state::screen_update_bingor(screen_device &screen, bitmap_rgb32 &b
{
int x,y,count;
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
count = (0x2000/2);
@@ -479,22 +479,22 @@ UINT32 bingor_state::screen_update_bingor(screen_device &screen, bitmap_rgb32 &b
color = (m_blit_ram[count] & 0xf000)>>12;
if(cliprect.contains(x+3, y))
- bitmap.pix32(y, x+3) = screen.machine().pens[color];
+ bitmap.pix32(y, x+3) = machine().pens[color];
color = (m_blit_ram[count] & 0x0f00)>>8;
if(cliprect.contains(x+2, y))
- bitmap.pix32(y, x+2) = screen.machine().pens[color];
+ bitmap.pix32(y, x+2) = machine().pens[color];
color = (m_blit_ram[count] & 0x00f0)>>4;
if(cliprect.contains(x+1, y))
- bitmap.pix32(y, x+1) = screen.machine().pens[color];
+ bitmap.pix32(y, x+1) = machine().pens[color];
color = (m_blit_ram[count] & 0x000f)>>0;
if(cliprect.contains(x+0, y))
- bitmap.pix32(y, x+0) = screen.machine().pens[color];
+ bitmap.pix32(y, x+0) = machine().pens[color];
count++;
}
diff --git a/src/mame/drivers/blackt96.c b/src/mame/drivers/blackt96.c
index fcdea2270f5..41c50a5281a 100644
--- a/src/mame/drivers/blackt96.c
+++ b/src/mame/drivers/blackt96.c
@@ -232,9 +232,9 @@ UINT32 blackt96_state::screen_update_blackt96(screen_device &screen, bitmap_ind1
{
int count;
int x,y;
- gfx_element *gfx = screen.machine().gfx[2];
+ gfx_element *gfx = machine().gfx[2];
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
int strip;
int page;
@@ -243,7 +243,7 @@ UINT32 blackt96_state::screen_update_blackt96(screen_device &screen, bitmap_ind1
{
for (page = 7;page>0;page--)
{
- draw_strip(screen.machine(), bitmap, cliprect, page, strip, 1);
+ draw_strip(machine(), bitmap, cliprect, page, strip, 1);
}
}
@@ -251,7 +251,7 @@ UINT32 blackt96_state::screen_update_blackt96(screen_device &screen, bitmap_ind1
{
for (page = 7;page>0;page--)
{
- draw_strip(screen.machine(), bitmap, cliprect, page, strip, 0);
+ draw_strip(machine(), bitmap, cliprect, page, strip, 0);
}
}
diff --git a/src/mame/drivers/blitz68k.c b/src/mame/drivers/blitz68k.c
index e9d07d6c874..9137906a00d 100644
--- a/src/mame/drivers/blitz68k.c
+++ b/src/mame/drivers/blitz68k.c
@@ -218,7 +218,7 @@ UINT32 blitz68k_state::screen_update_blitz68k(screen_device &screen, bitmap_rgb3
{
for(x = 0; x < 512; x++)
{
- bitmap.pix32(y, x) = screen.machine().pens[*src++];
+ bitmap.pix32(y, x) = machine().pens[*src++];
}
}
@@ -239,10 +239,10 @@ UINT32 blitz68k_state::screen_update_blitz68k_noblit(screen_device &screen, bitm
for(x = 0; x < 512; )
{
UINT16 pen = *src++;
- bitmap.pix32(y, x++) = screen.machine().pens[(pen >> 8) & 0xf];
- bitmap.pix32(y, x++) = screen.machine().pens[(pen >> 12) & 0xf];
- bitmap.pix32(y, x++) = screen.machine().pens[(pen >> 0) & 0xf];
- bitmap.pix32(y, x++) = screen.machine().pens[(pen >> 4) & 0xf];
+ bitmap.pix32(y, x++) = machine().pens[(pen >> 8) & 0xf];
+ bitmap.pix32(y, x++) = machine().pens[(pen >> 12) & 0xf];
+ bitmap.pix32(y, x++) = machine().pens[(pen >> 0) & 0xf];
+ bitmap.pix32(y, x++) = machine().pens[(pen >> 4) & 0xf];
}
}
diff --git a/src/mame/drivers/bmcbowl.c b/src/mame/drivers/bmcbowl.c
index ca0078dfa0e..758578226d0 100644
--- a/src/mame/drivers/bmcbowl.c
+++ b/src/mame/drivers/bmcbowl.c
@@ -157,7 +157,7 @@ UINT32 bmcbowl_state::screen_update_bmcbowl(screen_device &screen, bitmap_ind16
*/
int x,y,z,pixdat;
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
z=0;
for (y=0;y<230;y++)
diff --git a/src/mame/drivers/bmcpokr.c b/src/mame/drivers/bmcpokr.c
index 488b0e9d998..e26c97f9592 100644
--- a/src/mame/drivers/bmcpokr.c
+++ b/src/mame/drivers/bmcpokr.c
@@ -201,7 +201,7 @@ GFXDECODE_END
UINT32 bmcpokr_state::screen_update_bmcpokr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- gfx_element *gfx = screen.machine().gfx[0];
+ gfx_element *gfx = machine().gfx[0];
int count = 0;
for (int y=0;y<32;y++)
diff --git a/src/mame/drivers/bnstars.c b/src/mame/drivers/bnstars.c
index ea660a852f4..1b5593f08f6 100644
--- a/src/mame/drivers/bnstars.c
+++ b/src/mame/drivers/bnstars.c
@@ -535,7 +535,7 @@ void bnstars_state::video_start()
UINT32 bnstars_state::screen_update_bnstars_left(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
bitmap.fill(0, cliprect); /* bg color */
@@ -544,14 +544,14 @@ UINT32 bnstars_state::screen_update_bnstars_left(screen_device &screen, bitmap_i
m_ms32_bg_tilemap[0]->set_scrolly(0, m_ms32_bg0_scroll[0x0c/4] + m_ms32_bg0_scroll[0x14/4] );
m_ms32_bg_tilemap[0]->draw(bitmap, cliprect, 0,1);
- draw_roz(screen.machine(),bitmap,cliprect,2,0);
+ draw_roz(machine(),bitmap,cliprect,2,0);
m_ms32_tx_tilemap[0]->set_scrollx(0, m_ms32_tx0_scroll[0x00/4] + m_ms32_tx0_scroll[0x08/4] + 0x18);
m_ms32_tx_tilemap[0]->set_scrolly(0, m_ms32_tx0_scroll[0x0c/4] + m_ms32_tx0_scroll[0x14/4]);
m_ms32_tx_tilemap[0]->draw(bitmap, cliprect, 0,4);
- draw_sprites(screen.machine(),bitmap,cliprect, m_ms32_spram, 0x20000, 0);
+ draw_sprites(machine(),bitmap,cliprect, m_ms32_spram, 0x20000, 0);
return 0;
}
@@ -559,7 +559,7 @@ UINT32 bnstars_state::screen_update_bnstars_left(screen_device &screen, bitmap_i
UINT32 bnstars_state::screen_update_bnstars_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
bitmap.fill(0x8000+0, cliprect); /* bg color */
@@ -568,13 +568,13 @@ UINT32 bnstars_state::screen_update_bnstars_right(screen_device &screen, bitmap_
m_ms32_bg_tilemap[1]->set_scrolly(0, m_ms32_bg1_scroll[0x0c/4] + m_ms32_bg1_scroll[0x14/4] );
m_ms32_bg_tilemap[1]->draw(bitmap, cliprect, 0,1);
- draw_roz(screen.machine(),bitmap,cliprect,2,1);
+ draw_roz(machine(),bitmap,cliprect,2,1);
m_ms32_tx_tilemap[1]->set_scrollx(0, m_ms32_tx1_scroll[0x00/4] + m_ms32_tx1_scroll[0x08/4] + 0x18);
m_ms32_tx_tilemap[1]->set_scrolly(0, m_ms32_tx1_scroll[0x0c/4] + m_ms32_tx1_scroll[0x14/4]);
m_ms32_tx_tilemap[1]->draw(bitmap, cliprect, 0,4);
- draw_sprites(screen.machine(),bitmap,cliprect, m_ms32_spram+(0x20000/4), 0x20000, 4);
+ draw_sprites(machine(),bitmap,cliprect, m_ms32_spram+(0x20000/4), 0x20000, 4);
return 0;
}
diff --git a/src/mame/drivers/boxer.c b/src/mame/drivers/boxer.c
index 4e4ac6a3b8a..802808208b4 100644
--- a/src/mame/drivers/boxer.c
+++ b/src/mame/drivers/boxer.c
@@ -184,7 +184,7 @@ UINT32 boxer_state::screen_update_boxer(screen_device &screen, bitmap_ind16 &bit
UINT8 code = m_tile_ram[32 * i + j];
drawgfx_transpen(bitmap, cliprect,
- screen.machine().gfx[2],
+ machine().gfx[2],
code,
0,
code & 0x40, code & 0x40,
@@ -193,7 +193,7 @@ UINT32 boxer_state::screen_update_boxer(screen_device &screen, bitmap_ind16 &bit
}
}
- draw_boxer(screen.machine(), bitmap, cliprect);
+ draw_boxer(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/drivers/buster.c b/src/mame/drivers/buster.c
index 9869e21e62d..842a4198796 100644
--- a/src/mame/drivers/buster.c
+++ b/src/mame/drivers/buster.c
@@ -33,7 +33,7 @@ void buster_state::video_start()
UINT32 buster_state::screen_update_buster(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- gfx_element *gfx = screen.machine().gfx[0];
+ gfx_element *gfx = machine().gfx[0];
int count = 0x0000;
int y,x;
diff --git a/src/mame/drivers/cabaret.c b/src/mame/drivers/cabaret.c
index d42bbc719b3..065027206a0 100644
--- a/src/mame/drivers/cabaret.c
+++ b/src/mame/drivers/cabaret.c
@@ -115,7 +115,7 @@ void cabaret_state::video_start()
UINT32 cabaret_state::screen_update_cabaret(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
diff --git a/src/mame/drivers/calorie.c b/src/mame/drivers/calorie.c
index f7f0c91dcf3..30d760608c0 100644
--- a/src/mame/drivers/calorie.c
+++ b/src/mame/drivers/calorie.c
@@ -192,12 +192,12 @@ UINT32 calorie_state::screen_update_calorie(screen_device &screen, bitmap_ind16
if (m_sprites[x + 1] & 0x10)
{
/* 32x32 sprites */
- drawgfx_transpen(bitmap, cliprect, screen.machine().gfx[3], tileno | 0x40, color, flipx, flipy, xpos, ypos - 31, 0);
+ drawgfx_transpen(bitmap, cliprect, machine().gfx[3], tileno | 0x40, color, flipx, flipy, xpos, ypos - 31, 0);
}
else
{
/* 16x16 sprites */
- drawgfx_transpen(bitmap, cliprect, screen.machine().gfx[2], tileno, color, flipx, flipy, xpos, ypos - 15, 0);
+ drawgfx_transpen(bitmap, cliprect, machine().gfx[2], tileno, color, flipx, flipy, xpos, ypos - 15, 0);
}
}
return 0;
diff --git a/src/mame/drivers/cardline.c b/src/mame/drivers/cardline.c
index 9175c94b99b..4c1da2ba71d 100644
--- a/src/mame/drivers/cardline.c
+++ b/src/mame/drivers/cardline.c
@@ -64,14 +64,14 @@ UINT32 cardline_state::screen_update_cardline(screen_device &screen, bitmap_ind1
int index=y*64+x;
if(m_video&1)
{
- DRAW_TILE(screen.machine(),0,0);
- DRAW_TILE(screen.machine(),0x800,1);
+ DRAW_TILE(machine(),0,0);
+ DRAW_TILE(machine(),0x800,1);
}
if(m_video&2)
{
- DRAW_TILE(screen.machine(),0x1000,0);
- DRAW_TILE(screen.machine(),0x1800,1);
+ DRAW_TILE(machine(),0x1000,0);
+ DRAW_TILE(machine(),0x1800,1);
}
}
}
diff --git a/src/mame/drivers/carrera.c b/src/mame/drivers/carrera.c
index 9529d2ab3f6..7da2d28f529 100644
--- a/src/mame/drivers/carrera.c
+++ b/src/mame/drivers/carrera.c
@@ -260,7 +260,7 @@ UINT32 carrera_state::screen_update_carrera(screen_device &screen, bitmap_ind16
{
int tile = m_tileram[count&0x7ff] | m_tileram[(count&0x7ff)+0x800]<<8;
- drawgfx_opaque(bitmap,cliprect,screen.machine().gfx[0],tile,0,0,0,x*8,y*8);
+ drawgfx_opaque(bitmap,cliprect,machine().gfx[0],tile,0,0,0,x*8,y*8);
count++;
}
}
diff --git a/src/mame/drivers/cb2001.c b/src/mame/drivers/cb2001.c
index ed01f887aa3..f8857b1f75f 100644
--- a/src/mame/drivers/cb2001.c
+++ b/src/mame/drivers/cb2001.c
@@ -335,7 +335,7 @@ e3 -> c6
UINT32 cb2001_state::screen_update_cb2001(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
int count,x,y;
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
count = 0x0000;
@@ -356,7 +356,7 @@ UINT32 cb2001_state::screen_update_cb2001(screen_device &screen, bitmap_rgb32 &b
tile += m_videobank*0x2000;
- drawgfx_opaque(bitmap,cliprect,screen.machine().gfx[0],tile,colour,0,0,x*8,y*8);
+ drawgfx_opaque(bitmap,cliprect,machine().gfx[0],tile,colour,0,0,x*8,y*8);
count++;
}
@@ -422,7 +422,7 @@ UINT32 cb2001_state::screen_update_cb2001(screen_device &screen, bitmap_rgb32 &b
tile += 0x1000;
}
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[0],tile,colour,0,0,x*8,y*8,0);
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[0],tile,colour,0,0,x*8,y*8,0);
count++;
}
}
diff --git a/src/mame/drivers/cball.c b/src/mame/drivers/cball.c
index ea32dfc1a7c..478bb7bdb0c 100644
--- a/src/mame/drivers/cball.c
+++ b/src/mame/drivers/cball.c
@@ -64,7 +64,7 @@ UINT32 cball_state::screen_update_cball(screen_device &screen, bitmap_ind16 &bit
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
/* draw sprite */
- drawgfx_transpen(bitmap, cliprect, screen.machine().gfx[1],
+ drawgfx_transpen(bitmap, cliprect, machine().gfx[1],
m_video_ram[0x399] >> 4,
0,
0, 0,
diff --git a/src/mame/drivers/cham24.c b/src/mame/drivers/cham24.c
index 5119f5989a4..60bd543b4d7 100644
--- a/src/mame/drivers/cham24.c
+++ b/src/mame/drivers/cham24.c
@@ -306,7 +306,7 @@ void cham24_state::video_start()
UINT32 cham24_state::screen_update_cham24(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
/* render the ppu */
- ppu2c0x_device *ppu = screen.machine().device<ppu2c0x_device>("ppu");
+ ppu2c0x_device *ppu = machine().device<ppu2c0x_device>("ppu");
ppu->render(bitmap, 0, 0, 0, 0);
return 0;
}
diff --git a/src/mame/drivers/champbas.c b/src/mame/drivers/champbas.c
index 823606773d7..8d02c617333 100644
--- a/src/mame/drivers/champbas.c
+++ b/src/mame/drivers/champbas.c
@@ -103,7 +103,7 @@ void champbas_state::screen_eof_champbas(screen_device &screen, bool state)
m_watchdog_count++;
if (m_watchdog_count == 0x10)
- screen.machine().schedule_soft_reset();
+ machine().schedule_soft_reset();
}
}
diff --git a/src/mame/drivers/champbwl.c b/src/mame/drivers/champbwl.c
index 70caa7166ad..9e9486069ec 100644
--- a/src/mame/drivers/champbwl.c
+++ b/src/mame/drivers/champbwl.c
@@ -460,10 +460,10 @@ UINT32 champbwl_state::screen_update_champbwl(screen_device &screen, bitmap_ind1
{
bitmap.fill(0x1f0, cliprect);
- screen.machine().device<seta001_device>("spritegen")->set_fg_yoffsets( -0x12, 0x0e );
- screen.machine().device<seta001_device>("spritegen")->set_bg_yoffsets( 0x1, -0x1 );
+ machine().device<seta001_device>("spritegen")->set_fg_yoffsets( -0x12, 0x0e );
+ machine().device<seta001_device>("spritegen")->set_bg_yoffsets( 0x1, -0x1 );
- screen.machine().device<seta001_device>("spritegen")->seta001_draw_sprites(screen.machine(), bitmap, cliprect, 0x800, 1 );
+ machine().device<seta001_device>("spritegen")->seta001_draw_sprites(machine(), bitmap, cliprect, 0x800, 1 );
return 0;
}
@@ -471,7 +471,7 @@ void champbwl_state::screen_eof_champbwl(screen_device &screen, bool state)
{
// rising edge
if (state)
- screen.machine().device<seta001_device>("spritegen")->tnzs_eof();
+ machine().device<seta001_device>("spritegen")->tnzs_eof();
}
@@ -519,10 +519,10 @@ UINT32 champbwl_state::screen_update_doraemon(screen_device &screen, bitmap_ind1
{
bitmap.fill(0x1f0, cliprect);
- screen.machine().device<seta001_device>("spritegen")->set_bg_yoffsets( 0x00, 0x01 );
- screen.machine().device<seta001_device>("spritegen")->set_fg_yoffsets( 0x00, 0x10 );
+ machine().device<seta001_device>("spritegen")->set_bg_yoffsets( 0x00, 0x01 );
+ machine().device<seta001_device>("spritegen")->set_fg_yoffsets( 0x00, 0x10 );
- screen.machine().device<seta001_device>("spritegen")->seta001_draw_sprites(screen.machine(), bitmap, cliprect, 0x800, 1 );
+ machine().device<seta001_device>("spritegen")->seta001_draw_sprites(machine(), bitmap, cliprect, 0x800, 1 );
return 0;
}
@@ -530,7 +530,7 @@ void champbwl_state::screen_eof_doraemon(screen_device &screen, bool state)
{
// rising edge
if (state)
- screen.machine().device<seta001_device>("spritegen")->setac_eof();
+ machine().device<seta001_device>("spritegen")->setac_eof();
}
MACHINE_START_MEMBER(champbwl_state,doraemon)
diff --git a/src/mame/drivers/chanbara.c b/src/mame/drivers/chanbara.c
index dca41c4ee16..cc6eed32ed7 100644
--- a/src/mame/drivers/chanbara.c
+++ b/src/mame/drivers/chanbara.c
@@ -212,7 +212,7 @@ UINT32 chanbara_state::screen_update_chanbara(screen_device &screen, bitmap_ind1
m_bg2_tilemap->set_scrolly(0, m_scroll | (m_scrollhi << 8));
m_bg2_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
}
diff --git a/src/mame/drivers/chihiro.c b/src/mame/drivers/chihiro.c
index c71f939f006..f239d696da6 100644
--- a/src/mame/drivers/chihiro.c
+++ b/src/mame/drivers/chihiro.c
@@ -1099,7 +1099,7 @@ void nv2a_renderer::geforce_exec_method(address_space & space,UINT32 chanel,UINT
void nv2a_renderer::vblank_callback(screen_device &screen, bool state)
{
- chihiro_state *chst=screen.machine().driver_data<chihiro_state>();
+ chihiro_state *chst=machine().driver_data<chihiro_state>();
printf("vblank_callback\n\r");
if (state == true)
diff --git a/src/mame/drivers/chinsan.c b/src/mame/drivers/chinsan.c
index d6c2f341609..10890cd0ddf 100644
--- a/src/mame/drivers/chinsan.c
+++ b/src/mame/drivers/chinsan.c
@@ -109,7 +109,7 @@ UINT32 chinsan_state::screen_update_chinsan(screen_device &screen, bitmap_ind16
int tileno, colour;
tileno = m_video[count] | (m_video[count + 0x800] << 8);
colour = m_video[count + 0x1000] >> 3;
- drawgfx_opaque(bitmap,cliprect,screen.machine().gfx[0],tileno,colour,0,0,x*8,y*8);
+ drawgfx_opaque(bitmap,cliprect,machine().gfx[0],tileno,colour,0,0,x*8,y*8);
count++;
}
}
diff --git a/src/mame/drivers/cmmb.c b/src/mame/drivers/cmmb.c
index 5b7fa965897..43a014242b9 100644
--- a/src/mame/drivers/cmmb.c
+++ b/src/mame/drivers/cmmb.c
@@ -78,7 +78,7 @@ void cmmb_state::video_start()
UINT32 cmmb_state::screen_update_cmmb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
UINT8 *videoram = m_videoram;
- gfx_element *gfx = screen.machine().gfx[0];
+ gfx_element *gfx = machine().gfx[0];
int count = 0x00000;
int y,x;
diff --git a/src/mame/drivers/cntsteer.c b/src/mame/drivers/cntsteer.c
index aab0610ed8a..a11a9cf536c 100644
--- a/src/mame/drivers/cntsteer.c
+++ b/src/mame/drivers/cntsteer.c
@@ -284,7 +284,7 @@ UINT32 cntsteer_state::screen_update_zerotrgt(screen_device &screen, bitmap_ind1
{
if (m_disable_roz)
- bitmap.fill(screen.machine().pens[8 * m_bg_color_bank], cliprect);
+ bitmap.fill(machine().pens[8 * m_bg_color_bank], cliprect);
else
{
int p1, p2, p3, p4;
@@ -324,7 +324,7 @@ UINT32 cntsteer_state::screen_update_zerotrgt(screen_device &screen, bitmap_ind1
0, 0);
}
- zerotrgt_draw_sprites(screen.machine(), bitmap, cliprect);
+ zerotrgt_draw_sprites(machine(), bitmap, cliprect);
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
@@ -334,7 +334,7 @@ UINT32 cntsteer_state::screen_update_cntsteer(screen_device &screen, bitmap_ind1
{
if (m_disable_roz)
- bitmap.fill(screen.machine().pens[8 * m_bg_color_bank], cliprect);
+ bitmap.fill(machine().pens[8 * m_bg_color_bank], cliprect);
else
{
int p1, p2, p3, p4;
@@ -372,7 +372,7 @@ UINT32 cntsteer_state::screen_update_cntsteer(screen_device &screen, bitmap_ind1
0, 0);
}
- cntsteer_draw_sprites(screen.machine(), bitmap, cliprect);
+ cntsteer_draw_sprites(machine(), bitmap, cliprect);
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
diff --git a/src/mame/drivers/cobra.c b/src/mame/drivers/cobra.c
index e5a21e411f1..8a1c74a7673 100644
--- a/src/mame/drivers/cobra.c
+++ b/src/mame/drivers/cobra.c
@@ -1000,7 +1000,7 @@ UINT32 cobra_state::screen_update_cobra(screen_device &screen, bitmap_rgb32 &bit
if (m_has_psac)
{
- device_t *k001604 = screen.machine().device("k001604");
+ device_t *k001604 = machine().device("k001604");
k001604_draw_back_layer(k001604, bitmap, cliprect);
k001604_draw_front_layer(k001604, bitmap, cliprect);
diff --git a/src/mame/drivers/coinmvga.c b/src/mame/drivers/coinmvga.c
index 9b7894aedcc..e7759b82139 100644
--- a/src/mame/drivers/coinmvga.c
+++ b/src/mame/drivers/coinmvga.c
@@ -252,7 +252,7 @@ void coinmvga_state::video_start()
UINT32 coinmvga_state::screen_update_coinmvga(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- gfx_element *gfx = screen.machine().gfx[0];
+ gfx_element *gfx = machine().gfx[0];
int count = 0x04000/2;
int y,x;
diff --git a/src/mame/drivers/coolridr.c b/src/mame/drivers/coolridr.c
index dd2e175c5a2..7c85854ca9b 100644
--- a/src/mame/drivers/coolridr.c
+++ b/src/mame/drivers/coolridr.c
@@ -335,33 +335,33 @@ void coolridr_state::video_start()
UINT32 coolridr_state::screen_update_coolridr(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
/* planes seems to basically be at 0x8000 and 0x28000... */
- gfx_element *gfx = screen.machine().gfx[2];
+ gfx_element *gfx = machine().gfx[2];
UINT32 count;
int y,x;
- if(screen.machine().input().code_pressed(KEYCODE_Z))
+ if(machine().input().code_pressed(KEYCODE_Z))
m_test_offs+=4;
- if(screen.machine().input().code_pressed(KEYCODE_X))
+ if(machine().input().code_pressed(KEYCODE_X))
m_test_offs-=4;
- if(screen.machine().input().code_pressed(KEYCODE_C))
+ if(machine().input().code_pressed(KEYCODE_C))
m_test_offs+=0x40;
- if(screen.machine().input().code_pressed(KEYCODE_V))
+ if(machine().input().code_pressed(KEYCODE_V))
m_test_offs-=0x40;
- if(screen.machine().input().code_pressed(KEYCODE_B))
+ if(machine().input().code_pressed(KEYCODE_B))
m_test_offs+=0x400;
- if(screen.machine().input().code_pressed(KEYCODE_N))
+ if(machine().input().code_pressed(KEYCODE_N))
m_test_offs-=0x400;
- if(screen.machine().input().code_pressed_once(KEYCODE_A))
+ if(machine().input().code_pressed_once(KEYCODE_A))
m_color++;
- if(screen.machine().input().code_pressed_once(KEYCODE_S))
+ if(machine().input().code_pressed_once(KEYCODE_S))
m_color--;
if(m_test_offs > 0x100000*4)
diff --git a/src/mame/drivers/cps3.c b/src/mame/drivers/cps3.c
index 4ab17fffbd4..59cfea2d4f1 100644
--- a/src/mame/drivers/cps3.c
+++ b/src/mame/drivers/cps3.c
@@ -1082,7 +1082,7 @@ UINT32 cps3_state::screen_update_cps3(screen_device &screen, bitmap_rgb32 &bitma
{
for (uu=0;uu<1023;uu++)
{
- cps3_draw_tilemapsprite_line(screen.machine(), tilemapnum, uu, m_renderbuffer_bitmap, m_renderbuffer_clip );
+ cps3_draw_tilemapsprite_line(machine(), tilemapnum, uu, m_renderbuffer_bitmap, m_renderbuffer_clip );
}
}
bg_drawn[tilemapnum] = 1;
@@ -1155,13 +1155,13 @@ UINT32 cps3_state::screen_update_cps3(screen_device &screen, bitmap_rgb32 &bitma
/* use the bpp value from the main list or the sublists? */
if (whichbpp)
{
- if (!global_bpp) screen.machine().gfx[1]->set_granularity(256);
- else screen.machine().gfx[1]->set_granularity(64);
+ if (!global_bpp) machine().gfx[1]->set_granularity(256);
+ else machine().gfx[1]->set_granularity(64);
}
else
{
- if (!bpp) screen.machine().gfx[1]->set_granularity(256);
- else screen.machine().gfx[1]->set_granularity(64);
+ if (!bpp) machine().gfx[1]->set_granularity(256);
+ else machine().gfx[1]->set_granularity(64);
}
{
@@ -1169,11 +1169,11 @@ UINT32 cps3_state::screen_update_cps3(screen_device &screen, bitmap_rgb32 &bitma
if (global_alpha || alpha)
{
- cps3_drawgfxzoom(m_renderbuffer_bitmap,m_renderbuffer_clip,screen.machine().gfx[1],realtileno,actualpal,0^flipx,0^flipy,current_xpos,current_ypos,CPS3_TRANSPARENCY_PEN_INDEX_BLEND,0,xinc,yinc, NULL, 0);
+ cps3_drawgfxzoom(m_renderbuffer_bitmap,m_renderbuffer_clip,machine().gfx[1],realtileno,actualpal,0^flipx,0^flipy,current_xpos,current_ypos,CPS3_TRANSPARENCY_PEN_INDEX_BLEND,0,xinc,yinc, NULL, 0);
}
else
{
- cps3_drawgfxzoom(m_renderbuffer_bitmap,m_renderbuffer_clip,screen.machine().gfx[1],realtileno,actualpal,0^flipx,0^flipy,current_xpos,current_ypos,CPS3_TRANSPARENCY_PEN_INDEX,0,xinc,yinc, NULL, 0);
+ cps3_drawgfxzoom(m_renderbuffer_bitmap,m_renderbuffer_clip,machine().gfx[1],realtileno,actualpal,0^flipx,0^flipy,current_xpos,current_ypos,CPS3_TRANSPARENCY_PEN_INDEX,0,xinc,yinc, NULL, 0);
}
count++;
}
@@ -1239,7 +1239,7 @@ UINT32 cps3_state::screen_update_cps3(screen_device &screen, bitmap_rgb32 &bitma
pal += m_ss_pal_base << 5;
tile+=0x200;
- cps3_drawgfxzoom(bitmap, cliprect, screen.machine().gfx[0],tile,pal,flipx,flipy,x*8,y*8,CPS3_TRANSPARENCY_PEN,0,0x10000,0x10000,NULL,0);
+ cps3_drawgfxzoom(bitmap, cliprect, machine().gfx[0],tile,pal,flipx,flipy,x*8,y*8,CPS3_TRANSPARENCY_PEN,0,0x10000,0x10000,NULL,0);
count++;
}
}
diff --git a/src/mame/drivers/crystal.c b/src/mame/drivers/crystal.c
index f41c72ed2eb..9421a359b88 100644
--- a/src/mame/drivers/crystal.c
+++ b/src/mame/drivers/crystal.c
@@ -651,7 +651,7 @@ static void SetVidReg( address_space &space, UINT16 reg, UINT16 val )
UINT32 crystal_state::screen_update_crystal(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- address_space &space = *screen.machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
int DoFlip;
UINT32 B0 = 0x0;
@@ -716,7 +716,7 @@ void crystal_state::screen_eof_crystal(screen_device &screen, bool state)
// rising edge
if (state)
{
- address_space &space = *screen.machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
UINT16 head, tail;
int DoFlip = 0;
diff --git a/src/mame/drivers/cshooter.c b/src/mame/drivers/cshooter.c
index 65211ca2d5e..468beca3146 100644
--- a/src/mame/drivers/cshooter.c
+++ b/src/mame/drivers/cshooter.c
@@ -166,25 +166,25 @@ UINT32 cshooter_state::screen_update_cshooter(screen_device &screen, bitmap_ind1
{
int tile=0x30+((spriteram[i]>>2)&0x1f);
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[0],
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[0],
tile,
spriteram[i+1],
0, 0,
spriteram[i+3],spriteram[i+2],3);
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[0],
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[0],
tile,
spriteram[i+1],
0, 0,
spriteram[i+3]+8,spriteram[i+2],3);
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[0],
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[0],
tile,
spriteram[i+1],
0, 0,
spriteram[i+3]+8,spriteram[i+2]+8,3);
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[0],
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[0],
tile,
spriteram[i+1],
0, 0,
diff --git a/src/mame/drivers/cubeqst.c b/src/mame/drivers/cubeqst.c
index 97f6b29b2e6..2c305b729c8 100644
--- a/src/mame/drivers/cubeqst.c
+++ b/src/mame/drivers/cubeqst.c
@@ -127,8 +127,8 @@ UINT32 cubeqst_state::screen_update_cubeqst(screen_device &screen, bitmap_rgb32
for (y = cliprect.min_y; y <= cliprect.max_y; ++y)
{
int i;
- int num_entries = cubeqcpu_get_ptr_ram_val(screen.machine().device("line_cpu"), y);
- UINT32 *stk_ram = cubeqcpu_get_stack_ram(screen.machine().device("line_cpu"));
+ int num_entries = cubeqcpu_get_ptr_ram_val(machine().device("line_cpu"), y);
+ UINT32 *stk_ram = cubeqcpu_get_stack_ram(machine().device("line_cpu"));
UINT32 *dest = &bitmap.pix32(y);
UINT32 pen;
diff --git a/src/mame/drivers/dacholer.c b/src/mame/drivers/dacholer.c
index a91816783ed..bceae49218e 100644
--- a/src/mame/drivers/dacholer.c
+++ b/src/mame/drivers/dacholer.c
@@ -167,7 +167,7 @@ UINT32 dacholer_state::screen_update_dacholer(screen_device &screen, bitmap_ind1
}
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
}
diff --git a/src/mame/drivers/dblewing.c b/src/mame/drivers/dblewing.c
index e507200b6a0..d8e0fc4d93a 100644
--- a/src/mame/drivers/dblewing.c
+++ b/src/mame/drivers/dblewing.c
@@ -111,11 +111,11 @@ UINT32 dblewing_state::screen_update_dblewing(screen_device &screen, bitmap_ind1
deco16ic_pf_update(m_deco_tilegen1, m_pf1_rowscroll, m_pf2_rowscroll);
bitmap.fill(0, cliprect); /* not Confirmed */
- screen.machine().priority_bitmap.fill(0);
+ machine().priority_bitmap.fill(0);
deco16ic_tilemap_2_draw(m_deco_tilegen1, bitmap, cliprect, 0, 2);
deco16ic_tilemap_1_draw(m_deco_tilegen1, bitmap, cliprect, 0, 4);
- screen.machine().device<decospr_device>("spritegen")->draw_sprites(bitmap, cliprect, m_spriteram, 0x400);
+ machine().device<decospr_device>("spritegen")->draw_sprites(bitmap, cliprect, m_spriteram, 0x400);
return 0;
}
diff --git a/src/mame/drivers/ddayjlc.c b/src/mame/drivers/ddayjlc.c
index 5c48cda7b98..6c95e0ca4e0 100644
--- a/src/mame/drivers/ddayjlc.c
+++ b/src/mame/drivers/ddayjlc.c
@@ -406,7 +406,7 @@ UINT32 ddayjlc_state::screen_update_ddayjlc(screen_device &screen, bitmap_ind16
code = (code & 0x7f) | ((flags & 0x30) << 3);
- drawgfx_transpen(bitmap, cliprect, screen.machine().gfx[0], code, color, xflip, yflip, x, y, 0);
+ drawgfx_transpen(bitmap, cliprect, machine().gfx[0], code, color, xflip, yflip, x, y, 0);
}
{
@@ -417,9 +417,9 @@ UINT32 ddayjlc_state::screen_update_ddayjlc(screen_device &screen, bitmap_ind16
{
c = m_videoram[y * 32 + x];
if (x > 1 && x < 30)
- drawgfx_transpen(bitmap, cliprect, screen.machine().gfx[1], c + m_char_bank * 0x100, 2, 0, 0, x*8, y*8, 0);
+ drawgfx_transpen(bitmap, cliprect, machine().gfx[1], c + m_char_bank * 0x100, 2, 0, 0, x*8, y*8, 0);
else
- drawgfx_opaque(bitmap, cliprect, screen.machine().gfx[1], c + m_char_bank * 0x100, 2, 0, 0, x*8, y*8);
+ drawgfx_opaque(bitmap, cliprect, machine().gfx[1], c + m_char_bank * 0x100, 2, 0, 0, x*8, y*8);
}
}
return 0;
diff --git a/src/mame/drivers/ddealer.c b/src/mame/drivers/ddealer.c
index d19d69b21a3..5a32e8ea2fd 100644
--- a/src/mame/drivers/ddealer.c
+++ b/src/mame/drivers/ddealer.c
@@ -281,24 +281,24 @@ UINT32 ddealer_state::screen_update_ddealer(screen_device &screen, bitmap_ind16
{
if (m_vregs[0xcc / 2] & 0x80)
{
- ddealer_draw_video_layer(screen.machine(), &m_vregs[0x1e0 / 2], m_left_fg_vram_top, m_left_fg_vram_bottom, bitmap, cliprect, m_flipscreen);
- ddealer_draw_video_layer(screen.machine(), &m_vregs[0xcc / 2], m_right_fg_vram_top, m_right_fg_vram_bottom, bitmap, cliprect, m_flipscreen);
+ ddealer_draw_video_layer(machine(), &m_vregs[0x1e0 / 2], m_left_fg_vram_top, m_left_fg_vram_bottom, bitmap, cliprect, m_flipscreen);
+ ddealer_draw_video_layer(machine(), &m_vregs[0xcc / 2], m_right_fg_vram_top, m_right_fg_vram_bottom, bitmap, cliprect, m_flipscreen);
}
else
{
- ddealer_draw_video_layer(screen.machine(), &m_vregs[0x1e0 / 2], m_left_fg_vram_top, m_left_fg_vram_bottom, bitmap, cliprect, m_flipscreen);
+ ddealer_draw_video_layer(machine(), &m_vregs[0x1e0 / 2], m_left_fg_vram_top, m_left_fg_vram_bottom, bitmap, cliprect, m_flipscreen);
}
}
else
{
if (m_vregs[0xcc / 2] & 0x80)
{
- ddealer_draw_video_layer(screen.machine(), &m_vregs[0xcc / 2], m_left_fg_vram_top, m_left_fg_vram_bottom, bitmap, cliprect, m_flipscreen);
- ddealer_draw_video_layer(screen.machine(), &m_vregs[0x1e0 / 2], m_right_fg_vram_top, m_right_fg_vram_bottom, bitmap, cliprect, m_flipscreen);
+ ddealer_draw_video_layer(machine(), &m_vregs[0xcc / 2], m_left_fg_vram_top, m_left_fg_vram_bottom, bitmap, cliprect, m_flipscreen);
+ ddealer_draw_video_layer(machine(), &m_vregs[0x1e0 / 2], m_right_fg_vram_top, m_right_fg_vram_bottom, bitmap, cliprect, m_flipscreen);
}
else
{
- ddealer_draw_video_layer(screen.machine(), &m_vregs[0x1e0 / 2], m_left_fg_vram_top, m_left_fg_vram_bottom, bitmap, cliprect, m_flipscreen);
+ ddealer_draw_video_layer(machine(), &m_vregs[0x1e0 / 2], m_left_fg_vram_top, m_left_fg_vram_bottom, bitmap, cliprect, m_flipscreen);
}
}
diff --git a/src/mame/drivers/ddenlovr.c b/src/mame/drivers/ddenlovr.c
index 650cbba36f0..a2e8fbeca4b 100644
--- a/src/mame/drivers/ddenlovr.c
+++ b/src/mame/drivers/ddenlovr.c
@@ -1307,7 +1307,7 @@ UINT32 dynax_state::screen_update_ddenlovr(screen_device &screen, bitmap_ind16 &
#if 0
static int base = 0x0;
- const UINT8 *gfx = screen.machine().root_device().memregion("blitter")->base();
+ const UINT8 *gfx = machine().root_device().memregion("blitter")->base();
int next;
memset(m_ddenlovr_pixmap[0], 0, 512 * 512);
memset(m_ddenlovr_pixmap[1], 0, 512 * 512);
@@ -1318,38 +1318,38 @@ UINT32 dynax_state::screen_update_ddenlovr(screen_device &screen, bitmap_ind16 &
m_ddenlovr_blit_pen_mode = 0;
m_ddenlovr_blit_y = 5;
m_ddenlovr_clip_ctrl = 0x0f;
- next = blit_draw(screen.machine(), base, 0);
+ next = blit_draw(machine(), base, 0);
popmessage("GFX %06x", base);
- if (screen.machine().input().code_pressed(KEYCODE_S)) base = next;
- if (screen.machine().input().code_pressed_once(KEYCODE_X)) base = next;
- if (screen.machine().input().code_pressed(KEYCODE_C)) { base--; while ((gfx[base] & 0xf0) != 0x30) base--; }
- if (screen.machine().input().code_pressed(KEYCODE_V)) { base++; while ((gfx[base] & 0xf0) != 0x30) base++; }
- if (screen.machine().input().code_pressed_once(KEYCODE_D)) { base--; while ((gfx[base] & 0xf0) != 0x30) base--; }
- if (screen.machine().input().code_pressed_once(KEYCODE_F)) { base++; while ((gfx[base] & 0xf0) != 0x30) base++; }
+ if (machine().input().code_pressed(KEYCODE_S)) base = next;
+ if (machine().input().code_pressed_once(KEYCODE_X)) base = next;
+ if (machine().input().code_pressed(KEYCODE_C)) { base--; while ((gfx[base] & 0xf0) != 0x30) base--; }
+ if (machine().input().code_pressed(KEYCODE_V)) { base++; while ((gfx[base] & 0xf0) != 0x30) base++; }
+ if (machine().input().code_pressed_once(KEYCODE_D)) { base--; while ((gfx[base] & 0xf0) != 0x30) base--; }
+ if (machine().input().code_pressed_once(KEYCODE_F)) { base++; while ((gfx[base] & 0xf0) != 0x30) base++; }
#endif
bitmap.fill(m_ddenlovr_bgcolor, cliprect);
#ifdef MAME_DEBUG
- if (screen.machine().input().code_pressed(KEYCODE_Z))
+ if (machine().input().code_pressed(KEYCODE_Z))
{
int mask, mask2;
mask = 0;
- if (screen.machine().input().code_pressed(KEYCODE_Q)) mask |= 1;
- if (screen.machine().input().code_pressed(KEYCODE_W)) mask |= 2;
- if (screen.machine().input().code_pressed(KEYCODE_E)) mask |= 4;
- if (screen.machine().input().code_pressed(KEYCODE_R)) mask |= 8;
+ if (machine().input().code_pressed(KEYCODE_Q)) mask |= 1;
+ if (machine().input().code_pressed(KEYCODE_W)) mask |= 2;
+ if (machine().input().code_pressed(KEYCODE_E)) mask |= 4;
+ if (machine().input().code_pressed(KEYCODE_R)) mask |= 8;
mask2 = 0;
if (m_extra_layers)
{
- if (screen.machine().input().code_pressed(KEYCODE_A)) mask2 |= 1;
- if (screen.machine().input().code_pressed(KEYCODE_S)) mask2 |= 2;
- if (screen.machine().input().code_pressed(KEYCODE_D)) mask2 |= 4;
- if (screen.machine().input().code_pressed(KEYCODE_F)) mask2 |= 8;
+ if (machine().input().code_pressed(KEYCODE_A)) mask2 |= 1;
+ if (machine().input().code_pressed(KEYCODE_S)) mask2 |= 2;
+ if (machine().input().code_pressed(KEYCODE_D)) mask2 |= 4;
+ if (machine().input().code_pressed(KEYCODE_F)) mask2 |= 8;
}
if (mask || mask2)
@@ -1368,10 +1368,10 @@ UINT32 dynax_state::screen_update_ddenlovr(screen_device &screen, bitmap_ind16 &
pri = 0;
}
- copylayer(screen.machine(), bitmap, cliprect, order[pri][0]);
- copylayer(screen.machine(), bitmap, cliprect, order[pri][1]);
- copylayer(screen.machine(), bitmap, cliprect, order[pri][2]);
- copylayer(screen.machine(), bitmap, cliprect, order[pri][3]);
+ copylayer(machine(), bitmap, cliprect, order[pri][0]);
+ copylayer(machine(), bitmap, cliprect, order[pri][1]);
+ copylayer(machine(), bitmap, cliprect, order[pri][2]);
+ copylayer(machine(), bitmap, cliprect, order[pri][3]);
if (m_extra_layers)
{
@@ -1383,10 +1383,10 @@ UINT32 dynax_state::screen_update_ddenlovr(screen_device &screen, bitmap_ind16 &
pri = 0;
}
- copylayer(screen.machine(), bitmap, cliprect, order[pri][0] + 4);
- copylayer(screen.machine(), bitmap, cliprect, order[pri][1] + 4);
- copylayer(screen.machine(), bitmap, cliprect, order[pri][2] + 4);
- copylayer(screen.machine(), bitmap, cliprect, order[pri][3] + 4);
+ copylayer(machine(), bitmap, cliprect, order[pri][0] + 4);
+ copylayer(machine(), bitmap, cliprect, order[pri][1] + 4);
+ copylayer(machine(), bitmap, cliprect, order[pri][2] + 4);
+ copylayer(machine(), bitmap, cliprect, order[pri][3] + 4);
}
m_ddenlovr_layer_enable = enab;
diff --git a/src/mame/drivers/dec8.c b/src/mame/drivers/dec8.c
index 78da8e36dc5..8a6863ae365 100644
--- a/src/mame/drivers/dec8.c
+++ b/src/mame/drivers/dec8.c
@@ -71,7 +71,7 @@ void dec8_state::screen_eof_dec8(screen_device &screen, bool state)
// rising edge
if (state)
{
- address_space &space = *screen.machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
dec8_mxc06_karn_buffer_spriteram_w(space, 0, 0);
}
}
diff --git a/src/mame/drivers/deco156.c b/src/mame/drivers/deco156.c
index ce487616e59..262f6613a6b 100644
--- a/src/mame/drivers/deco156.c
+++ b/src/mame/drivers/deco156.c
@@ -74,13 +74,13 @@ UINT32 deco156_state::screen_update_wcvol95(screen_device &screen, bitmap_rgb32
//FIXME: flip_screen_x should not be written!
flip_screen_set_no_update(1);
- screen.machine().priority_bitmap.fill(0);
+ machine().priority_bitmap.fill(0);
bitmap.fill(0);
deco16ic_pf_update(m_deco_tilegen1, m_pf1_rowscroll, m_pf2_rowscroll);
deco16ic_tilemap_2_draw(m_deco_tilegen1, bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0);
- screen.machine().device<decospr_device>("spritegen")->draw_sprites(bitmap, cliprect, m_spriteram, 0x800);
+ machine().device<decospr_device>("spritegen")->draw_sprites(bitmap, cliprect, m_spriteram, 0x800);
deco16ic_tilemap_1_draw(m_deco_tilegen1, bitmap, cliprect, 0, 0);
return 0;
}
diff --git a/src/mame/drivers/deco_ld.c b/src/mame/drivers/deco_ld.c
index b10d5d1b68a..bc09dde4da6 100644
--- a/src/mame/drivers/deco_ld.c
+++ b/src/mame/drivers/deco_ld.c
@@ -196,13 +196,13 @@ static void draw_sprites(running_machine &machine, bitmap_rgb32 &bitmap, const r
UINT32 deco_ld_state::screen_update_rblaster(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- gfx_element *gfx = screen.machine().gfx[0];
+ gfx_element *gfx = machine().gfx[0];
int y,x;
bitmap.fill(0, cliprect);
- draw_sprites(screen.machine(), bitmap,cliprect,m_vram1,0x000);
- draw_sprites(screen.machine(), bitmap,cliprect,m_vram0,0x100);
+ draw_sprites(machine(), bitmap,cliprect,m_vram1,0x000);
+ draw_sprites(machine(), bitmap,cliprect,m_vram0,0x100);
for (y=0;y<32;y++)
{
diff --git a/src/mame/drivers/destroyr.c b/src/mame/drivers/destroyr.c
index 2b2515f4aec..202f3ea43ad 100644
--- a/src/mame/drivers/destroyr.c
+++ b/src/mame/drivers/destroyr.c
@@ -82,7 +82,7 @@ UINT32 destroyr_state::screen_update_destroyr(screen_device &screen, bitmap_ind1
continue;
}
- drawgfx_transpen(bitmap, cliprect, screen.machine().gfx[2], num, 0, flipx, 0, horz, 16 * i, 0);
+ drawgfx_transpen(bitmap, cliprect, machine().gfx[2], num, 0, flipx, 0, horz, 16 * i, 0);
}
/* draw alpha numerics */
@@ -92,7 +92,7 @@ UINT32 destroyr_state::screen_update_destroyr(screen_device &screen, bitmap_ind1
{
int num = m_alpha_num_ram[32 * i + j];
- drawgfx_transpen(bitmap, cliprect, screen.machine().gfx[0], num, 0, 0, 0, 8 * j, 8 * i, 0);
+ drawgfx_transpen(bitmap, cliprect, machine().gfx[0], num, 0, 0, 0, 8 * j, 8 * i, 0);
}
}
@@ -103,13 +103,13 @@ UINT32 destroyr_state::screen_update_destroyr(screen_device &screen, bitmap_ind1
int horz = 256 - m_minor_obj_ram[i + 2];
int vert = 256 - m_minor_obj_ram[i + 4];
- drawgfx_transpen(bitmap, cliprect, screen.machine().gfx[1], num, 0, 0, 0, horz, vert, 0);
+ drawgfx_transpen(bitmap, cliprect, machine().gfx[1], num, 0, 0, 0, horz, vert, 0);
}
/* draw waves */
for (i = 0; i < 4; i++)
{
- drawgfx_transpen(bitmap, cliprect, screen.machine().gfx[3], m_wavemod ? 1 : 0, 0, 0, 0, 64 * i, 0x4e, 0);
+ drawgfx_transpen(bitmap, cliprect, machine().gfx[3], m_wavemod ? 1 : 0, 0, 0, 0, 64 * i, 0x4e, 0);
}
/* draw cursor */
diff --git a/src/mame/drivers/discoboy.c b/src/mame/drivers/discoboy.c
index 420f6ebeef1..53019051e0f 100644
--- a/src/mame/drivers/discoboy.c
+++ b/src/mame/drivers/discoboy.c
@@ -159,7 +159,7 @@ UINT32 discoboy_state::screen_update_discoboy(screen_device &screen, bitmap_ind1
g = ((pal >> 4) & 0xf) << 4;
r = ((pal >> 8) & 0xf) << 4;
- palette_set_color(screen.machine(), i / 2, MAKE_RGB(r, g, b));
+ palette_set_color(machine(), i / 2, MAKE_RGB(r, g, b));
}
for (i = 0; i < 0x800; i += 2)
@@ -172,7 +172,7 @@ UINT32 discoboy_state::screen_update_discoboy(screen_device &screen, bitmap_ind1
g = ((pal >> 4) & 0xf) << 4;
r = ((pal >> 8) & 0xf) << 4;
- palette_set_color(screen.machine(), (i / 2) + 0x400, MAKE_RGB(r, g, b));
+ palette_set_color(machine(), (i / 2) + 0x400, MAKE_RGB(r, g, b));
}
bitmap.fill(0x3ff, cliprect);
@@ -191,12 +191,12 @@ UINT32 discoboy_state::screen_update_discoboy(screen_device &screen, bitmap_ind1
tileno = 0x2000 + (tileno & 0x1fff) + 0x0000;
}
- drawgfx_opaque(bitmap, cliprect, screen.machine().gfx[1], tileno, m_ram_att[count / 2], 0, 0, x*8, y*8);
+ drawgfx_opaque(bitmap, cliprect, machine().gfx[1], tileno, m_ram_att[count / 2], 0, 0, x*8, y*8);
count += 2;
}
}
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/drivers/diverboy.c b/src/mame/drivers/diverboy.c
index 12e69de0b61..372380f5e1f 100644
--- a/src/mame/drivers/diverboy.c
+++ b/src/mame/drivers/diverboy.c
@@ -116,8 +116,8 @@ static void draw_sprites( running_machine& machine, bitmap_ind16 &bitmap, const
UINT32 diverboy_state::screen_update_diverboy(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
-// bitmap.fill(get_black_pen(screen.machine()), cliprect);
- draw_sprites(screen.machine(), bitmap, cliprect);
+// bitmap.fill(get_black_pen(machine()), cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/drivers/dlair.c b/src/mame/drivers/dlair.c
index 266fcceca50..c99f3ffa7cb 100644
--- a/src/mame/drivers/dlair.c
+++ b/src/mame/drivers/dlair.c
@@ -237,7 +237,7 @@ UINT32 dlair_state::screen_update_dleuro(screen_device &screen, bitmap_ind16 &bi
for (x = 0; x < 32; x++)
{
UINT8 *base = &videoram[y * 64 + x * 2 + 1];
- drawgfx_opaque(bitmap, cliprect, screen.machine().gfx[0], base[0], base[1], 0, 0, 10 * x, 16 * y);
+ drawgfx_opaque(bitmap, cliprect, machine().gfx[0], base[0], base[1], 0, 0, 10 * x, 16 * y);
}
return 0;
diff --git a/src/mame/drivers/dmndrby.c b/src/mame/drivers/dmndrby.c
index bfaac82f707..e9da0f5852b 100644
--- a/src/mame/drivers/dmndrby.c
+++ b/src/mame/drivers/dmndrby.c
@@ -350,11 +350,11 @@ UINT32 dmndrby_state::screen_update_dderby(screen_device &screen, bitmap_ind16 &
{
int x,y,count;
int off,scrolly;
- gfx_element *gfx = screen.machine().gfx[0];
- gfx_element *sprites = screen.machine().gfx[1];
- gfx_element *track = screen.machine().gfx[2];
+ gfx_element *gfx = machine().gfx[0];
+ gfx_element *sprites = machine().gfx[1];
+ gfx_element *track = machine().gfx[2];
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
/* Draw racetrack
diff --git a/src/mame/drivers/dominob.c b/src/mame/drivers/dominob.c
index e3fd1bdde57..d840eaa2545 100644
--- a/src/mame/drivers/dominob.c
+++ b/src/mame/drivers/dominob.c
@@ -135,7 +135,7 @@ UINT32 dominob_state::screen_update_dominob(screen_device &screen, bitmap_ind16
{
drawgfx_opaque(bitmap,
cliprect,
- screen.machine().gfx[1],
+ machine().gfx[1],
m_bgram[index] + 256 * (m_bgram[index + 1] & 0xf),
m_bgram[index + 1] >> 4,
0, 0,
@@ -150,7 +150,7 @@ UINT32 dominob_state::screen_update_dominob(screen_device &screen, bitmap_ind16
{
drawgfx_transpen( bitmap,
cliprect,
- screen.machine().gfx[0],
+ machine().gfx[0],
m_videoram[(y * 32 + x) * 2 + 1] + (m_videoram[(y * 32 + x) * 2] & 7) * 256,
(m_videoram[(y * 32 + x) * 2] >> 3),
0, 0,
@@ -158,7 +158,7 @@ UINT32 dominob_state::screen_update_dominob(screen_device &screen, bitmap_ind16
}
}
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/drivers/dreamwld.c b/src/mame/drivers/dreamwld.c
index 0beaa64431f..2aa5016002c 100644
--- a/src/mame/drivers/dreamwld.c
+++ b/src/mame/drivers/dreamwld.c
@@ -395,7 +395,7 @@ UINT32 dreamwld_state::screen_update_dreamwld(screen_device &screen, bitmap_ind1
tmptilemap0->draw(bitmap, cliprect, 0, 0);
tmptilemap1->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/drivers/drtomy.c b/src/mame/drivers/drtomy.c
index daf58c8f81c..4e6e54000a7 100644
--- a/src/mame/drivers/drtomy.c
+++ b/src/mame/drivers/drtomy.c
@@ -137,7 +137,7 @@ UINT32 drtomy_state::screen_update_drtomy(screen_device &screen, bitmap_ind16 &b
m_tilemap_bg->draw(bitmap, cliprect, 0, 0);
m_tilemap_fg->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/drivers/dunhuang.c b/src/mame/drivers/dunhuang.c
index 3ee886db00c..c1a4cfa6c95 100644
--- a/src/mame/drivers/dunhuang.c
+++ b/src/mame/drivers/dunhuang.c
@@ -164,16 +164,16 @@ UINT32 dunhuang_state::screen_update_dunhuang(screen_device &screen, bitmap_ind1
int layers_ctrl = -1;
#if DUNHUANG_DEBUG
-if (screen.machine().input().code_pressed(KEYCODE_Z))
+if (machine().input().code_pressed(KEYCODE_Z))
{
int msk = 0;
- if (screen.machine().input().code_pressed(KEYCODE_Q)) msk |= 1;
- if (screen.machine().input().code_pressed(KEYCODE_W)) msk |= 2;
+ if (machine().input().code_pressed(KEYCODE_Q)) msk |= 1;
+ if (machine().input().code_pressed(KEYCODE_W)) msk |= 2;
if (msk != 0) layers_ctrl &= msk;
}
#endif
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
switch (m_layers)
{
diff --git a/src/mame/drivers/dwarfd.c b/src/mame/drivers/dwarfd.c
index f34b13b04b6..cc7750c0502 100644
--- a/src/mame/drivers/dwarfd.c
+++ b/src/mame/drivers/dwarfd.c
@@ -850,8 +850,8 @@ static void drawCrt( running_machine &machine, bitmap_rgb32 &bitmap,const rectan
UINT32 dwarfd_state::screen_update_dwarfd(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
- drawCrt(screen.machine(), bitmap, cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
+ drawCrt(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/drivers/egghunt.c b/src/mame/drivers/egghunt.c
index 14f9718fc1a..6d7801658e4 100644
--- a/src/mame/drivers/egghunt.c
+++ b/src/mame/drivers/egghunt.c
@@ -184,7 +184,7 @@ void egghunt_state::video_start()
UINT32 egghunt_state::screen_update_egghunt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/drivers/esh.c b/src/mame/drivers/esh.c
index b8f7a5c4c7f..fe9d1b782bf 100644
--- a/src/mame/drivers/esh.c
+++ b/src/mame/drivers/esh.c
@@ -77,7 +77,7 @@ UINT32 esh_state::screen_update_esh(screen_device &screen, bitmap_rgb32 &bitmap,
//int blinkLine = (m_tile_control_ram[current_screen_character] & 0x40) >> 6;
//int blinkChar = (m_tile_control_ram[current_screen_character] & 0x80) >> 7;
- drawgfx_transpen(bitmap, cliprect, screen.machine().gfx[0],
+ drawgfx_transpen(bitmap, cliprect, machine().gfx[0],
m_tile_ram[current_screen_character] + (0x100 * tileOffs),
palIndex,
0, 0, charx*8, chary*8, 0);
diff --git a/src/mame/drivers/expro02.c b/src/mame/drivers/expro02.c
index be6b0dfcbda..83f83a42a81 100644
--- a/src/mame/drivers/expro02.c
+++ b/src/mame/drivers/expro02.c
@@ -199,7 +199,7 @@ void expro02_state::palette_init()
UINT32 expro02_state::screen_update_galsnew(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
-// kaneko16_fill_bitmap(screen.machine(),bitmap,cliprect);
+// kaneko16_fill_bitmap(machine(),bitmap,cliprect);
int y,x;
int count;
@@ -238,7 +238,7 @@ UINT32 expro02_state::screen_update_galsnew(screen_device &screen, bitmap_ind16
int i;
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
m_view2_0->kaneko16_prepare(bitmap, cliprect);
@@ -247,7 +247,7 @@ UINT32 expro02_state::screen_update_galsnew(screen_device &screen, bitmap_ind16
m_view2_0->render_tilemap_chip(bitmap,cliprect,i);
}
- m_kaneko_spr->kaneko16_render_sprites(screen.machine(),bitmap,cliprect, m_spriteram, m_spriteram.bytes());
+ m_kaneko_spr->kaneko16_render_sprites(machine(),bitmap,cliprect, m_spriteram, m_spriteram.bytes());
return 0;
}
diff --git a/src/mame/drivers/famibox.c b/src/mame/drivers/famibox.c
index 9e6a01e17b6..dd70c10eedd 100644
--- a/src/mame/drivers/famibox.c
+++ b/src/mame/drivers/famibox.c
@@ -542,7 +542,7 @@ void famibox_state::video_start()
UINT32 famibox_state::screen_update_famibox(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
/* render the ppu */
- ppu2c0x_device *ppu = screen.machine().device<ppu2c0x_device>("ppu");
+ ppu2c0x_device *ppu = machine().device<ppu2c0x_device>("ppu");
ppu->render(bitmap, 0, 0, 0, 0);
return 0;
}
diff --git a/src/mame/drivers/fcrash.c b/src/mame/drivers/fcrash.c
index ab1861a2fa6..6d877fd4255 100644
--- a/src/mame/drivers/fcrash.c
+++ b/src/mame/drivers/fcrash.c
@@ -228,12 +228,12 @@ UINT32 cps_state::screen_update_fcrash(screen_device &screen, bitmap_ind16 &bitm
layercontrol = m_cps_b_regs[0x20 / 2];
/* Get video memory base registers */
- cps1_get_video_base(screen.machine());
+ cps1_get_video_base(machine());
/* Build palette */
- fcrash_build_palette(screen.machine());
+ fcrash_build_palette(machine());
- fcrash_update_transmasks(screen.machine());
+ fcrash_update_transmasks(machine());
m_bg_tilemap[0]->set_scrollx(0, m_scroll1x - 62);
m_bg_tilemap[0]->set_scrolly(0, m_scroll1y);
@@ -270,28 +270,28 @@ UINT32 cps_state::screen_update_fcrash(screen_device &screen, bitmap_ind16 &bitm
/* Blank screen */
bitmap.fill(0xbff, cliprect);
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
l0 = (layercontrol >> 0x06) & 03;
l1 = (layercontrol >> 0x08) & 03;
l2 = (layercontrol >> 0x0a) & 03;
l3 = (layercontrol >> 0x0c) & 03;
- fcrash_render_layer(screen.machine(), bitmap, cliprect, l0, 0);
+ fcrash_render_layer(machine(), bitmap, cliprect, l0, 0);
if (l1 == 0)
- fcrash_render_high_layer(screen.machine(), bitmap, cliprect, l0);
+ fcrash_render_high_layer(machine(), bitmap, cliprect, l0);
- fcrash_render_layer(screen.machine(), bitmap, cliprect, l1, 0);
+ fcrash_render_layer(machine(), bitmap, cliprect, l1, 0);
if (l2 == 0)
- fcrash_render_high_layer(screen.machine(), bitmap, cliprect, l1);
+ fcrash_render_high_layer(machine(), bitmap, cliprect, l1);
- fcrash_render_layer(screen.machine(), bitmap, cliprect, l2, 0);
+ fcrash_render_layer(machine(), bitmap, cliprect, l2, 0);
if (l3 == 0)
- fcrash_render_high_layer(screen.machine(), bitmap, cliprect, l2);
+ fcrash_render_high_layer(machine(), bitmap, cliprect, l2);
- fcrash_render_layer(screen.machine(), bitmap, cliprect, l3, 0);
+ fcrash_render_layer(machine(), bitmap, cliprect, l3, 0);
return 0;
}
@@ -307,12 +307,12 @@ UINT32 cps_state::screen_update_kodb(screen_device &screen, bitmap_ind16 &bitmap
layercontrol = m_cps_b_regs[0x20 / 2];
/* Get video memory base registers */
- cps1_get_video_base(screen.machine());
+ cps1_get_video_base(machine());
/* Build palette */
- fcrash_build_palette(screen.machine());
+ fcrash_build_palette(machine());
- fcrash_update_transmasks(screen.machine());
+ fcrash_update_transmasks(machine());
m_bg_tilemap[0]->set_scrollx(0, m_scroll1x);
m_bg_tilemap[0]->set_scrolly(0, m_scroll1y);
@@ -350,28 +350,28 @@ UINT32 cps_state::screen_update_kodb(screen_device &screen, bitmap_ind16 &bitmap
/* Blank screen */
bitmap.fill(0xbff, cliprect);
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
l0 = (layercontrol >> 0x06) & 03;
l1 = (layercontrol >> 0x08) & 03;
l2 = (layercontrol >> 0x0a) & 03;
l3 = (layercontrol >> 0x0c) & 03;
- fcrash_render_layer(screen.machine(), bitmap, cliprect, l0, 0);
+ fcrash_render_layer(machine(), bitmap, cliprect, l0, 0);
if (l1 == 0)
- fcrash_render_high_layer(screen.machine(), bitmap, cliprect, l0);
+ fcrash_render_high_layer(machine(), bitmap, cliprect, l0);
- fcrash_render_layer(screen.machine(), bitmap, cliprect, l1, 0);
+ fcrash_render_layer(machine(), bitmap, cliprect, l1, 0);
if (l2 == 0)
- fcrash_render_high_layer(screen.machine(), bitmap, cliprect, l1);
+ fcrash_render_high_layer(machine(), bitmap, cliprect, l1);
- fcrash_render_layer(screen.machine(), bitmap, cliprect, l2, 0);
+ fcrash_render_layer(machine(), bitmap, cliprect, l2, 0);
if (l3 == 0)
- fcrash_render_high_layer(screen.machine(), bitmap, cliprect, l2);
+ fcrash_render_high_layer(machine(), bitmap, cliprect, l2);
- fcrash_render_layer(screen.machine(), bitmap, cliprect, l3, 0);
+ fcrash_render_layer(machine(), bitmap, cliprect, l3, 0);
return 0;
}
diff --git a/src/mame/drivers/feversoc.c b/src/mame/drivers/feversoc.c
index 3d8d2768d6d..2cff200e19b 100644
--- a/src/mame/drivers/feversoc.c
+++ b/src/mame/drivers/feversoc.c
@@ -94,7 +94,7 @@ UINT32 feversoc_state::screen_update_feversoc(screen_device &screen, bitmap_ind1
UINT32 *spriteram32 = m_spriteram;
int offs,spr_offs,colour,sx,sy,h,w,dx,dy;
- bitmap.fill(screen.machine().pens[0], cliprect); //black pen
+ bitmap.fill(machine().pens[0], cliprect); //black pen
for(offs=(0x2000/4)-2;offs>-1;offs-=2)
{
@@ -112,7 +112,7 @@ UINT32 feversoc_state::screen_update_feversoc(screen_device &screen, bitmap_ind1
for(dx=0;dx<w;dx++)
for(dy=0;dy<h;dy++)
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[0],spr_offs++,colour,0,0,(sx+dx*16),(sy+dy*16),0x3f);
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[0],spr_offs++,colour,0,0,(sx+dx*16),(sy+dy*16),0x3f);
}
return 0;
diff --git a/src/mame/drivers/firefox.c b/src/mame/drivers/firefox.c
index 603d9632268..37275370513 100644
--- a/src/mame/drivers/firefox.c
+++ b/src/mame/drivers/firefox.c
@@ -220,7 +220,7 @@ UINT32 firefox_state::screen_update_firefox(screen_device &screen, bitmap_rgb32
int sprite;
int gfxtop = screen.visible_area().min_y;
- bitmap.fill(palette_get_color(screen.machine(), 256), cliprect);
+ bitmap.fill(palette_get_color(machine(), 256), cliprect);
for( sprite = 0; sprite < 32; sprite++ )
{
@@ -240,7 +240,7 @@ UINT32 firefox_state::screen_update_firefox(screen_device &screen, bitmap_rgb32
int flipx = flags & 0x20;
int code = sprite_data[ 15 - row ] + ( 256 * ( ( flags >> 6 ) & 3 ) );
- drawgfx_transpen( bitmap, cliprect, screen.machine().gfx[ 1 ], code, color, flipx, flipy, x + 8, gfxtop + 500 - y - ( row * 16 ), 0 );
+ drawgfx_transpen( bitmap, cliprect, machine().gfx[ 1 ], code, color, flipx, flipy, x + 8, gfxtop + 500 - y - ( row * 16 ), 0 );
}
}
}
diff --git a/src/mame/drivers/flipjack.c b/src/mame/drivers/flipjack.c
index 8a6ce406bed..815cd91e60d 100644
--- a/src/mame/drivers/flipjack.c
+++ b/src/mame/drivers/flipjack.c
@@ -152,7 +152,7 @@ UINT32 flipjack_state::screen_update_flipjack(screen_device &screen, bitmap_rgb3
{
int x,y,count;
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
// draw playfield
if (m_layer & 2)
@@ -179,7 +179,7 @@ UINT32 flipjack_state::screen_update_flipjack(screen_device &screen, bitmap_rgb3
color = ((pen_r >> (7-xi)) & 1)<<0;
color|= ((pen_g >> (7-xi)) & 1)<<1;
color|= ((pen_b >> (7-xi)) & 1)<<2;
- bitmap.pix32(y, x+xi) = screen.machine().pens[color+0x80];
+ bitmap.pix32(y, x+xi) = machine().pens[color+0x80];
}
}
@@ -193,7 +193,7 @@ UINT32 flipjack_state::screen_update_flipjack(screen_device &screen, bitmap_rgb3
{
for (x=0;x<32;x++)
{
- gfx_element *gfx = screen.machine().gfx[0];
+ gfx_element *gfx = machine().gfx[0];
int tile = m_bank << 8 | m_vram[x+y*0x100];
int color = m_cram[x+y*0x100] & 0x3f;
@@ -221,7 +221,7 @@ UINT32 flipjack_state::screen_update_flipjack(screen_device &screen, bitmap_rgb3
{
color = ((pen >> (7-xi)) & 1) ? 0x87 : 0;
if(color)
- bitmap.pix32(y, x+xi) = screen.machine().pens[color];
+ bitmap.pix32(y, x+xi) = machine().pens[color];
}
}
diff --git a/src/mame/drivers/flyball.c b/src/mame/drivers/flyball.c
index fdf99db5666..b52d627e861 100644
--- a/src/mame/drivers/flyball.c
+++ b/src/mame/drivers/flyball.c
@@ -117,7 +117,7 @@ UINT32 flyball_state::screen_update_flyball(screen_device &screen, bitmap_ind16
m_tmap->draw(bitmap, cliprect, 0, 0);
/* draw pitcher */
- drawgfx_transpen(bitmap, cliprect, screen.machine().gfx[1], m_pitcher_pic ^ 0xf, 0, 1, 0, pitcherx, pitchery, 1);
+ drawgfx_transpen(bitmap, cliprect, machine().gfx[1], m_pitcher_pic ^ 0xf, 0, 1, 0, pitcherx, pitchery, 1);
/* draw ball */
diff --git a/src/mame/drivers/fortecar.c b/src/mame/drivers/fortecar.c
index 5c7826f69e4..d2b73f0e97a 100644
--- a/src/mame/drivers/fortecar.c
+++ b/src/mame/drivers/fortecar.c
@@ -369,7 +369,7 @@ UINT32 fortecar_state::screen_update_fortecar(screen_device &screen, bitmap_ind1
if(bpp)
color&=0x3;
- drawgfx_opaque(bitmap,cliprect,screen.machine().gfx[bpp],tile,color,0,0,x*8,y*8);
+ drawgfx_opaque(bitmap,cliprect,machine().gfx[bpp],tile,color,0,0,x*8,y*8);
count++;
}
diff --git a/src/mame/drivers/funkball.c b/src/mame/drivers/funkball.c
index 0ff86a5c21c..ede14ee5773 100644
--- a/src/mame/drivers/funkball.c
+++ b/src/mame/drivers/funkball.c
@@ -1137,7 +1137,7 @@ void funkball_state::machine_reset()
UINT32 funkball_state::screen_update_funkball(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- voodoo_update(screen.machine().device("voodoo_0"), bitmap, cliprect);
+ voodoo_update(machine().device("voodoo_0"), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/drivers/gal3.c b/src/mame/drivers/gal3.c
index 550dc0c3152..d5fabde73dc 100644
--- a/src/mame/drivers/gal3.c
+++ b/src/mame/drivers/gal3.c
@@ -201,10 +201,10 @@ UINT32 gal3_state::screen_update_gal3(screen_device &screen, bitmap_rgb32 &bitma
static int pivot = 15;
int pri;
- update_palette(screen.machine());
+ update_palette(machine());
- if( screen.machine().input().code_pressed_once(KEYCODE_H)&&(pivot<15) ) pivot+=1;
- if( screen.machine().input().code_pressed_once(KEYCODE_J)&&(pivot>0) ) pivot-=1;
+ if( machine().input().code_pressed_once(KEYCODE_H)&&(pivot<15) ) pivot+=1;
+ if( machine().input().code_pressed_once(KEYCODE_J)&&(pivot>0) ) pivot-=1;
for( pri=0; pri<pivot; pri++ )
{
diff --git a/src/mame/drivers/galaxi.c b/src/mame/drivers/galaxi.c
index 839e4fcba25..fbcc208ed83 100644
--- a/src/mame/drivers/galaxi.c
+++ b/src/mame/drivers/galaxi.c
@@ -187,20 +187,20 @@ UINT32 galaxi_state::screen_update_galaxi(screen_device &screen, bitmap_ind16 &b
int layers_ctrl = -1;
#ifdef MAME_DEBUG
- if (screen.machine().input().code_pressed(KEYCODE_R)) // remapped due to inputs changes.
+ if (machine().input().code_pressed(KEYCODE_R)) // remapped due to inputs changes.
{
int msk = 0;
- if (screen.machine().input().code_pressed(KEYCODE_T)) msk |= 1;
- if (screen.machine().input().code_pressed(KEYCODE_Y)) msk |= 2;
- if (screen.machine().input().code_pressed(KEYCODE_U)) msk |= 4;
- if (screen.machine().input().code_pressed(KEYCODE_I)) msk |= 8;
- if (screen.machine().input().code_pressed(KEYCODE_O)) msk |= 16;
+ if (machine().input().code_pressed(KEYCODE_T)) msk |= 1;
+ if (machine().input().code_pressed(KEYCODE_Y)) msk |= 2;
+ if (machine().input().code_pressed(KEYCODE_U)) msk |= 4;
+ if (machine().input().code_pressed(KEYCODE_I)) msk |= 8;
+ if (machine().input().code_pressed(KEYCODE_O)) msk |= 16;
if (msk != 0) layers_ctrl &= msk;
}
#endif
if (layers_ctrl & 1) m_bg1_tmap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0);
- else bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ else bitmap.fill(get_black_pen(machine()), cliprect);
if (layers_ctrl & 2) m_bg2_tmap->draw(bitmap, cliprect, 0, 0);
if (layers_ctrl & 4) m_bg3_tmap->draw(bitmap, cliprect, 0, 0);
if (layers_ctrl & 8) m_bg4_tmap->draw(bitmap, cliprect, 0, 0);
diff --git a/src/mame/drivers/galgame.c b/src/mame/drivers/galgame.c
index b96d28d7012..c0eec734f56 100644
--- a/src/mame/drivers/galgame.c
+++ b/src/mame/drivers/galgame.c
@@ -171,7 +171,7 @@ WRITE16_MEMBER(galaxygame_state::ke_w)
UINT32 galaxygame_state::screen_update_galaxygame(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
for (int i = 0; i < m_point_display_list_index; i++ )
{
bitmap.pix16(m_point_display_list[i].x >> 7, m_point_display_list[i].y >> 7) = 1;
diff --git a/src/mame/drivers/galpani3.c b/src/mame/drivers/galpani3.c
index aeb2d7d4dae..67fbb2c0a6b 100644
--- a/src/mame/drivers/galpani3.c
+++ b/src/mame/drivers/galpani3.c
@@ -195,7 +195,7 @@ UINT32 galpani3_state::screen_update_galpani3(screen_device &screen, bitmap_rgb3
UINT16* src1;
UINT32* dst;
UINT16 pixdata1;
- const pen_t *paldata = screen.machine().pens;
+ const pen_t *paldata = machine().pens;
bitmap.fill(0x0000, cliprect);
@@ -259,7 +259,7 @@ UINT32 galpani3_state::screen_update_galpani3(screen_device &screen, bitmap_rgb3
UINT16 pen = dat1+0x4000;
UINT32 pal = paldata[pen];
- if (gp3_is_alpha_pen(screen.machine(), pen))
+ if (gp3_is_alpha_pen(machine(), pen))
{
int r,g,b;
r = (pal & 0x00ff0000)>>16;
@@ -287,7 +287,7 @@ UINT32 galpani3_state::screen_update_galpani3(screen_device &screen, bitmap_rgb3
UINT16 pen = dat2+0x4100;
UINT32 pal = paldata[pen];
- if (gp3_is_alpha_pen(screen.machine(), pen))
+ if (gp3_is_alpha_pen(machine(), pen))
{
int r,g,b;
r = (pal & 0x00ff0000)>>16;
@@ -319,20 +319,20 @@ UINT32 galpani3_state::screen_update_galpani3(screen_device &screen, bitmap_rgb3
/*
else if (pridat==0x2f) // area outside of the girl
{
- //dst[0] = screen.machine().rand()&0x3fff;
+ //dst[0] = machine().rand()&0x3fff;
}
else if (pridat==0x00) // the initial line / box that gets drawn
{
- //dst[0] = screen.machine().rand()&0x3fff;
+ //dst[0] = machine().rand()&0x3fff;
}
else if (pridat==0x30) // during the 'gals boxes' on the intro
{
- //dst[0] = screen.machine().rand()&0x3fff;
+ //dst[0] = machine().rand()&0x3fff;
}
else if (pridat==0x0c) // 'nice' at end of level
{
- //dst[0] = screen.machine().rand()&0x3fff;
+ //dst[0] = machine().rand()&0x3fff;
}
else
{
@@ -346,7 +346,7 @@ UINT32 galpani3_state::screen_update_galpani3(screen_device &screen, bitmap_rgb3
m_sprite_bitmap_1.fill(0x0000, cliprect);
- m_spritegen->skns_draw_sprites(screen.machine(), m_sprite_bitmap_1, cliprect, &m_spriteram32[0], 0x4000, screen.machine().root_device().memregion("gfx1")->base(), screen.machine().root_device().memregion ("gfx1")->bytes(), m_spc_regs );
+ m_spritegen->skns_draw_sprites(machine(), m_sprite_bitmap_1, cliprect, &m_spriteram32[0], 0x4000, machine().root_device().memregion("gfx1")->base(), machine().root_device().memregion ("gfx1")->bytes(), m_spc_regs );
// ignoring priority bits for now..
for (y=0;y<240;y++)
diff --git a/src/mame/drivers/galpanic.c b/src/mame/drivers/galpanic.c
index d1770986414..0e746c9f9b1 100644
--- a/src/mame/drivers/galpanic.c
+++ b/src/mame/drivers/galpanic.c
@@ -129,7 +129,7 @@ void galpanic_state::screen_eof_galpanic(screen_device &screen, bool state)
// rising edge
if (state)
{
- device_t *pandora = screen.machine().device("pandora");
+ device_t *pandora = machine().device("pandora");
pandora_eof(pandora);
}
}
diff --git a/src/mame/drivers/gamecstl.c b/src/mame/drivers/gamecstl.c
index 650ab9d7e0a..98589992569 100644
--- a/src/mame/drivers/gamecstl.c
+++ b/src/mame/drivers/gamecstl.c
@@ -166,7 +166,7 @@ static void draw_char(bitmap_ind16 &bitmap, const rectangle &cliprect, gfx_eleme
UINT32 gamecstl_state::screen_update_gamecstl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
int i, j;
- gfx_element *gfx = screen.machine().gfx[0];
+ gfx_element *gfx = machine().gfx[0];
UINT32 *cga = m_cga_ram;
int index = 0;
diff --git a/src/mame/drivers/go2000.c b/src/mame/drivers/go2000.c
index 890ae0747c4..91524a70d04 100644
--- a/src/mame/drivers/go2000.c
+++ b/src/mame/drivers/go2000.c
@@ -187,7 +187,7 @@ UINT32 go2000_state::screen_update_go2000(screen_device &screen, bitmap_ind16 &b
{
int tile = m_videoram[count];
int attr = m_videoram2[count];
- drawgfx_opaque(bitmap, cliprect, screen.machine().gfx[0], tile, attr, 0, 0, x * 8, y * 8);
+ drawgfx_opaque(bitmap, cliprect, machine().gfx[0], tile, attr, 0, 0, x * 8, y * 8);
count++;
}
}
@@ -199,7 +199,7 @@ UINT32 go2000_state::screen_update_go2000(screen_device &screen, bitmap_ind16 &b
{
int tile = m_videoram[count];
int attr = m_videoram2[count];
- drawgfx_transpen(bitmap, cliprect, screen.machine().gfx[0], tile, attr, 0, 0, x * 8, y * 8, 0xf);
+ drawgfx_transpen(bitmap, cliprect, machine().gfx[0], tile, attr, 0, 0, x * 8, y * 8, 0xf);
count++;
}
}
@@ -208,8 +208,8 @@ UINT32 go2000_state::screen_update_go2000(screen_device &screen, bitmap_ind16 &b
{
int offs;
- int max_x = screen.machine().primary_screen->width() - 8;
- int max_y = screen.machine().primary_screen->height() - 8;
+ int max_x = machine().primary_screen->width() - 8;
+ int max_y = machine().primary_screen->height() - 8;
for (offs = 0xf800 / 2; offs < 0x10000 / 2 ; offs += 4/2)
{
@@ -290,7 +290,7 @@ UINT32 go2000_state::screen_update_go2000(screen_device &screen, bitmap_ind16 &b
tile_flipy = !tile_flipy;
}
- drawgfx_transpen( bitmap, cliprect,screen.machine().gfx[0],
+ drawgfx_transpen( bitmap, cliprect,machine().gfx[0],
(tile & 0x1fff) + bank*0x4000,
attr,
tile_flipx, tile_flipy,
diff --git a/src/mame/drivers/gpworld.c b/src/mame/drivers/gpworld.c
index 1603b2eef0a..dc26dab3482 100644
--- a/src/mame/drivers/gpworld.c
+++ b/src/mame/drivers/gpworld.c
@@ -228,8 +228,8 @@ UINT32 gpworld_state::screen_update_gpworld(screen_device &screen, bitmap_rgb32
{
bitmap.fill(0, cliprect);
- gpworld_draw_tiles(screen.machine(), bitmap, cliprect);
- gpworld_draw_sprites(screen.machine(), bitmap, cliprect);
+ gpworld_draw_tiles(machine(), bitmap, cliprect);
+ gpworld_draw_sprites(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/drivers/gstream.c b/src/mame/drivers/gstream.c
index cb6bc28e2cb..8000adf7aa4 100644
--- a/src/mame/drivers/gstream.c
+++ b/src/mame/drivers/gstream.c
@@ -526,7 +526,7 @@ UINT32 gstream_state::screen_update_gstream(screen_device &screen, bitmap_ind16
if (x & 0x8000) x -= 0x10000;
if (y & 0x8000) y -= 0x10000;
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[1],code,col,0,0,x-2,y,0);
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[1],code,col,0,0,x-2,y,0);
}
return 0;
diff --git a/src/mame/drivers/guab.c b/src/mame/drivers/guab.c
index 224f6b753ed..23bc82f858f 100644
--- a/src/mame/drivers/guab.c
+++ b/src/mame/drivers/guab.c
@@ -269,7 +269,7 @@ UINT32 guab_state::screen_update_guab(screen_device &screen, bitmap_ind16 &bitma
/* If blanked, fill with black */
if (state.blanked)
{
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
return 0;
}
@@ -283,8 +283,8 @@ UINT32 guab_state::screen_update_guab(screen_device &screen, bitmap_ind16 &bitma
UINT8 pen = src[x >> 1];
/* Draw two 4-bit pixels */
- *dest++ = screen.machine().pens[pen >> 4];
- *dest++ = screen.machine().pens[pen & 0x0f];
+ *dest++ = machine().pens[pen >> 4];
+ *dest++ = machine().pens[pen & 0x0f];
}
}
diff --git a/src/mame/drivers/halleys.c b/src/mame/drivers/halleys.c
index 3f5ee2466c8..7858fc3a722 100644
--- a/src/mame/drivers/halleys.c
+++ b/src/mame/drivers/halleys.c
@@ -1494,7 +1494,7 @@ UINT32 halleys_state::screen_update_halleys(screen_device &screen, bitmap_ind16
bitmap.fill(m_bgcolor, cliprect);
#ifdef MAME_DEBUG
- if (screen.machine().root_device().ioport("DEBUG")->read()) copy_scroll_xp(bitmap, m_render_layer[3], *m_scrollx0, *m_scrolly0); // not used???
+ if (machine().root_device().ioport("DEBUG")->read()) copy_scroll_xp(bitmap, m_render_layer[3], *m_scrollx0, *m_scrolly0); // not used???
#endif
copy_scroll_xp(bitmap, m_render_layer[2], *m_scrollx1, *m_scrolly1);
@@ -1504,7 +1504,7 @@ UINT32 halleys_state::screen_update_halleys(screen_device &screen, bitmap_ind16
// HALF-HACK: apply RGB filter when the following conditions are met
i = m_io_ram[0xa0];
j = m_io_ram[0xa1];
- if (m_io_ram[0x2b] && (i>0xc6 && i<0xfe) && (j==0xc0 || j==0xed)) filter_bitmap(screen.machine(), bitmap, i);
+ if (m_io_ram[0x2b] && (i>0xc6 && i<0xfe) && (j==0xc0 || j==0xed)) filter_bitmap(machine(), bitmap, i);
return 0;
}
diff --git a/src/mame/drivers/highvdeo.c b/src/mame/drivers/highvdeo.c
index b18c728ea8d..0970e48a467 100644
--- a/src/mame/drivers/highvdeo.c
+++ b/src/mame/drivers/highvdeo.c
@@ -152,12 +152,12 @@ UINT32 highvdeo_state::screen_update_tourvisn(screen_device &screen, bitmap_rgb3
color = ((m_blit_ram[count]) & 0x00ff)>>0;
if(cliprect.contains((x*2)+0, y))
- bitmap.pix32(y, (x*2)+0) = screen.machine().pens[color];
+ bitmap.pix32(y, (x*2)+0) = machine().pens[color];
color = ((m_blit_ram[count]) & 0xff00)>>8;
if(cliprect.contains((x*2)+1, y))
- bitmap.pix32(y, (x*2)+1) = screen.machine().pens[color];
+ bitmap.pix32(y, (x*2)+1) = machine().pens[color];
count++;
}
diff --git a/src/mame/drivers/hitme.c b/src/mame/drivers/hitme.c
index f9873c740d5..ad3c961845a 100644
--- a/src/mame/drivers/hitme.c
+++ b/src/mame/drivers/hitme.c
@@ -68,7 +68,7 @@ VIDEO_START_MEMBER(hitme_state,barricad)
UINT32 hitme_state::screen_update_hitme(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
/* the card width resistor comes from an input port, scaled to the range 0-25 kOhms */
- double width_resist = screen.machine().root_device().ioport("WIDTH")->read() * 25000 / 100;
+ double width_resist = machine().root_device().ioport("WIDTH")->read() * 25000 / 100;
/* this triggers a oneshot for the following length of time */
double width_duration = 0.45 * 1000e-12 * width_resist;
/* the dot clock runs at the standard horizontal frequency * 320+16 clocks per scanline */
diff --git a/src/mame/drivers/hitpoker.c b/src/mame/drivers/hitpoker.c
index 9aadb4c5555..9aedc2bbae1 100644
--- a/src/mame/drivers/hitpoker.c
+++ b/src/mame/drivers/hitpoker.c
@@ -111,7 +111,7 @@ UINT32 hitpoker_state::screen_update_hitpoker(screen_device &screen, bitmap_ind1
gfx_bpp = (m_colorram[count] & 0x80)>>7; //flag between 4 and 8 bpp
color = gfx_bpp ? ((m_colorram[count] & 0x70)>>4) : (m_colorram[count] & 0xf);
- drawgfx_opaque(bitmap,cliprect,screen.machine().gfx[gfx_bpp],tile,color,0,0,x*8,y*8);
+ drawgfx_opaque(bitmap,cliprect,machine().gfx[gfx_bpp],tile,color,0,0,x*8,y*8);
count+=2;
}
diff --git a/src/mame/drivers/hornet.c b/src/mame/drivers/hornet.c
index e14628617f3..7b24a9ed4db 100644
--- a/src/mame/drivers/hornet.c
+++ b/src/mame/drivers/hornet.c
@@ -424,8 +424,8 @@ static void voodoo_vblank_1(device_t *device, int param)
UINT32 hornet_state::screen_update_hornet(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- device_t *voodoo = screen.machine().device("voodoo0");
- device_t *k037122 = screen.machine().device("k037122_1");
+ device_t *voodoo = machine().device("voodoo0");
+ device_t *k037122 = machine().device("k037122_1");
voodoo_update(voodoo, bitmap, cliprect);
@@ -440,8 +440,8 @@ UINT32 hornet_state::screen_update_hornet_2board(screen_device &screen, bitmap_r
{
if (strcmp(screen.tag(), ":lscreen") == 0)
{
- device_t *k037122 = screen.machine().device("k037122_1");
- device_t *voodoo = screen.machine().device("voodoo0");
+ device_t *k037122 = machine().device("k037122_1");
+ device_t *voodoo = machine().device("voodoo0");
voodoo_update(voodoo, bitmap, cliprect);
/* TODO: tilemaps per screen */
@@ -449,8 +449,8 @@ UINT32 hornet_state::screen_update_hornet_2board(screen_device &screen, bitmap_r
}
else if (strcmp(screen.tag(), ":rscreen") == 0)
{
- device_t *k037122 = screen.machine().device("k037122_2");
- device_t *voodoo = screen.machine().device("voodoo1");
+ device_t *k037122 = machine().device("k037122_2");
+ device_t *voodoo = machine().device("voodoo1");
voodoo_update(voodoo, bitmap, cliprect);
/* TODO: tilemaps per screen */
diff --git a/src/mame/drivers/hotblock.c b/src/mame/drivers/hotblock.c
index 4fc858e183d..6a4d940336e 100644
--- a/src/mame/drivers/hotblock.c
+++ b/src/mame/drivers/hotblock.c
@@ -149,12 +149,12 @@ UINT32 hotblock_state::screen_update_hotblock(screen_device &screen, bitmap_ind1
int i;
static const int xxx = 320, yyy = 204;
- bitmap.fill(get_black_pen(screen.machine()));
+ bitmap.fill(get_black_pen(machine()));
for (i = 0; i < 256; i++)
{
int dat = (m_pal[i * 2 + 1] << 8) | m_pal[i * 2];
- palette_set_color_rgb(screen.machine(), i, pal5bit(dat >> 0), pal5bit(dat >> 5), pal5bit(dat >> 10));
+ palette_set_color_rgb(machine(), i, pal5bit(dat >> 0), pal5bit(dat >> 5), pal5bit(dat >> 10));
}
count = 0;
diff --git a/src/mame/drivers/hvyunit.c b/src/mame/drivers/hvyunit.c
index b81e50c4345..e2d3e01abc9 100644
--- a/src/mame/drivers/hvyunit.c
+++ b/src/mame/drivers/hvyunit.c
@@ -186,7 +186,7 @@ UINT32 hvyunit_state::screen_update_hvyunit(screen_device &screen, bitmap_ind16
m_bg_tilemap->set_scrollx(0, ((m_port0_data & 0x40) << 2) + m_scrollx + SX_POS); // TODO
m_bg_tilemap->set_scrolly(0, ((m_port0_data & 0x80) << 1) + m_scrolly + SY_POS); // TODO
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
pandora_update(m_pandora, bitmap, cliprect);
diff --git a/src/mame/drivers/igs009.c b/src/mame/drivers/igs009.c
index 5628d599733..ce55431e707 100644
--- a/src/mame/drivers/igs009.c
+++ b/src/mame/drivers/igs009.c
@@ -287,12 +287,12 @@ UINT32 igs009_state::screen_update_jingbell(screen_device &screen, bitmap_ind16
int layers_ctrl = m_video_enable ? -1 : 0;
#ifdef MAME_DEBUG
- if (screen.machine().input().code_pressed(KEYCODE_Z))
+ if (machine().input().code_pressed(KEYCODE_Z))
{
int mask = 0;
- if (screen.machine().input().code_pressed(KEYCODE_Q)) mask |= 1;
- if (screen.machine().input().code_pressed(KEYCODE_W)) mask |= 2;
- if (screen.machine().input().code_pressed(KEYCODE_A)) mask |= 4;
+ if (machine().input().code_pressed(KEYCODE_Q)) mask |= 1;
+ if (machine().input().code_pressed(KEYCODE_W)) mask |= 2;
+ if (machine().input().code_pressed(KEYCODE_A)) mask |= 4;
if (mask != 0) layers_ctrl &= mask;
}
#endif
@@ -323,7 +323,7 @@ UINT32 igs009_state::screen_update_jingbell(screen_device &screen, bitmap_ind16
/* draw top of screen */
clip.set(visarea.min_x, visarea.max_x, startclipmin, startclipmin+2);
- bitmap.fill(screen.machine().pens[rowenable], clip);
+ bitmap.fill(machine().pens[rowenable], clip);
if (rowenable==0)
{ // 0 and 1 are the same? or is there a global switchoff?
@@ -347,7 +347,7 @@ UINT32 igs009_state::screen_update_jingbell(screen_device &screen, bitmap_ind16
}
}
- else bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ else bitmap.fill(get_black_pen(machine()), cliprect);
if (layers_ctrl & 2) m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
diff --git a/src/mame/drivers/igs011.c b/src/mame/drivers/igs011.c
index 423e141d6a5..85b4fac09a9 100644
--- a/src/mame/drivers/igs011.c
+++ b/src/mame/drivers/igs011.c
@@ -255,17 +255,17 @@ UINT32 igs011_state::screen_update_igs011(screen_device &screen, bitmap_ind16 &b
UINT16 *pri_ram;
#ifdef MAME_DEBUG
- if (screen.machine().input().code_pressed(KEYCODE_Z))
+ if (machine().input().code_pressed(KEYCODE_Z))
{
int mask = 0;
- if (screen.machine().input().code_pressed(KEYCODE_Q)) mask |= 0x01;
- if (screen.machine().input().code_pressed(KEYCODE_W)) mask |= 0x02;
- if (screen.machine().input().code_pressed(KEYCODE_E)) mask |= 0x04;
- if (screen.machine().input().code_pressed(KEYCODE_R)) mask |= 0x08;
- if (screen.machine().input().code_pressed(KEYCODE_A)) mask |= 0x10;
- if (screen.machine().input().code_pressed(KEYCODE_S)) mask |= 0x20;
- if (screen.machine().input().code_pressed(KEYCODE_D)) mask |= 0x40;
- if (screen.machine().input().code_pressed(KEYCODE_F)) mask |= 0x80;
+ if (machine().input().code_pressed(KEYCODE_Q)) mask |= 0x01;
+ if (machine().input().code_pressed(KEYCODE_W)) mask |= 0x02;
+ if (machine().input().code_pressed(KEYCODE_E)) mask |= 0x04;
+ if (machine().input().code_pressed(KEYCODE_R)) mask |= 0x08;
+ if (machine().input().code_pressed(KEYCODE_A)) mask |= 0x10;
+ if (machine().input().code_pressed(KEYCODE_S)) mask |= 0x20;
+ if (machine().input().code_pressed(KEYCODE_D)) mask |= 0x40;
+ if (machine().input().code_pressed(KEYCODE_F)) mask |= 0x80;
if (mask) layer_enable &= mask;
}
#endif
@@ -294,7 +294,7 @@ UINT32 igs011_state::screen_update_igs011(screen_device &screen, bitmap_ind16 &b
#ifdef MAME_DEBUG
if ((layer_enable != -1) && (pri_addr == 0xff))
- bitmap.pix16(y, x) = get_black_pen(screen.machine());
+ bitmap.pix16(y, x) = get_black_pen(machine());
else
#endif
bitmap.pix16(y, x) = m_layer[l][scr_addr] | (l << 8);
diff --git a/src/mame/drivers/igs017.c b/src/mame/drivers/igs017.c
index 564cb448754..595ec8784fa 100644
--- a/src/mame/drivers/igs017.c
+++ b/src/mame/drivers/igs017.c
@@ -415,27 +415,27 @@ UINT32 igs017_state::screen_update_igs017(screen_device &screen, bitmap_ind16 &b
int layers_ctrl = -1;
#ifdef MAME_DEBUG
- if (screen.machine().input().code_pressed(KEYCODE_Z))
+ if (machine().input().code_pressed(KEYCODE_Z))
{
int mask = 0;
- if (screen.machine().input().code_pressed(KEYCODE_Q)) mask |= 1;
- if (screen.machine().input().code_pressed(KEYCODE_W)) mask |= 2;
- if (screen.machine().input().code_pressed(KEYCODE_A)) mask |= 4;
+ if (machine().input().code_pressed(KEYCODE_Q)) mask |= 1;
+ if (machine().input().code_pressed(KEYCODE_W)) mask |= 2;
+ if (machine().input().code_pressed(KEYCODE_A)) mask |= 4;
if (mask != 0) layers_ctrl &= mask;
}
#endif
- if (debug_viewer(screen.machine(), bitmap,cliprect))
+ if (debug_viewer(machine(), bitmap,cliprect))
return 0;
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
if (m_video_disable)
return 0;
if (layers_ctrl & 1) m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0);
- if (layers_ctrl & 4) draw_sprites(screen.machine(), bitmap, cliprect);
+ if (layers_ctrl & 4) draw_sprites(machine(), bitmap, cliprect);
if (layers_ctrl & 2) m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
diff --git a/src/mame/drivers/igs_m027.c b/src/mame/drivers/igs_m027.c
index fb9e4d29a5f..bb19589a314 100644
--- a/src/mame/drivers/igs_m027.c
+++ b/src/mame/drivers/igs_m027.c
@@ -185,7 +185,7 @@ void igs_m027_state::video_start()
UINT32 igs_m027_state::screen_update_igs_majhong(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
//??????????
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
//??????
m_igs_bg_tilemap->draw(bitmap, cliprect, 0,0);
diff --git a/src/mame/drivers/igspoker.c b/src/mame/drivers/igspoker.c
index 73e4b056388..81970a7ad78 100644
--- a/src/mame/drivers/igspoker.c
+++ b/src/mame/drivers/igspoker.c
@@ -201,7 +201,7 @@ void igspoker_state::video_start()
UINT32 igspoker_state::screen_update_igs_video(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
// FIX: CSK227IT must have some way to disable background, or wrong gfx?
if (m_bg_enable) m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
diff --git a/src/mame/drivers/intrscti.c b/src/mame/drivers/intrscti.c
index dfc588cd0bd..e7add981cd6 100644
--- a/src/mame/drivers/intrscti.c
+++ b/src/mame/drivers/intrscti.c
@@ -38,7 +38,7 @@ UINT32 intrscti_state::screen_update_intrscti(screen_device &screen, bitmap_ind1
int y,x;
int count;
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
count = 0;
for (y=0;y<32;y++)
@@ -47,7 +47,7 @@ UINT32 intrscti_state::screen_update_intrscti(screen_device &screen, bitmap_ind1
{
int dat;
dat = m_vram[count];
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[0],dat/*+0x100*/,0,0,0,x*8,y*8,0);
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[0],dat/*+0x100*/,0,0,0,x*8,y*8,0);
count++;
}
}
@@ -59,7 +59,7 @@ UINT32 intrscti_state::screen_update_intrscti(screen_device &screen, bitmap_ind1
{
int dat;
dat = m_vram[count];
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[0],dat+0x100,0,0,0,x*8,y*8,0);
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[0],dat+0x100,0,0,0,x*8,y*8,0);
count++;
}
}
diff --git a/src/mame/drivers/istellar.c b/src/mame/drivers/istellar.c
index 05f7e86ab06..1fb73e1d8b9 100644
--- a/src/mame/drivers/istellar.c
+++ b/src/mame/drivers/istellar.c
@@ -77,7 +77,7 @@ UINT32 istellar_state::screen_update_istellar(screen_device &screen, bitmap_rgb3
int tile = m_tile_ram[x+y*32];
int attr = m_tile_control_ram[x+y*32];
- drawgfx_transpen(bitmap, cliprect, screen.machine().gfx[0],tile,attr & 0x0f,0, 0, x*8, y*8, 0);
+ drawgfx_transpen(bitmap, cliprect, machine().gfx[0],tile,attr & 0x0f,0, 0, x*8, y*8, 0);
}
}
diff --git a/src/mame/drivers/itgambl2.c b/src/mame/drivers/itgambl2.c
index a3a053a5242..2bc97df7493 100644
--- a/src/mame/drivers/itgambl2.c
+++ b/src/mame/drivers/itgambl2.c
@@ -90,33 +90,33 @@ UINT32 itgambl2_state::screen_update_itgambl2(screen_device &screen, bitmap_rgb3
int x,y,count;
const UINT8 *blit_ram = memregion("gfx1")->base();
- if(screen.machine().input().code_pressed(KEYCODE_Z))
+ if(machine().input().code_pressed(KEYCODE_Z))
m_test_x++;
- if(screen.machine().input().code_pressed(KEYCODE_X))
+ if(machine().input().code_pressed(KEYCODE_X))
m_test_x--;
- if(screen.machine().input().code_pressed(KEYCODE_A))
+ if(machine().input().code_pressed(KEYCODE_A))
m_test_y++;
- if(screen.machine().input().code_pressed(KEYCODE_S))
+ if(machine().input().code_pressed(KEYCODE_S))
m_test_y--;
- if(screen.machine().input().code_pressed(KEYCODE_Q))
+ if(machine().input().code_pressed(KEYCODE_Q))
m_start_offs+=0x200;
- if(screen.machine().input().code_pressed(KEYCODE_W))
+ if(machine().input().code_pressed(KEYCODE_W))
m_start_offs-=0x200;
- if(screen.machine().input().code_pressed(KEYCODE_E))
+ if(machine().input().code_pressed(KEYCODE_E))
m_start_offs++;
- if(screen.machine().input().code_pressed(KEYCODE_R))
+ if(machine().input().code_pressed(KEYCODE_R))
m_start_offs--;
popmessage("%d %d %04x",m_test_x,m_test_y,m_start_offs);
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
count = (m_start_offs);
@@ -129,7 +129,7 @@ UINT32 itgambl2_state::screen_update_itgambl2(screen_device &screen, bitmap_rgb3
color = (blit_ram[count] & 0xff)>>0;
if(cliprect.contains(x, y))
- bitmap.pix32(y, x) = screen.machine().pens[color];
+ bitmap.pix32(y, x) = machine().pens[color];
count++;
}
diff --git a/src/mame/drivers/itgambl3.c b/src/mame/drivers/itgambl3.c
index cfe00de541b..4476611df85 100644
--- a/src/mame/drivers/itgambl3.c
+++ b/src/mame/drivers/itgambl3.c
@@ -78,33 +78,33 @@ UINT32 itgambl3_state::screen_update_itgambl3(screen_device &screen, bitmap_rgb3
int x,y,count;
const UINT8 *blit_ram = memregion("gfx1")->base();
- if(screen.machine().input().code_pressed(KEYCODE_Z))
+ if(machine().input().code_pressed(KEYCODE_Z))
m_test_x++;
- if(screen.machine().input().code_pressed(KEYCODE_X))
+ if(machine().input().code_pressed(KEYCODE_X))
m_test_x--;
- if(screen.machine().input().code_pressed(KEYCODE_A))
+ if(machine().input().code_pressed(KEYCODE_A))
m_test_y++;
- if(screen.machine().input().code_pressed(KEYCODE_S))
+ if(machine().input().code_pressed(KEYCODE_S))
m_test_y--;
- if(screen.machine().input().code_pressed(KEYCODE_Q))
+ if(machine().input().code_pressed(KEYCODE_Q))
m_start_offs+=0x200;
- if(screen.machine().input().code_pressed(KEYCODE_W))
+ if(machine().input().code_pressed(KEYCODE_W))
m_start_offs-=0x200;
- if(screen.machine().input().code_pressed(KEYCODE_E))
+ if(machine().input().code_pressed(KEYCODE_E))
m_start_offs++;
- if(screen.machine().input().code_pressed(KEYCODE_R))
+ if(machine().input().code_pressed(KEYCODE_R))
m_start_offs--;
popmessage("%d %d %04x",m_test_x,m_test_y,m_start_offs);
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
count = (m_start_offs);
@@ -117,7 +117,7 @@ UINT32 itgambl3_state::screen_update_itgambl3(screen_device &screen, bitmap_rgb3
color = (blit_ram[count] & 0xff)>>0;
if(cliprect.contains(x, y))
- bitmap.pix32(y, x) = screen.machine().pens[color];
+ bitmap.pix32(y, x) = machine().pens[color];
count++;
}
diff --git a/src/mame/drivers/itgamble.c b/src/mame/drivers/itgamble.c
index 56d3a138aec..a2159d7cd07 100644
--- a/src/mame/drivers/itgamble.c
+++ b/src/mame/drivers/itgamble.c
@@ -90,7 +90,7 @@ void itgamble_state::video_start()
UINT32 itgamble_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- bitmap.fill(get_black_pen(screen.machine()));
+ bitmap.fill(get_black_pen(machine()));
return 0;
}
diff --git a/src/mame/drivers/jackie.c b/src/mame/drivers/jackie.c
index b8fb36ad8c5..dcee353352c 100644
--- a/src/mame/drivers/jackie.c
+++ b/src/mame/drivers/jackie.c
@@ -204,7 +204,7 @@ UINT32 jackie_state::screen_update_jackie(screen_device &screen, bitmap_ind16 &b
int startclipmin = 0;
const rectangle &visarea = screen.visible_area();
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
for (i=0;i < 0x40;i++)
{
diff --git a/src/mame/drivers/jackpool.c b/src/mame/drivers/jackpool.c
index 1ff5fde79ce..1eaef3666be 100644
--- a/src/mame/drivers/jackpool.c
+++ b/src/mame/drivers/jackpool.c
@@ -47,7 +47,7 @@ void jackpool_state::video_start()
UINT32 jackpool_state::screen_update_jackpool(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- gfx_element *gfx = screen.machine().gfx[0];
+ gfx_element *gfx = machine().gfx[0];
int count;// = 0x00000/2;
int y,x;
diff --git a/src/mame/drivers/jalmah.c b/src/mame/drivers/jalmah.c
index 254728bfd61..96fe997b067 100644
--- a/src/mame/drivers/jalmah.c
+++ b/src/mame/drivers/jalmah.c
@@ -442,7 +442,7 @@ UINT32 jalmah_state::screen_update_jalmah(screen_device &screen, bitmap_ind16 &b
{
UINT16 *jm_scrollram = m_jm_scrollram;
UINT8 cur_prin;
- jalmah_priority_system(screen.machine());
+ jalmah_priority_system(machine());
m_sc0_tilemap_0->set_scrollx(0, jm_scrollram[0] & 0xfff);
m_sc0_tilemap_1->set_scrollx(0, jm_scrollram[0] & 0x7ff);
@@ -485,14 +485,14 @@ UINT32 jalmah_state::screen_update_jalmah(screen_device &screen, bitmap_ind16 &b
m_sc3_tilemap_2->set_scrolly(0, jm_scrollram[7] & 0x1ff);
m_sc3_tilemap_3->set_scrolly(0, jm_scrollram[7] & 0x3ff);
- bitmap.fill(screen.machine().pens[0xff], cliprect); //selectable by a ram address?
+ bitmap.fill(machine().pens[0xff], cliprect); //selectable by a ram address?
for(cur_prin=1;cur_prin<=0x8;cur_prin<<=1)
{
- if(cur_prin==m_sc0_prin) { draw_sc0_layer(screen.machine(),bitmap,cliprect); }
- if(cur_prin==m_sc1_prin) { draw_sc1_layer(screen.machine(),bitmap,cliprect); }
- if(cur_prin==m_sc2_prin) { draw_sc2_layer(screen.machine(),bitmap,cliprect); }
- if(cur_prin==m_sc3_prin) { draw_sc3_layer(screen.machine(),bitmap,cliprect); }
+ if(cur_prin==m_sc0_prin) { draw_sc0_layer(machine(),bitmap,cliprect); }
+ if(cur_prin==m_sc1_prin) { draw_sc1_layer(machine(),bitmap,cliprect); }
+ if(cur_prin==m_sc2_prin) { draw_sc2_layer(machine(),bitmap,cliprect); }
+ if(cur_prin==m_sc3_prin) { draw_sc3_layer(machine(),bitmap,cliprect); }
}
return 0;
@@ -507,7 +507,7 @@ UINT32 jalmah_state::screen_update_urashima(screen_device &screen, bitmap_ind16
m_sc0_tilemap_0->set_scrolly(0, jm_scrollram[4]);
m_sc3_tilemap_0->set_scrolly(0, jm_scrollram[7]);
- bitmap.fill(screen.machine().pens[0x1ff], cliprect);//selectable by a ram address?
+ bitmap.fill(machine().pens[0x1ff], cliprect);//selectable by a ram address?
if(m_jm_vregs[0] & 1) { m_sc0_tilemap_0->draw(bitmap, cliprect, 0,0); }
if(m_jm_vregs[3] & 1) { m_sc3_tilemap_0->draw(bitmap, cliprect, 0,0); }
return 0;
diff --git a/src/mame/drivers/jangou.c b/src/mame/drivers/jangou.c
index 8fc02ceb217..1ccf1f914c1 100644
--- a/src/mame/drivers/jangou.c
+++ b/src/mame/drivers/jangou.c
@@ -158,8 +158,8 @@ UINT32 jangou_state::screen_update_jangou(screen_device &screen, bitmap_ind16 &b
for (x = cliprect.min_x; x <= cliprect.max_x; x += 2)
{
UINT32 srcpix = *src++;
- *dst++ = screen.machine().pens[srcpix & 0xf];
- *dst++ = screen.machine().pens[(srcpix >> 4) & 0xf];
+ *dst++ = machine().pens[srcpix & 0xf];
+ *dst++ = machine().pens[(srcpix >> 4) & 0xf];
}
}
diff --git a/src/mame/drivers/jantotsu.c b/src/mame/drivers/jantotsu.c
index 3309e783a04..cd6e3457b28 100644
--- a/src/mame/drivers/jantotsu.c
+++ b/src/mame/drivers/jantotsu.c
@@ -169,7 +169,7 @@ UINT32 jantotsu_state::screen_update_jantotsu(screen_device &screen, bitmap_rgb3
color |= (((m_bitmap[count + pen_i*0x2000]) >> (7 - i)) & 1) << pen_i;
if (cliprect.contains(x + i, y))
- bitmap.pix32(y, x + i) = screen.machine().pens[color];
+ bitmap.pix32(y, x + i) = machine().pens[color];
}
count++;
diff --git a/src/mame/drivers/jchan.c b/src/mame/drivers/jchan.c
index 2560e721ae7..e70f563846b 100644
--- a/src/mame/drivers/jchan.c
+++ b/src/mame/drivers/jchan.c
@@ -305,9 +305,9 @@ UINT32 jchan_state::screen_update_jchan(screen_device &screen, bitmap_ind16 &bit
UINT16 pixdata1;
UINT16 pixdata2;
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
m_view2_0->kaneko16_prepare(bitmap, cliprect);
@@ -319,8 +319,8 @@ UINT32 jchan_state::screen_update_jchan(screen_device &screen, bitmap_ind16 &bit
m_sprite_bitmap_1->fill(0x0000, cliprect);
m_sprite_bitmap_2->fill(0x0000, cliprect);
- m_spritegen1->skns_draw_sprites(screen.machine(), *m_sprite_bitmap_1, cliprect, m_sprite_ram32_1, 0x4000, screen.machine().root_device().memregion("gfx1")->base(), screen.machine().root_device().memregion ("gfx1")->bytes(), m_sprite_regs32_1 );
- m_spritegen2->skns_draw_sprites(screen.machine(), *m_sprite_bitmap_2, cliprect, m_sprite_ram32_2, 0x4000, screen.machine().root_device().memregion("gfx2")->base(), memregion ("gfx2")->bytes(), m_sprite_regs32_2 );
+ m_spritegen1->skns_draw_sprites(machine(), *m_sprite_bitmap_1, cliprect, m_sprite_ram32_1, 0x4000, machine().root_device().memregion("gfx1")->base(), machine().root_device().memregion ("gfx1")->bytes(), m_sprite_regs32_1 );
+ m_spritegen2->skns_draw_sprites(machine(), *m_sprite_bitmap_2, cliprect, m_sprite_ram32_2, 0x4000, machine().root_device().memregion("gfx2")->base(), memregion ("gfx2")->bytes(), m_sprite_regs32_2 );
// ignoring priority bits for now - might use alpha too, check 0x8000 of palette writes
for (y=0;y<240;y++)
diff --git a/src/mame/drivers/jclub2.c b/src/mame/drivers/jclub2.c
index 97e7134c85b..8f10201a6c2 100644
--- a/src/mame/drivers/jclub2.c
+++ b/src/mame/drivers/jclub2.c
@@ -238,17 +238,17 @@ UINT32 darkhors_state::screen_update_darkhors(screen_device &screen, bitmap_ind1
int layers_ctrl = -1;
#if DARKHORS_DEBUG
- if (screen.machine().input().code_pressed(KEYCODE_Z))
+ if (machine().input().code_pressed(KEYCODE_Z))
{
int mask = 0;
- if (screen.machine().input().code_pressed(KEYCODE_Q)) mask |= 1;
- if (screen.machine().input().code_pressed(KEYCODE_W)) mask |= 2;
- if (screen.machine().input().code_pressed(KEYCODE_A)) mask |= 4;
+ if (machine().input().code_pressed(KEYCODE_Q)) mask |= 1;
+ if (machine().input().code_pressed(KEYCODE_W)) mask |= 2;
+ if (machine().input().code_pressed(KEYCODE_A)) mask |= 4;
if (mask != 0) layers_ctrl &= mask;
}
#endif
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
m_tmap->set_scrollx(0, (m_tmapscroll[0] >> 16) - 5);
m_tmap->set_scrolly(0, (m_tmapscroll[0] & 0xffff) - 0xff );
@@ -258,7 +258,7 @@ UINT32 darkhors_state::screen_update_darkhors(screen_device &screen, bitmap_ind1
m_tmap2->set_scrolly(0, (m_tmapscroll2[0] & 0xffff) - 0xff );
if (layers_ctrl & 2) m_tmap2->draw(bitmap, cliprect, 0, 0);
- if (layers_ctrl & 4) draw_sprites(screen.machine(),bitmap,cliprect);
+ if (layers_ctrl & 4) draw_sprites(machine(),bitmap,cliprect);
#if DARKHORS_DEBUG
#if 0
@@ -725,7 +725,7 @@ UINT32 darkhors_state::screen_update_jclub2(screen_device &screen, bitmap_ind16
{
// this isn't an st0020..
- m_gdfs_st0020->st0020_draw_all(screen.machine(), bitmap, cliprect);
+ m_gdfs_st0020->st0020_draw_all(machine(), bitmap, cliprect);
return 0;
}
@@ -788,7 +788,7 @@ VIDEO_START_MEMBER(darkhors_state,jclub2o)
UINT32 darkhors_state::screen_update_jclub2o(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- m_gdfs_st0020->st0020_draw_all(screen.machine(), bitmap, cliprect);
+ m_gdfs_st0020->st0020_draw_all(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/drivers/jollyjgr.c b/src/mame/drivers/jollyjgr.c
index fdd105ed7dd..83fd0c3af6c 100644
--- a/src/mame/drivers/jollyjgr.c
+++ b/src/mame/drivers/jollyjgr.c
@@ -504,7 +504,7 @@ UINT32 jollyjgr_state::screen_update_jollyjgr(screen_device &screen, bitmap_ind1
if(m_pri) //used in Frog & Spiders level 3
{
if(!(m_bitmap_disable))
- draw_bitmap(screen.machine(), bitmap);
+ draw_bitmap(machine(), bitmap);
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
}
@@ -513,7 +513,7 @@ UINT32 jollyjgr_state::screen_update_jollyjgr(screen_device &screen, bitmap_ind1
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
if(!(m_bitmap_disable))
- draw_bitmap(screen.machine(), bitmap);
+ draw_bitmap(machine(), bitmap);
}
/* Sprites are the same as in Galaxian */
@@ -540,7 +540,7 @@ UINT32 jollyjgr_state::screen_update_jollyjgr(screen_device &screen, bitmap_ind1
if (offs < 3 * 4)
sy++;
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[1],
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[1],
code,color,
flipx,flipy,
sx,sy,0);
diff --git a/src/mame/drivers/jpmsys5.c b/src/mame/drivers/jpmsys5.c
index 9c91bce3a11..a719f7c595e 100644
--- a/src/mame/drivers/jpmsys5.c
+++ b/src/mame/drivers/jpmsys5.c
@@ -233,7 +233,7 @@ UINT32 jpmsys5_state::screen_update_jpmsys5v(screen_device &screen, bitmap_rgb32
if (state.blanked)
{
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
return 0;
}
@@ -247,8 +247,8 @@ UINT32 jpmsys5_state::screen_update_jpmsys5v(screen_device &screen, bitmap_rgb32
UINT8 pen = src[(x-cliprect.min_x)>>1];
/* Draw two 4-bit pixels */
- *dest++ = screen.machine().pens[(pen >> 4) & 0xf];
- *dest++ = screen.machine().pens[pen & 0xf];
+ *dest++ = machine().pens[(pen >> 4) & 0xf];
+ *dest++ = machine().pens[pen & 0xf];
}
}
diff --git a/src/mame/drivers/kingdrby.c b/src/mame/drivers/kingdrby.c
index fea27bdddd2..f2bd9185b7d 100644
--- a/src/mame/drivers/kingdrby.c
+++ b/src/mame/drivers/kingdrby.c
@@ -243,7 +243,7 @@ UINT32 kingdrby_state::screen_update_kingdrby(screen_device &screen, bitmap_ind1
/*TILEMAP_DRAW_CATEGORY + TILEMAP_DRAW_OPAQUE doesn't suit well?*/
m_sc0_tilemap->draw(bitmap, cliprect, 0,0);
- draw_sprites(screen.machine(),bitmap,cliprect);
+ draw_sprites(machine(),bitmap,cliprect);
m_sc1_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_CATEGORY(1),0);
m_sc0w_tilemap->draw(bitmap, clip, 0,0);
diff --git a/src/mame/drivers/laserbat.c b/src/mame/drivers/laserbat.c
index e06ef5b3b1b..3bd17c93882 100644
--- a/src/mame/drivers/laserbat.c
+++ b/src/mame/drivers/laserbat.c
@@ -528,7 +528,7 @@ UINT32 laserbat_state::screen_update_laserbat(screen_device &screen, bitmap_ind1
}
if (m_sprite_enable)
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[1],
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[1],
m_sprite_code,
m_sprite_color,
0,0,
diff --git a/src/mame/drivers/lastfght.c b/src/mame/drivers/lastfght.c
index 37187ca34e2..5c8a6b23a46 100644
--- a/src/mame/drivers/lastfght.c
+++ b/src/mame/drivers/lastfght.c
@@ -151,24 +151,24 @@ UINT32 lastfght_state::screen_update_lastfght(screen_device &screen, bitmap_ind1
#if 1
// gfx roms viewer (toggle with enter, use pgup/down to browse)
int x, y, count = 0;
- UINT8 *gfxdata = screen.machine().root_device().memregion("gfx1")->base();
+ UINT8 *gfxdata = machine().root_device().memregion("gfx1")->base();
UINT8 data;
- if (screen.machine().input().code_pressed_once(KEYCODE_ENTER)) m_view_roms ^= 1;
+ if (machine().input().code_pressed_once(KEYCODE_ENTER)) m_view_roms ^= 1;
if (m_view_roms)
{
- if (screen.machine().input().code_pressed_once(KEYCODE_PGDN)) m_base += 512 * 256;
- if (screen.machine().input().code_pressed_once(KEYCODE_PGUP)) m_base -= 512 * 256;
+ if (machine().input().code_pressed_once(KEYCODE_PGDN)) m_base += 512 * 256;
+ if (machine().input().code_pressed_once(KEYCODE_PGUP)) m_base -= 512 * 256;
m_base %= memregion("gfx1")->bytes();
count = m_base;
- bitmap.fill(get_black_pen(screen.machine()), cliprect );
+ bitmap.fill(get_black_pen(machine()), cliprect );
for (y = 0 ; y < 256; y++)
{
for (x = 0; x < 512; x++)
{
- data = (((count & 0xf) == 0) && ((count & 0x1e00) == 0)) ? get_white_pen(screen.machine()) : gfxdata[count]; // white grid or data
+ data = (((count & 0xf) == 0) && ((count & 0x1e00) == 0)) ? get_white_pen(machine()) : gfxdata[count]; // white grid or data
bitmap.pix16(y, x) = data;
count++;
}
diff --git a/src/mame/drivers/lgp.c b/src/mame/drivers/lgp.c
index 3120cc39e8d..b65d3925719 100644
--- a/src/mame/drivers/lgp.c
+++ b/src/mame/drivers/lgp.c
@@ -101,7 +101,7 @@ UINT32 lgp_state::screen_update_lgp(screen_device &screen, bitmap_rgb32 &bitmap,
int charx, chary;
/* make color 0 transparent */
- palette_set_color(screen.machine(), 0, MAKE_ARGB(0,0,0,0));
+ palette_set_color(machine(), 0, MAKE_ARGB(0,0,0,0));
/* clear */
bitmap.fill(0, cliprect);
@@ -115,7 +115,7 @@ UINT32 lgp_state::screen_update_lgp(screen_device &screen, bitmap_rgb32 &bitmap,
/* Somewhere there's a flag that offsets the tilemap by 0x100*x */
/* Palette is likely set somewhere as well (tile_control_ram?) */
- drawgfx_transpen(bitmap, cliprect, screen.machine().gfx[0],
+ drawgfx_transpen(bitmap, cliprect, machine().gfx[0],
m_tile_ram[current_screen_character],
0,
0, 0, charx*8, chary*8, 0);
diff --git a/src/mame/drivers/limenko.c b/src/mame/drivers/limenko.c
index fe0450ed95e..36621a7599d 100644
--- a/src/mame/drivers/limenko.c
+++ b/src/mame/drivers/limenko.c
@@ -519,7 +519,7 @@ UINT32 limenko_state::screen_update_limenko(screen_device &screen, bitmap_ind16
{
// m_videoreg[4] ???? It always has this value: 0xffeffff8 (2 signed bytes? values: -17 and -8 ?)
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
m_bg_tilemap->enable(m_videoreg[0] & 4);
m_md_tilemap->enable(m_videoreg[0] & 2);
@@ -538,7 +538,7 @@ UINT32 limenko_state::screen_update_limenko(screen_device &screen, bitmap_ind16
m_fg_tilemap->draw(bitmap, cliprect, 0,1);
if(m_videoreg[0] & 8)
- copy_sprites(screen.machine(), bitmap, m_sprites_bitmap, screen.machine().priority_bitmap, cliprect);
+ copy_sprites(machine(), bitmap, m_sprites_bitmap, machine().priority_bitmap, cliprect);
return 0;
}
diff --git a/src/mame/drivers/looping.c b/src/mame/drivers/looping.c
index 3b243aa4779..371ce7d8197 100644
--- a/src/mame/drivers/looping.c
+++ b/src/mame/drivers/looping.c
@@ -308,7 +308,7 @@ UINT32 looping_state::screen_update_looping(screen_device &screen, bitmap_ind16
{
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/drivers/luckgrln.c b/src/mame/drivers/luckgrln.c
index 3069cb477be..aa723c545d2 100644
--- a/src/mame/drivers/luckgrln.c
+++ b/src/mame/drivers/luckgrln.c
@@ -362,10 +362,10 @@ UINT32 luckgrln_state::screen_update_luckgrln(screen_device &screen, bitmap_ind1
if (bgenable==3) m_reel4_tilemap->draw(bitmap, clip, 0, 0);
}
- if (tileattr&0x08) drawgfx_transpen(bitmap,clip,screen.machine().gfx[region],tile,col,0,0,x*8,y*8, 0);
+ if (tileattr&0x08) drawgfx_transpen(bitmap,clip,machine().gfx[region],tile,col,0,0,x*8,y*8, 0);
#else // treat it as priority flag instead (looks better in non-adult title screen - needs verifying)
- if (!(tileattr&0x08)) drawgfx_transpen(bitmap,clip,screen.machine().gfx[region],tile,col,0,0,x*8,y*8, 0);
+ if (!(tileattr&0x08)) drawgfx_transpen(bitmap,clip,machine().gfx[region],tile,col,0,0,x*8,y*8, 0);
if (tileattr&0x04)
{
@@ -375,7 +375,7 @@ UINT32 luckgrln_state::screen_update_luckgrln(screen_device &screen, bitmap_ind1
if (bgenable==3) m_reel4_tilemap->draw(bitmap, clip, 0, 0);
}
- if ((tileattr&0x08)) drawgfx_transpen(bitmap,clip,screen.machine().gfx[region],tile,col,0,0,x*8,y*8, 0);
+ if ((tileattr&0x08)) drawgfx_transpen(bitmap,clip,machine().gfx[region],tile,col,0,0,x*8,y*8, 0);
#endif
count++;
diff --git a/src/mame/drivers/m63.c b/src/mame/drivers/m63.c
index 334daa37756..49a3c9233e4 100644
--- a/src/mame/drivers/m63.c
+++ b/src/mame/drivers/m63.c
@@ -369,7 +369,7 @@ UINT32 m63_state::screen_update_m63(screen_device &screen, bitmap_ind16 &bitmap,
m_bg_tilemap->set_scrolly(col, m_scrollram[col * 8]);
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
}
diff --git a/src/mame/drivers/magicard.c b/src/mame/drivers/magicard.c
index ee9156854cf..90966b7bf28 100644
--- a/src/mame/drivers/magicard.c
+++ b/src/mame/drivers/magicard.c
@@ -415,11 +415,11 @@ void magicard_state::video_start()
UINT32 magicard_state::screen_update_magicard(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- magicard_state *state = screen.machine().driver_data<magicard_state>();
+ magicard_state *state = machine().driver_data<magicard_state>();
int x,y;
UINT32 count;
- bitmap.fill(get_black_pen(screen.machine()), cliprect); //TODO
+ bitmap.fill(get_black_pen(machine()), cliprect); //TODO
if(!(SCC_DE_VREG)) //display enable
return 0;
@@ -437,22 +437,22 @@ UINT32 magicard_state::screen_update_magicard(screen_device &screen, bitmap_rgb3
color = ((m_magicram[count]) & 0x000f)>>0;
if(cliprect.contains((x*4)+3, y))
- bitmap.pix32(y, (x*4)+3) = screen.machine().pens[color];
+ bitmap.pix32(y, (x*4)+3) = machine().pens[color];
color = ((m_magicram[count]) & 0x00f0)>>4;
if(cliprect.contains((x*4)+2, y))
- bitmap.pix32(y, (x*4)+2) = screen.machine().pens[color];
+ bitmap.pix32(y, (x*4)+2) = machine().pens[color];
color = ((m_magicram[count]) & 0x0f00)>>8;
if(cliprect.contains((x*4)+1, y))
- bitmap.pix32(y, (x*4)+1) = screen.machine().pens[color];
+ bitmap.pix32(y, (x*4)+1) = machine().pens[color];
color = ((m_magicram[count]) & 0xf000)>>12;
if(cliprect.contains((x*4)+0, y))
- bitmap.pix32(y, (x*4)+0) = screen.machine().pens[color];
+ bitmap.pix32(y, (x*4)+0) = machine().pens[color];
count++;
}
@@ -469,12 +469,12 @@ UINT32 magicard_state::screen_update_magicard(screen_device &screen, bitmap_rgb3
color = ((m_magicram[count]) & 0x00ff)>>0;
if(cliprect.contains((x*2)+1, y))
- bitmap.pix32(y, (x*2)+1) = screen.machine().pens[color];
+ bitmap.pix32(y, (x*2)+1) = machine().pens[color];
color = ((m_magicram[count]) & 0xff00)>>8;
if(cliprect.contains((x*2)+0, y))
- bitmap.pix32(y, (x*2)+0) = screen.machine().pens[color];
+ bitmap.pix32(y, (x*2)+0) = machine().pens[color];
count++;
}
diff --git a/src/mame/drivers/majorpkr.c b/src/mame/drivers/majorpkr.c
index 96a52fe1929..98b90b696f9 100644
--- a/src/mame/drivers/majorpkr.c
+++ b/src/mame/drivers/majorpkr.c
@@ -540,7 +540,7 @@ void majorpkr_state::video_start()
UINT32 majorpkr_state::screen_update_majorpkr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
rectangle custom_clip;
diff --git a/src/mame/drivers/marinedt.c b/src/mame/drivers/marinedt.c
index a0ff829df74..9a0d06df48b 100644
--- a/src/mame/drivers/marinedt.c
+++ b/src/mame/drivers/marinedt.c
@@ -527,14 +527,14 @@ UINT32 marinedt_state::screen_update_marinedt(screen_device &screen, bitmap_ind1
m_tx_tilemap->draw(*m_tile, cliprect, 0, 0);
m_obj1->fill(0);
- drawgfx_transpen(*m_obj1, m_obj1->cliprect(), screen.machine().gfx[1],
+ drawgfx_transpen(*m_obj1, m_obj1->cliprect(), machine().gfx[1],
OBJ_CODE(m_obj1_a),
OBJ_COLOR(m_obj1_a),
OBJ_FLIPX(m_obj1_a), OBJ_FLIPY(m_obj1_a),
0, 0, 0);
m_obj2->fill(0);
- drawgfx_transpen(*m_obj2, m_obj2->cliprect(), screen.machine().gfx[2],
+ drawgfx_transpen(*m_obj2, m_obj2->cliprect(), machine().gfx[2],
OBJ_CODE(m_obj2_a),
OBJ_COLOR(m_obj2_a),
OBJ_FLIPX(m_obj2_a), OBJ_FLIPY(m_obj2_a),
diff --git a/src/mame/drivers/mastboy.c b/src/mame/drivers/mastboy.c
index e278441864b..312e3b59f09 100644
--- a/src/mame/drivers/mastboy.c
+++ b/src/mame/drivers/mastboy.c
@@ -498,7 +498,7 @@ UINT32 mastboy_state::screen_update_mastboy(screen_device &screen, bitmap_ind16
{
int coldat = m_colram[i+1] | (m_colram[i+0]<<8);
- palette_set_color_rgb(screen.machine(),i/2,pal4bit(coldat>>8),pal4bit(coldat>>12),pal4bit(coldat>>4));
+ palette_set_color_rgb(machine(),i/2,pal4bit(coldat>>8),pal4bit(coldat>>12),pal4bit(coldat>>4));
}
for (y=0;y<32;y++)
@@ -512,12 +512,12 @@ UINT32 mastboy_state::screen_update_mastboy(screen_device &screen, bitmap_ind16
if (tileno&0x800)
{
- gfx = screen.machine().gfx[1];
+ gfx = machine().gfx[1];
tileno &=0x7ff;
}
else
{
- gfx = screen.machine().gfx[0];
+ gfx = machine().gfx[0];
}
diff --git a/src/mame/drivers/maygayv1.c b/src/mame/drivers/maygayv1.c
index e7204647935..4cb3182c99e 100644
--- a/src/mame/drivers/maygayv1.c
+++ b/src/mame/drivers/maygayv1.c
@@ -311,7 +311,7 @@ UINT32 maygayv1_state::screen_update_maygayv1(screen_device &screen, bitmap_ind1
/* If screen output is disabled, fill with black */
if (!(VREG(VCR0) & VCR0_DEN))
{
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
return 0;
}
@@ -453,7 +453,7 @@ void maygayv1_state::screen_eof_maygayv1(screen_device &screen, bool state)
for (i = 0; i < 16; ++i)
{
UINT16 entry = *palbase++;
- palette_set_color_rgb(screen.machine(), entry & 0xf, pal4bit(entry >> 12), pal4bit(entry >> 8), pal4bit(entry >> 4));
+ palette_set_color_rgb(machine(), entry & 0xf, pal4bit(entry >> 12), pal4bit(entry >> 8), pal4bit(entry >> 4));
}
}
}
diff --git a/src/mame/drivers/mazerbla.c b/src/mame/drivers/mazerbla.c
index 867c9ec4352..81513899e83 100644
--- a/src/mame/drivers/mazerbla.c
+++ b/src/mame/drivers/mazerbla.c
@@ -239,38 +239,38 @@ UINT32 mazerbla_state::screen_update_test_vcu(screen_device &screen, bitmap_ind1
m_tmpbitmaps[0].fill(color_base);
- if (screen.machine().input().code_pressed_once(KEYCODE_1)) /* plane 1 */
+ if (machine().input().code_pressed_once(KEYCODE_1)) /* plane 1 */
planes_enabled[0] ^= 1;
- if (screen.machine().input().code_pressed_once(KEYCODE_2)) /* plane 2 */
+ if (machine().input().code_pressed_once(KEYCODE_2)) /* plane 2 */
planes_enabled[1] ^= 1;
- if (screen.machine().input().code_pressed_once(KEYCODE_3)) /* plane 3 */
+ if (machine().input().code_pressed_once(KEYCODE_3)) /* plane 3 */
planes_enabled[2] ^= 1;
- if (screen.machine().input().code_pressed_once(KEYCODE_4)) /* plane 4 */
+ if (machine().input().code_pressed_once(KEYCODE_4)) /* plane 4 */
planes_enabled[3] ^= 1;
- if (screen.machine().input().code_pressed_once(KEYCODE_I)) /* show/hide debug info */
+ if (machine().input().code_pressed_once(KEYCODE_I)) /* show/hide debug info */
m_dbg_info = !m_dbg_info;
- if (screen.machine().input().code_pressed_once(KEYCODE_G)) /* enable gfx area handling */
+ if (machine().input().code_pressed_once(KEYCODE_G)) /* enable gfx area handling */
m_dbg_gfx_e = !m_dbg_gfx_e;
- if (screen.machine().input().code_pressed_once(KEYCODE_C)) /* enable color area handling */
+ if (machine().input().code_pressed_once(KEYCODE_C)) /* enable color area handling */
m_dbg_clr_e = !m_dbg_clr_e;
- if (screen.machine().input().code_pressed_once(KEYCODE_V)) /* draw only when vbank==dbg_vbank */
+ if (machine().input().code_pressed_once(KEYCODE_V)) /* draw only when vbank==dbg_vbank */
m_dbg_vbank ^= 1;
- if (screen.machine().input().code_pressed_once(KEYCODE_L)) /* showlookup ram */
+ if (machine().input().code_pressed_once(KEYCODE_L)) /* showlookup ram */
m_dbg_lookup = (m_dbg_lookup + 1) % 5; //0,1,2,3, 4-off
if (m_dbg_info)
{
sprintf(buf,"I-info, G-gfx, C-color, V-vbank, 1-4 enable planes");
- ui_draw_text(buf, 10, 0 * ui_get_line_height(screen.machine()));
+ ui_draw_text(buf, 10, 0 * ui_get_line_height(machine()));
sprintf(buf,"g:%1i c:%1i v:%1i vbk=%1i planes=%1i%1i%1i%1i ", m_dbg_gfx_e&1, m_dbg_clr_e&1, m_dbg_vbank, vbank&1,
planes_enabled[0],
@@ -278,7 +278,7 @@ UINT32 mazerbla_state::screen_update_test_vcu(screen_device &screen, bitmap_ind1
planes_enabled[2],
planes_enabled[3] );
- ui_draw_text(buf, 10, 1 * ui_get_line_height(screen.machine()));
+ ui_draw_text(buf, 10, 1 * ui_get_line_height(machine()));
if (m_dbg_lookup!=4)
{
@@ -293,7 +293,7 @@ UINT32 mazerbla_state::screen_update_test_vcu(screen_device &screen, bitmap_ind1
{
sprintf(buf + strlen(buf), "%02x ", lookup_ram[lookup_offs + x + y * 16]);
}
- ui_draw_text(buf, 0, (2 + y) * ui_get_line_height(screen.machine()));
+ ui_draw_text(buf, 0, (2 + y) * ui_get_line_height(machine()));
}
}
}
diff --git a/src/mame/drivers/mediagx.c b/src/mame/drivers/mediagx.c
index 22dbca74b9b..d625c713f93 100644
--- a/src/mame/drivers/mediagx.c
+++ b/src/mame/drivers/mediagx.c
@@ -384,11 +384,11 @@ UINT32 mediagx_state::screen_update_mediagx(screen_device &screen, bitmap_rgb32
{
bitmap.fill(0, cliprect);
- draw_framebuffer(screen.machine(), bitmap, cliprect);
+ draw_framebuffer(machine(), bitmap, cliprect);
if (m_disp_ctrl_reg[DC_OUTPUT_CFG] & 0x1) // don't show MDA text screen on 16-bit mode. this is basically a hack
{
- draw_cga(screen.machine(), bitmap, cliprect);
+ draw_cga(machine(), bitmap, cliprect);
}
return 0;
}
diff --git a/src/mame/drivers/meritm.c b/src/mame/drivers/meritm.c
index 6e6107954ce..c425739e25c 100644
--- a/src/mame/drivers/meritm.c
+++ b/src/mame/drivers/meritm.c
@@ -464,18 +464,18 @@ void meritm_state::video_start()
UINT32 meritm_state::screen_update_meritm(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- if(screen.machine().input().code_pressed_once(KEYCODE_Q))
+ if(machine().input().code_pressed_once(KEYCODE_Q))
{
m_layer0_enabled^=1;
popmessage("Layer 0 %sabled",m_layer0_enabled ? "en" : "dis");
}
- if(screen.machine().input().code_pressed_once(KEYCODE_W))
+ if(machine().input().code_pressed_once(KEYCODE_W))
{
m_layer1_enabled^=1;
popmessage("Layer 1 %sabled",m_layer1_enabled ? "en" : "dis");
}
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
if ( m_layer0_enabled )
{
diff --git a/src/mame/drivers/mgolf.c b/src/mame/drivers/mgolf.c
index 75296b1f751..64c6388d718 100644
--- a/src/mame/drivers/mgolf.c
+++ b/src/mame/drivers/mgolf.c
@@ -73,14 +73,14 @@ UINT32 mgolf_state::screen_update_mgolf(screen_device &screen, bitmap_ind16 &bit
/* draw sprites */
for (i = 0; i < 2; i++)
{
- drawgfx_transpen(bitmap, cliprect, screen.machine().gfx[1],
+ drawgfx_transpen(bitmap, cliprect, machine().gfx[1],
m_video_ram[0x399 + 4 * i],
i,
0, 0,
m_video_ram[0x390 + 2 * i] - 7,
m_video_ram[0x398 + 4 * i] - 16, 0);
- drawgfx_transpen(bitmap, cliprect, screen.machine().gfx[1],
+ drawgfx_transpen(bitmap, cliprect, machine().gfx[1],
m_video_ram[0x39b + 4 * i],
i,
0, 0,
diff --git a/src/mame/drivers/midas.c b/src/mame/drivers/midas.c
index e3e9475ba3c..f15e56108b5 100644
--- a/src/mame/drivers/midas.c
+++ b/src/mame/drivers/midas.c
@@ -190,18 +190,18 @@ UINT32 midas_state::screen_update_midas(screen_device &screen, bitmap_ind16 &bit
int layers_ctrl = -1;
#ifdef MAME_DEBUG
- if ( screen.machine().input().code_pressed(KEYCODE_Z) )
+ if ( machine().input().code_pressed(KEYCODE_Z) )
{
int msk = 0;
- if (screen.machine().input().code_pressed(KEYCODE_Q)) msk |= 1 << 0; // for m_tmap
- if (screen.machine().input().code_pressed(KEYCODE_A)) msk |= 1 << 1; // for sprites
+ if (machine().input().code_pressed(KEYCODE_Q)) msk |= 1 << 0; // for m_tmap
+ if (machine().input().code_pressed(KEYCODE_A)) msk |= 1 << 1; // for sprites
if (msk != 0) layers_ctrl &= msk;
}
#endif
bitmap.fill(4095, cliprect);
- if (layers_ctrl & 2) draw_sprites(screen.machine(), bitmap,cliprect);
+ if (layers_ctrl & 2) draw_sprites(machine(), bitmap,cliprect);
if (layers_ctrl & 1) m_tmap->draw(bitmap, cliprect, 0, 0);
return 0;
diff --git a/src/mame/drivers/mirage.c b/src/mame/drivers/mirage.c
index d363c15bde7..54f9491c84a 100644
--- a/src/mame/drivers/mirage.c
+++ b/src/mame/drivers/mirage.c
@@ -87,21 +87,21 @@ void miragemi_state::video_start()
UINT32 miragemi_state::screen_update_mirage(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- address_space &space = screen.machine().driver_data()->generic_space();
+ address_space &space = machine().driver_data()->generic_space();
UINT16 flip = deco16ic_pf_control_r(m_deco_tilegen1, space, 0, 0xffff);
flip_screen_set(BIT(flip, 7));
- screen.machine().device<decospr_device>("spritegen")->draw_sprites(bitmap, cliprect, m_spriteram->buffer(), 0x400);
+ machine().device<decospr_device>("spritegen")->draw_sprites(bitmap, cliprect, m_spriteram->buffer(), 0x400);
deco16ic_pf_update(m_deco_tilegen1, m_pf1_rowscroll, m_pf2_rowscroll);
bitmap.fill(256, cliprect); /* not verified */
deco16ic_tilemap_2_draw(m_deco_tilegen1, bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0);
- screen.machine().device<decospr_device>("spritegen")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0800, 0x0800, 0x200, 0x1ff);
+ machine().device<decospr_device>("spritegen")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0800, 0x0800, 0x200, 0x1ff);
deco16ic_tilemap_1_draw(m_deco_tilegen1, bitmap, cliprect, 0, 0);
- screen.machine().device<decospr_device>("spritegen")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0000, 0x0800, 0x200, 0x1ff);
+ machine().device<decospr_device>("spritegen")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0000, 0x0800, 0x200, 0x1ff);
return 0;
}
diff --git a/src/mame/drivers/mirax.c b/src/mame/drivers/mirax.c
index db73e306f86..4c9aafa129f 100644
--- a/src/mame/drivers/mirax.c
+++ b/src/mame/drivers/mirax.c
@@ -222,9 +222,9 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
UINT32 mirax_state::screen_update_mirax(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- draw_tilemap(screen.machine(),bitmap,cliprect,1);
- draw_sprites(screen.machine(),bitmap,cliprect);
- draw_tilemap(screen.machine(),bitmap,cliprect,0);
+ draw_tilemap(machine(),bitmap,cliprect,1);
+ draw_sprites(machine(),bitmap,cliprect);
+ draw_tilemap(machine(),bitmap,cliprect,0);
return 0;
}
diff --git a/src/mame/drivers/missb2.c b/src/mame/drivers/missb2.c
index 42da7a77c33..99f44157a19 100644
--- a/src/mame/drivers/missb2.c
+++ b/src/mame/drivers/missb2.c
@@ -66,7 +66,7 @@ UINT32 missb2_state::screen_update_missb2(screen_device &screen, bitmap_ind16 &b
//popmessage("%02x",(*m_bgvram) & 0x1f);
for (bg_offs = ((*m_bgvram) << 4); bg_offs < (((*m_bgvram) << 4) | 0xf); bg_offs++)
{
- drawgfx_opaque(bitmap,cliprect,screen.machine().gfx[1],
+ drawgfx_opaque(bitmap,cliprect,machine().gfx[1],
bg_offs,
1,
0,0,
@@ -76,7 +76,7 @@ UINT32 missb2_state::screen_update_missb2(screen_device &screen, bitmap_ind16 &b
sx = 0;
- prom = screen.machine().root_device().memregion("proms")->base();
+ prom = machine().root_device().memregion("proms")->base();
for (offs = 0; offs < m_objectram.bytes(); offs += 4)
{
/* skip empty sprites */
@@ -126,7 +126,7 @@ UINT32 missb2_state::screen_update_missb2(screen_device &screen, bitmap_ind16 &b
flipy = !flipy;
}
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[0],
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[0],
code,
0,
flipx,flipy,
diff --git a/src/mame/drivers/mjsister.c b/src/mame/drivers/mjsister.c
index bb5cb4c445a..80200fb0c47 100644
--- a/src/mame/drivers/mjsister.c
+++ b/src/mame/drivers/mjsister.c
@@ -139,8 +139,8 @@ UINT32 mjsister_state::screen_update_mjsister(screen_device &screen, bitmap_ind1
for (offs = 0; offs < 0x8000; offs++)
{
- mjsister_plot0(screen.machine(), offs, m_videoram0[offs]);
- mjsister_plot1(screen.machine(), offs, m_videoram1[offs]);
+ mjsister_plot0(machine(), offs, m_videoram0[offs]);
+ mjsister_plot1(machine(), offs, m_videoram1[offs]);
}
m_screen_redraw = 0;
}
@@ -155,7 +155,7 @@ UINT32 mjsister_state::screen_update_mjsister(screen_device &screen, bitmap_ind1
copybitmap_trans(bitmap, *m_tmpbitmap1, flip, flip, 2, 0, cliprect, 0);
}
else
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
return 0;
}
diff --git a/src/mame/drivers/mlanding.c b/src/mame/drivers/mlanding.c
index 20af7c33a37..44bd7445ebb 100644
--- a/src/mame/drivers/mlanding.c
+++ b/src/mame/drivers/mlanding.c
@@ -103,8 +103,8 @@ UINT32 mlanding_state::screen_update_mlanding(screen_device &screen, bitmap_ind1
{
UINT16 srcpix = *src++;
- *dst++ = screen.machine().pens[256+(srcpix & 0xff) + (m_pal_fg_bank & 1 ? 0x100 : 0x000)];
- *dst++ = screen.machine().pens[256+(srcpix >> 8) + (m_pal_fg_bank & 1 ? 0x100 : 0x000)];
+ *dst++ = machine().pens[256+(srcpix & 0xff) + (m_pal_fg_bank & 1 ? 0x100 : 0x000)];
+ *dst++ = machine().pens[256+(srcpix >> 8) + (m_pal_fg_bank & 1 ? 0x100 : 0x000)];
}
}
diff --git a/src/mame/drivers/monzagp.c b/src/mame/drivers/monzagp.c
index 9d8c39b3b13..29889c3125f 100644
--- a/src/mame/drivers/monzagp.c
+++ b/src/mame/drivers/monzagp.c
@@ -74,25 +74,25 @@ UINT32 monzagp_state::screen_update_monzagp(screen_device &screen, bitmap_ind16
{
int x,y;
- if(screen.machine().input().code_pressed_once(KEYCODE_Z))
+ if(machine().input().code_pressed_once(KEYCODE_Z))
m_bank--;
- if(screen.machine().input().code_pressed_once(KEYCODE_X))
+ if(machine().input().code_pressed_once(KEYCODE_X))
m_bank++;
- if(screen.machine().input().code_pressed_once(KEYCODE_Q))
+ if(machine().input().code_pressed_once(KEYCODE_Q))
{
m_screenw--;
printf("%x\n",m_screenw);
}
- if(screen.machine().input().code_pressed_once(KEYCODE_W))
+ if(machine().input().code_pressed_once(KEYCODE_W))
{
m_screenw++;
printf("%x\n",m_screenw);
}
- if(screen.machine().input().code_pressed_once(KEYCODE_A))
+ if(machine().input().code_pressed_once(KEYCODE_A))
{
FILE * p=fopen("vram.bin","wb");
fwrite(&m_vram[0],1,0x10000,p);
@@ -104,7 +104,7 @@ UINT32 monzagp_state::screen_update_monzagp(screen_device &screen, bitmap_ind16
{
for(x=0;x<256;x++)
{
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[m_bank&1],
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[m_bank&1],
m_vram[y*m_screenw+x],
//(m_vram[y*m_screenw+x]&0x3f)+(m_bank>>1)*64,
0,
diff --git a/src/mame/drivers/mpoker.c b/src/mame/drivers/mpoker.c
index 2da44d68377..7be7527c9dd 100644
--- a/src/mame/drivers/mpoker.c
+++ b/src/mame/drivers/mpoker.c
@@ -210,7 +210,7 @@ UINT32 mpoker_state::screen_update_mpoker(screen_device &screen, bitmap_ind16 &b
{
int y,x;
int count;
- gfx_element *gfx = screen.machine().gfx[0];
+ gfx_element *gfx = machine().gfx[0];
count = 0;
for (y=0;y<32;y++)
diff --git a/src/mame/drivers/mpu4dealem.c b/src/mame/drivers/mpu4dealem.c
index 21d95123826..3121a6d13a0 100644
--- a/src/mame/drivers/mpu4dealem.c
+++ b/src/mame/drivers/mpu4dealem.c
@@ -124,7 +124,7 @@ UINT32 mpu4dealem_state::screen_update_dealem(screen_device &screen, bitmap_ind1
{
int tile = m_dealem_videoram[count + 0x1000] | (m_dealem_videoram[count] << 8);
count++;
- drawgfx_opaque(bitmap,cliprect,screen.machine().gfx[0],tile,0,0,0,x * 8,y * 8);
+ drawgfx_opaque(bitmap,cliprect,machine().gfx[0],tile,0,0,0,x * 8,y * 8);
}
}
diff --git a/src/mame/drivers/mpu4vid.c b/src/mame/drivers/mpu4vid.c
index 8f6a9563260..608a5993ec4 100644
--- a/src/mame/drivers/mpu4vid.c
+++ b/src/mame/drivers/mpu4vid.c
@@ -517,7 +517,7 @@ UINT32 mpu4vid_state::screen_update_mpu4_vid(screen_device &screen, bitmap_rgb32
bitmap.fill(0, cliprect);
- m_scn2674->scn2574_draw(screen.machine(), bitmap, cliprect, m_vid_mainram );
+ m_scn2674->scn2574_draw(machine(), bitmap, cliprect, m_vid_mainram );
return 0;
}
diff --git a/src/mame/drivers/multfish.c b/src/mame/drivers/multfish.c
index 49eef71823f..37109161a9d 100644
--- a/src/mame/drivers/multfish.c
+++ b/src/mame/drivers/multfish.c
@@ -285,7 +285,7 @@ UINT32 multfish_state::screen_update_multfish(screen_device &screen, bitmap_ind1
{
int i;
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
if (!m_disp_enable) return 0;
diff --git a/src/mame/drivers/multigam.c b/src/mame/drivers/multigam.c
index 415c38508e3..95fb9d14c1a 100644
--- a/src/mame/drivers/multigam.c
+++ b/src/mame/drivers/multigam.c
@@ -1118,7 +1118,7 @@ void multigam_state::video_start()
UINT32 multigam_state::screen_update_multigam(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
/* render the ppu */
- ppu2c0x_device *ppu = screen.machine().device<ppu2c0x_device>("ppu");
+ ppu2c0x_device *ppu = machine().device<ppu2c0x_device>("ppu");
ppu->render(bitmap, 0, 0, 0, 0);
return 0;
}
diff --git a/src/mame/drivers/murogem.c b/src/mame/drivers/murogem.c
index 441c57cb866..a84f7cb0824 100644
--- a/src/mame/drivers/murogem.c
+++ b/src/mame/drivers/murogem.c
@@ -217,7 +217,7 @@ UINT32 murogem_state::screen_update_murogem(screen_device &screen, bitmap_ind16
int tileno = m_videoram[count]&0x3f;
int attr = m_videoram[count+0x400]&0x0f;
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[0],tileno,attr,0,0,xx*8,yy*8,0);
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[0],tileno,attr,0,0,xx*8,yy*8,0);
count++;
diff --git a/src/mame/drivers/murogmbl.c b/src/mame/drivers/murogmbl.c
index 5524bd163e5..ab2d0f5d162 100644
--- a/src/mame/drivers/murogmbl.c
+++ b/src/mame/drivers/murogmbl.c
@@ -97,7 +97,7 @@ void murogmbl_state::video_start()
UINT32 murogmbl_state::screen_update_murogmbl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- gfx_element *gfx = screen.machine().gfx[0];
+ gfx_element *gfx = machine().gfx[0];
int count = 0;
int y, x;
diff --git a/src/mame/drivers/mwarr.c b/src/mame/drivers/mwarr.c
index b73b926b4c3..2628b4e2b7b 100644
--- a/src/mame/drivers/mwarr.c
+++ b/src/mame/drivers/mwarr.c
@@ -485,7 +485,7 @@ UINT32 mwarr_state::screen_update_mwarr(screen_device &screen, bitmap_ind16 &bit
{
int i;
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
if (BIT(m_vidattrram[6], 0))
{
@@ -531,7 +531,7 @@ UINT32 mwarr_state::screen_update_mwarr(screen_device &screen, bitmap_ind16 &bit
m_mlow_tilemap->draw(bitmap, cliprect, 0, 0x02);
m_mhigh_tilemap->draw(bitmap, cliprect, 0, 0x04);
m_tx_tilemap->draw(bitmap, cliprect, 0, 0x10);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/drivers/namcos23.c b/src/mame/drivers/namcos23.c
index d9d0b24c258..a715f2521c5 100644
--- a/src/mame/drivers/namcos23.c
+++ b/src/mame/drivers/namcos23.c
@@ -2421,11 +2421,11 @@ VIDEO_START_MEMBER(namcos23_state,ss23)
UINT32 namcos23_state::screen_update_ss23(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
- render_run( screen.machine(), bitmap );
+ render_run( machine(), bitmap );
- gfx_element *gfx = screen.machine().gfx[0];
+ gfx_element *gfx = machine().gfx[0];
gfx->mark_all_dirty();
m_bgtilemap->draw(bitmap, cliprect, 0/*flags*/, 0/*priority*/ ); /* opaque */
diff --git a/src/mame/drivers/neoprint.c b/src/mame/drivers/neoprint.c
index 7620a2bf101..a9c2c36e2c2 100644
--- a/src/mame/drivers/neoprint.c
+++ b/src/mame/drivers/neoprint.c
@@ -115,8 +115,8 @@ UINT32 neoprint_state::screen_update_neoprint(screen_device &screen, bitmap_ind1
{
bitmap.fill(0, cliprect);
- draw_layer(screen.machine(),bitmap,cliprect,1,2);
- draw_layer(screen.machine(),bitmap,cliprect,0,2);
+ draw_layer(machine(),bitmap,cliprect,1,2);
+ draw_layer(machine(),bitmap,cliprect,0,2);
return 0;
}
@@ -125,9 +125,9 @@ UINT32 neoprint_state::screen_update_nprsp(screen_device &screen, bitmap_ind16 &
{
bitmap.fill(0, cliprect);
- draw_layer(screen.machine(),bitmap,cliprect,1,0);
- draw_layer(screen.machine(),bitmap,cliprect,2,0);
- draw_layer(screen.machine(),bitmap,cliprect,0,0);
+ draw_layer(machine(),bitmap,cliprect,1,0);
+ draw_layer(machine(),bitmap,cliprect,2,0);
+ draw_layer(machine(),bitmap,cliprect,0,0);
return 0;
}
diff --git a/src/mame/drivers/nightgal.c b/src/mame/drivers/nightgal.c
index 1337badb70a..d3738f9660f 100644
--- a/src/mame/drivers/nightgal.c
+++ b/src/mame/drivers/nightgal.c
@@ -108,8 +108,8 @@ UINT32 nightgal_state::screen_update_nightgal(screen_device &screen, bitmap_ind1
for (x = cliprect.min_x; x <= cliprect.max_x; x += 2)
{
UINT32 srcpix = *src++;
- *dst++ = screen.machine().pens[srcpix & 0xf];
- *dst++ = screen.machine().pens[(srcpix >> 4) & 0xf];
+ *dst++ = machine().pens[srcpix & 0xf];
+ *dst++ = machine().pens[(srcpix >> 4) & 0xf];
}
}
diff --git a/src/mame/drivers/nmg5.c b/src/mame/drivers/nmg5.c
index a03015eb671..2312d3240a7 100644
--- a/src/mame/drivers/nmg5.c
+++ b/src/mame/drivers/nmg5.c
@@ -897,33 +897,33 @@ UINT32 nmg5_state::screen_update_nmg5(screen_device &screen, bitmap_ind16 &bitma
if (m_priority_reg == 0)
{
- screen.machine().device<decospr_device>("spritegen")->draw_sprites(bitmap, cliprect, m_spriteram, 0x400);
+ machine().device<decospr_device>("spritegen")->draw_sprites(bitmap, cliprect, m_spriteram, 0x400);
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_bitmap(screen.machine(), bitmap);
+ draw_bitmap(machine(), bitmap);
}
else if (m_priority_reg == 1)
{
- draw_bitmap(screen.machine(), bitmap);
- screen.machine().device<decospr_device>("spritegen")->draw_sprites(bitmap, cliprect, m_spriteram, 0x400);
+ draw_bitmap(machine(), bitmap);
+ machine().device<decospr_device>("spritegen")->draw_sprites(bitmap, cliprect, m_spriteram, 0x400);
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
}
else if (m_priority_reg == 2)
{
- screen.machine().device<decospr_device>("spritegen")->draw_sprites(bitmap, cliprect, m_spriteram, 0x400);
- draw_bitmap(screen.machine(), bitmap);
+ machine().device<decospr_device>("spritegen")->draw_sprites(bitmap, cliprect, m_spriteram, 0x400);
+ draw_bitmap(machine(), bitmap);
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
}
else if (m_priority_reg == 3)
{
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
- screen.machine().device<decospr_device>("spritegen")->draw_sprites(bitmap, cliprect, m_spriteram, 0x400);
- draw_bitmap(screen.machine(), bitmap);
+ machine().device<decospr_device>("spritegen")->draw_sprites(bitmap, cliprect, m_spriteram, 0x400);
+ draw_bitmap(machine(), bitmap);
}
else if (m_priority_reg == 7)
{
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_bitmap(screen.machine(), bitmap);
- screen.machine().device<decospr_device>("spritegen")->draw_sprites(bitmap, cliprect, m_spriteram, 0x400);
+ draw_bitmap(machine(), bitmap);
+ machine().device<decospr_device>("spritegen")->draw_sprites(bitmap, cliprect, m_spriteram, 0x400);
}
return 0;
}
diff --git a/src/mame/drivers/norautp.c b/src/mame/drivers/norautp.c
index 943b6462ff7..6151ee6cd75 100644
--- a/src/mame/drivers/norautp.c
+++ b/src/mame/drivers/norautp.c
@@ -569,7 +569,7 @@ UINT32 norautp_state::screen_update_norautp(screen_device &screen, bitmap_ind16
count = 0;
- bitmap.fill(screen.machine().pens[0], cliprect); //black pen
+ bitmap.fill(machine().pens[0], cliprect); //black pen
for(y = 0; y < 8; y++)
{
@@ -581,7 +581,7 @@ UINT32 norautp_state::screen_update_norautp(screen_device &screen, bitmap_ind16
int tile = m_np_vram[count] & 0x3f;
int colour = (m_np_vram[count] & 0xc0) >> 6;
- drawgfx_opaque(bitmap,cliprect, screen.machine().gfx[1], tile, colour, 0, 0, (x * 32) + 8, y * 32);
+ drawgfx_opaque(bitmap,cliprect, machine().gfx[1], tile, colour, 0, 0, (x * 32) + 8, y * 32);
count+=2;
}
@@ -593,7 +593,7 @@ UINT32 norautp_state::screen_update_norautp(screen_device &screen, bitmap_ind16
int tile = m_np_vram[count] & 0x3f;
int colour = (m_np_vram[count] & 0xc0) >> 6;
- drawgfx_opaque(bitmap,cliprect, screen.machine().gfx[0], tile, colour, 0, 0, x * 16, y * 32);
+ drawgfx_opaque(bitmap,cliprect, machine().gfx[0], tile, colour, 0, 0, x * 16, y * 32);
count++;
}
diff --git a/src/mame/drivers/nwk-tr.c b/src/mame/drivers/nwk-tr.c
index fadaef38263..a68801b383a 100644
--- a/src/mame/drivers/nwk-tr.c
+++ b/src/mame/drivers/nwk-tr.c
@@ -276,10 +276,10 @@ static void voodoo_vblank_0(device_t *device, int param)
UINT32 nwktr_state::screen_update_nwktr(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- device_t *voodoo = screen.machine().device("voodoo");
- device_t *k001604 = screen.machine().device("k001604");
+ device_t *voodoo = machine().device("voodoo");
+ device_t *k001604 = machine().device("k001604");
- bitmap.fill(screen.machine().pens[0], cliprect);
+ bitmap.fill(machine().pens[0], cliprect);
voodoo_update(voodoo, bitmap, cliprect);
diff --git a/src/mame/drivers/olibochu.c b/src/mame/drivers/olibochu.c
index 9df89ebf99b..d36771dcbf6 100644
--- a/src/mame/drivers/olibochu.c
+++ b/src/mame/drivers/olibochu.c
@@ -230,7 +230,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
UINT32 olibochu_state::screen_update_olibochu(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/drivers/panicr.c b/src/mame/drivers/panicr.c
index 56de7c7ffa5..5812accee53 100644
--- a/src/mame/drivers/panicr.c
+++ b/src/mame/drivers/panicr.c
@@ -250,11 +250,11 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,const re
UINT32 panicr_state::screen_update_panicr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
m_txttilemap->mark_all_dirty();
m_bgtilemap->set_scrollx(0, m_scrollx);
m_bgtilemap->draw(bitmap, cliprect, 0,0);
- draw_sprites(screen.machine(),bitmap,cliprect);
+ draw_sprites(machine(),bitmap,cliprect);
m_txttilemap->draw(bitmap, cliprect, 0,0);
return 0;
diff --git a/src/mame/drivers/pcxt.c b/src/mame/drivers/pcxt.c
index 9ef43239469..d1af4896e41 100644
--- a/src/mame/drivers/pcxt.c
+++ b/src/mame/drivers/pcxt.c
@@ -154,7 +154,7 @@ UINT32 pcxt_state::screen_update_tetriskr(screen_device &screen, bitmap_rgb32 &b
color |= ((bg_rom[y*320/8+x+(pen_i*0x20000)+yi*0x400+m_bg_bank*0x2000+1] >> (7-xi)) & 1) << pen_i;
if(cliprect.contains(x*8+xi, y*8+yi))
- bitmap.pix32(y*8+yi, x*8+xi) = screen.machine().pens[color];
+ bitmap.pix32(y*8+yi, x*8+xi) = machine().pens[color];
}
}
}
diff --git a/src/mame/drivers/photon.c b/src/mame/drivers/photon.c
index 9b1b6834c8d..2b4c6ed0285 100644
--- a/src/mame/drivers/photon.c
+++ b/src/mame/drivers/photon.c
@@ -208,7 +208,7 @@ void photon_state::video_start()
UINT32 photon_state::screen_update_photon(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- return pk8000_video_update(screen, bitmap, cliprect, screen.machine().root_device().memregion("maincpu")->base());
+ return pk8000_video_update(screen, bitmap, cliprect, machine().root_device().memregion("maincpu")->base());
}
static MACHINE_CONFIG_START( photon, photon_state )
diff --git a/src/mame/drivers/pinkiri8.c b/src/mame/drivers/pinkiri8.c
index 042a06196d2..615ba482587 100644
--- a/src/mame/drivers/pinkiri8.c
+++ b/src/mame/drivers/pinkiri8.c
@@ -205,7 +205,7 @@ ronjan
UINT32 pinkiri8_state::screen_update_pinkiri8(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
int col_bank;
- gfx_element *gfx = screen.machine().gfx[0];
+ gfx_element *gfx = machine().gfx[0];
/* update palette */
for (int pen = 0; pen < 0x800 ; pen++)
@@ -214,14 +214,14 @@ UINT32 pinkiri8_state::screen_update_pinkiri8(screen_device &screen, bitmap_ind1
int r = (val & 0x001f) >> 0;
int g = (val & 0x03e0) >> 5;
int b = (val & 0x7c00) >> 10;
- palette_set_color_rgb(screen.machine(), pen, pal5bit(r), pal5bit(g), pal5bit(b));
+ palette_set_color_rgb(machine(), pen, pal5bit(r), pal5bit(g), pal5bit(b));
}
int game_type_hack = 0;
- if (!strcmp(screen.machine().system().name,"janshi")) game_type_hack = 1;
+ if (!strcmp(machine().system().name,"janshi")) game_type_hack = 1;
- if ( screen.machine().input().code_pressed_once(KEYCODE_W) )
+ if ( machine().input().code_pressed_once(KEYCODE_W) )
{
int i;
int count2;
@@ -251,7 +251,7 @@ UINT32 pinkiri8_state::screen_update_pinkiri8(screen_device &screen, bitmap_ind1
//popmessage("%02x",m_janshi_crtc_regs[0x0a]);
col_bank = (m_janshi_crtc_regs[0x0a] & 0x40) >> 6;
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
/* FIXME: color is a bit of a mystery */
{
@@ -325,7 +325,7 @@ UINT32 pinkiri8_state::screen_update_pinkiri8(screen_device &screen, bitmap_ind1
if (bit)
{
- //col = screen.machine().rand();
+ //col = machine().rand();
width = 2;
}
else
diff --git a/src/mame/drivers/poker72.c b/src/mame/drivers/poker72.c
index 7309032a7f8..69a0ca1352c 100644
--- a/src/mame/drivers/poker72.c
+++ b/src/mame/drivers/poker72.c
@@ -58,7 +58,7 @@ UINT32 poker72_state::screen_update_poker72(screen_device &screen, bitmap_ind16
tile|= m_tile_bank << 12;
- drawgfx_opaque(bitmap,cliprect,screen.machine().gfx[0],tile,color,fx,fy,x*8,y*8);
+ drawgfx_opaque(bitmap,cliprect,machine().gfx[0],tile,color,fx,fy,x*8,y*8);
count+=2;
}
diff --git a/src/mame/drivers/poo.c b/src/mame/drivers/poo.c
index 23537a51bef..427a965d5db 100644
--- a/src/mame/drivers/poo.c
+++ b/src/mame/drivers/poo.c
@@ -80,7 +80,7 @@ UINT32 poo_state::screen_update_unclepoo(screen_device &screen, bitmap_ind16 &bi
{
int y,x;
int count;
- gfx_element *gfx = screen.machine().gfx[0];
+ gfx_element *gfx = machine().gfx[0];
count = 0;
diff --git a/src/mame/drivers/popobear.c b/src/mame/drivers/popobear.c
index 076828d2883..c4a17a66d0d 100644
--- a/src/mame/drivers/popobear.c
+++ b/src/mame/drivers/popobear.c
@@ -264,11 +264,11 @@ UINT32 popobear_state::screen_update_popobear(screen_device &screen, bitmap_ind1
//popmessage("%04x",m_vregs[0/2]);
- draw_layer(screen.machine(),bitmap,cliprect,3);
- draw_layer(screen.machine(),bitmap,cliprect,2);
- draw_layer(screen.machine(),bitmap,cliprect,1);
- draw_layer(screen.machine(),bitmap,cliprect,0);
- draw_sprites(screen.machine(),bitmap,cliprect);
+ draw_layer(machine(),bitmap,cliprect,3);
+ draw_layer(machine(),bitmap,cliprect,2);
+ draw_layer(machine(),bitmap,cliprect,1);
+ draw_layer(machine(),bitmap,cliprect,0);
+ draw_sprites(machine(),bitmap,cliprect);
return 0;
}
diff --git a/src/mame/drivers/powerbal.c b/src/mame/drivers/powerbal.c
index 1337e46a414..8081d1cc5a2 100644
--- a/src/mame/drivers/powerbal.c
+++ b/src/mame/drivers/powerbal.c
@@ -430,7 +430,7 @@ UINT32 playmark_state::screen_update_powerbal(screen_device &screen, bitmap_ind1
{
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/drivers/progolf.c b/src/mame/drivers/progolf.c
index e2f65bbe484..afdf668e3fa 100644
--- a/src/mame/drivers/progolf.c
+++ b/src/mame/drivers/progolf.c
@@ -118,9 +118,9 @@ UINT32 progolf_state::screen_update_progolf(screen_device &screen, bitmap_ind16
{
int tile = videoram[count];
- drawgfx_opaque(bitmap,cliprect,screen.machine().gfx[0],tile,1,0,0,(256-x*8)+scroll,y*8);
+ drawgfx_opaque(bitmap,cliprect,machine().gfx[0],tile,1,0,0,(256-x*8)+scroll,y*8);
/* wrap-around */
- drawgfx_opaque(bitmap,cliprect,screen.machine().gfx[0],tile,1,0,0,(256-x*8)+scroll-1024,y*8);
+ drawgfx_opaque(bitmap,cliprect,machine().gfx[0],tile,1,0,0,(256-x*8)+scroll-1024,y*8);
count++;
}
@@ -142,7 +142,7 @@ UINT32 progolf_state::screen_update_progolf(screen_device &screen, bitmap_ind16
color = m_fg_fb[(xi+yi*8)+count*0x40];
if(color != 0 && cliprect.contains(x+yi, 256-y+xi))
- bitmap.pix16(x+yi, 256-y+xi) = screen.machine().pens[(color & 0x7)];
+ bitmap.pix16(x+yi, 256-y+xi) = machine().pens[(color & 0x7)];
}
}
diff --git a/src/mame/drivers/pturn.c b/src/mame/drivers/pturn.c
index 356cc88ecd0..0139dabba71 100644
--- a/src/mame/drivers/pturn.c
+++ b/src/mame/drivers/pturn.c
@@ -196,7 +196,7 @@ UINT32 pturn_state::screen_update_pturn(screen_device &screen, bitmap_ind16 &bit
if(sx|sy)
{
- drawgfx_transpen(bitmap, cliprect,screen.machine().gfx[2],
+ drawgfx_transpen(bitmap, cliprect,machine().gfx[2],
spriteram[offs+1] & 0x3f ,
(spriteram[offs+2] & 0x1f),
flipx, flipy,
diff --git a/src/mame/drivers/pzletime.c b/src/mame/drivers/pzletime.c
index 63c8451b3e3..aaccbeb5f72 100644
--- a/src/mame/drivers/pzletime.c
+++ b/src/mame/drivers/pzletime.c
@@ -97,7 +97,7 @@ UINT32 pzletime_state::screen_update_pzletime(screen_device &screen, bitmap_ind1
int count;
int y, x;
- bitmap.fill(screen.machine().pens[0], cliprect); //bg pen
+ bitmap.fill(machine().pens[0], cliprect); //bg pen
m_txt_tilemap->set_scrolly(0, m_tilemap_regs[0] - 3);
m_txt_tilemap->set_scrollx(0, m_tilemap_regs[1]);
@@ -139,7 +139,7 @@ UINT32 pzletime_state::screen_update_pzletime(screen_device &screen, bitmap_ind1
// is spriteram[offs + 0] & 0x200 flipy? it's always set
- drawgfx_transpen(bitmap, cliprect, screen.machine().gfx[1], spr_offs, colour, 0, 1, sx, sy, 0);
+ drawgfx_transpen(bitmap, cliprect, machine().gfx[1], spr_offs, colour, 0, 1, sx, sy, 0);
}
}
diff --git a/src/mame/drivers/quizpun2.c b/src/mame/drivers/quizpun2.c
index 60d8271c31a..5333e92e55e 100644
--- a/src/mame/drivers/quizpun2.c
+++ b/src/mame/drivers/quizpun2.c
@@ -161,19 +161,19 @@ UINT32 quizpun2_state::screen_update_quizpun2(screen_device &screen, bitmap_ind1
int layers_ctrl = -1;
#ifdef MAME_DEBUG
- if (screen.machine().input().code_pressed(KEYCODE_Z))
+ if (machine().input().code_pressed(KEYCODE_Z))
{
int msk = 0;
- if (screen.machine().input().code_pressed(KEYCODE_Q)) msk |= 1;
- if (screen.machine().input().code_pressed(KEYCODE_W)) msk |= 2;
+ if (machine().input().code_pressed(KEYCODE_Q)) msk |= 1;
+ if (machine().input().code_pressed(KEYCODE_W)) msk |= 2;
if (msk != 0) layers_ctrl &= msk;
}
#endif
if (layers_ctrl & 1) m_bg_tmap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0);
- else bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ else bitmap.fill(get_black_pen(machine()), cliprect);
-bitmap.fill(get_black_pen(screen.machine()), cliprect);
+bitmap.fill(get_black_pen(machine()), cliprect);
if (layers_ctrl & 2) m_fg_tmap->draw(bitmap, cliprect, 0, 0);
return 0;
diff --git a/src/mame/drivers/r2dx_v33.c b/src/mame/drivers/r2dx_v33.c
index c24c4ce1d66..e3f5ae5d2f6 100644
--- a/src/mame/drivers/r2dx_v33.c
+++ b/src/mame/drivers/r2dx_v33.c
@@ -216,13 +216,13 @@ void r2dx_v33_state::video_start()
UINT32 r2dx_v33_state::screen_update_rdx_v33(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
m_md_tilemap->draw(bitmap, cliprect, 0, 0);
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(),bitmap,cliprect,0);
+ draw_sprites(machine(),bitmap,cliprect,0);
m_tx_tilemap->draw(bitmap, cliprect, 0, 0);
@@ -231,19 +231,19 @@ UINT32 r2dx_v33_state::screen_update_rdx_v33(screen_device &screen, bitmap_ind16
{
static UINT32 src_addr = 0x100000;
static int frame;
- address_space &space = *screen.machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
- //if(screen.machine().input().code_pressed_once(KEYCODE_A))
+ //if(machine().input().code_pressed_once(KEYCODE_A))
// src_addr+=0x800;
- //if(screen.machine().input().code_pressed_once(KEYCODE_S))
+ //if(machine().input().code_pressed_once(KEYCODE_S))
// src_addr-=0x800;
frame++;
popmessage("%08x 0",src_addr);
- //if(screen.machine().input().code_pressed_once(KEYCODE_Z))
+ //if(machine().input().code_pressed_once(KEYCODE_Z))
if(frame == 5)
{
int i,data;
diff --git a/src/mame/drivers/rabbit.c b/src/mame/drivers/rabbit.c
index c7aad838471..771519511eb 100644
--- a/src/mame/drivers/rabbit.c
+++ b/src/mame/drivers/rabbit.c
@@ -466,7 +466,7 @@ UINT32 rabbit_state::screen_update_rabbit(screen_device &screen, bitmap_ind16 &b
{
int prilevel;
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
// popmessage("%08x %08x", m_viewregs0[0], m_viewregs0[1]);
// popmessage("%08x %08x %08x %08x %08x %08x", m_tilemap_regs[0][0],m_tilemap_regs[0][1],m_tilemap_regs[0][2],m_tilemap_regs[0][3],m_tilemap_regs[0][4],m_tilemap_regs[0][5]);
@@ -484,16 +484,16 @@ UINT32 rabbit_state::screen_update_rabbit(screen_device &screen, bitmap_ind16 &b
/* prio isnt certain but seems to work.. */
for (prilevel = 0xf; prilevel >0; prilevel--)
{
- if (prilevel == ((m_tilemap_regs[3][0]&0x0f000000)>>24)) rabbit_drawtilemap(screen.machine(),bitmap,cliprect, 3);
- if (prilevel == ((m_tilemap_regs[2][0]&0x0f000000)>>24)) rabbit_drawtilemap(screen.machine(),bitmap,cliprect, 2);
- if (prilevel == ((m_tilemap_regs[1][0]&0x0f000000)>>24)) rabbit_drawtilemap(screen.machine(),bitmap,cliprect, 1);
- if (prilevel == ((m_tilemap_regs[0][0]&0x0f000000)>>24)) rabbit_drawtilemap(screen.machine(),bitmap,cliprect, 0);
+ if (prilevel == ((m_tilemap_regs[3][0]&0x0f000000)>>24)) rabbit_drawtilemap(machine(),bitmap,cliprect, 3);
+ if (prilevel == ((m_tilemap_regs[2][0]&0x0f000000)>>24)) rabbit_drawtilemap(machine(),bitmap,cliprect, 2);
+ if (prilevel == ((m_tilemap_regs[1][0]&0x0f000000)>>24)) rabbit_drawtilemap(machine(),bitmap,cliprect, 1);
+ if (prilevel == ((m_tilemap_regs[0][0]&0x0f000000)>>24)) rabbit_drawtilemap(machine(),bitmap,cliprect, 0);
if (prilevel == 0x09) // should it be selectable?
{
- rabbit_clearspritebitmap(screen.machine(),bitmap,cliprect);
- draw_sprites(screen.machine(),bitmap,cliprect); // render to bitmap
- draw_sprite_bitmap(screen.machine(),bitmap,cliprect); // copy bitmap to screen
+ rabbit_clearspritebitmap(machine(),bitmap,cliprect);
+ draw_sprites(machine(),bitmap,cliprect); // render to bitmap
+ draw_sprite_bitmap(machine(),bitmap,cliprect); // copy bitmap to screen
}
}
return 0;
diff --git a/src/mame/drivers/raiden2.c b/src/mame/drivers/raiden2.c
index 11945e8c468..2be07048d59 100644
--- a/src/mame/drivers/raiden2.c
+++ b/src/mame/drivers/raiden2.c
@@ -962,33 +962,33 @@ VIDEO_START_MEMBER(raiden2_state,raiden2)
UINT32 raiden2_state::screen_update_raiden2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
- //if (!screen.machine().input().code_pressed(KEYCODE_Q))
+ //if (!machine().input().code_pressed(KEYCODE_Q))
{
if (!(raiden2_tilemap_enable & 1))
background_layer->draw(bitmap, cliprect, 0, 0);
}
- //if (!screen.machine().input().code_pressed(KEYCODE_W))
+ //if (!machine().input().code_pressed(KEYCODE_W))
{
if (!(raiden2_tilemap_enable & 2))
midground_layer->draw(bitmap, cliprect, 0, 0);
}
- //if (!screen.machine().input().code_pressed(KEYCODE_E))
+ //if (!machine().input().code_pressed(KEYCODE_E))
{
if (!(raiden2_tilemap_enable & 4))
foreground_layer->draw(bitmap, cliprect, 0, 0);
}
- //if (!screen.machine().input().code_pressed(KEYCODE_S))
+ //if (!machine().input().code_pressed(KEYCODE_S))
{
//if (!(raiden2_tilemap_enable & 0x10))
- draw_sprites(screen.machine(), bitmap, cliprect, 0);
+ draw_sprites(machine(), bitmap, cliprect, 0);
}
- //if (!screen.machine().input().code_pressed(KEYCODE_A))
+ //if (!machine().input().code_pressed(KEYCODE_A))
{
if (!(raiden2_tilemap_enable & 8))
text_layer->draw(bitmap, cliprect, 0, 0);
diff --git a/src/mame/drivers/rbmk.c b/src/mame/drivers/rbmk.c
index a71618e8cbb..ffb75ebbf06 100644
--- a/src/mame/drivers/rbmk.c
+++ b/src/mame/drivers/rbmk.c
@@ -508,7 +508,7 @@ UINT32 rbmk_state::screen_update_rbmk(screen_device &screen, bitmap_ind16 &bitma
for (x=0;x<64;x++)
{
int tile = m_gms_vidram2[count+0x600];
- drawgfx_opaque(bitmap,cliprect,screen.machine().gfx[0],(tile&0xfff)+((m_tilebank&0x10)>>4)*0x1000,tile>>12,0,0,x*8,y*32);
+ drawgfx_opaque(bitmap,cliprect,machine().gfx[0],(tile&0xfff)+((m_tilebank&0x10)>>4)*0x1000,tile>>12,0,0,x*8,y*32);
count++;
}
}
@@ -520,7 +520,7 @@ UINT32 rbmk_state::screen_update_rbmk(screen_device &screen, bitmap_ind16 &bitma
for (x=0;x<64;x++)
{
int tile = m_gms_vidram[count];
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[1],(tile&0xfff)+((m_tilebank>>1)&3)*0x1000,tile>>12,0,0,x*8,y*8,0);
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[1],(tile&0xfff)+((m_tilebank>>1)&3)*0x1000,tile>>12,0,0,x*8,y*8,0);
count++;
}
}
diff --git a/src/mame/drivers/rgum.c b/src/mame/drivers/rgum.c
index 22388013368..fc6b322f44e 100644
--- a/src/mame/drivers/rgum.c
+++ b/src/mame/drivers/rgum.c
@@ -43,7 +43,7 @@ void rgum_state::video_start()
UINT32 rgum_state::screen_update_royalgum(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
int x,y,count;
- gfx_element *gfx = screen.machine().gfx[0];
+ gfx_element *gfx = machine().gfx[0];
count = 0;
diff --git a/src/mame/drivers/sandscrp.c b/src/mame/drivers/sandscrp.c
index 4d59798f675..264614bf74d 100644
--- a/src/mame/drivers/sandscrp.c
+++ b/src/mame/drivers/sandscrp.c
@@ -117,12 +117,12 @@ public:
UINT32 sandscrp_state::screen_update_sandscrp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- device_t *pandora = screen.machine().device("pandora");
+ device_t *pandora = machine().device("pandora");
bitmap.fill(0, cliprect);
int i;
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
m_view2_0->kaneko16_prepare(bitmap, cliprect);
@@ -173,9 +173,9 @@ void sandscrp_state::screen_eof_sandscrp(screen_device &screen, bool state)
// rising edge
if (state)
{
- device_t *pandora = screen.machine().device("pandora");
+ device_t *pandora = machine().device("pandora");
m_sprite_irq = 1;
- update_irq_state(screen.machine());
+ update_irq_state(machine());
pandora_eof(pandora);
}
}
diff --git a/src/mame/drivers/sbrkout.c b/src/mame/drivers/sbrkout.c
index a6f3dace53b..cc9c3a79486 100644
--- a/src/mame/drivers/sbrkout.c
+++ b/src/mame/drivers/sbrkout.c
@@ -341,7 +341,7 @@ UINT32 sbrkout_state::screen_update_sbrkout(screen_device &screen, bitmap_ind16
int sx = 31 * 8 - videoram[0x380 + 0x10 + ball * 2];
int sy = 30 * 8 - videoram[0x380 + 0x18 + ball * 2];
- drawgfx_transpen(bitmap, cliprect, screen.machine().gfx[1], code, 0, 0, 0, sx, sy, 0);
+ drawgfx_transpen(bitmap, cliprect, machine().gfx[1], code, 0, 0, 0, sx, sy, 0);
}
return 0;
}
diff --git a/src/mame/drivers/segac2.c b/src/mame/drivers/segac2.c
index c1223e90557..3c6c95ddc61 100644
--- a/src/mame/drivers/segac2.c
+++ b/src/mame/drivers/segac2.c
@@ -1275,10 +1275,10 @@ VIDEO_START_MEMBER(segac2_state,segac2_new)
// and applies it's own external colour circuity
UINT32 segac2_state::screen_update_segac2_new(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- const pen_t *paldata = screen.machine().pens;
+ const pen_t *paldata = machine().pens;
if (!m_segac2_enable_display)
{
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
return 0;
}
diff --git a/src/mame/drivers/segald.c b/src/mame/drivers/segald.c
index a6552629fb7..ce0d3a22b1a 100644
--- a/src/mame/drivers/segald.c
+++ b/src/mame/drivers/segald.c
@@ -111,8 +111,8 @@ UINT32 segald_state::screen_update_astron(screen_device &screen, bitmap_rgb32 &b
{
bitmap.fill(0, cliprect);
- astron_draw_characters(screen.machine(), bitmap, cliprect);
- astron_draw_sprites(screen.machine(), bitmap, cliprect);
+ astron_draw_characters(machine(), bitmap, cliprect);
+ astron_draw_sprites(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/drivers/seta.c b/src/mame/drivers/seta.c
index e1ebcc5e83a..fc5513d6f99 100644
--- a/src/mame/drivers/seta.c
+++ b/src/mame/drivers/seta.c
@@ -1600,7 +1600,7 @@ void seta_state::screen_eof_seta_buffer_sprites(screen_device &screen, bool stat
// rising edge
if (state)
{
- screen.machine().device<seta001_device>("spritegen")->setac_eof();
+ machine().device<seta001_device>("spritegen")->setac_eof();
}
}
diff --git a/src/mame/drivers/sfbonus.c b/src/mame/drivers/sfbonus.c
index 0be77ea157d..c236afdc945 100644
--- a/src/mame/drivers/sfbonus.c
+++ b/src/mame/drivers/sfbonus.c
@@ -1073,8 +1073,8 @@ UINT32 sfbonus_state::screen_update_sfbonus(screen_device &screen, bitmap_ind16
globalyscroll += 8;
globalxscroll += 8;
- bitmap.fill(screen.machine().pens[0], cliprect);
- m_temp_reel_bitmap->fill(screen.machine().pens[0], cliprect);
+ bitmap.fill(machine().pens[0], cliprect);
+ m_temp_reel_bitmap->fill(machine().pens[0], cliprect);
/* render reels to bitmap */
sfbonus_draw_reel_layer(screen,*m_temp_reel_bitmap,cliprect,0);
@@ -1170,7 +1170,7 @@ UINT32 sfbonus_state::screen_update_sfbonus(screen_device &screen, bitmap_ind16
m_1800_regs[7]);
#endif
- ipt = screen.machine().system().ipt;
+ ipt = machine().system().ipt;
if ((ipt == INPUT_PORTS_NAME(amcoe2_reels3)) || (ipt == INPUT_PORTS_NAME(amcoe2_reels4))
|| (ipt == INPUT_PORTS_NAME(amcoe2_poker)))
{
diff --git a/src/mame/drivers/shanghai.c b/src/mame/drivers/shanghai.c
index 5d048fc6810..da394be3ea7 100644
--- a/src/mame/drivers/shanghai.c
+++ b/src/mame/drivers/shanghai.c
@@ -78,10 +78,10 @@ void shanghai_state::video_start()
UINT32 shanghai_state::screen_update_shanghai(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- device_t *hd63484 = screen.machine().device("hd63484");
+ device_t *hd63484 = machine().device("hd63484");
int x, y, b, src;
- address_space &space = screen.machine().driver_data()->generic_space();
+ address_space &space = machine().driver_data()->generic_space();
b = ((hd63484_regs_r(hd63484, space, 0xcc/2, 0xffff) & 0x000f) << 16) + hd63484_regs_r(hd63484, space, 0xce/2, 0xffff);
for (y = 0; y < 280; y++)
{
diff --git a/src/mame/drivers/sigmab52.c b/src/mame/drivers/sigmab52.c
index 105c977738c..82bae37ef39 100644
--- a/src/mame/drivers/sigmab52.c
+++ b/src/mame/drivers/sigmab52.c
@@ -168,16 +168,16 @@ void sigmab52_state::video_start()
UINT32 sigmab52_state::screen_update_jwildb52(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- device_t *hd63484 = screen.machine().device("hd63484");
+ device_t *hd63484 = machine().device("hd63484");
int x, y, b, src;
- address_space &space = screen.machine().driver_data()->generic_space();
+ address_space &space = machine().driver_data()->generic_space();
b = ((hd63484_regs_r(hd63484, space, 0xcc/2, 0xffff) & 0x000f) << 16) + hd63484_regs_r(hd63484, space, 0xce/2, 0xffff);
//save vram to file
#if 0
- if (screen.machine().input().code_pressed_once(KEYCODE_Q))
+ if (machine().input().code_pressed_once(KEYCODE_Q))
{
FILE *p = fopen("vram.bin", "wb");
fwrite(&HD63484_ram[0], 1, 0x40000 * 4, p);
@@ -201,7 +201,7 @@ UINT32 sigmab52_state::screen_update_jwildb52(screen_device &screen, bitmap_ind1
}
}
-if (!screen.machine().input().code_pressed(KEYCODE_O))
+if (!machine().input().code_pressed(KEYCODE_O))
if ((hd63484_regs_r(hd63484, space, 0x06/2, 0xffff) & 0x0300) == 0x0300)
{
int sy = (hd63484_regs_r(hd63484, space, 0x94/2, 0xffff) & 0x0fff) - (hd63484_regs_r(hd63484, space, 0x88/2, 0xffff) >> 8);
diff --git a/src/mame/drivers/sigmab98.c b/src/mame/drivers/sigmab98.c
index e8e5b38d048..9b128162c0a 100644
--- a/src/mame/drivers/sigmab98.c
+++ b/src/mame/drivers/sigmab98.c
@@ -309,24 +309,24 @@ UINT32 sigmab98_state::screen_update_sigmab98(screen_device &screen, bitmap_ind1
int layers_ctrl = -1;
#ifdef MAME_DEBUG
- if (screen.machine().input().code_pressed(KEYCODE_Z))
+ if (machine().input().code_pressed(KEYCODE_Z))
{
int msk = 0;
- if (screen.machine().input().code_pressed(KEYCODE_Q)) msk |= 1;
- if (screen.machine().input().code_pressed(KEYCODE_W)) msk |= 2;
- if (screen.machine().input().code_pressed(KEYCODE_E)) msk |= 4;
- if (screen.machine().input().code_pressed(KEYCODE_R)) msk |= 8;
+ if (machine().input().code_pressed(KEYCODE_Q)) msk |= 1;
+ if (machine().input().code_pressed(KEYCODE_W)) msk |= 2;
+ if (machine().input().code_pressed(KEYCODE_E)) msk |= 4;
+ if (machine().input().code_pressed(KEYCODE_R)) msk |= 8;
if (msk != 0) layers_ctrl &= msk;
}
#endif
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
// Draw from priority 3 (bottom, converted to a bitmask) to priority 0 (top)
- draw_sprites(screen.machine(), bitmap, cliprect, layers_ctrl & 8);
- draw_sprites(screen.machine(), bitmap, cliprect, layers_ctrl & 4);
- draw_sprites(screen.machine(), bitmap, cliprect, layers_ctrl & 2);
- draw_sprites(screen.machine(), bitmap, cliprect, layers_ctrl & 1);
+ draw_sprites(machine(), bitmap, cliprect, layers_ctrl & 8);
+ draw_sprites(machine(), bitmap, cliprect, layers_ctrl & 4);
+ draw_sprites(machine(), bitmap, cliprect, layers_ctrl & 2);
+ draw_sprites(machine(), bitmap, cliprect, layers_ctrl & 1);
return 0;
}
diff --git a/src/mame/drivers/silvmil.c b/src/mame/drivers/silvmil.c
index a852ac766d4..2cf42249141 100644
--- a/src/mame/drivers/silvmil.c
+++ b/src/mame/drivers/silvmil.c
@@ -154,7 +154,7 @@ UINT32 silvmil_state::screen_update_silvmil(screen_device &screen, bitmap_ind16
m_bg_layer->draw(bitmap, cliprect, 0, 0);
m_fg_layer->draw(bitmap, cliprect, 0, 0);
- screen.machine().device<decospr_device>("spritegen")->draw_sprites(bitmap, cliprect, m_spriteram, 0x400);
+ machine().device<decospr_device>("spritegen")->draw_sprites(bitmap, cliprect, m_spriteram, 0x400);
return 0;
}
diff --git a/src/mame/drivers/skyarmy.c b/src/mame/drivers/skyarmy.c
index 77a46d943f4..cb73c396717 100644
--- a/src/mame/drivers/skyarmy.c
+++ b/src/mame/drivers/skyarmy.c
@@ -145,7 +145,7 @@ UINT32 skyarmy_state::screen_update_skyarmy(screen_device &screen, bitmap_ind16
flipy = (spriteram[offs+1]&0x80)>>7;
flipx = (spriteram[offs+1]&0x40)>>6;
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[1],
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[1],
spriteram[offs+1]&0x3f,
pal,
flipx,flipy,
diff --git a/src/mame/drivers/snowbros.c b/src/mame/drivers/snowbros.c
index 6a741abb638..ff5d92c42c1 100644
--- a/src/mame/drivers/snowbros.c
+++ b/src/mame/drivers/snowbros.c
@@ -84,7 +84,7 @@ WRITE16_MEMBER(snowbros_state::snowbros_flipscreen_w)
UINT32 snowbros_state::screen_update_snowbros(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- device_t *pandora = screen.machine().device("pandora");
+ device_t *pandora = machine().device("pandora");
/* This clears & redraws the entire screen each pass */
bitmap.fill(0xf0, cliprect);
@@ -98,7 +98,7 @@ void snowbros_state::screen_eof_snowbros(screen_device &screen, bool state)
// rising edge
if (state)
{
- device_t *pandora = screen.machine().device("pandora");
+ device_t *pandora = machine().device("pandora");
pandora_eof(pandora);
}
}
diff --git a/src/mame/drivers/speglsht.c b/src/mame/drivers/speglsht.c
index 3c86405eabb..fcf5fb08c89 100644
--- a/src/mame/drivers/speglsht.c
+++ b/src/mame/drivers/speglsht.c
@@ -376,7 +376,7 @@ UINT32 speglsht_state::screen_update_speglsht(screen_device &screen, bitmap_rgb3
{
if(srcline[x])
{
- rgb_t color=palette_get_color(screen.machine(), srcline[x]);
+ rgb_t color=palette_get_color(machine(), srcline[x]);
PLOT_PIXEL_RGB(x,y,RGB_RED(color),RGB_GREEN(color),RGB_BLUE(color));
}
}
diff --git a/src/mame/drivers/spoker.c b/src/mame/drivers/spoker.c
index a62c47dd2d5..37a6a8e0732 100644
--- a/src/mame/drivers/spoker.c
+++ b/src/mame/drivers/spoker.c
@@ -105,7 +105,7 @@ void spoker_state::video_start()
UINT32 spoker_state::screen_update_spoker(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
diff --git a/src/mame/drivers/srmp5.c b/src/mame/drivers/srmp5.c
index ec2abe85204..b56bcf8a20c 100644
--- a/src/mame/drivers/srmp5.c
+++ b/src/mame/drivers/srmp5.c
@@ -212,7 +212,7 @@ UINT32 srmp5_state::screen_update_srmp5(screen_device &screen, bitmap_rgb32 &bit
{
if (m_tileduty[i] == 1)
{
- screen.machine().gfx[0]->decode(i);
+ machine().gfx[0]->decode(i);
m_tileduty[i] = 0;
}
}
diff --git a/src/mame/drivers/srmp6.c b/src/mame/drivers/srmp6.c
index f4248f16f04..5eff4350907 100644
--- a/src/mame/drivers/srmp6.c
+++ b/src/mame/drivers/srmp6.c
@@ -190,13 +190,13 @@ UINT32 srmp6_state::screen_update_srmp6(screen_device &screen, bitmap_rgb32 &bit
#if 0
/* debug */
- if(screen.machine().input().code_pressed_once(KEYCODE_Q))
+ if(machine().input().code_pressed_once(KEYCODE_Q))
{
++xixi;
printf("%x\n",xixi);
}
- if(screen.machine().input().code_pressed_once(KEYCODE_W))
+ if(machine().input().code_pressed_once(KEYCODE_W))
{
--xixi;
printf("%x\n",xixi);
@@ -273,7 +273,7 @@ UINT32 srmp6_state::screen_update_srmp6(screen_device &screen, bitmap_rgb32 &bit
else
yb=y+(height-yw-1)*8+global_y;
- drawgfx_alpha(bitmap,cliprect,screen.machine().gfx[0],tileno,global_pal,flip_x,flip_y,xb,yb,0,alpha);
+ drawgfx_alpha(bitmap,cliprect,machine().gfx[0],tileno,global_pal,flip_x,flip_y,xb,yb,0,alpha);
tileno++;
}
}
@@ -287,7 +287,7 @@ UINT32 srmp6_state::screen_update_srmp6(screen_device &screen, bitmap_rgb32 &bit
memcpy(m_sprram_old, m_sprram, 0x80000);
- if(screen.machine().input().code_pressed_once(KEYCODE_Q))
+ if(machine().input().code_pressed_once(KEYCODE_Q))
{
FILE *p=fopen("tileram.bin","wb");
fwrite(m_tileram, 1, 0x100000*16, p);
diff --git a/src/mame/drivers/statriv2.c b/src/mame/drivers/statriv2.c
index 659152cf539..2f368746f0c 100644
--- a/src/mame/drivers/statriv2.c
+++ b/src/mame/drivers/statriv2.c
@@ -194,8 +194,8 @@ WRITE8_MEMBER(statriv2_state::statriv2_videoram_w)
UINT32 statriv2_state::screen_update_statriv2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- if (tms9927_screen_reset(screen.machine().device("tms")))
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ if (tms9927_screen_reset(machine().device("tms")))
+ bitmap.fill(get_black_pen(machine()), cliprect);
else
m_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
diff --git a/src/mame/drivers/sub.c b/src/mame/drivers/sub.c
index 4eedb6ed0ba..863e12c7cac 100644
--- a/src/mame/drivers/sub.c
+++ b/src/mame/drivers/sub.c
@@ -142,8 +142,8 @@ void sub_state::video_start()
UINT32 sub_state::screen_update_sub(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- gfx_element *gfx = screen.machine().gfx[0];
- gfx_element *gfx_1 = screen.machine().gfx[1];
+ gfx_element *gfx = machine().gfx[0];
+ gfx_element *gfx_1 = machine().gfx[1];
int y,x;
int count = 0;
diff --git a/src/mame/drivers/subsino2.c b/src/mame/drivers/subsino2.c
index 98e93fe730f..4084fdc4c75 100644
--- a/src/mame/drivers/subsino2.c
+++ b/src/mame/drivers/subsino2.c
@@ -638,11 +638,11 @@ UINT32 subsino2_state::screen_update_subsino2(screen_device &screen, bitmap_ind1
int y;
#ifdef MAME_DEBUG
- if (screen.machine().input().code_pressed(KEYCODE_Z))
+ if (machine().input().code_pressed(KEYCODE_Z))
{
int msk = 0;
- if (screen.machine().input().code_pressed(KEYCODE_Q)) msk |= 1;
- if (screen.machine().input().code_pressed(KEYCODE_W)) msk |= 2;
+ if (machine().input().code_pressed(KEYCODE_Q)) msk |= 1;
+ if (machine().input().code_pressed(KEYCODE_W)) msk |= 2;
if (msk != 0) layers_ctrl &= msk;
}
#endif
@@ -687,7 +687,7 @@ UINT32 subsino2_state::screen_update_subsino2(screen_device &screen, bitmap_ind1
}
}
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
if (layers_ctrl & 1)
{
diff --git a/src/mame/drivers/summit.c b/src/mame/drivers/summit.c
index 513e45ba2ec..b828f0c9bf0 100644
--- a/src/mame/drivers/summit.c
+++ b/src/mame/drivers/summit.c
@@ -42,7 +42,7 @@ void summit_state::video_start()
UINT32 summit_state::screen_update_summit(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- gfx_element *gfx = screen.machine().gfx[0];
+ gfx_element *gfx = machine().gfx[0];
int count = 0x0000;
int y,x;
diff --git a/src/mame/drivers/supdrapo.c b/src/mame/drivers/supdrapo.c
index 7520f7267c8..6f8c4131b18 100644
--- a/src/mame/drivers/supdrapo.c
+++ b/src/mame/drivers/supdrapo.c
@@ -119,7 +119,7 @@ UINT32 supdrapo_state::screen_update_supdrapo(screen_device &screen, bitmap_ind1
/* Global Column Coloring, GUESS! */
color = m_col_line[(x*2) + 1] ? (m_col_line[(x*2) + 1] - 1) & 7 : 0;
- drawgfx_opaque(bitmap, cliprect, screen.machine().gfx[0], tile,color, 0, 0, x*8, y*8);
+ drawgfx_opaque(bitmap, cliprect, machine().gfx[0], tile,color, 0, 0, x*8, y*8);
count++;
}
diff --git a/src/mame/drivers/superwng.c b/src/mame/drivers/superwng.c
index de54f01846c..2dc3f2b3e0c 100644
--- a/src/mame/drivers/superwng.c
+++ b/src/mame/drivers/superwng.c
@@ -152,7 +152,7 @@ UINT32 superwng_state::screen_update_superwng(screen_device &screen, bitmap_ind1
int sy = m_colorram_bg[i];
int color = m_colorram_bg[i + 1] & 0xf;
- drawgfx_transpen(bitmap, cliprect,screen.machine().gfx[1],
+ drawgfx_transpen(bitmap, cliprect,machine().gfx[1],
code,
color,
flip, flip,
diff --git a/src/mame/drivers/suprgolf.c b/src/mame/drivers/suprgolf.c
index 24509cfce8a..f307fd4267f 100644
--- a/src/mame/drivers/suprgolf.c
+++ b/src/mame/drivers/suprgolf.c
@@ -98,7 +98,7 @@ void suprgolf_state::video_start()
UINT32 suprgolf_state::screen_update_suprgolf(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
int x,y,count,color;
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
{
count = 0;
@@ -110,7 +110,7 @@ UINT32 suprgolf_state::screen_update_suprgolf(screen_device &screen, bitmap_ind1
color = m_bg_fb[count];
if(x <= cliprect.max_x && y <= cliprect.max_y)
- bitmap.pix16(y, x) = screen.machine().pens[(color & 0x7ff)];
+ bitmap.pix16(y, x) = machine().pens[(color & 0x7ff)];
count++;
}
@@ -127,7 +127,7 @@ UINT32 suprgolf_state::screen_update_suprgolf(screen_device &screen, bitmap_ind1
color = m_fg_fb[count];
if(((m_fg_fb[count] & 0x0f) != 0x0f) && (x <= cliprect.max_x && y <= cliprect.max_y))
- bitmap.pix16(y, x) = screen.machine().pens[(color & 0x7ff)];
+ bitmap.pix16(y, x) = machine().pens[(color & 0x7ff)];
count++;
}
diff --git a/src/mame/drivers/taitotz.c b/src/mame/drivers/taitotz.c
index e2468d4bef1..6a905557640 100644
--- a/src/mame/drivers/taitotz.c
+++ b/src/mame/drivers/taitotz.c
@@ -1285,7 +1285,7 @@ UINT32 taitotz_state::screen_update_taitotz(screen_device &screen, bitmap_rgb32
bitmap.fill(0x000000, cliprect);
m_renderer->set_fb(&bitmap);
- m_renderer->render_displaylist(screen.machine(), cliprect);
+ m_renderer->render_displaylist(machine(), cliprect);
UINT16 *screen_src = (UINT16*)&m_screen_ram[m_scr_base];
diff --git a/src/mame/drivers/taitowlf.c b/src/mame/drivers/taitowlf.c
index 590d7b447c9..20744071faf 100644
--- a/src/mame/drivers/taitowlf.c
+++ b/src/mame/drivers/taitowlf.c
@@ -89,9 +89,9 @@ public:
UINT32 taitowlf_state::screen_update_taitowlf(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
int x,y,count;
- const UINT8 *blit_ram = screen.machine().root_device().memregion("user5")->base();
+ const UINT8 *blit_ram = machine().root_device().memregion("user5")->base();
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
count = (0);
@@ -104,7 +104,7 @@ UINT32 taitowlf_state::screen_update_taitowlf(screen_device &screen, bitmap_rgb3
color = (blit_ram[count] & 0xff);
if(cliprect.contains(x+0, y))
- bitmap.pix32(y, x+0) = screen.machine().pens[color];
+ bitmap.pix32(y, x+0) = machine().pens[color];
count++;
}
diff --git a/src/mame/drivers/tasman.c b/src/mame/drivers/tasman.c
index 0720280187b..b5d7a791ae1 100644
--- a/src/mame/drivers/tasman.c
+++ b/src/mame/drivers/tasman.c
@@ -58,7 +58,7 @@ VIDEO_START_MEMBER(kongambl_state,kongambl)
UINT32 kongambl_state::screen_update_kongambl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
#if CUSTOM_DRAW
- gfx_element *gfx = screen.machine().gfx[0];
+ gfx_element *gfx = machine().gfx[0];
UINT32 count;
count = 0;
@@ -69,7 +69,7 @@ UINT32 kongambl_state::screen_update_kongambl(screen_device &screen, bitmap_ind1
{
UINT32 tile = m_vram[count] & 0xffff;
- if(screen.machine().primary_screen->visible_area().contains(x*8, y*8))
+ if(machine().primary_screen->visible_area().contains(x*8, y*8))
drawgfx_opaque(bitmap,cliprect,gfx,tile,0,0,0,x*8,y*8);
count++;
@@ -84,7 +84,7 @@ UINT32 kongambl_state::screen_update_kongambl(screen_device &screen, bitmap_ind1
{
UINT32 tile = m_vram[count] & 0xffff;
- if(screen.machine().primary_screen->visible_area().contains(x*8, y*8))
+ if(machine().primary_screen->visible_area().contains(x*8, y*8))
drawgfx_transpen(bitmap,cliprect,gfx,tile,0,0,0,x*8,y*8,0);
count++;
@@ -93,10 +93,10 @@ UINT32 kongambl_state::screen_update_kongambl(screen_device &screen, bitmap_ind1
#else
- device_t *k056832 = screen.machine().device("k056832");
+ device_t *k056832 = machine().device("k056832");
bitmap.fill(0, cliprect);
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
k056832_tilemap_draw(k056832, bitmap, cliprect, 3, 0, 0);
k056832_tilemap_draw(k056832, bitmap, cliprect, 2, 0, 0);
diff --git a/src/mame/drivers/tmaster.c b/src/mame/drivers/tmaster.c
index 9ac49733637..20333722d04 100644
--- a/src/mame/drivers/tmaster.c
+++ b/src/mame/drivers/tmaster.c
@@ -363,17 +363,17 @@ UINT32 tmaster_state::screen_update_tmaster(screen_device &screen, bitmap_ind16
int layers_ctrl = -1;
#ifdef MAME_DEBUG
- if (screen.machine().input().code_pressed(KEYCODE_Z))
+ if (machine().input().code_pressed(KEYCODE_Z))
{
int mask = 0;
- if (screen.machine().input().code_pressed(KEYCODE_Q)) mask |= 1;
- if (screen.machine().input().code_pressed(KEYCODE_W)) mask |= 2;
+ if (machine().input().code_pressed(KEYCODE_Q)) mask |= 1;
+ if (machine().input().code_pressed(KEYCODE_W)) mask |= 2;
if (mask != 0) layers_ctrl &= mask;
}
#endif
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
if (layers_ctrl & 1) copybitmap_trans(bitmap, m_bitmap[0][(m_regs[0x02/2]>>8)&1], 0,0,0,0, cliprect, 0xff);
if (layers_ctrl & 2) copybitmap_trans(bitmap, m_bitmap[1][(m_regs[0x02/2]>>9)&1], 0,0,0,0, cliprect, 0xff);
diff --git a/src/mame/drivers/tmmjprd.c b/src/mame/drivers/tmmjprd.c
index 648c28e25f4..25da5f81f0d 100644
--- a/src/mame/drivers/tmmjprd.c
+++ b/src/mame/drivers/tmmjprd.c
@@ -295,11 +295,11 @@ UINT32 tmmjprd_state::screen_update_tmmjprd_left(screen_device &screen, bitmap_i
{
UINT8* gfxroms = memregion("gfx2")->base();
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
- ttmjprd_draw_tilemap( screen.machine(), bitmap, cliprect, m_tilemap_ram[3], m_tilemap_regs[3], gfxroms );
- draw_sprites(screen.machine(),bitmap,cliprect, 1);
- ttmjprd_draw_tilemap( screen.machine(), bitmap, cliprect, m_tilemap_ram[2], m_tilemap_regs[2], gfxroms );
+ ttmjprd_draw_tilemap( machine(), bitmap, cliprect, m_tilemap_ram[3], m_tilemap_regs[3], gfxroms );
+ draw_sprites(machine(),bitmap,cliprect, 1);
+ ttmjprd_draw_tilemap( machine(), bitmap, cliprect, m_tilemap_ram[2], m_tilemap_regs[2], gfxroms );
/*
popmessage("%08x %08x %08x %08x %08x %08x",
@@ -329,11 +329,11 @@ UINT32 tmmjprd_state::screen_update_tmmjprd_right(screen_device &screen, bitmap_
{
UINT8* gfxroms = memregion("gfx2")->base();
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
- ttmjprd_draw_tilemap( screen.machine(), bitmap, cliprect, m_tilemap_ram[1], m_tilemap_regs[1], gfxroms );
- draw_sprites(screen.machine(),bitmap,cliprect, 0);
- ttmjprd_draw_tilemap( screen.machine(), bitmap, cliprect, m_tilemap_ram[0], m_tilemap_regs[0], gfxroms );
+ ttmjprd_draw_tilemap( machine(), bitmap, cliprect, m_tilemap_ram[1], m_tilemap_regs[1], gfxroms );
+ draw_sprites(machine(),bitmap,cliprect, 0);
+ ttmjprd_draw_tilemap( machine(), bitmap, cliprect, m_tilemap_ram[0], m_tilemap_regs[0], gfxroms );
return 0;
}
diff --git a/src/mame/drivers/trvmadns.c b/src/mame/drivers/trvmadns.c
index 0b5294ab413..7a56da2c4ce 100644
--- a/src/mame/drivers/trvmadns.c
+++ b/src/mame/drivers/trvmadns.c
@@ -295,7 +295,7 @@ void trvmadns_state::video_start()
UINT32 trvmadns_state::screen_update_trvmadns(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
int x,y,count;
- gfx_element *gfx = screen.machine().gfx[0];
+ gfx_element *gfx = machine().gfx[0];
bitmap.fill(0xd, cliprect);
diff --git a/src/mame/drivers/ttchamp.c b/src/mame/drivers/ttchamp.c
index fc54c625f86..0bddc8cbf31 100644
--- a/src/mame/drivers/ttchamp.c
+++ b/src/mame/drivers/ttchamp.c
@@ -104,7 +104,7 @@ UINT32 ttchamp_state::screen_update_ttchamp(screen_device &screen, bitmap_ind16
// int i;
static const int xxx=320,yyy=204;
- bitmap.fill(get_black_pen(screen.machine()));
+ bitmap.fill(get_black_pen(machine()));
// for (i=0;i<256;i++)
// {
diff --git a/src/mame/drivers/tugboat.c b/src/mame/drivers/tugboat.c
index fbecd3f16dc..1599238169e 100644
--- a/src/mame/drivers/tugboat.c
+++ b/src/mame/drivers/tugboat.c
@@ -139,8 +139,8 @@ UINT32 tugboat_state::screen_update_tugboat(screen_device &screen, bitmap_ind16
int startaddr1 = m_hd46505_1_reg[0x0c]*256 + m_hd46505_1_reg[0x0d];
- draw_tilemap(screen.machine(), bitmap,cliprect,startaddr0,0,1,FALSE);
- draw_tilemap(screen.machine(), bitmap,cliprect,startaddr1,2,3,TRUE);
+ draw_tilemap(machine(), bitmap,cliprect,startaddr0,0,1,FALSE);
+ draw_tilemap(machine(), bitmap,cliprect,startaddr1,2,3,TRUE);
return 0;
}
diff --git a/src/mame/drivers/twins.c b/src/mame/drivers/twins.c
index 7509c169097..2c263f3c2fb 100644
--- a/src/mame/drivers/twins.c
+++ b/src/mame/drivers/twins.c
@@ -124,7 +124,7 @@ UINT32 twins_state::screen_update_twins(screen_device &screen, bitmap_ind16 &bit
int i;
static const int xxx=320,yyy=204;
- bitmap.fill(get_black_pen(screen.machine()));
+ bitmap.fill(get_black_pen(machine()));
for (i=0;i<0x100;i++)
{
@@ -140,7 +140,7 @@ UINT32 twins_state::screen_update_twins(screen_device &screen, bitmap_ind16 &bit
b = (dat>>10) & 0x1f;
b = BITSWAP8(b,7,6,5,0,1,2,3,4);
- palette_set_color_rgb(screen.machine(),i, pal5bit(r),pal5bit(g),pal5bit(b));
+ palette_set_color_rgb(machine(),i, pal5bit(r),pal5bit(g),pal5bit(b));
}
count=0;
@@ -229,7 +229,7 @@ UINT32 twins_state::screen_update_twinsa(screen_device &screen, bitmap_ind16 &bi
int i;
static const int xxx=320,yyy=204;
- bitmap.fill(get_black_pen(screen.machine()));
+ bitmap.fill(get_black_pen(machine()));
for (i=0;i<0x1000-3;i+=3)
{
@@ -238,7 +238,7 @@ UINT32 twins_state::screen_update_twinsa(screen_device &screen, bitmap_ind16 &bi
g = m_pal[i+1];
b = m_pal[i+2];
- palette_set_color_rgb(screen.machine(),i/3, pal6bit(r), pal6bit(g), pal6bit(b));
+ palette_set_color_rgb(machine(),i/3, pal6bit(r), pal6bit(g), pal6bit(b));
}
count=0;
diff --git a/src/mame/drivers/umipoker.c b/src/mame/drivers/umipoker.c
index 8edfa66e14e..30ab41f92f3 100644
--- a/src/mame/drivers/umipoker.c
+++ b/src/mame/drivers/umipoker.c
@@ -141,7 +141,7 @@ UINT32 umipoker_state::screen_update_umipoker(screen_device &screen, bitmap_ind1
m_tilemap_2->set_scrolly(0, m_umipoker_scrolly[2]);
m_tilemap_3->set_scrolly(0, m_umipoker_scrolly[3]);
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
m_tilemap_0->draw(bitmap, cliprect, 0,0);
m_tilemap_1->draw(bitmap, cliprect, 0,0);
diff --git a/src/mame/drivers/vega.c b/src/mame/drivers/vega.c
index e95fa934521..653cc26c33b 100644
--- a/src/mame/drivers/vega.c
+++ b/src/mame/drivers/vega.c
@@ -582,7 +582,7 @@ UINT32 vega_state::screen_update_vega(screen_device &screen, bitmap_ind16 &bitma
// if(color==0) color=0xf;
- drawgfx_transpen(bitmap, cliprect, screen.machine().gfx[0], character, color, 0, 0, x*7, y*10,0);
+ drawgfx_transpen(bitmap, cliprect, machine().gfx[0], character, color, 0, 0, x*7, y*10,0);
++idx;
}
@@ -604,7 +604,7 @@ UINT32 vega_state::screen_update_vega(screen_device &screen, bitmap_ind16 &bitma
{
//for(int x=0;x<4;++x)
{
- drawgfx_transpen(bitmap, cliprect, screen.machine().gfx[2], num, 0, 1, flip?1:0, x*4+x0, (flip?(3-y):y)*8+y0, 0);
+ drawgfx_transpen(bitmap, cliprect, machine().gfx[2], num, 0, 1, flip?1:0, x*4+x0, (flip?(3-y):y)*8+y0, 0);
++num;
}
}
@@ -645,7 +645,7 @@ UINT32 vega_state::screen_update_vega(screen_device &screen, bitmap_ind16 &bitma
for(int y=0;y<4;++y)
{
- drawgfx_transpen(bitmap, cliprect, screen.machine().gfx[3], strip_num, 0, !xor_line, 0, x*4+x0, y*8+y0, 0);
+ drawgfx_transpen(bitmap, cliprect, machine().gfx[3], strip_num, 0, !xor_line, 0, x*4+x0, y*8+y0, 0);
++strip_num;
}
}
diff --git a/src/mame/drivers/viper.c b/src/mame/drivers/viper.c
index c26ff9ef220..b319aae6cc8 100644
--- a/src/mame/drivers/viper.c
+++ b/src/mame/drivers/viper.c
@@ -351,7 +351,7 @@ public:
UINT32 viper_state::screen_update_viper(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- device_t *device = screen.machine().device("voodoo");
+ device_t *device = machine().device("voodoo");
return voodoo_update(device, bitmap, cliprect) ? 0 : UPDATE_HAS_NOT_CHANGED;
}
diff --git a/src/mame/drivers/vmetal.c b/src/mame/drivers/vmetal.c
index 97f17e020e6..6856eeb65fd 100644
--- a/src/mame/drivers/vmetal.c
+++ b/src/mame/drivers/vmetal.c
@@ -460,8 +460,8 @@ VIDEO_START_MEMBER(vmetal_state,varia)
UINT32 vmetal_state::screen_update_varia(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
- screen.machine().priority_bitmap.fill(0, cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
m_mid2tilemap->set_scrollx(0, m_vmetal_videoregs[0x06a/2]-64 /*+ m_vmetal_videoregs[0x066/2]*/);
m_mid1tilemap->set_scrollx(0, m_vmetal_videoregs[0x07a/2]-64 /*+ m_vmetal_videoregs[0x076/2]*/);
@@ -473,7 +473,7 @@ UINT32 vmetal_state::screen_update_varia(screen_device &screen, bitmap_ind16 &bi
m_mid1tilemap->draw(bitmap, cliprect, 0, 0);
m_mid2tilemap->draw(bitmap, cliprect, 0, 0);
- metro_draw_sprites(screen.machine(), bitmap, cliprect);
+ metro_draw_sprites(machine(), bitmap, cliprect);
m_texttilemap->draw(bitmap, cliprect, 0, 0);
return 0;
}
diff --git a/src/mame/drivers/vpoker.c b/src/mame/drivers/vpoker.c
index 3428407b4b4..744812a5251 100644
--- a/src/mame/drivers/vpoker.c
+++ b/src/mame/drivers/vpoker.c
@@ -137,7 +137,7 @@ void vpoker_state::video_start()
UINT32 vpoker_state::screen_update_vpoker(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
UINT8 *videoram = m_videoram;
- gfx_element *gfx = screen.machine().gfx[0];
+ gfx_element *gfx = machine().gfx[0];
int count = 0x0000;
int y,x;
diff --git a/src/mame/drivers/vroulet.c b/src/mame/drivers/vroulet.c
index 23139e58828..5f82b2ac6b0 100644
--- a/src/mame/drivers/vroulet.c
+++ b/src/mame/drivers/vroulet.c
@@ -119,7 +119,7 @@ void vroulet_state::video_start()
UINT32 vroulet_state::screen_update_vroulet(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- drawgfx_transpen(bitmap, cliprect, screen.machine().gfx[0], 0x320, 1, 0, 0,
+ drawgfx_transpen(bitmap, cliprect, machine().gfx[0], 0x320, 1, 0, 0,
m_ball[1], m_ball[0] - 12, 0);
return 0;
}
diff --git a/src/mame/drivers/witch.c b/src/mame/drivers/witch.c
index ca88359f4a8..d5effaaa0d2 100644
--- a/src/mame/drivers/witch.c
+++ b/src/mame/drivers/witch.c
@@ -774,7 +774,7 @@ UINT32 witch_state::screen_update_witch(screen_device &screen, bitmap_ind16 &bit
m_gfx1_tilemap->draw(bitmap, cliprect, 0,0);
m_gfx0a_tilemap->draw(bitmap, cliprect, 0,0);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
m_gfx0b_tilemap->draw(bitmap, cliprect, 0,0);
return 0;
}
diff --git a/src/mame/drivers/zr107.c b/src/mame/drivers/zr107.c
index f72019f532e..9ef819ca684 100644
--- a/src/mame/drivers/zr107.c
+++ b/src/mame/drivers/zr107.c
@@ -222,9 +222,9 @@ VIDEO_START_MEMBER(zr107_state,jetwave)
UINT32 zr107_state::screen_update_jetwave(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- device_t *k001604 = screen.machine().device("k001604");
+ device_t *k001604 = machine().device("k001604");
- bitmap.fill(screen.machine().pens[0], cliprect);
+ bitmap.fill(machine().pens[0], cliprect);
K001005_draw(bitmap, cliprect);
@@ -233,7 +233,7 @@ UINT32 zr107_state::screen_update_jetwave(screen_device &screen, bitmap_rgb32 &b
draw_7segment_led(bitmap, 3, 3, m_led_reg0);
draw_7segment_led(bitmap, 9, 3, m_led_reg1);
- sharc_set_flag_input(screen.machine().device("dsp"), 1, ASSERT_LINE);
+ sharc_set_flag_input(machine().device("dsp"), 1, ASSERT_LINE);
return 0;
}
@@ -274,8 +274,8 @@ VIDEO_START_MEMBER(zr107_state,zr107)
UINT32 zr107_state::screen_update_zr107(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- device_t *k056832 = screen.machine().device("k056832");
- bitmap.fill(screen.machine().pens[0], cliprect);
+ device_t *k056832 = machine().device("k056832");
+ bitmap.fill(machine().pens[0], cliprect);
k056832_tilemap_draw(k056832, bitmap, cliprect, 1, 0, 0);
K001005_draw(bitmap, cliprect);
@@ -284,7 +284,7 @@ UINT32 zr107_state::screen_update_zr107(screen_device &screen, bitmap_rgb32 &bit
draw_7segment_led(bitmap, 3, 3, m_led_reg0);
draw_7segment_led(bitmap, 9, 3, m_led_reg1);
- sharc_set_flag_input(screen.machine().device("dsp"), 1, ASSERT_LINE);
+ sharc_set_flag_input(machine().device("dsp"), 1, ASSERT_LINE);
return 0;
}