summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame
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
parent8196b6177882559f277b0688f4f210e352cce6be (diff)
changed most of screen.machine() to machine() (no whatsnew)
Diffstat (limited to 'src/mame')
-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
-rw-r--r--src/mame/machine/slikshot.c2
-rw-r--r--src/mame/video/1942.c2
-rw-r--r--src/mame/video/1943.c6
-rw-r--r--src/mame/video/20pacgal.c4
-rw-r--r--src/mame/video/40love.c4
-rw-r--r--src/mame/video/8080bw.c46
-rw-r--r--src/mame/video/actfancr.c8
-rw-r--r--src/mame/video/aeroboto.c2
-rw-r--r--src/mame/video/aerofgt.c74
-rw-r--r--src/mame/video/ajax.c4
-rw-r--r--src/mame/video/aliens.c2
-rw-r--r--src/mame/video/alpha68k.c72
-rw-r--r--src/mame/video/ambush.c6
-rw-r--r--src/mame/video/amiga.c2
-rw-r--r--src/mame/video/amigaaga.c2
-rw-r--r--src/mame/video/amspdwy.c2
-rw-r--r--src/mame/video/angelkds.c4
-rw-r--r--src/mame/video/appoooh.c16
-rw-r--r--src/mame/video/aquarium.c2
-rw-r--r--src/mame/video/arabian.c2
-rw-r--r--src/mame/video/arcadecl.c2
-rw-r--r--src/mame/video/argus.c22
-rw-r--r--src/mame/video/arkanoid.c2
-rw-r--r--src/mame/video/armedf.c6
-rw-r--r--src/mame/video/asterix.c2
-rw-r--r--src/mame/video/asuka.c4
-rw-r--r--src/mame/video/atarifb.c12
-rw-r--r--src/mame/video/atarig42.c2
-rw-r--r--src/mame/video/atarigx2.c2
-rw-r--r--src/mame/video/atarisy2.c2
-rw-r--r--src/mame/video/bagman.c2
-rw-r--r--src/mame/video/balsente.c4
-rw-r--r--src/mame/video/baraduke.c10
-rw-r--r--src/mame/video/batman.c2
-rw-r--r--src/mame/video/battlane.c4
-rw-r--r--src/mame/video/battlera.c14
-rw-r--r--src/mame/video/battlex.c2
-rw-r--r--src/mame/video/battlnts.c2
-rw-r--r--src/mame/video/bbusters.c8
-rw-r--r--src/mame/video/bigevglf.c2
-rw-r--r--src/mame/video/bigstrkb.c4
-rw-r--r--src/mame/video/bionicc.c4
-rw-r--r--src/mame/video/bishi.c2
-rw-r--r--src/mame/video/bking.c12
-rw-r--r--src/mame/video/bladestl.c4
-rw-r--r--src/mame/video/blktiger.c2
-rw-r--r--src/mame/video/blmbycar.c14
-rw-r--r--src/mame/video/blockhl.c2
-rw-r--r--src/mame/video/bloodbro.c12
-rw-r--r--src/mame/video/blueprnt.c4
-rw-r--r--src/mame/video/bogeyman.c2
-rw-r--r--src/mame/video/bombjack.c2
-rw-r--r--src/mame/video/boogwing.c12
-rw-r--r--src/mame/video/bosco.c8
-rw-r--r--src/mame/video/brkthru.c4
-rw-r--r--src/mame/video/bsktball.c2
-rw-r--r--src/mame/video/btime.c48
-rw-r--r--src/mame/video/bublbobl.c2
-rw-r--r--src/mame/video/buggychl.c6
-rw-r--r--src/mame/video/bwing.c6
-rw-r--r--src/mame/video/cabal.c2
-rw-r--r--src/mame/video/canyon.c6
-rw-r--r--src/mame/video/capbowl.c2
-rw-r--r--src/mame/video/carjmbre.c2
-rw-r--r--src/mame/video/carpolo.c146
-rw-r--r--src/mame/video/cave.c36
-rw-r--r--src/mame/video/cbasebal.c2
-rw-r--r--src/mame/video/cbuster.c12
-rw-r--r--src/mame/video/ccastles.c4
-rw-r--r--src/mame/video/cclimber.c46
-rw-r--r--src/mame/video/centiped.c10
-rw-r--r--src/mame/video/chaknpop.c4
-rw-r--r--src/mame/video/champbas.c4
-rw-r--r--src/mame/video/changela.c2
-rw-r--r--src/mame/video/cheekyms.c6
-rw-r--r--src/mame/video/cinemat.c4
-rw-r--r--src/mame/video/circus.c10
-rw-r--r--src/mame/video/circusc.c2
-rw-r--r--src/mame/video/citycon.c4
-rw-r--r--src/mame/video/cloak.c6
-rw-r--r--src/mame/video/cloud9.c6
-rw-r--r--src/mame/video/clshroad.c2
-rw-r--r--src/mame/video/cninja.c42
-rw-r--r--src/mame/video/combatsc.c24
-rw-r--r--src/mame/video/commando.c2
-rw-r--r--src/mame/video/compgolf.c2
-rw-r--r--src/mame/video/contra.c8
-rw-r--r--src/mame/video/cop01.c2
-rw-r--r--src/mame/video/copsnrob.c14
-rw-r--r--src/mame/video/cosmic.c24
-rw-r--r--src/mame/video/cps1.c50
-rw-r--r--src/mame/video/crbaloon.c2
-rw-r--r--src/mame/video/crgolf.c2
-rw-r--r--src/mame/video/crospang.c2
-rw-r--r--src/mame/video/crshrace.c14
-rw-r--r--src/mame/video/cvs.c12
-rw-r--r--src/mame/video/darkmist.c8
-rw-r--r--src/mame/video/darkseal.c6
-rw-r--r--src/mame/video/dassault.c44
-rw-r--r--src/mame/video/dbz.c2
-rw-r--r--src/mame/video/dc.c6
-rw-r--r--src/mame/video/dcon.c8
-rw-r--r--src/mame/video/dday.c2
-rw-r--r--src/mame/video/ddragon.c2
-rw-r--r--src/mame/video/ddragon3.c10
-rw-r--r--src/mame/video/ddribble.c6
-rw-r--r--src/mame/video/deadang.c6
-rw-r--r--src/mame/video/dec0.c130
-rw-r--r--src/mame/video/dec8.c32
-rw-r--r--src/mame/video/deco32.c58
-rw-r--r--src/mame/video/deco_mlc.c4
-rw-r--r--src/mame/video/decocass.c20
-rw-r--r--src/mame/video/deniam.c20
-rw-r--r--src/mame/video/dietgo.c4
-rw-r--r--src/mame/video/digdug.c2
-rw-r--r--src/mame/video/djmain.c8
-rw-r--r--src/mame/video/dkong.c14
-rw-r--r--src/mame/video/docastle.c2
-rw-r--r--src/mame/video/dogfgt.c4
-rw-r--r--src/mame/video/dooyong.c44
-rw-r--r--src/mame/video/drgnmst.c2
-rw-r--r--src/mame/video/dribling.c2
-rw-r--r--src/mame/video/drmicro.c4
-rw-r--r--src/mame/video/dynax.c70
-rw-r--r--src/mame/video/dynduke.c12
-rw-r--r--src/mame/video/epos.c2
-rw-r--r--src/mame/video/eprom.c8
-rw-r--r--src/mame/video/equites.c6
-rw-r--r--src/mame/video/esd16.c12
-rw-r--r--src/mame/video/espial.c2
-rw-r--r--src/mame/video/exedexes.c4
-rw-r--r--src/mame/video/exerion.c10
-rw-r--r--src/mame/video/exidy.c8
-rw-r--r--src/mame/video/exidy440.c6
-rw-r--r--src/mame/video/exprraid.c2
-rw-r--r--src/mame/video/exzisus.c4
-rw-r--r--src/mame/video/f1gp.c22
-rw-r--r--src/mame/video/fantland.c2
-rw-r--r--src/mame/video/fastfred.c6
-rw-r--r--src/mame/video/fastlane.c6
-rw-r--r--src/mame/video/fcombat.c4
-rw-r--r--src/mame/video/fgoal.c10
-rw-r--r--src/mame/video/finalizr.c4
-rw-r--r--src/mame/video/firetrap.c2
-rw-r--r--src/mame/video/firetrk.c38
-rw-r--r--src/mame/video/fitfight.c24
-rw-r--r--src/mame/video/flkatck.c4
-rw-r--r--src/mame/video/flower.c2
-rw-r--r--src/mame/video/flstory.c10
-rw-r--r--src/mame/video/foodf.c4
-rw-r--r--src/mame/video/freekick.c6
-rw-r--r--src/mame/video/funkybee.c4
-rw-r--r--src/mame/video/funkyjet.c4
-rw-r--r--src/mame/video/funybubl.c8
-rw-r--r--src/mame/video/fuukifg2.c10
-rw-r--r--src/mame/video/fuukifg3.c8
-rw-r--r--src/mame/video/gaelco.c8
-rw-r--r--src/mame/video/gaelco3d.c12
-rw-r--r--src/mame/video/gaiden.c16
-rw-r--r--src/mame/video/galaga.c6
-rw-r--r--src/mame/video/galastrm.c42
-rw-r--r--src/mame/video/galaxia.c12
-rw-r--r--src/mame/video/galaxian.c6
-rw-r--r--src/mame/video/galaxold.c20
-rw-r--r--src/mame/video/galivan.c6
-rw-r--r--src/mame/video/galpani2.c14
-rw-r--r--src/mame/video/galpanic.c10
-rw-r--r--src/mame/video/galspnbl.c8
-rw-r--r--src/mame/video/gaplus.c8
-rw-r--r--src/mame/video/gberet.c4
-rw-r--r--src/mame/video/gcpinbal.c10
-rw-r--r--src/mame/video/gijoe.c4
-rw-r--r--src/mame/video/ginganin.c22
-rw-r--r--src/mame/video/gladiatr.c6
-rw-r--r--src/mame/video/glass.c4
-rw-r--r--src/mame/video/gng.c2
-rw-r--r--src/mame/video/goal92.c12
-rw-r--r--src/mame/video/goindol.c4
-rw-r--r--src/mame/video/goldstar.c20
-rw-r--r--src/mame/video/gomoku.c4
-rw-r--r--src/mame/video/gotcha.c2
-rw-r--r--src/mame/video/gottlieb.c4
-rw-r--r--src/mame/video/gotya.c4
-rw-r--r--src/mame/video/gradius3.c4
-rw-r--r--src/mame/video/grchamp.c6
-rw-r--r--src/mame/video/gridlee.c4
-rw-r--r--src/mame/video/groundfx.c12
-rw-r--r--src/mame/video/gstriker.c8
-rw-r--r--src/mame/video/gsword.c2
-rw-r--r--src/mame/video/gunbustr.c18
-rw-r--r--src/mame/video/gunsmoke.c4
-rw-r--r--src/mame/video/gyruss.c6
-rw-r--r--src/mame/video/hcastle.c12
-rw-r--r--src/mame/video/higemaru.c2
-rw-r--r--src/mame/video/himesiki.c2
-rw-r--r--src/mame/video/hnayayoi.c12
-rw-r--r--src/mame/video/hng64.c30
-rw-r--r--src/mame/video/holeland.c4
-rw-r--r--src/mame/video/homedata.c16
-rw-r--r--src/mame/video/homerun.c2
-rw-r--r--src/mame/video/hyperspt.c2
-rw-r--r--src/mame/video/hyprduel.c22
-rw-r--r--src/mame/video/ikki.c6
-rw-r--r--src/mame/video/inufuku.c6
-rw-r--r--src/mame/video/irobot.c2
-rw-r--r--src/mame/video/ironhors.c4
-rw-r--r--src/mame/video/itech8.c14
-rw-r--r--src/mame/video/jack.c4
-rw-r--r--src/mame/video/jackal.c6
-rw-r--r--src/mame/video/jailbrek.c2
-rw-r--r--src/mame/video/jedi.c4
-rw-r--r--src/mame/video/kan_panb.c16
-rw-r--r--src/mame/video/kaneko16.c10
-rw-r--r--src/mame/video/karnov.c4
-rw-r--r--src/mame/video/kchamp.c4
-rw-r--r--src/mame/video/kickgoal.c2
-rw-r--r--src/mame/video/kingobox.c4
-rw-r--r--src/mame/video/kncljoe.c2
-rw-r--r--src/mame/video/konamigx.c22
-rw-r--r--src/mame/video/ksayakyu.c2
-rw-r--r--src/mame/video/kyugo.c2
-rw-r--r--src/mame/video/labyrunr.c12
-rw-r--r--src/mame/video/ladybug.c12
-rw-r--r--src/mame/video/ladyfrog.c2
-rw-r--r--src/mame/video/lasso.c18
-rw-r--r--src/mame/video/lastduel.c12
-rw-r--r--src/mame/video/lazercmd.c6
-rw-r--r--src/mame/video/legionna.c16
-rw-r--r--src/mame/video/leland.c6
-rw-r--r--src/mame/video/lemmings.c20
-rw-r--r--src/mame/video/lethal.c2
-rw-r--r--src/mame/video/liberate.c12
-rw-r--r--src/mame/video/lkage.c4
-rw-r--r--src/mame/video/lockon.c12
-rw-r--r--src/mame/video/lordgun.c16
-rw-r--r--src/mame/video/lsasquad.c14
-rw-r--r--src/mame/video/lwings.c4
-rw-r--r--src/mame/video/m10.c2
-rw-r--r--src/mame/video/m107.c4
-rw-r--r--src/mame/video/m52.c10
-rw-r--r--src/mame/video/m57.c4
-rw-r--r--src/mame/video/m58.c4
-rw-r--r--src/mame/video/m62.c28
-rw-r--r--src/mame/video/m72.c10
-rw-r--r--src/mame/video/m90.c18
-rw-r--r--src/mame/video/m92.c20
-rw-r--r--src/mame/video/macrossp.c16
-rw-r--r--src/mame/video/madalien.c8
-rw-r--r--src/mame/video/madmotor.c12
-rw-r--r--src/mame/video/magmax.c6
-rw-r--r--src/mame/video/mainevt.c2
-rw-r--r--src/mame/video/mainsnk.c2
-rw-r--r--src/mame/video/malzak.c2
-rw-r--r--src/mame/video/mappy.c8
-rw-r--r--src/mame/video/marineb.c38
-rw-r--r--src/mame/video/mario.c6
-rw-r--r--src/mame/video/markham.c2
-rw-r--r--src/mame/video/matmania.c16
-rw-r--r--src/mame/video/mcatadv.c12
-rw-r--r--src/mame/video/mcr.c12
-rw-r--r--src/mame/video/mcr3.c4
-rw-r--r--src/mame/video/mcr68.c8
-rw-r--r--src/mame/video/meadows.c4
-rw-r--r--src/mame/video/megasys1.c6
-rw-r--r--src/mame/video/megazone.c8
-rw-r--r--src/mame/video/mermaid.c42
-rw-r--r--src/mame/video/metlclsh.c2
-rw-r--r--src/mame/video/metro.c16
-rw-r--r--src/mame/video/mexico86.c8
-rw-r--r--src/mame/video/midzeus.c10
-rw-r--r--src/mame/video/midzeus2.c14
-rw-r--r--src/mame/video/mikie.c2
-rw-r--r--src/mame/video/mitchell.c2
-rw-r--r--src/mame/video/mjkjidai.c4
-rw-r--r--src/mame/video/model1.c28
-rw-r--r--src/mame/video/model2.c4
-rw-r--r--src/mame/video/model3.c20
-rw-r--r--src/mame/video/momoko.c20
-rw-r--r--src/mame/video/moo.c2
-rw-r--r--src/mame/video/mouser.c6
-rw-r--r--src/mame/video/mrdo.c2
-rw-r--r--src/mame/video/mrflea.c4
-rw-r--r--src/mame/video/mrjong.c2
-rw-r--r--src/mame/video/ms32.c22
-rw-r--r--src/mame/video/msisaac.c2
-rw-r--r--src/mame/video/mugsmash.c2
-rw-r--r--src/mame/video/munchmo.c6
-rw-r--r--src/mame/video/mustache.c2
-rw-r--r--src/mame/video/mystston.c10
-rw-r--r--src/mame/video/mystwarr.c8
-rw-r--r--src/mame/video/n64.c2
-rw-r--r--src/mame/video/n8080.c14
-rw-r--r--src/mame/video/namcofl.c4
-rw-r--r--src/mame/video/namcona1.c10
-rw-r--r--src/mame/video/namconb1.c8
-rw-r--r--src/mame/video/namcos1.c8
-rw-r--r--src/mame/video/namcos21.c6
-rw-r--r--src/mame/video/namcos22.c44
-rw-r--r--src/mame/video/namcos86.c16
-rw-r--r--src/mame/video/naughtyb.c4
-rw-r--r--src/mame/video/nbmj8891.c4
-rw-r--r--src/mame/video/nbmj8900.c4
-rw-r--r--src/mame/video/nbmj8991.c8
-rw-r--r--src/mame/video/nbmj9195.c4
-rw-r--r--src/mame/video/nemesis.c4
-rw-r--r--src/mame/video/neogeo.c4
-rw-r--r--src/mame/video/ninjakd2.c8
-rw-r--r--src/mame/video/ninjaw.c6
-rw-r--r--src/mame/video/nitedrvr.c2
-rw-r--r--src/mame/video/niyanpai.c6
-rw-r--r--src/mame/video/nmk16.c16
-rw-r--r--src/mame/video/nova2001.c8
-rw-r--r--src/mame/video/nycaptor.c46
-rw-r--r--src/mame/video/ohmygod.c2
-rw-r--r--src/mame/video/ojankohs.c2
-rw-r--r--src/mame/video/oneshot.c10
-rw-r--r--src/mame/video/opwolf.c2
-rw-r--r--src/mame/video/orbit.c4
-rw-r--r--src/mame/video/othldrby.c10
-rw-r--r--src/mame/video/othunder.c4
-rw-r--r--src/mame/video/overdriv.c2
-rw-r--r--src/mame/video/pacland.c12
-rw-r--r--src/mame/video/pacman.c24
-rw-r--r--src/mame/video/pandoras.c2
-rw-r--r--src/mame/video/paradise.c26
-rw-r--r--src/mame/video/parodius.c2
-rw-r--r--src/mame/video/pbaction.c2
-rw-r--r--src/mame/video/pcktgal.c10
-rw-r--r--src/mame/video/pgm.c4
-rw-r--r--src/mame/video/pingpong.c2
-rw-r--r--src/mame/video/pirates.c2
-rw-r--r--src/mame/video/pitnrun.c12
-rw-r--r--src/mame/video/pktgaldx.c14
-rw-r--r--src/mame/video/playch10.c4
-rw-r--r--src/mame/video/playmark.c26
-rw-r--r--src/mame/video/plygonet.c6
-rw-r--r--src/mame/video/pokechmp.c2
-rw-r--r--src/mame/video/polepos.c4
-rw-r--r--src/mame/video/polyplay.c2
-rw-r--r--src/mame/video/poolshrk.c2
-rw-r--r--src/mame/video/pooyan.c2
-rw-r--r--src/mame/video/popeye.c4
-rw-r--r--src/mame/video/popper.c2
-rw-r--r--src/mame/video/portrait.c2
-rw-r--r--src/mame/video/powerins.c12
-rw-r--r--src/mame/video/prehisle.c4
-rw-r--r--src/mame/video/psikyo.c24
-rw-r--r--src/mame/video/psikyo4.c4
-rw-r--r--src/mame/video/psikyosh.c16
-rw-r--r--src/mame/video/psychic5.c10
-rw-r--r--src/mame/video/punchout.c20
-rw-r--r--src/mame/video/pushman.c2
-rw-r--r--src/mame/video/qdrmfgp.c4
-rw-r--r--src/mame/video/quasar.c6
-rw-r--r--src/mame/video/quizdna.c4
-rw-r--r--src/mame/video/raiden.c4
-rw-r--r--src/mame/video/rainbow.c8
-rw-r--r--src/mame/video/rallyx.c28
-rw-r--r--src/mame/video/rampart.c2
-rw-r--r--src/mame/video/rastan.c2
-rw-r--r--src/mame/video/realbrk.c32
-rw-r--r--src/mame/video/redalert.c6
-rw-r--r--src/mame/video/redclash.c10
-rw-r--r--src/mame/video/relief.c2
-rw-r--r--src/mame/video/renegade.c2
-rw-r--r--src/mame/video/retofinv.c2
-rw-r--r--src/mame/video/rockrage.c4
-rw-r--r--src/mame/video/rocnrope.c2
-rw-r--r--src/mame/video/rohga.c42
-rw-r--r--src/mame/video/rollerg.c2
-rw-r--r--src/mame/video/rollrace.c6
-rw-r--r--src/mame/video/route16.c6
-rw-r--r--src/mame/video/rpunch.c6
-rw-r--r--src/mame/video/runaway.c8
-rw-r--r--src/mame/video/rungun.c4
-rw-r--r--src/mame/video/sauro.c4
-rw-r--r--src/mame/video/sbasketb.c2
-rw-r--r--src/mame/video/scotrsht.c2
-rw-r--r--src/mame/video/sderby.c4
-rw-r--r--src/mame/video/segag80r.c18
-rw-r--r--src/mame/video/segag80v.c2
-rw-r--r--src/mame/video/segas18.c2
-rw-r--r--src/mame/video/segas24.c4
-rw-r--r--src/mame/video/segas32.c16
-rw-r--r--src/mame/video/seibuspi.c26
-rw-r--r--src/mame/video/seicross.c2
-rw-r--r--src/mame/video/senjyo.c16
-rw-r--r--src/mame/video/seta.c14
-rw-r--r--src/mame/video/seta2.c4
-rw-r--r--src/mame/video/sf.c2
-rw-r--r--src/mame/video/shadfrce.c6
-rw-r--r--src/mame/video/shangkid.c8
-rw-r--r--src/mame/video/shaolins.c2
-rw-r--r--src/mame/video/shisen.c2
-rw-r--r--src/mame/video/shootout.c8
-rw-r--r--src/mame/video/sidearms.c4
-rw-r--r--src/mame/video/sidepckt.c2
-rw-r--r--src/mame/video/silkroad.c4
-rw-r--r--src/mame/video/simpl156.c4
-rw-r--r--src/mame/video/simpsons.c2
-rw-r--r--src/mame/video/skydiver.c2
-rw-r--r--src/mame/video/skyfox.c4
-rw-r--r--src/mame/video/skykid.c4
-rw-r--r--src/mame/video/skyraid.c10
-rw-r--r--src/mame/video/slapfght.c14
-rw-r--r--src/mame/video/slapshot.c20
-rw-r--r--src/mame/video/snes.c2
-rw-r--r--src/mame/video/snk.c20
-rw-r--r--src/mame/video/snk68.c6
-rw-r--r--src/mame/video/solomon.c2
-rw-r--r--src/mame/video/sonson.c2
-rw-r--r--src/mame/video/spacefb.c2
-rw-r--r--src/mame/video/spbactn.c22
-rw-r--r--src/mame/video/spcforce.c2
-rw-r--r--src/mame/video/spdodgeb.c2
-rw-r--r--src/mame/video/speedatk.c2
-rw-r--r--src/mame/video/speedbal.c2
-rw-r--r--src/mame/video/speedspn.c4
-rw-r--r--src/mame/video/splash.c8
-rw-r--r--src/mame/video/sprcros2.c2
-rw-r--r--src/mame/video/sprint2.c18
-rw-r--r--src/mame/video/sprint4.c16
-rw-r--r--src/mame/video/sprint8.c12
-rw-r--r--src/mame/video/spy.c2
-rw-r--r--src/mame/video/srmp2.c38
-rw-r--r--src/mame/video/srumbler.c2
-rw-r--r--src/mame/video/sshangha.c16
-rw-r--r--src/mame/video/sslam.c8
-rw-r--r--src/mame/video/ssozumo.c2
-rw-r--r--src/mame/video/sspeedr.c6
-rw-r--r--src/mame/video/ssrj.c2
-rw-r--r--src/mame/video/ssv.c6
-rw-r--r--src/mame/video/st0016.c8
-rw-r--r--src/mame/video/stactics.c2
-rw-r--r--src/mame/video/stadhero.c8
-rw-r--r--src/mame/video/starcrus.c16
-rw-r--r--src/mame/video/starshp1.c22
-rw-r--r--src/mame/video/stfight.c6
-rw-r--r--src/mame/video/stlforce.c2
-rw-r--r--src/mame/video/strnskil.c2
-rw-r--r--src/mame/video/stvvdp2.c60
-rw-r--r--src/mame/video/subs.c16
-rw-r--r--src/mame/video/suna16.c12
-rw-r--r--src/mame/video/suna8.c18
-rw-r--r--src/mame/video/supbtime.c4
-rw-r--r--src/mame/video/superchs.c18
-rw-r--r--src/mame/video/superqix.c4
-rw-r--r--src/mame/video/suprloco.c2
-rw-r--r--src/mame/video/suprnova.c12
-rw-r--r--src/mame/video/suprridr.c2
-rw-r--r--src/mame/video/suprslam.c6
-rw-r--r--src/mame/video/surpratk.c2
-rw-r--r--src/mame/video/system16.c32
-rw-r--r--src/mame/video/tagteam.c2
-rw-r--r--src/mame/video/tail2nos.c2
-rw-r--r--src/mame/video/taito_b.c24
-rw-r--r--src/mame/video/taito_f2.c70
-rw-r--r--src/mame/video/taito_f3.c28
-rw-r--r--src/mame/video/taito_h.c40
-rw-r--r--src/mame/video/taito_l.c6
-rw-r--r--src/mame/video/taito_o.c4
-rw-r--r--src/mame/video/taito_z.c32
-rw-r--r--src/mame/video/taitoair.c4
-rw-r--r--src/mame/video/taitojc.c12
-rw-r--r--src/mame/video/taitosj.c4
-rw-r--r--src/mame/video/tank8.c16
-rw-r--r--src/mame/video/tankbatt.c2
-rw-r--r--src/mame/video/tankbust.c2
-rw-r--r--src/mame/video/taotaido.c2
-rw-r--r--src/mame/video/targeth.c2
-rw-r--r--src/mame/video/tatsumi.c50
-rw-r--r--src/mame/video/taxidriv.c8
-rw-r--r--src/mame/video/tbowl.c4
-rw-r--r--src/mame/video/tceptor.c2
-rw-r--r--src/mame/video/tecmo.c4
-rw-r--r--src/mame/video/tecmo16.c6
-rw-r--r--src/mame/video/tecmosys.c6
-rw-r--r--src/mame/video/tehkanwc.c6
-rw-r--r--src/mame/video/terracre.c4
-rw-r--r--src/mame/video/tetrisp2.c36
-rw-r--r--src/mame/video/thedeep.c4
-rw-r--r--src/mame/video/thepit.c4
-rw-r--r--src/mame/video/thief.c4
-rw-r--r--src/mame/video/thoop2.c12
-rw-r--r--src/mame/video/thunderj.c2
-rw-r--r--src/mame/video/thunderx.c2
-rw-r--r--src/mame/video/tiamc1.c2
-rw-r--r--src/mame/video/tigeroad.c4
-rw-r--r--src/mame/video/timelimt.c2
-rw-r--r--src/mame/video/timeplt.c2
-rw-r--r--src/mame/video/tmnt.c18
-rw-r--r--src/mame/video/tnzs.c2
-rw-r--r--src/mame/video/toaplan1.c12
-rw-r--r--src/mame/video/toaplan2.c10
-rw-r--r--src/mame/video/toki.c4
-rw-r--r--src/mame/video/toobin.c4
-rw-r--r--src/mame/video/topspeed.c14
-rw-r--r--src/mame/video/toypop.c4
-rw-r--r--src/mame/video/tp84.c6
-rw-r--r--src/mame/video/trackfld.c2
-rw-r--r--src/mame/video/travrusa.c2
-rw-r--r--src/mame/video/triplhnt.c6
-rw-r--r--src/mame/video/tryout.c4
-rw-r--r--src/mame/video/tsamurai.c8
-rw-r--r--src/mame/video/tubep.c4
-rw-r--r--src/mame/video/tumbleb.c38
-rw-r--r--src/mame/video/tumblep.c4
-rw-r--r--src/mame/video/tunhunt.c10
-rw-r--r--src/mame/video/turbo.c10
-rw-r--r--src/mame/video/tutankhm.c2
-rw-r--r--src/mame/video/twin16.c14
-rw-r--r--src/mame/video/twincobr.c10
-rw-r--r--src/mame/video/tx1.c32
-rw-r--r--src/mame/video/ultratnk.c18
-rw-r--r--src/mame/video/undrfire.c50
-rw-r--r--src/mame/video/unico.c22
-rw-r--r--src/mame/video/vaportra.c14
-rw-r--r--src/mame/video/vastar.c6
-rw-r--r--src/mame/video/vball.c2
-rw-r--r--src/mame/video/vectrex.c6
-rw-r--r--src/mame/video/vendetta.c2
-rw-r--r--src/mame/video/vicdual.c2
-rw-r--r--src/mame/video/victory.c8
-rw-r--r--src/mame/video/videopin.c2
-rw-r--r--src/mame/video/vigilant.c22
-rw-r--r--src/mame/video/volfied.c4
-rw-r--r--src/mame/video/vulgus.c2
-rw-r--r--src/mame/video/warpwarp.c2
-rw-r--r--src/mame/video/warriorb.c4
-rw-r--r--src/mame/video/wc90.c8
-rw-r--r--src/mame/video/wc90b.c4
-rw-r--r--src/mame/video/wecleman.c26
-rw-r--r--src/mame/video/welltris.c4
-rw-r--r--src/mame/video/wgp.c16
-rw-r--r--src/mame/video/williams.c2
-rw-r--r--src/mame/video/wiping.c8
-rw-r--r--src/mame/video/wiz.c24
-rw-r--r--src/mame/video/wolfpack.c16
-rw-r--r--src/mame/video/wrally.c4
-rw-r--r--src/mame/video/wwfsstar.c2
-rw-r--r--src/mame/video/wwfwfest.c6
-rw-r--r--src/mame/video/xain.c16
-rw-r--r--src/mame/video/xevious.c2
-rw-r--r--src/mame/video/xexex.c2
-rw-r--r--src/mame/video/xmen.c10
-rw-r--r--src/mame/video/xorworld.c2
-rw-r--r--src/mame/video/xxmissio.c6
-rw-r--r--src/mame/video/yiear.c2
-rw-r--r--src/mame/video/yunsun16.c4
-rw-r--r--src/mame/video/yunsung8.c6
-rw-r--r--src/mame/video/zac2650.c2
-rw-r--r--src/mame/video/zaccaria.c6
-rw-r--r--src/mame/video/zaxxon.c16
761 files changed, 3351 insertions, 3351 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;
}
diff --git a/src/mame/machine/slikshot.c b/src/mame/machine/slikshot.c
index 1147f9770cd..87322a32435 100644
--- a/src/mame/machine/slikshot.c
+++ b/src/mame/machine/slikshot.c
@@ -593,7 +593,7 @@ UINT32 itech8_state::screen_update_slikshot(screen_device &screen, bitmap_rgb32
if (temp >= 0x90) temp = 0x90;
m_curx = temp;
- compute_sensors(screen.machine());
+ compute_sensors(machine());
// popmessage("V=%02x,%02x X=%02x", m_curvx, m_curvy, m_curx);
m_crosshair_vis = 0;
}
diff --git a/src/mame/video/1942.c b/src/mame/video/1942.c
index f9969f9e9f7..f646096b4c0 100644
--- a/src/mame/video/1942.c
+++ b/src/mame/video/1942.c
@@ -237,7 +237,7 @@ UINT32 _1942_state::screen_update_1942(screen_device &screen, bitmap_ind16 &bitm
{
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/video/1943.c b/src/mame/video/1943.c
index 61bf977bf64..710c6debdda 100644
--- a/src/mame/video/1943.c
+++ b/src/mame/video/1943.c
@@ -258,16 +258,16 @@ UINT32 _1943_state::screen_update_1943(screen_device &screen, bitmap_ind16 &bitm
if (m_bg2_on)
m_bg2_tilemap->draw(bitmap, cliprect, 0, 0);
else
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
if (m_obj_on)
- draw_sprites(screen.machine(), bitmap, cliprect, 0);
+ draw_sprites(machine(), bitmap, cliprect, 0);
if (m_bg1_on)
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
if (m_obj_on)
- draw_sprites(screen.machine(), bitmap, cliprect, 1);
+ draw_sprites(machine(), bitmap, cliprect, 1);
if (m_char_on)
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
diff --git a/src/mame/video/20pacgal.c b/src/mame/video/20pacgal.c
index b5ccccd917c..374faf26e85 100644
--- a/src/mame/video/20pacgal.c
+++ b/src/mame/video/20pacgal.c
@@ -412,8 +412,8 @@ UINT32 _20pacgal_state::screen_update_20pacgal(screen_device &screen, bitmap_rgb
bitmap.fill(0, cliprect);
draw_stars(this, bitmap,cliprect);
draw_chars(this, bitmap);
- draw_sprites(screen.machine(),this, bitmap);
- do_pen_lookup(screen.machine(), this, bitmap, cliprect);
+ draw_sprites(machine(),this, bitmap);
+ do_pen_lookup(machine(), this, bitmap, cliprect);
return 0;
}
diff --git a/src/mame/video/40love.c b/src/mame/video/40love.c
index 3f89b4ddf05..9f631f3a0ff 100644
--- a/src/mame/video/40love.c
+++ b/src/mame/video/40love.c
@@ -352,11 +352,11 @@ static void draw_pixram( running_machine &machine, bitmap_ind16 &bitmap, const r
UINT32 fortyl_state::screen_update_fortyl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- draw_pixram(screen.machine(), bitmap, cliprect);
+ draw_pixram(machine(), bitmap, cliprect);
m_bg_tilemap->set_scrolldy(- m_video_ctrl[1] + 1, - m_video_ctrl[1] - 1 );
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/video/8080bw.c b/src/mame/video/8080bw.c
index 5e6df02ac86..c4f139224f6 100644
--- a/src/mame/video/8080bw.c
+++ b/src/mame/video/8080bw.c
@@ -133,10 +133,10 @@ UINT32 _8080bw_state::screen_update_invadpt2(screen_device &screen, bitmap_rgb32
UINT8 data = m_main_ram[offs];
UINT8 fore_color = m_screen_red ? 1 : color_map_base[color_address] & 0x07;
- set_8_pixels(screen.machine(), bitmap, y, x, data, pens, fore_color, 0);
+ set_8_pixels(machine(), bitmap, y, x, data, pens, fore_color, 0);
}
- clear_extra_columns(screen.machine(), bitmap, pens, 0);
+ clear_extra_columns(machine(), bitmap, pens, 0);
return 0;
}
@@ -165,10 +165,10 @@ UINT32 _8080bw_state::screen_update_ballbomb(screen_device &screen, bitmap_rgb32
UINT8 fore_color = m_screen_red ? 1 : color_map_base[color_address] & 0x07;
/* blue background */
- set_8_pixels(screen.machine(), bitmap, y, x, data, pens, fore_color, 2);
+ set_8_pixels(machine(), bitmap, y, x, data, pens, fore_color, 2);
}
- clear_extra_columns(screen.machine(), bitmap, pens, 2);
+ clear_extra_columns(machine(), bitmap, pens, 2);
return 0;
}
@@ -205,10 +205,10 @@ UINT32 _8080bw_state::screen_update_schaser(screen_device &screen, bitmap_rgb32
back_color = (((back_data & 0x0c) == 0x0c) && m_schaser_background_select) ? 4 : 2;
}
- set_8_pixels(screen.machine(), bitmap, y, x, data, pens, fore_color, back_color);
+ set_8_pixels(machine(), bitmap, y, x, data, pens, fore_color, back_color);
}
- clear_extra_columns(screen.machine(), bitmap, pens, m_schaser_background_disable ? 0 : 2);
+ clear_extra_columns(machine(), bitmap, pens, m_schaser_background_disable ? 0 : 2);
return 0;
}
@@ -230,10 +230,10 @@ UINT32 _8080bw_state::screen_update_schasercv(screen_device &screen, bitmap_rgb3
UINT8 fore_color = m_colorram[offs & 0x1f9f] & 0x07;
/* blue background */
- set_8_pixels(screen.machine(), bitmap, y, x, data, pens, fore_color, 2);
+ set_8_pixels(machine(), bitmap, y, x, data, pens, fore_color, 2);
}
- clear_extra_columns(screen.machine(), bitmap, pens, 2);
+ clear_extra_columns(machine(), bitmap, pens, 2);
return 0;
}
@@ -254,10 +254,10 @@ UINT32 _8080bw_state::screen_update_rollingc(screen_device &screen, bitmap_rgb32
UINT8 data = m_main_ram[offs];
UINT8 fore_color = m_colorram[offs & 0x1f1f] & 0x07;
- set_8_pixels(screen.machine(), bitmap, y, x, data, pens, fore_color, 0);
+ set_8_pixels(machine(), bitmap, y, x, data, pens, fore_color, 0);
}
- clear_extra_columns(screen.machine(), bitmap, pens, 0);
+ clear_extra_columns(machine(), bitmap, pens, 0);
return 0;
}
@@ -272,7 +272,7 @@ UINT32 _8080bw_state::screen_update_polaris(screen_device &screen, bitmap_rgb32
invadpt2_get_pens(pens);
- color_map_base = screen.machine().root_device().memregion("proms")->base();
+ color_map_base = machine().root_device().memregion("proms")->base();
cloud_gfx = memregion("user1")->base();
for (offs = 0; offs < m_main_ram.bytes(); offs++)
@@ -297,7 +297,7 @@ UINT32 _8080bw_state::screen_update_polaris(screen_device &screen, bitmap_rgb32
if ((color_map_base[color_address] & 0x08) || (cloud_y >= 64))
{
- set_8_pixels(screen.machine(), bitmap, y, x, data, pens, fore_color, back_color);
+ set_8_pixels(machine(), bitmap, y, x, data, pens, fore_color, back_color);
}
else
{
@@ -320,7 +320,7 @@ UINT32 _8080bw_state::screen_update_polaris(screen_device &screen, bitmap_rgb32
color = (cloud_gfx[cloud_gfx_offs] & bit) ? 7 : back_color;
}
- set_pixel(screen.machine(), bitmap, y, x, pens, color);
+ set_pixel(machine(), bitmap, y, x, pens, color);
x = x + 1;
data = data >> 1;
@@ -328,7 +328,7 @@ UINT32 _8080bw_state::screen_update_polaris(screen_device &screen, bitmap_rgb32
}
}
- clear_extra_columns(screen.machine(), bitmap, pens, 6);
+ clear_extra_columns(machine(), bitmap, pens, 6);
return 0;
}
@@ -349,10 +349,10 @@ UINT32 _8080bw_state::screen_update_lupin3(screen_device &screen, bitmap_rgb32 &
UINT8 data = m_main_ram[offs];
UINT8 fore_color = ~m_colorram[offs & 0x1f9f] & 0x07;
- set_8_pixels(screen.machine(), bitmap, y, x, data, pens, fore_color, 0);
+ set_8_pixels(machine(), bitmap, y, x, data, pens, fore_color, 0);
}
- clear_extra_columns(screen.machine(), bitmap, pens, 0);
+ clear_extra_columns(machine(), bitmap, pens, 0);
return 0;
}
@@ -375,10 +375,10 @@ UINT32 _8080bw_state::screen_update_cosmo(screen_device &screen, bitmap_rgb32 &b
UINT8 data = m_main_ram[offs];
UINT8 fore_color = m_colorram[color_address] & 0x07;
- set_8_pixels(screen.machine(), bitmap, y, x, data, pens, fore_color, 0);
+ set_8_pixels(machine(), bitmap, y, x, data, pens, fore_color, 0);
}
- clear_extra_columns(screen.machine(), bitmap, pens, 0);
+ clear_extra_columns(machine(), bitmap, pens, 0);
return 0;
}
@@ -406,10 +406,10 @@ UINT32 _8080bw_state::screen_update_indianbt(screen_device &screen, bitmap_rgb32
UINT8 data = m_main_ram[offs];
UINT8 fore_color = color_map_base[color_address] & 0x07;
- set_8_pixels(screen.machine(), bitmap, y, x, data, pens, fore_color, 0);
+ set_8_pixels(machine(), bitmap, y, x, data, pens, fore_color, 0);
}
- clear_extra_columns(screen.machine(), bitmap, pens, 0);
+ clear_extra_columns(machine(), bitmap, pens, 0);
return 0;
}
@@ -439,7 +439,7 @@ UINT32 _8080bw_state::screen_update_shuttlei(screen_device &screen, bitmap_rgb32
}
}
- clear_extra_columns(screen.machine(), bitmap, pens, 0);
+ clear_extra_columns(machine(), bitmap, pens, 0);
return 0;
}
@@ -460,10 +460,10 @@ UINT32 _8080bw_state::screen_update_sflush(screen_device &screen, bitmap_rgb32 &
UINT8 data = m_main_ram[offs];
UINT8 fore_color = m_colorram[offs & 0x1f9f] & 0x07;
- set_8_pixels(screen.machine(), bitmap, y, x, data, pens, fore_color, 0);
+ set_8_pixels(machine(), bitmap, y, x, data, pens, fore_color, 0);
}
- clear_extra_columns(screen.machine(), bitmap, pens, 0);
+ clear_extra_columns(machine(), bitmap, pens, 0);
return 0;
}
diff --git a/src/mame/video/actfancr.c b/src/mame/video/actfancr.c
index 38fbd695829..39f8db71068 100644
--- a/src/mame/video/actfancr.c
+++ b/src/mame/video/actfancr.c
@@ -29,11 +29,11 @@ UINT32 actfancr_state::screen_update_actfancr(screen_device &screen, bitmap_ind1
/* Draw playfield */
//m_flipscreen = m_control_2[0] & 0x80;
- //screen.machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
+ //machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
- screen.machine().device<deco_bac06_device>("tilegen1")->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0x00, 0x00, 0x00, 0x00);
- screen.machine().device<deco_mxc06_device>("spritegen")->draw_sprites(screen.machine(), bitmap, cliprect, m_spriteram16, 0x00, 0x00, 0x0f);
- screen.machine().device<deco_bac06_device>("tilegen2")->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00);
+ machine().device<deco_bac06_device>("tilegen1")->deco_bac06_pf_draw(machine(),bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0x00, 0x00, 0x00, 0x00);
+ machine().device<deco_mxc06_device>("spritegen")->draw_sprites(machine(), bitmap, cliprect, m_spriteram16, 0x00, 0x00, 0x0f);
+ machine().device<deco_bac06_device>("tilegen2")->deco_bac06_pf_draw(machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00);
return 0;
}
diff --git a/src/mame/video/aeroboto.c b/src/mame/video/aeroboto.c
index 2d73056ec26..3574cbfa2af 100644
--- a/src/mame/video/aeroboto.c
+++ b/src/mame/video/aeroboto.c
@@ -214,7 +214,7 @@ UINT32 aeroboto_state::screen_update_aeroboto(screen_device &screen, bitmap_ind1
m_bg_tilemap->set_scrolly(0, *m_vscroll);
m_bg_tilemap->draw(bitmap, splitrect2, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
// the status display behaves more closely to a 40-line splitscreen than an overlay
m_bg_tilemap->set_scrolly(0, 0);
diff --git a/src/mame/video/aerofgt.c b/src/mame/video/aerofgt.c
index d325cf7516e..5607952af38 100644
--- a/src/mame/video/aerofgt.c
+++ b/src/mame/video/aerofgt.c
@@ -821,11 +821,11 @@ UINT32 aerofgt_state::screen_update_pspikes(screen_device &screen, bitmap_ind16
m_bg1_tilemap->set_scrollx((i + scrolly) & 0xff, m_rasterram[i]);
m_bg1_tilemap->set_scrolly(0, scrolly);
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
m_bg1_tilemap->draw(bitmap, cliprect, 0, 0);
- turbofrc_draw_sprites(screen.machine(), bitmap, cliprect, 0, -1);
- turbofrc_draw_sprites(screen.machine(), bitmap, cliprect, 0, 0);
+ turbofrc_draw_sprites(machine(), bitmap, cliprect, 0, -1);
+ turbofrc_draw_sprites(machine(), bitmap, cliprect, 0, 0);
return 0;
}
@@ -840,7 +840,7 @@ UINT32 aerofgt_state::screen_update_pspikesb(screen_device &screen, bitmap_ind16
m_bg1_tilemap->set_scrolly(0, scrolly);
m_bg1_tilemap->draw(bitmap, cliprect, 0, 0);
- pspikesb_draw_sprites(screen.machine(), bitmap, cliprect);
+ pspikesb_draw_sprites(machine(), bitmap, cliprect);
return 0;
}
@@ -849,7 +849,7 @@ UINT32 aerofgt_state::screen_update_spikes91(screen_device &screen, bitmap_ind16
int i, scrolly;
int y, x;
int count;
- gfx_element *gfx = screen.machine().gfx[0];
+ gfx_element *gfx = machine().gfx[0];
m_bg1_tilemap->set_scroll_rows(256);
scrolly = m_bg1scrolly;
@@ -859,7 +859,7 @@ UINT32 aerofgt_state::screen_update_spikes91(screen_device &screen, bitmap_ind16
m_bg1_tilemap->set_scrolly(0, scrolly);
m_bg1_tilemap->draw(bitmap, cliprect, 0, 0);
- spikes91_draw_sprites(screen.machine(), bitmap, cliprect);
+ spikes91_draw_sprites(machine(), bitmap, cliprect);
/* we could use a tilemap, but it's easier to just do it here */
count = 0;
@@ -891,16 +891,16 @@ UINT32 aerofgt_state::screen_update_karatblz(screen_device &screen, bitmap_ind16
m_bg2_tilemap->set_scrollx(0, m_bg2scrollx - 4);
m_bg2_tilemap->set_scrolly(0, m_bg2scrolly);
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
m_bg1_tilemap->draw(bitmap, cliprect, 0, 0);
m_bg2_tilemap->draw(bitmap, cliprect, 0, 0);
/* we use the priority buffer so sprites are drawn front to back */
- turbofrc_draw_sprites(screen.machine(), bitmap, cliprect, 1, -1);
- turbofrc_draw_sprites(screen.machine(), bitmap, cliprect, 1, 0);
- turbofrc_draw_sprites(screen.machine(), bitmap, cliprect, 0, -1);
- turbofrc_draw_sprites(screen.machine(), bitmap, cliprect, 0, 0);
+ turbofrc_draw_sprites(machine(), bitmap, cliprect, 1, -1);
+ turbofrc_draw_sprites(machine(), bitmap, cliprect, 1, 0);
+ turbofrc_draw_sprites(machine(), bitmap, cliprect, 0, -1);
+ turbofrc_draw_sprites(machine(), bitmap, cliprect, 0, 0);
return 0;
}
@@ -916,16 +916,16 @@ UINT32 aerofgt_state::screen_update_spinlbrk(screen_device &screen, bitmap_ind16
m_bg2_tilemap->set_scrollx(0, m_bg2scrollx - 4);
// m_bg2_tilemap->set_scrolly(0, m_bg2scrolly);
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
m_bg1_tilemap->draw(bitmap, cliprect, 0, 0);
m_bg2_tilemap->draw(bitmap, cliprect, 0, 1);
/* we use the priority buffer so sprites are drawn front to back */
- spinlbrk_draw_sprites(screen.machine(), bitmap, cliprect, 0, 0);
- spinlbrk_draw_sprites(screen.machine(), bitmap, cliprect, 0, -1);
- spinlbrk_draw_sprites(screen.machine(), bitmap, cliprect, 1, 0);
- spinlbrk_draw_sprites(screen.machine(), bitmap, cliprect, 1, -1);
+ spinlbrk_draw_sprites(machine(), bitmap, cliprect, 0, 0);
+ spinlbrk_draw_sprites(machine(), bitmap, cliprect, 0, -1);
+ spinlbrk_draw_sprites(machine(), bitmap, cliprect, 1, 0);
+ spinlbrk_draw_sprites(machine(), bitmap, cliprect, 1, -1);
return 0;
}
@@ -942,16 +942,16 @@ UINT32 aerofgt_state::screen_update_turbofrc(screen_device &screen, bitmap_ind16
m_bg2_tilemap->set_scrollx(0, m_bg2scrollx - 7);
m_bg2_tilemap->set_scrolly(0, m_bg2scrolly + 2);
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
m_bg1_tilemap->draw(bitmap, cliprect, 0, 0);
m_bg2_tilemap->draw(bitmap, cliprect, 0, 1);
/* we use the priority buffer so sprites are drawn front to back */
- turbofrc_draw_sprites(screen.machine(), bitmap, cliprect, 1, -1); //ship
- turbofrc_draw_sprites(screen.machine(), bitmap, cliprect, 1, 0); //intro
- turbofrc_draw_sprites(screen.machine(), bitmap, cliprect, 0, -1); //enemy
- turbofrc_draw_sprites(screen.machine(), bitmap, cliprect, 0, 0); //enemy
+ turbofrc_draw_sprites(machine(), bitmap, cliprect, 1, -1); //ship
+ turbofrc_draw_sprites(machine(), bitmap, cliprect, 1, 0); //intro
+ turbofrc_draw_sprites(machine(), bitmap, cliprect, 0, -1); //enemy
+ turbofrc_draw_sprites(machine(), bitmap, cliprect, 0, 0); //enemy
return 0;
}
@@ -962,17 +962,17 @@ UINT32 aerofgt_state::screen_update_aerofgt(screen_device &screen, bitmap_ind16
m_bg2_tilemap->set_scrollx(0, m_rasterram[0x0200] - 20);
m_bg2_tilemap->set_scrolly(0, m_bg2scrolly);
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
m_bg1_tilemap->draw(bitmap, cliprect, 0, 0);
- aerofgt_draw_sprites(screen.machine(), bitmap, cliprect, 0);
- aerofgt_draw_sprites(screen.machine(), bitmap, cliprect, 1);
+ aerofgt_draw_sprites(machine(), bitmap, cliprect, 0);
+ aerofgt_draw_sprites(machine(), bitmap, cliprect, 1);
m_bg2_tilemap->draw(bitmap, cliprect, 0, 0);
- aerofgt_draw_sprites(screen.machine(), bitmap, cliprect, 2);
- aerofgt_draw_sprites(screen.machine(), bitmap, cliprect, 3);
+ aerofgt_draw_sprites(machine(), bitmap, cliprect, 2);
+ aerofgt_draw_sprites(machine(), bitmap, cliprect, 3);
return 0;
}
@@ -989,13 +989,13 @@ UINT32 aerofgt_state::screen_update_aerfboot(screen_device &screen, bitmap_ind16
m_bg2_tilemap->set_scrollx(0, m_bg2scrollx + 172);
m_bg2_tilemap->set_scrolly(0, m_bg2scrolly + 2);
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
m_bg1_tilemap->draw(bitmap, cliprect, 0, 0);
m_bg2_tilemap->draw(bitmap, cliprect, 0, 1);
/* we use the priority buffer so sprites are drawn front to back */
- aerfboot_draw_sprites(screen.machine(), bitmap, cliprect);
+ aerfboot_draw_sprites(machine(), bitmap, cliprect);
return 0;
}
@@ -1012,16 +1012,16 @@ UINT32 aerofgt_state::screen_update_aerfboo2(screen_device &screen, bitmap_ind16
m_bg2_tilemap->set_scrollx(0, m_bg2scrollx - 7);
m_bg2_tilemap->set_scrolly(0, m_bg2scrolly + 2);
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
m_bg1_tilemap->draw(bitmap, cliprect, 0, 0);
m_bg2_tilemap->draw(bitmap, cliprect, 0, 1);
/* we use the priority buffer so sprites are drawn front to back */
- aerfboo2_draw_sprites(screen.machine(), bitmap, cliprect, 1, -1); //ship
- aerfboo2_draw_sprites(screen.machine(), bitmap, cliprect, 1, 0); //intro
- aerfboo2_draw_sprites(screen.machine(), bitmap, cliprect, 0, -1); //enemy
- aerfboo2_draw_sprites(screen.machine(), bitmap, cliprect, 0, 0); //enemy
+ aerfboo2_draw_sprites(machine(), bitmap, cliprect, 1, -1); //ship
+ aerfboo2_draw_sprites(machine(), bitmap, cliprect, 1, 0); //intro
+ aerfboo2_draw_sprites(machine(), bitmap, cliprect, 0, -1); //enemy
+ aerfboo2_draw_sprites(machine(), bitmap, cliprect, 0, 0); //enemy
return 0;
}
@@ -1035,11 +1035,11 @@ UINT32 aerofgt_state::screen_update_wbbc97(screen_device &screen, bitmap_rgb32 &
m_bg1_tilemap->set_scrollx((i + scrolly) & 0xff, m_rasterram[i]);
m_bg1_tilemap->set_scrolly(0, scrolly);
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
if (m_wbbc97_bitmap_enable)
{
- wbbc97_draw_bitmap(screen.machine(), bitmap);
+ wbbc97_draw_bitmap(machine(), bitmap);
m_bg1_tilemap->draw(bitmap, cliprect, 0, 0);
}
else
@@ -1047,7 +1047,7 @@ UINT32 aerofgt_state::screen_update_wbbc97(screen_device &screen, bitmap_rgb32 &
m_bg1_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0);
}
- turbofrc_draw_sprites(screen.machine(), bitmap, cliprect, 0, -1);
- turbofrc_draw_sprites(screen.machine(), bitmap, cliprect, 0, 0);
+ turbofrc_draw_sprites(machine(), bitmap, cliprect, 0, -1);
+ turbofrc_draw_sprites(machine(), bitmap, cliprect, 0, 0);
return 0;
}
diff --git a/src/mame/video/ajax.c b/src/mame/video/ajax.c
index 3c68fe3bbab..384aa04e03e 100644
--- a/src/mame/video/ajax.c
+++ b/src/mame/video/ajax.c
@@ -91,9 +91,9 @@ UINT32 ajax_state::screen_update_ajax(screen_device &screen, bitmap_ind16 &bitma
k052109_tilemap_update(m_k052109);
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
k052109_tilemap_draw(m_k052109, bitmap, cliprect, 2, 0, 1);
if (m_priority)
{
diff --git a/src/mame/video/aliens.c b/src/mame/video/aliens.c
index 03f3e53c932..3c642b216f0 100644
--- a/src/mame/video/aliens.c
+++ b/src/mame/video/aliens.c
@@ -77,7 +77,7 @@ UINT32 aliens_state::screen_update_aliens(screen_device &screen, bitmap_ind16 &b
k052109_tilemap_update(m_k052109);
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
bitmap.fill(m_layer_colorbase[1] * 16, cliprect);
k052109_tilemap_draw(m_k052109, bitmap, cliprect, 1, 0, 1);
diff --git a/src/mame/video/alpha68k.c b/src/mame/video/alpha68k.c
index 1cc4cc05608..69479fad77d 100644
--- a/src/mame/video/alpha68k.c
+++ b/src/mame/video/alpha68k.c
@@ -128,17 +128,17 @@ UINT32 alpha68k_state::screen_update_alpha68k_II(screen_device &screen, bitmap_i
{
if (m_last_bank != m_bank_base)
- screen.machine().tilemap().mark_all_dirty();
+ machine().tilemap().mark_all_dirty();
m_last_bank = m_bank_base;
- screen.machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
+ machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
bitmap.fill(2047, cliprect);
//AT
- draw_sprites(screen.machine(), bitmap, cliprect, 0, 0x07c0, 0x0800);
- draw_sprites(screen.machine(), bitmap, cliprect, 1, 0x0000, 0x0800);
- draw_sprites(screen.machine(), bitmap, cliprect, 2, 0x0000, 0x0800);
- draw_sprites(screen.machine(), bitmap, cliprect, 0, 0x0000, 0x07c0);
+ draw_sprites(machine(), bitmap, cliprect, 0, 0x07c0, 0x0800);
+ draw_sprites(machine(), bitmap, cliprect, 1, 0x0000, 0x0800);
+ draw_sprites(machine(), bitmap, cliprect, 2, 0x0000, 0x0800);
+ draw_sprites(machine(), bitmap, cliprect, 0, 0x0000, 0x07c0);
//ZT
m_fix_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
@@ -274,35 +274,35 @@ UINT32 alpha68k_state::screen_update_alpha68k_V(screen_device &screen, bitmap_in
UINT16 *spriteram = m_spriteram;
if (m_last_bank != m_bank_base)
- screen.machine().tilemap().mark_all_dirty();
+ machine().tilemap().mark_all_dirty();
m_last_bank = m_bank_base;
- screen.machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
+ machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
bitmap.fill(4095, cliprect);
/* This appears to be correct priority */
if (m_microcontroller_id == 0x8814) /* Sky Adventure */
{
- draw_sprites_V(screen.machine(), bitmap, cliprect, 0, 0x07c0, 0x0800, 0, 0x8000, 0x7fff);
- draw_sprites_V(screen.machine(), bitmap, cliprect, 1, 0x0000, 0x0800, 0, 0x8000, 0x7fff);
+ draw_sprites_V(machine(), bitmap, cliprect, 0, 0x07c0, 0x0800, 0, 0x8000, 0x7fff);
+ draw_sprites_V(machine(), bitmap, cliprect, 1, 0x0000, 0x0800, 0, 0x8000, 0x7fff);
//AT: *KLUDGE* fixes priest priority in level 1(could be a game bug)
if (spriteram[0x1bde] == 0x24 && (spriteram[0x1bdf] >> 8) == 0x3b)
{
- draw_sprites_V(screen.machine(), bitmap, cliprect, 2, 0x03c0, 0x0800, 0, 0x8000, 0x7fff);
- draw_sprites_V(screen.machine(), bitmap, cliprect, 2, 0x0000, 0x03c0, 0, 0x8000, 0x7fff);
+ draw_sprites_V(machine(), bitmap, cliprect, 2, 0x03c0, 0x0800, 0, 0x8000, 0x7fff);
+ draw_sprites_V(machine(), bitmap, cliprect, 2, 0x0000, 0x03c0, 0, 0x8000, 0x7fff);
}
else
- draw_sprites_V(screen.machine(), bitmap, cliprect, 2, 0x0000, 0x0800, 0, 0x8000, 0x7fff);
+ draw_sprites_V(machine(), bitmap, cliprect, 2, 0x0000, 0x0800, 0, 0x8000, 0x7fff);
- draw_sprites_V(screen.machine(), bitmap, cliprect, 0, 0x0000, 0x07c0, 0, 0x8000, 0x7fff);
+ draw_sprites_V(machine(), bitmap, cliprect, 0, 0x0000, 0x07c0, 0, 0x8000, 0x7fff);
}
else /* gangwars */
{
- draw_sprites_V(screen.machine(), bitmap, cliprect, 0, 0x07c0, 0x0800, 0x8000, 0, 0x7fff);
- draw_sprites_V(screen.machine(), bitmap, cliprect, 1, 0x0000, 0x0800, 0x8000, 0, 0x7fff);
- draw_sprites_V(screen.machine(), bitmap, cliprect, 2, 0x0000, 0x0800, 0x8000, 0, 0x7fff);
- draw_sprites_V(screen.machine(), bitmap, cliprect, 0, 0x0000, 0x07c0, 0x8000, 0, 0x7fff);
+ draw_sprites_V(machine(), bitmap, cliprect, 0, 0x07c0, 0x0800, 0x8000, 0, 0x7fff);
+ draw_sprites_V(machine(), bitmap, cliprect, 1, 0x0000, 0x0800, 0x8000, 0, 0x7fff);
+ draw_sprites_V(machine(), bitmap, cliprect, 2, 0x0000, 0x0800, 0x8000, 0, 0x7fff);
+ draw_sprites_V(machine(), bitmap, cliprect, 0, 0x0000, 0x07c0, 0x8000, 0, 0x7fff);
}
m_fix_tilemap->draw(bitmap, cliprect, 0, 0);
@@ -313,18 +313,18 @@ UINT32 alpha68k_state::screen_update_alpha68k_V_sb(screen_device &screen, bitmap
{
if (m_last_bank != m_bank_base)
- screen.machine().tilemap().mark_all_dirty();
+ machine().tilemap().mark_all_dirty();
m_last_bank = m_bank_base;
- screen.machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
+ machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
bitmap.fill(4095, cliprect);
/* This appears to be correct priority */
- draw_sprites_V(screen.machine(), bitmap, cliprect, 0, 0x07c0, 0x0800, 0x4000, 0x8000, 0x3fff);
- draw_sprites_V(screen.machine(), bitmap, cliprect, 1, 0x0000, 0x0800, 0x4000, 0x8000, 0x3fff);
- draw_sprites_V(screen.machine(), bitmap, cliprect, 2, 0x0000, 0x0800, 0x4000, 0x8000, 0x3fff);
- draw_sprites_V(screen.machine(), bitmap, cliprect, 0, 0x0000, 0x07c0, 0x4000, 0x8000, 0x3fff);
+ draw_sprites_V(machine(), bitmap, cliprect, 0, 0x07c0, 0x0800, 0x4000, 0x8000, 0x3fff);
+ draw_sprites_V(machine(), bitmap, cliprect, 1, 0x0000, 0x0800, 0x4000, 0x8000, 0x3fff);
+ draw_sprites_V(machine(), bitmap, cliprect, 2, 0x0000, 0x0800, 0x4000, 0x8000, 0x3fff);
+ draw_sprites_V(machine(), bitmap, cliprect, 0, 0x0000, 0x07c0, 0x4000, 0x8000, 0x3fff);
m_fix_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
@@ -364,12 +364,12 @@ UINT32 alpha68k_state::screen_update_alpha68k_I(screen_device &screen, bitmap_in
{
int yshift = (m_microcontroller_id == 0x890a) ? 1 : 0; // The Next Space is 1 pixel off
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
/* This appears to be correct priority */
- draw_sprites_I(screen.machine(), bitmap, cliprect, 2, 0x0800, yshift);
- draw_sprites_I(screen.machine(), bitmap, cliprect, 3, 0x0c00, yshift);
- draw_sprites_I(screen.machine(), bitmap, cliprect, 1, 0x0400, yshift);
+ draw_sprites_I(machine(), bitmap, cliprect, 2, 0x0800, yshift);
+ draw_sprites_I(machine(), bitmap, cliprect, 3, 0x0c00, yshift);
+ draw_sprites_I(machine(), bitmap, cliprect, 1, 0x0400, yshift);
return 0;
}
//ZT
@@ -496,12 +496,12 @@ static void kyros_draw_sprites( running_machine &machine, bitmap_ind16 &bitmap,
UINT32 alpha68k_state::screen_update_kyros(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- colortable_entry_set_value(screen.machine().colortable, 0x100, *m_videoram & 0xff);
+ colortable_entry_set_value(machine().colortable, 0x100, *m_videoram & 0xff);
bitmap.fill(0x100, cliprect); //AT
- kyros_draw_sprites(screen.machine(), bitmap, cliprect, 2, 0x0800);
- kyros_draw_sprites(screen.machine(), bitmap, cliprect, 3, 0x0c00);
- kyros_draw_sprites(screen.machine(), bitmap, cliprect, 1, 0x0400);
+ kyros_draw_sprites(machine(), bitmap, cliprect, 2, 0x0800);
+ kyros_draw_sprites(machine(), bitmap, cliprect, 3, 0x0c00);
+ kyros_draw_sprites(machine(), bitmap, cliprect, 1, 0x0400);
return 0;
}
@@ -555,11 +555,11 @@ static void sstingry_draw_sprites( running_machine &machine, bitmap_ind16 &bitma
UINT32 alpha68k_state::screen_update_sstingry(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- colortable_entry_set_value(screen.machine().colortable, 0x100, *m_videoram & 0xff);
+ colortable_entry_set_value(machine().colortable, 0x100, *m_videoram & 0xff);
bitmap.fill(0x100, cliprect); //AT
- sstingry_draw_sprites(screen.machine(), bitmap, cliprect, 2, 0x0800);
- sstingry_draw_sprites(screen.machine(), bitmap, cliprect, 3, 0x0c00);
- sstingry_draw_sprites(screen.machine(), bitmap, cliprect, 1, 0x0400);
+ sstingry_draw_sprites(machine(), bitmap, cliprect, 2, 0x0800);
+ sstingry_draw_sprites(machine(), bitmap, cliprect, 3, 0x0c00);
+ sstingry_draw_sprites(machine(), bitmap, cliprect, 1, 0x0400);
return 0;
}
diff --git a/src/mame/video/ambush.c b/src/mame/video/ambush.c
index 87d1f2df039..b939e25d032 100644
--- a/src/mame/video/ambush.c
+++ b/src/mame/video/ambush.c
@@ -95,7 +95,7 @@ UINT32 ambush_state::screen_update_ambush(screen_device &screen, bitmap_ind16 &b
bitmap.fill(0, cliprect);
/* Draw the characters */
- draw_chars(screen.machine(), bitmap, cliprect, 0x00);
+ draw_chars(machine(), bitmap, cliprect, 0x00);
/* Draw the sprites. */
for (offs = m_spriteram.bytes() - 4; offs >= 0; offs -= 4)
@@ -146,13 +146,13 @@ UINT32 ambush_state::screen_update_ambush(screen_device &screen, bitmap_ind16 &b
flipy = !flipy;
}
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[gfx],
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[gfx],
code, col | ((*m_colorbank & 0x03) << 4),
flipx, flipy,
sx,sy,0);
}
/* Draw the foreground priority characters over the sprites */
- draw_chars(screen.machine(), bitmap, cliprect, 0x10);
+ draw_chars(machine(), bitmap, cliprect, 0x10);
return 0;
}
diff --git a/src/mame/video/amiga.c b/src/mame/video/amiga.c
index 857b3b2f91b..95653dcc600 100644
--- a/src/mame/video/amiga.c
+++ b/src/mame/video/amiga.c
@@ -1005,7 +1005,7 @@ UINT32 amiga_state::screen_update_amiga(screen_device &screen, bitmap_ind16 &bit
/* render each scanline in the visible region */
for (y = cliprect.min_y; y <= cliprect.max_y; y++)
- amiga_render_scanline(screen.machine(), bitmap, y);
+ amiga_render_scanline(machine(), bitmap, y);
return 0;
}
diff --git a/src/mame/video/amigaaga.c b/src/mame/video/amigaaga.c
index 1859ea2d013..0de5c0492bb 100644
--- a/src/mame/video/amigaaga.c
+++ b/src/mame/video/amigaaga.c
@@ -865,7 +865,7 @@ UINT32 amiga_state::screen_update_amiga_aga(screen_device &screen, bitmap_rgb32
/* render each scanline in the visible region */
for (y = cliprect.min_y; y <= cliprect.max_y; y++)
- amiga_aga_render_scanline(screen.machine(), bitmap, y);
+ amiga_aga_render_scanline(machine(), bitmap, y);
return 0;
}
diff --git a/src/mame/video/amspdwy.c b/src/mame/video/amspdwy.c
index 9b277805b3d..7908ee09644 100644
--- a/src/mame/video/amspdwy.c
+++ b/src/mame/video/amspdwy.c
@@ -144,6 +144,6 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
UINT32 amspdwy_state::screen_update_amspdwy(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/video/angelkds.c b/src/mame/video/angelkds.c
index b039ae03a01..c98ea4b19be 100644
--- a/src/mame/video/angelkds.c
+++ b/src/mame/video/angelkds.c
@@ -271,7 +271,7 @@ UINT32 angelkds_state::screen_update_angelkds(screen_device &screen, bitmap_ind1
if ((m_layer_ctrl & 0x80) == 0x00)
m_bgtop_tilemap->draw(bitmap, clip, 0, 0);
- draw_sprites(screen.machine(), bitmap, clip, 0x80);
+ draw_sprites(machine(), bitmap, clip, 0x80);
if ((m_layer_ctrl & 0x20) == 0x00)
m_tx_tilemap->draw(bitmap, clip, 0, 0);
@@ -282,7 +282,7 @@ UINT32 angelkds_state::screen_update_angelkds(screen_device &screen, bitmap_ind1
if ((m_layer_ctrl & 0x40) == 0x00)
m_bgbot_tilemap->draw(bitmap, clip, 0, 0);
- draw_sprites(screen.machine(), bitmap, clip, 0x40);
+ draw_sprites(machine(), bitmap, clip, 0x40);
if ((m_layer_ctrl & 0x20) == 0x00)
m_tx_tilemap->draw(bitmap, clip, 0, 0);
diff --git a/src/mame/video/appoooh.c b/src/mame/video/appoooh.c
index 3b60db24e3d..43d78ad00f6 100644
--- a/src/mame/video/appoooh.c
+++ b/src/mame/video/appoooh.c
@@ -276,16 +276,16 @@ UINT32 appoooh_state::screen_update_appoooh(screen_device &screen, bitmap_ind16
if (m_priority == 1)
{
/* sprite set #1 */
- appoooh_draw_sprites(bitmap, cliprect, screen.machine().gfx[2], m_spriteram);
+ appoooh_draw_sprites(bitmap, cliprect, machine().gfx[2], m_spriteram);
/* sprite set #2 */
- appoooh_draw_sprites(bitmap, cliprect, screen.machine().gfx[3], m_spriteram_2);
+ appoooh_draw_sprites(bitmap, cliprect, machine().gfx[3], m_spriteram_2);
}
else
{
/* sprite set #2 */
- appoooh_draw_sprites(bitmap, cliprect, screen.machine().gfx[3], m_spriteram_2);
+ appoooh_draw_sprites(bitmap, cliprect, machine().gfx[3], m_spriteram_2);
/* sprite set #1 */
- appoooh_draw_sprites(bitmap, cliprect, screen.machine().gfx[2], m_spriteram);
+ appoooh_draw_sprites(bitmap, cliprect, machine().gfx[2], m_spriteram);
}
if (m_priority != 0) /* fg in front of sprites */
@@ -305,16 +305,16 @@ UINT32 appoooh_state::screen_update_robowres(screen_device &screen, bitmap_ind16
if (m_priority == 1)
{
/* sprite set #1 */
- robowres_draw_sprites(bitmap, cliprect, screen.machine().gfx[2], m_spriteram);
+ robowres_draw_sprites(bitmap, cliprect, machine().gfx[2], m_spriteram);
/* sprite set #2 */
- robowres_draw_sprites(bitmap, cliprect, screen.machine().gfx[3], m_spriteram_2);
+ robowres_draw_sprites(bitmap, cliprect, machine().gfx[3], m_spriteram_2);
}
else
{
/* sprite set #2 */
- robowres_draw_sprites(bitmap, cliprect, screen.machine().gfx[3], m_spriteram_2);
+ robowres_draw_sprites(bitmap, cliprect, machine().gfx[3], m_spriteram_2);
/* sprite set #1 */
- robowres_draw_sprites(bitmap, cliprect, screen.machine().gfx[2], m_spriteram);
+ robowres_draw_sprites(bitmap, cliprect, machine().gfx[2], m_spriteram);
}
if (m_priority != 0) /* fg in front of sprites */
diff --git a/src/mame/video/aquarium.c b/src/mame/video/aquarium.c
index 37ccce63ddf..5b16a1a2373 100644
--- a/src/mame/video/aquarium.c
+++ b/src/mame/video/aquarium.c
@@ -163,7 +163,7 @@ UINT32 aquarium_state::screen_update_aquarium(screen_device &screen, bitmap_ind1
m_bak_tilemap->draw(bitmap, cliprect, 0, 0);
m_mid_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 16);
+ draw_sprites(machine(), bitmap, cliprect, 16);
m_bak_tilemap->draw(bitmap, cliprect, 1, 0);
m_mid_tilemap->draw(bitmap, cliprect, 1, 0);
diff --git a/src/mame/video/arabian.c b/src/mame/video/arabian.c
index 4d4358c9c87..5d8254a21c6 100644
--- a/src/mame/video/arabian.c
+++ b/src/mame/video/arabian.c
@@ -367,7 +367,7 @@ WRITE8_MEMBER(arabian_state::arabian_videoram_w)
UINT32 arabian_state::screen_update_arabian(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- const pen_t *pens = &screen.machine().pens[(m_video_control >> 3) << 8];
+ const pen_t *pens = &machine().pens[(m_video_control >> 3) << 8];
int y;
/* render the screen from the bitmap */
diff --git a/src/mame/video/arcadecl.c b/src/mame/video/arcadecl.c
index 26144fea7eb..a34c0699ec4 100644
--- a/src/mame/video/arcadecl.c
+++ b/src/mame/video/arcadecl.c
@@ -81,7 +81,7 @@ UINT32 arcadecl_state::screen_update_arcadecl(screen_device &screen, bitmap_ind1
{
/* draw the playfield */
- arcadecl_bitmap_render(screen.machine(), bitmap, cliprect);
+ arcadecl_bitmap_render(machine(), bitmap, cliprect);
/* draw and merge the MO */
if (m_has_mo)
diff --git a/src/mame/video/argus.c b/src/mame/video/argus.c
index bacd62d3115..08e6c9f7270 100644
--- a/src/mame/video/argus.c
+++ b/src/mame/video/argus.c
@@ -1156,45 +1156,45 @@ static void butasan_log_vram(running_machine &machine)
UINT32 argus_state::screen_update_argus(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- bg_setting(screen.machine());
+ bg_setting(machine());
/* scroll BG0 and render tile at proper position */
- argus_bg0_scroll_handle(screen.machine());
+ argus_bg0_scroll_handle(machine());
m_bg0_tilemap->draw(bitmap, cliprect, 0, 0);
- argus_draw_sprites(screen.machine(), bitmap, cliprect, 0);
+ argus_draw_sprites(machine(), bitmap, cliprect, 0);
if (m_bg_status & 1) /* Backgound enable */
m_bg1_tilemap->draw(bitmap, cliprect, 0, 0);
- argus_draw_sprites(screen.machine(), bitmap, cliprect, 1);
+ argus_draw_sprites(machine(), bitmap, cliprect, 1);
m_tx_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
}
UINT32 argus_state::screen_update_valtric(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- bg_setting(screen.machine());
+ bg_setting(machine());
if (m_bg_status & 1) /* Backgound enable */
valtric_draw_mosaic(screen, bitmap, cliprect);
else
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
- valtric_draw_sprites(screen.machine(), bitmap, cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
+ valtric_draw_sprites(machine(), bitmap, cliprect);
m_tx_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
}
UINT32 argus_state::screen_update_butasan(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- bg_setting(screen.machine());
+ bg_setting(machine());
if (m_bg_status & 1) /* Backgound enable */
m_bg0_tilemap->draw(bitmap, cliprect, 0, 0);
else
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
if (m_butasan_bg1_status & 1) m_bg1_tilemap->draw(bitmap, cliprect, 0, 0);
- butasan_draw_sprites(screen.machine(), bitmap, cliprect);
+ butasan_draw_sprites(machine(), bitmap, cliprect);
m_tx_tilemap->draw(bitmap, cliprect, 0, 0);
- butasan_log_vram(screen.machine());
+ butasan_log_vram(machine());
return 0;
}
diff --git a/src/mame/video/arkanoid.c b/src/mame/video/arkanoid.c
index 0c46b02a231..2dd79f9bb2c 100644
--- a/src/mame/video/arkanoid.c
+++ b/src/mame/video/arkanoid.c
@@ -200,7 +200,7 @@ UINT32 arkanoid_state::screen_update_arkanoid(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/video/armedf.c b/src/mame/video/armedf.c
index 29994708bc3..b7637c26ed8 100644
--- a/src/mame/video/armedf.c
+++ b/src/mame/video/armedf.c
@@ -398,15 +398,15 @@ UINT32 armedf_state::screen_update_armedf(screen_device &screen, bitmap_ind16 &b
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
if (sprite_enable)
- draw_sprites(screen.machine(), bitmap, cliprect, 2);
+ draw_sprites(machine(), bitmap, cliprect, 2);
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
if (sprite_enable)
- draw_sprites(screen.machine(), bitmap, cliprect, 1);
+ draw_sprites(machine(), bitmap, cliprect, 1);
if (sprite_enable)
- draw_sprites(screen.machine(), bitmap, cliprect, 0);
+ draw_sprites(machine(), bitmap, cliprect, 0);
m_tx_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_CATEGORY(0), 0);
diff --git a/src/mame/video/asterix.c b/src/mame/video/asterix.c
index 509e439901f..3150ca8b912 100644
--- a/src/mame/video/asterix.c
+++ b/src/mame/video/asterix.c
@@ -94,7 +94,7 @@ UINT32 asterix_state::screen_update_asterix(screen_device &screen, bitmap_ind16
konami_sortlayers3(layer, m_layerpri);
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
bitmap.fill(0, cliprect);
k056832_tilemap_draw(m_k056832, bitmap, cliprect, layer[0], K056832_DRAW_FLAG_MIRROR, 1);
diff --git a/src/mame/video/asuka.c b/src/mame/video/asuka.c
index 9aea933c539..d8c9ef621ac 100644
--- a/src/mame/video/asuka.c
+++ b/src/mame/video/asuka.c
@@ -28,7 +28,7 @@ UINT32 asuka_state::screen_update_asuka(screen_device &screen, bitmap_ind16 &bit
layer[1] = layer[0] ^ 1;
layer[2] = 2;
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
/* Ensure screen blanked even when bottom layer not drawn due to disable bit */
bitmap.fill(0, cliprect);
@@ -53,7 +53,7 @@ UINT32 asuka_state::screen_update_bonzeadv(screen_device &screen, bitmap_ind16 &
layer[1] = layer[0] ^ 1;
layer[2] = 2;
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
/* Ensure screen blanked even when bottom layer not drawn due to disable bit */
bitmap.fill(0, cliprect);
diff --git a/src/mame/video/atarifb.c b/src/mame/video/atarifb.c
index 6857ca8d35f..53483155a9d 100644
--- a/src/mame/video/atarifb.c
+++ b/src/mame/video/atarifb.c
@@ -175,9 +175,9 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
UINT32 atarifb_state::screen_update_atarifb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- draw_playfield_and_alpha(screen.machine(), bitmap, cliprect, 0, 0);
+ draw_playfield_and_alpha(machine(), bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 1, 0);
+ draw_sprites(machine(), bitmap, cliprect, 1, 0);
return 0;
}
@@ -185,9 +185,9 @@ UINT32 atarifb_state::screen_update_atarifb(screen_device &screen, bitmap_ind16
UINT32 atarifb_state::screen_update_abaseb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- draw_playfield_and_alpha(screen.machine(), bitmap, cliprect, -8, 0);
+ draw_playfield_and_alpha(machine(), bitmap, cliprect, -8, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 1, 0);
+ draw_sprites(machine(), bitmap, cliprect, 1, 0);
return 0;
}
@@ -195,9 +195,9 @@ UINT32 atarifb_state::screen_update_abaseb(screen_device &screen, bitmap_ind16 &
UINT32 atarifb_state::screen_update_soccer(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- draw_playfield_and_alpha(screen.machine(), bitmap, cliprect, 0, 8);
+ draw_playfield_and_alpha(machine(), bitmap, cliprect, 0, 8);
- draw_sprites(screen.machine(), bitmap, cliprect, 2, 1);
+ draw_sprites(machine(), bitmap, cliprect, 2, 1);
return 0;
}
diff --git a/src/mame/video/atarig42.c b/src/mame/video/atarig42.c
index 3de6b9c414e..d52501cf6b0 100644
--- a/src/mame/video/atarig42.c
+++ b/src/mame/video/atarig42.c
@@ -179,7 +179,7 @@ void atarig42_scanline_update(screen_device &screen, int scanline)
UINT32 atarig42_state::screen_update_atarig42(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- bitmap_ind8 &priority_bitmap = screen.machine().priority_bitmap;
+ bitmap_ind8 &priority_bitmap = machine().priority_bitmap;
/* draw the playfield */
priority_bitmap.fill(0, cliprect);
diff --git a/src/mame/video/atarigx2.c b/src/mame/video/atarigx2.c
index a93395c487e..05d899df770 100644
--- a/src/mame/video/atarigx2.c
+++ b/src/mame/video/atarigx2.c
@@ -177,7 +177,7 @@ void atarigx2_scanline_update(screen_device &screen, int scanline)
UINT32 atarigx2_state::screen_update_atarigx2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- bitmap_ind8 &priority_bitmap = screen.machine().priority_bitmap;
+ bitmap_ind8 &priority_bitmap = machine().priority_bitmap;
/* draw the playfield */
priority_bitmap.fill(0, cliprect);
diff --git a/src/mame/video/atarisy2.c b/src/mame/video/atarisy2.c
index 5ff4dc2548e..28378dbb1f9 100644
--- a/src/mame/video/atarisy2.c
+++ b/src/mame/video/atarisy2.c
@@ -318,7 +318,7 @@ WRITE16_HANDLER( atarisy2_videoram_w )
UINT32 atarisy2_state::screen_update_atarisy2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- bitmap_ind8 &priority_bitmap = screen.machine().priority_bitmap;
+ bitmap_ind8 &priority_bitmap = machine().priority_bitmap;
atarimo_rect_list rectlist;
bitmap_ind16 *mobitmap;
int x, y, r;
diff --git a/src/mame/video/bagman.c b/src/mame/video/bagman.c
index aa85f13b1a3..7e35339655c 100644
--- a/src/mame/video/bagman.c
+++ b/src/mame/video/bagman.c
@@ -149,6 +149,6 @@ UINT32 bagman_state::screen_update_bagman(screen_device &screen, bitmap_ind16 &b
return 0;
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/video/balsente.c b/src/mame/video/balsente.c
index bcab7b6db36..4893dc74509 100644
--- a/src/mame/video/balsente.c
+++ b/src/mame/video/balsente.c
@@ -208,7 +208,7 @@ static void draw_one_sprite(running_machine &machine, bitmap_ind16 &bitmap, cons
UINT32 balsente_state::screen_update_balsente(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- const pen_t *pens = &screen.machine().pens[m_palettebank_vis * 256];
+ const pen_t *pens = &machine().pens[m_palettebank_vis * 256];
int y, i;
/* draw scanlines from the VRAM directly */
@@ -217,7 +217,7 @@ UINT32 balsente_state::screen_update_balsente(screen_device &screen, bitmap_ind1
/* draw the sprite images */
for (i = 0; i < 40; i++)
- draw_one_sprite(screen.machine(), bitmap, cliprect, &m_spriteram[(0xe0 + i * 4) & 0xff]);
+ draw_one_sprite(machine(), bitmap, cliprect, &m_spriteram[(0xe0 + i * 4) & 0xff]);
return 0;
}
diff --git a/src/mame/video/baraduke.c b/src/mame/video/baraduke.c
index 59ff6f9c3f4..4f057ddff74 100644
--- a/src/mame/video/baraduke.c
+++ b/src/mame/video/baraduke.c
@@ -311,9 +311,9 @@ UINT32 baraduke_state::screen_update_baraduke(screen_device &screen, bitmap_ind1
/* flip screen is embedded in the sprite control registers */
/* can't use flip_screen_set() because the visible area is asymmetrical */
flip_screen_set_no_update(spriteram[0x07f6] & 0x01);
- screen.machine().tilemap().set_flip_all(flip_screen() ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0);
- set_scroll(screen.machine(), 0);
- set_scroll(screen.machine(), 1);
+ machine().tilemap().set_flip_all(flip_screen() ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0);
+ set_scroll(machine(), 0);
+ set_scroll(machine(), 1);
if (((m_xscroll[0] & 0x0e00) >> 9) == 6)
back = 1;
@@ -321,9 +321,9 @@ UINT32 baraduke_state::screen_update_baraduke(screen_device &screen, bitmap_ind1
back = 0;
m_bg_tilemap[back]->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE,0);
- draw_sprites(screen.machine(), bitmap,cliprect,0);
+ draw_sprites(machine(), bitmap,cliprect,0);
m_bg_tilemap[back ^ 1]->draw(bitmap, cliprect, 0,0);
- draw_sprites(screen.machine(), bitmap,cliprect,1);
+ draw_sprites(machine(), bitmap,cliprect,1);
m_tx_tilemap->draw(bitmap, cliprect, 0,0);
return 0;
diff --git a/src/mame/video/batman.c b/src/mame/video/batman.c
index 4cc58d781fe..389e5baca1b 100644
--- a/src/mame/video/batman.c
+++ b/src/mame/video/batman.c
@@ -192,7 +192,7 @@ void batman_scanline_update(screen_device &screen, int scanline)
UINT32 batman_state::screen_update_batman(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- bitmap_ind8 &priority_bitmap = screen.machine().priority_bitmap;
+ bitmap_ind8 &priority_bitmap = machine().priority_bitmap;
atarimo_rect_list rectlist;
bitmap_ind16 *mobitmap;
int x, y, r;
diff --git a/src/mame/video/battlane.c b/src/mame/video/battlane.c
index cabd3d96a84..e1647b7ee28 100644
--- a/src/mame/video/battlane.c
+++ b/src/mame/video/battlane.c
@@ -231,7 +231,7 @@ UINT32 battlane_state::screen_update_battlane(screen_device &screen, bitmap_ind1
m_bg_tilemap->mark_all_dirty(); // HACK
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect);
- draw_fg_bitmap(screen.machine(), bitmap);
+ draw_sprites(machine(), bitmap, cliprect);
+ draw_fg_bitmap(machine(), bitmap);
return 0;
}
diff --git a/src/mame/video/battlera.c b/src/mame/video/battlera.c
index 51f79a854ae..d80712ef409 100644
--- a/src/mame/video/battlera.c
+++ b/src/mame/video/battlera.c
@@ -304,9 +304,9 @@ UINT32 battlera_state::screen_update_battlera(screen_device &screen, bitmap_ind1
int offs,code,scrollx,scrolly,mx,my;
/* if any tiles changed, redraw the VRAM */
- if (screen.machine().gfx[0]->dirtyseq() != m_tile_dirtyseq)
+ if (machine().gfx[0]->dirtyseq() != m_tile_dirtyseq)
{
- m_tile_dirtyseq = screen.machine().gfx[0]->dirtyseq();
+ m_tile_dirtyseq = machine().gfx[0]->dirtyseq();
memset(m_vram_dirty, 1, 0x1000);
}
@@ -321,17 +321,17 @@ UINT32 battlera_state::screen_update_battlera(screen_device &screen, bitmap_ind1
/* If this tile was changed OR tilemap was changed, redraw */
if (m_vram_dirty[offs/2]) {
m_vram_dirty[offs/2]=0;
- drawgfx_opaque(*m_tile_bitmap,m_tile_bitmap->cliprect(),screen.machine().gfx[0],
+ drawgfx_opaque(*m_tile_bitmap,m_tile_bitmap->cliprect(),machine().gfx[0],
code,
m_HuC6270_vram[offs] >> 4,
0,0,
8*mx,8*my);
- drawgfx_opaque(*m_front_bitmap,m_tile_bitmap->cliprect(),screen.machine().gfx[2],
+ drawgfx_opaque(*m_front_bitmap,m_tile_bitmap->cliprect(),machine().gfx[2],
0,
0, /* fill the spot with pen 256 */
0,0,
8*mx,8*my);
- drawgfx_transmask(*m_front_bitmap,m_tile_bitmap->cliprect(),screen.machine().gfx[0],
+ drawgfx_transmask(*m_front_bitmap,m_tile_bitmap->cliprect(),machine().gfx[0],
code,
m_HuC6270_vram[offs] >> 4,
0,0,
@@ -348,13 +348,13 @@ UINT32 battlera_state::screen_update_battlera(screen_device &screen, bitmap_ind1
/* Todo: Background enable (not used anyway) */
/* Render low priority sprites, if enabled */
- if (m_sb_enable) draw_sprites(screen.machine(),bitmap,cliprect,0);
+ if (m_sb_enable) draw_sprites(machine(),bitmap,cliprect,0);
/* Render background over sprites */
copyscrollbitmap_trans(bitmap,*m_front_bitmap,1,&scrollx,1,&scrolly,cliprect,256);
/* Render high priority sprites, if enabled */
- if (m_sb_enable) draw_sprites(screen.machine(),bitmap,cliprect,1);
+ if (m_sb_enable) draw_sprites(machine(),bitmap,cliprect,1);
return 0;
}
diff --git a/src/mame/video/battlex.c b/src/mame/video/battlex.c
index 85537cc9317..b232e10b3ac 100644
--- a/src/mame/video/battlex.c
+++ b/src/mame/video/battlex.c
@@ -94,7 +94,7 @@ UINT32 battlex_state::screen_update_battlex(screen_device &screen, bitmap_ind16
m_bg_tilemap->set_scrollx(0, m_scroll_lsb | (m_scroll_msb << 8));
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/video/battlnts.c b/src/mame/video/battlnts.c
index 411f4252ed5..d46a54e33a7 100644
--- a/src/mame/video/battlnts.c
+++ b/src/mame/video/battlnts.c
@@ -48,7 +48,7 @@ UINT32 battlnts_state::screen_update_battlnts(screen_device &screen, bitmap_ind1
k007342_tilemap_update(m_k007342);
k007342_tilemap_draw(m_k007342, bitmap, cliprect, 0, TILEMAP_DRAW_OPAQUE ,0);
- k007420_sprites_draw(m_k007420, bitmap, cliprect, screen.machine().gfx[1]);
+ k007420_sprites_draw(m_k007420, bitmap, cliprect, machine().gfx[1]);
k007342_tilemap_draw(m_k007342, bitmap, cliprect, 0, 1 | TILEMAP_DRAW_OPAQUE ,0);
return 0;
}
diff --git a/src/mame/video/bbusters.c b/src/mame/video/bbusters.c
index 8e60dc2d64b..0025c07e372 100644
--- a/src/mame/video/bbusters.c
+++ b/src/mame/video/bbusters.c
@@ -280,10 +280,10 @@ UINT32 bbusters_state::screen_update_bbuster(screen_device &screen, bitmap_ind16
m_pf2_tilemap->set_scrolly(0, m_pf2_scroll_data[1]);
m_pf2_tilemap->draw(bitmap, cliprect, 0, 0);
- //draw_sprites(screen.machine(), bitmap, m_spriteram2->buffer(), 2, 0x8, 0x8);
+ //draw_sprites(machine(), bitmap, m_spriteram2->buffer(), 2, 0x8, 0x8);
m_pf1_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, m_spriteram2->buffer(), 2, 0, 0);
- draw_sprites(screen.machine(), bitmap, m_spriteram->buffer(), 1, 0, 0);
+ draw_sprites(machine(), bitmap, m_spriteram2->buffer(), 2, 0, 0);
+ draw_sprites(machine(), bitmap, m_spriteram->buffer(), 1, 0, 0);
m_fix_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
}
@@ -298,7 +298,7 @@ UINT32 bbusters_state::screen_update_mechatt(screen_device &screen, bitmap_ind16
m_pf2_tilemap->draw(bitmap, cliprect, 0, 0);
m_pf1_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, m_spriteram->buffer(), 1, 0, 0);
+ draw_sprites(machine(), bitmap, m_spriteram->buffer(), 1, 0, 0);
m_fix_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
}
diff --git a/src/mame/video/bigevglf.c b/src/mame/video/bigevglf.c
index d02c2a09ab1..5ca28840bba 100644
--- a/src/mame/video/bigevglf.c
+++ b/src/mame/video/bigevglf.c
@@ -89,6 +89,6 @@ UINT32 bigevglf_state::screen_update_bigevglf(screen_device &screen, bitmap_ind1
{
copybitmap(bitmap, m_tmp_bitmap[m_plane_visible], 0, 0, 0, 0, cliprect);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/video/bigstrkb.c b/src/mame/video/bigstrkb.c
index 170ebd92276..b04f6967967 100644
--- a/src/mame/video/bigstrkb.c
+++ b/src/mame/video/bigstrkb.c
@@ -124,7 +124,7 @@ void bigstrkb_state::video_start()
UINT32 bigstrkb_state::screen_update_bigstrkb(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_tilemap2->set_scrollx(0, m_vidreg1[0]+(256-14));
m_tilemap2->set_scrolly(0, m_vidreg2[0]);
@@ -135,7 +135,7 @@ UINT32 bigstrkb_state::screen_update_bigstrkb(screen_device &screen, bitmap_ind1
m_tilemap2->draw(bitmap, cliprect, 0,0);
m_tilemap3->draw(bitmap, cliprect, 0,0);
- draw_sprites(screen.machine(),bitmap,cliprect);
+ draw_sprites(machine(),bitmap,cliprect);
m_tilemap->draw(bitmap, cliprect, 0,0);
// popmessage ("Regs %08x %08x %08x %08x",bsb_vidreg2[0],bsb_vidreg2[1],bsb_vidreg2[2],bsb_vidreg2[3]);
diff --git a/src/mame/video/bionicc.c b/src/mame/video/bionicc.c
index eec1eeb212f..3508043c8ea 100644
--- a/src/mame/video/bionicc.c
+++ b/src/mame/video/bionicc.c
@@ -239,11 +239,11 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
UINT32 bionicc_state::screen_update_bionicc(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_fg_tilemap->draw(bitmap, cliprect, 1 | TILEMAP_DRAW_LAYER1, 0); /* nothing in FRONT */
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
m_fg_tilemap->draw(bitmap, cliprect, 0 | TILEMAP_DRAW_LAYER1, 0);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
m_fg_tilemap->draw(bitmap, cliprect, 0 | TILEMAP_DRAW_LAYER0, 0);
m_tx_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
diff --git a/src/mame/video/bishi.c b/src/mame/video/bishi.c
index 373d87283d0..f34f174855e 100644
--- a/src/mame/video/bishi.c
+++ b/src/mame/video/bishi.c
@@ -61,7 +61,7 @@ UINT32 bishi_state::screen_update_bishi(screen_device &screen, bitmap_rgb32 &bit
konami_sortlayers4(layers, layerpri);
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
for (i = 0; i < 4; i++)
{
diff --git a/src/mame/video/bking.c b/src/mame/video/bking.c
index bfea0f1d0e1..0b6a140f98d 100644
--- a/src/mame/video/bking.c
+++ b/src/mame/video/bking.c
@@ -239,20 +239,20 @@ UINT32 bking_state::screen_update_bking(screen_device &screen, bitmap_ind16 &bit
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
/* draw the balls */
- drawgfx_transpen(bitmap, cliprect, screen.machine().gfx[2],
+ drawgfx_transpen(bitmap, cliprect, machine().gfx[2],
m_ball1_pic,
m_palette_bank,
0, 0,
m_xld1, m_yld1, 0);
- drawgfx_transpen(bitmap, cliprect, screen.machine().gfx[3],
+ drawgfx_transpen(bitmap, cliprect, machine().gfx[3],
m_ball2_pic,
m_palette_bank,
0, 0,
m_xld2, m_yld2, 0);
/* draw the crow */
- drawgfx_transpen(bitmap, cliprect, screen.machine().gfx[1],
+ drawgfx_transpen(bitmap, cliprect, machine().gfx[1],
m_crow_pic,
m_palette_bank,
m_crow_flip, m_crow_flip,
@@ -278,7 +278,7 @@ void bking_state::screen_eof_bking(screen_device &screen, bool state)
xld = m_xld1;
yld = m_yld1;
- drawgfx_opaque(m_tmp_bitmap2, rect, screen.machine().gfx[2],
+ drawgfx_opaque(m_tmp_bitmap2, rect, machine().gfx[2],
m_ball1_pic,
0,
0, 0,
@@ -292,7 +292,7 @@ void bking_state::screen_eof_bking(screen_device &screen, bool state)
xld = m_xld2;
yld = m_yld2;
- drawgfx_opaque(m_tmp_bitmap2, rect, screen.machine().gfx[3],
+ drawgfx_opaque(m_tmp_bitmap2, rect, machine().gfx[3],
m_ball2_pic,
0,
0, 0,
@@ -311,7 +311,7 @@ void bking_state::screen_eof_bking(screen_device &screen, bool state)
if (latch != 0)
{
- const UINT8* MASK = screen.machine().root_device().memregion("user1")->base() + 8 * m_hit;
+ const UINT8* MASK = machine().root_device().memregion("user1")->base() + 8 * m_hit;
int x;
int y;
diff --git a/src/mame/video/bladestl.c b/src/mame/video/bladestl.c
index 2bd9c0b4bf1..3fad4974168 100644
--- a/src/mame/video/bladestl.c
+++ b/src/mame/video/bladestl.c
@@ -79,12 +79,12 @@ void bladestl_sprite_callback( running_machine &machine, int *code,int *color )
UINT32 bladestl_state::screen_update_bladestl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- set_pens(screen.machine());
+ set_pens(machine());
k007342_tilemap_update(m_k007342);
k007342_tilemap_draw(m_k007342, bitmap, cliprect, 1, TILEMAP_DRAW_OPAQUE ,0);
- k007420_sprites_draw(m_k007420, bitmap, cliprect, screen.machine().gfx[1]);
+ k007420_sprites_draw(m_k007420, bitmap, cliprect, machine().gfx[1]);
k007342_tilemap_draw(m_k007342, bitmap, cliprect, 1, 1 | TILEMAP_DRAW_OPAQUE ,0);
k007342_tilemap_draw(m_k007342, bitmap, cliprect, 0, 0 ,0);
k007342_tilemap_draw(m_k007342, bitmap, cliprect, 0, 1 ,0);
diff --git a/src/mame/video/blktiger.c b/src/mame/video/blktiger.c
index 570e8e1e472..288e0b61632 100644
--- a/src/mame/video/blktiger.c
+++ b/src/mame/video/blktiger.c
@@ -227,7 +227,7 @@ UINT32 blktiger_state::screen_update_blktiger(screen_device &screen, bitmap_ind1
(m_screen_layout ? m_bg_tilemap8x4 : m_bg_tilemap4x8)->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0);
if (m_objon)
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
if (m_bgon)
(m_screen_layout ? m_bg_tilemap8x4 : m_bg_tilemap4x8)->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0);
diff --git a/src/mame/video/blmbycar.c b/src/mame/video/blmbycar.c
index 19df36d0af1..b9021320049 100644
--- a/src/mame/video/blmbycar.c
+++ b/src/mame/video/blmbycar.c
@@ -224,19 +224,19 @@ UINT32 blmbycar_state::screen_update_blmbycar(screen_device &screen, bitmap_ind1
m_tilemap_1->set_scrollx(0, m_scroll_1[1] + 5);
#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_A)) 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_A)) msk |= 8;
if (msk != 0) layers_ctrl &= msk;
}
#endif
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
if (layers_ctrl & 1)
for (i = 0; i <= 1; i++)
@@ -249,7 +249,7 @@ if (screen.machine().input().code_pressed(KEYCODE_Z))
m_tilemap_1->draw(bitmap, cliprect, i, i);
if (layers_ctrl & 8)
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/video/blockhl.c b/src/mame/video/blockhl.c
index 6fbdec805c5..5b702283610 100644
--- a/src/mame/video/blockhl.c
+++ b/src/mame/video/blockhl.c
@@ -55,7 +55,7 @@ void blockhl_state::video_start()
UINT32 blockhl_state::screen_update_blockhl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
k052109_tilemap_update(m_k052109);
diff --git a/src/mame/video/bloodbro.c b/src/mame/video/bloodbro.c
index d33535f94bd..a9050678775 100644
--- a/src/mame/video/bloodbro.c
+++ b/src/mame/video/bloodbro.c
@@ -232,11 +232,11 @@ UINT32 bloodbro_state::screen_update_bloodbro(screen_device &screen, bitmap_ind1
m_fg_tilemap->set_scrollx(0,m_scroll[0x12]);
m_fg_tilemap->set_scrolly(0,m_scroll[0x13]);
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
m_bg_tilemap->draw(bitmap, cliprect, 0,0);
m_fg_tilemap->draw(bitmap, cliprect, 0,1);
- bloodbro_draw_sprites(screen.machine(),bitmap,cliprect);
+ bloodbro_draw_sprites(machine(),bitmap,cliprect);
m_tx_tilemap->draw(bitmap, cliprect, 0,0);
return 0;
}
@@ -248,11 +248,11 @@ UINT32 bloodbro_state::screen_update_weststry(screen_device &screen, bitmap_ind1
// m_fg_tilemap->set_scrollx(0,m_scroll[0x12]);
// m_fg_tilemap->set_scrolly(0,m_scroll[0x13]);
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
m_bg_tilemap->draw(bitmap, cliprect, 0,0);
m_fg_tilemap->draw(bitmap, cliprect, 0,1);
- weststry_draw_sprites(screen.machine(),bitmap,cliprect);
+ weststry_draw_sprites(machine(),bitmap,cliprect);
m_tx_tilemap->draw(bitmap, cliprect, 0,0);
return 0;
}
@@ -265,11 +265,11 @@ UINT32 bloodbro_state::screen_update_skysmash(screen_device &screen, bitmap_ind1
m_fg_tilemap->set_scrollx(0,m_scroll[0x0a]);
m_fg_tilemap->set_scrolly(0,m_scroll[0x0b]); /* ? */
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
m_bg_tilemap->draw(bitmap, cliprect, 0,0);
m_fg_tilemap->draw(bitmap, cliprect, 0,1);
- bloodbro_draw_sprites(screen.machine(),bitmap,cliprect);
+ bloodbro_draw_sprites(machine(),bitmap,cliprect);
m_tx_tilemap->draw(bitmap, cliprect, 0,0);
return 0;
}
diff --git a/src/mame/video/blueprnt.c b/src/mame/video/blueprnt.c
index 955be0ec665..00d3d7f5575 100644
--- a/src/mame/video/blueprnt.c
+++ b/src/mame/video/blueprnt.c
@@ -130,9 +130,9 @@ UINT32 blueprnt_state::screen_update_blueprnt(screen_device &screen, bitmap_ind1
for (i = 0; i < 32; i++)
m_bg_tilemap->set_scrolly(i, m_scrollram[30 - i]);
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
m_bg_tilemap->draw(bitmap, cliprect, 1, 0);
return 0;
}
diff --git a/src/mame/video/bogeyman.c b/src/mame/video/bogeyman.c
index 2f10f85648a..59870e09d3c 100644
--- a/src/mame/video/bogeyman.c
+++ b/src/mame/video/bogeyman.c
@@ -149,7 +149,7 @@ UINT32 bogeyman_state::screen_update_bogeyman(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/video/bombjack.c b/src/mame/video/bombjack.c
index 94e264be567..965389dd53b 100644
--- a/src/mame/video/bombjack.c
+++ b/src/mame/video/bombjack.c
@@ -131,6 +131,6 @@ UINT32 bombjack_state::screen_update_bombjack(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);
return 0;
}
diff --git a/src/mame/video/boogwing.c b/src/mame/video/boogwing.c
index cb1e5144f64..6562fb3a81b 100644
--- a/src/mame/video/boogwing.c
+++ b/src/mame/video/boogwing.c
@@ -180,21 +180,21 @@ static void mix_boogwing(running_machine &machine, bitmap_rgb32 &bitmap, const r
UINT32 boogwing_state::screen_update_boogwing(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);
UINT16 priority = decocomn_priority_r(m_decocomn, space, 0, 0xffff);
/* Draw sprite planes to bitmaps for later mixing */
- screen.machine().device<decospr_device>("spritegen2")->draw_sprites(bitmap, cliprect, m_spriteram2->buffer(), 0x400, true);
- screen.machine().device<decospr_device>("spritegen1")->draw_sprites(bitmap, cliprect, m_spriteram->buffer(), 0x400, true);
+ machine().device<decospr_device>("spritegen2")->draw_sprites(bitmap, cliprect, m_spriteram2->buffer(), 0x400, true);
+ machine().device<decospr_device>("spritegen1")->draw_sprites(bitmap, cliprect, m_spriteram->buffer(), 0x400, true);
flip_screen_set(BIT(flip, 7));
deco16ic_pf_update(m_deco_tilegen1, m_pf1_rowscroll, m_pf2_rowscroll);
deco16ic_pf_update(m_deco_tilegen2, m_pf3_rowscroll, m_pf4_rowscroll);
/* Draw playfields */
- bitmap.fill(screen.machine().pens[0x400], cliprect); /* pen not confirmed */
- screen.machine().priority_bitmap.fill(0);
+ bitmap.fill(machine().pens[0x400], cliprect); /* pen not confirmed */
+ machine().priority_bitmap.fill(0);
// bit&0x8 is definitely some kind of palette effect
// bit&0x4 combines playfields
@@ -225,7 +225,7 @@ UINT32 boogwing_state::screen_update_boogwing(screen_device &screen, bitmap_rgb3
deco16ic_tilemap_2_draw(m_deco_tilegen1, bitmap, cliprect, 0, 32);
}
- mix_boogwing(screen.machine(), bitmap,cliprect);
+ mix_boogwing(machine(), bitmap,cliprect);
deco16ic_tilemap_1_draw(m_deco_tilegen1, bitmap, cliprect, 0, 0);
return 0;
diff --git a/src/mame/video/bosco.c b/src/mame/video/bosco.c
index 7ef97037085..e8dc9b0dedd 100644
--- a/src/mame/video/bosco.c
+++ b/src/mame/video/bosco.c
@@ -299,19 +299,19 @@ UINT32 bosco_state::screen_update_bosco(screen_device &screen, bitmap_ind16 &bit
fg_clip.min_x = 28*8;
}
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
- draw_stars(screen.machine(),bitmap,cliprect,flip_screen());
+ bitmap.fill(get_black_pen(machine()), cliprect);
+ draw_stars(machine(),bitmap,cliprect,flip_screen());
m_bg_tilemap->draw(bitmap, bg_clip, 0,0);
m_fg_tilemap->draw(bitmap, fg_clip, 0,0);
- draw_sprites(screen.machine(), bitmap,cliprect);
+ draw_sprites(machine(), bitmap,cliprect);
/* draw the high priority characters */
m_bg_tilemap->draw(bitmap, bg_clip, 1,0);
m_fg_tilemap->draw(bitmap, fg_clip, 1,0);
- draw_bullets(screen.machine(), bitmap,cliprect);
+ draw_bullets(machine(), bitmap,cliprect);
return 0;
}
diff --git a/src/mame/video/brkthru.c b/src/mame/video/brkthru.c
index 6528c22eaf4..109b0f2c45b 100644
--- a/src/mame/video/brkthru.c
+++ b/src/mame/video/brkthru.c
@@ -252,13 +252,13 @@ UINT32 brkthru_state::screen_update_brkthru(screen_device &screen, bitmap_ind16
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0);
/* low priority sprites */
- draw_sprites(screen.machine(), bitmap, cliprect, 0x01);
+ draw_sprites(machine(), bitmap, cliprect, 0x01);
/* draw background over low priority sprites */
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
/* high priority sprites */
- draw_sprites(screen.machine(), bitmap, cliprect, 0x09);
+ draw_sprites(machine(), bitmap, cliprect, 0x09);
/* fg layer */
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
diff --git a/src/mame/video/bsktball.c b/src/mame/video/bsktball.c
index a17c82821b0..d849076d44f 100644
--- a/src/mame/video/bsktball.c
+++ b/src/mame/video/bsktball.c
@@ -54,6 +54,6 @@ UINT32 bsktball_state::screen_update_bsktball(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/video/btime.c b/src/mame/video/btime.c
index ff9b24c27f6..99ec46bf746 100644
--- a/src/mame/video/btime.c
+++ b/src/mame/video/btime.c
@@ -429,13 +429,13 @@ UINT32 btime_state::screen_update_btime(screen_device &screen, bitmap_ind16 &bit
start = (start + 1) & 0x03;
}
- draw_background(screen.machine(), bitmap, cliprect, m_btime_tilemap, 0);
- draw_chars(screen.machine(), bitmap, cliprect, TRUE, 0, -1);
+ draw_background(machine(), bitmap, cliprect, m_btime_tilemap, 0);
+ draw_chars(machine(), bitmap, cliprect, TRUE, 0, -1);
}
else
- draw_chars(screen.machine(), bitmap, cliprect, FALSE, 0, -1);
+ draw_chars(machine(), bitmap, cliprect, FALSE, 0, -1);
- draw_sprites(screen.machine(), bitmap, cliprect, 0, 1, 0, m_videoram, 0x20);
+ draw_sprites(machine(), bitmap, cliprect, 0, 1, 0, m_videoram, 0x20);
return 0;
}
@@ -443,8 +443,8 @@ UINT32 btime_state::screen_update_btime(screen_device &screen, bitmap_ind16 &bit
UINT32 btime_state::screen_update_eggs(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- draw_chars(screen.machine(), bitmap, cliprect, FALSE, 0, -1);
- draw_sprites(screen.machine(), bitmap, cliprect, 0, 0, 0, m_videoram, 0x20);
+ draw_chars(machine(), bitmap, cliprect, FALSE, 0, -1);
+ draw_sprites(machine(), bitmap, cliprect, 0, 0, 0, m_videoram, 0x20);
return 0;
}
@@ -452,8 +452,8 @@ UINT32 btime_state::screen_update_eggs(screen_device &screen, bitmap_ind16 &bitm
UINT32 btime_state::screen_update_lnc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- draw_chars(screen.machine(), bitmap, cliprect, FALSE, 0, -1);
- draw_sprites(screen.machine(), bitmap, cliprect, 0, 1, 2, m_videoram, 0x20);
+ draw_chars(machine(), bitmap, cliprect, FALSE, 0, -1);
+ draw_sprites(machine(), bitmap, cliprect, 0, 1, 2, m_videoram, 0x20);
return 0;
}
@@ -463,15 +463,15 @@ UINT32 btime_state::screen_update_zoar(screen_device &screen, bitmap_ind16 &bitm
{
if (m_bnj_scroll1 & 0x04)
{
- draw_background(screen.machine(), bitmap, cliprect, m_zoar_scrollram, m_btime_palette);
- draw_chars(screen.machine(), bitmap, cliprect, TRUE, m_btime_palette + 1, -1);
+ draw_background(machine(), bitmap, cliprect, m_zoar_scrollram, m_btime_palette);
+ draw_chars(machine(), bitmap, cliprect, TRUE, m_btime_palette + 1, -1);
}
else
- draw_chars(screen.machine(), bitmap, cliprect, FALSE, m_btime_palette + 1, -1);
+ draw_chars(machine(), bitmap, cliprect, FALSE, m_btime_palette + 1, -1);
/* The order is important for correct priorities */
- draw_sprites(screen.machine(), bitmap, cliprect, m_btime_palette + 1, 1, 2, m_videoram + 0x1f, 0x20);
- draw_sprites(screen.machine(), bitmap, cliprect, m_btime_palette + 1, 1, 2, m_videoram, 0x20);
+ draw_sprites(machine(), bitmap, cliprect, m_btime_palette + 1, 1, 2, m_videoram + 0x1f, 0x20);
+ draw_sprites(machine(), bitmap, cliprect, m_btime_palette + 1, 1, 2, m_videoram, 0x20);
return 0;
}
@@ -497,7 +497,7 @@ UINT32 btime_state::screen_update_bnj(screen_device &screen, bitmap_ind16 &bitma
sy = 256 - sy;
}
- drawgfx_opaque(*m_background_bitmap, m_background_bitmap->cliprect(), screen.machine().gfx[2],
+ drawgfx_opaque(*m_background_bitmap, m_background_bitmap->cliprect(), machine().gfx[2],
(m_bnj_backgroundram[offs] >> 4) + ((offs & 0x80) >> 3) + 32,
0,
flip_screen(), flip_screen(),
@@ -512,14 +512,14 @@ UINT32 btime_state::screen_update_bnj(screen_device &screen, bitmap_ind16 &bitma
/* copy the low priority characters followed by the sprites
then the high priority characters */
- draw_chars(screen.machine(), bitmap, cliprect, TRUE, 0, 1);
- draw_sprites(screen.machine(), bitmap, cliprect, 0, 0, 0, m_videoram, 0x20);
- draw_chars(screen.machine(), bitmap, cliprect, TRUE, 0, 0);
+ draw_chars(machine(), bitmap, cliprect, TRUE, 0, 1);
+ draw_sprites(machine(), bitmap, cliprect, 0, 0, 0, m_videoram, 0x20);
+ draw_chars(machine(), bitmap, cliprect, TRUE, 0, 0);
}
else
{
- draw_chars(screen.machine(), bitmap, cliprect, FALSE, 0, -1);
- draw_sprites(screen.machine(), bitmap, cliprect, 0, 0, 0, m_videoram, 0x20);
+ draw_chars(machine(), bitmap, cliprect, FALSE, 0, -1);
+ draw_sprites(machine(), bitmap, cliprect, 0, 0, 0, m_videoram, 0x20);
}
return 0;
@@ -543,15 +543,15 @@ UINT32 btime_state::screen_update_cookrace(screen_device &screen, bitmap_ind16 &
sy = 33 - sy;
}
- drawgfx_opaque(bitmap, cliprect, screen.machine().gfx[2],
+ drawgfx_opaque(bitmap, cliprect, machine().gfx[2],
m_bnj_backgroundram[offs],
0,
flip_screen(), flip_screen(),
8*sx,8*sy);
}
- draw_chars(screen.machine(), bitmap, cliprect, TRUE, 0, -1);
- draw_sprites(screen.machine(), bitmap, cliprect, 0, 1, 0, m_videoram, 0x20);
+ draw_chars(machine(), bitmap, cliprect, TRUE, 0, -1);
+ draw_sprites(machine(), bitmap, cliprect, 0, 1, 0, m_videoram, 0x20);
return 0;
}
@@ -559,8 +559,8 @@ UINT32 btime_state::screen_update_cookrace(screen_device &screen, bitmap_ind16 &
UINT32 btime_state::screen_update_disco(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- draw_chars(screen.machine(), bitmap, cliprect, FALSE, m_btime_palette, -1);
- draw_sprites(screen.machine(), bitmap, cliprect, m_btime_palette, 0, 0, m_spriteram, 1);
+ draw_chars(machine(), bitmap, cliprect, FALSE, m_btime_palette, -1);
+ draw_sprites(machine(), bitmap, cliprect, m_btime_palette, 0, 0, m_spriteram, 1);
return 0;
}
diff --git a/src/mame/video/bublbobl.c b/src/mame/video/bublbobl.c
index e945feaee21..2a927e4d756 100644
--- a/src/mame/video/bublbobl.c
+++ b/src/mame/video/bublbobl.c
@@ -80,7 +80,7 @@ UINT32 bublbobl_state::screen_update_bublbobl(screen_device &screen, bitmap_ind1
flipy = !flipy;
}
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[0],
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[0],
code,
color,
flipx,flipy,
diff --git a/src/mame/video/buggychl.c b/src/mame/video/buggychl.c
index 5cf2ed958b5..ee2b0385b4e 100644
--- a/src/mame/video/buggychl.c
+++ b/src/mame/video/buggychl.c
@@ -238,11 +238,11 @@ UINT32 buggychl_state::screen_update_buggychl(screen_device &screen, bitmap_ind1
bitmap.fill(0, cliprect);
if (m_bg_on)
- draw_bg(screen.machine(), bitmap, cliprect);
+ draw_bg(machine(), bitmap, cliprect);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
- draw_fg(screen.machine(), bitmap, cliprect);
+ draw_fg(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/video/bwing.c b/src/mame/video/bwing.c
index be5aab4feb8..bf670fb8696 100644
--- a/src/mame/video/bwing.c
+++ b/src/mame/video/bwing.c
@@ -308,10 +308,10 @@ UINT32 bwing_state::screen_update_bwing(screen_device &screen, bitmap_ind16 &bit
m_bgmap->draw(bitmap, cliprect, 0, 0);
}
else
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
// draw low priority sprites
- draw_sprites(screen.machine(), bitmap, cliprect, m_spriteram, 0);
+ draw_sprites(machine(), bitmap, cliprect, m_spriteram, 0);
// draw foreground
if (!(m_mapmask & 2))
@@ -325,7 +325,7 @@ UINT32 bwing_state::screen_update_bwing(screen_device &screen, bitmap_ind16 &bit
}
// draw high priority sprites
- draw_sprites(screen.machine(), bitmap, cliprect, m_spriteram, 1);
+ draw_sprites(machine(), bitmap, cliprect, m_spriteram, 1);
// draw text layer
// if (m_mapmask & 4)
diff --git a/src/mame/video/cabal.c b/src/mame/video/cabal.c
index f71e7acfe25..7bb302ae6f6 100644
--- a/src/mame/video/cabal.c
+++ b/src/mame/video/cabal.c
@@ -143,7 +143,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
UINT32 cabal_state::screen_update_cabal(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
m_background_layer->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE,0);
- draw_sprites(screen.machine(),bitmap,cliprect);
+ draw_sprites(machine(),bitmap,cliprect);
m_text_layer->draw(bitmap, cliprect, 0,0);
return 0;
}
diff --git a/src/mame/video/canyon.c b/src/mame/video/canyon.c
index 72702ce4f8d..7881c2ea559 100644
--- a/src/mame/video/canyon.c
+++ b/src/mame/video/canyon.c
@@ -75,12 +75,12 @@ UINT32 canyon_state::screen_update_canyon(screen_device &screen, bitmap_ind16 &b
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
- draw_bombs(screen.machine(), bitmap, cliprect);
+ draw_bombs(machine(), bitmap, cliprect);
/* watchdog is disabled during service mode */
- screen.machine().watchdog_enable(!(screen.machine().root_device().ioport("IN2")->read() & 0x10));
+ machine().watchdog_enable(!(machine().root_device().ioport("IN2")->read() & 0x10));
return 0;
}
diff --git a/src/mame/video/capbowl.c b/src/mame/video/capbowl.c
index 53507d65c18..96931c12a85 100644
--- a/src/mame/video/capbowl.c
+++ b/src/mame/video/capbowl.c
@@ -172,7 +172,7 @@ UINT32 capbowl_state::screen_update_capbowl(screen_device &screen, bitmap_rgb32
/* if we're blanked, just fill with black */
if (state.blanked)
{
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
return 0;
}
diff --git a/src/mame/video/carjmbre.c b/src/mame/video/carjmbre.c
index 67b65d0c765..e8dd64fcc9e 100644
--- a/src/mame/video/carjmbre.c
+++ b/src/mame/video/carjmbre.c
@@ -148,7 +148,7 @@ UINT32 carjmbre_state::screen_update_carjmbre(screen_device &screen, bitmap_ind1
flipy = !flipy;
}
- drawgfx_transpen(bitmap, cliprect, screen.machine().gfx[1],
+ drawgfx_transpen(bitmap, cliprect, machine().gfx[1],
m_spriteram[troffs + 1],
m_spriteram[troffs + 2] & 0xf,
flipx,flipy,
diff --git a/src/mame/video/carpolo.c b/src/mame/video/carpolo.c
index 0ea73450448..5ff4089bb35 100644
--- a/src/mame/video/carpolo.c
+++ b/src/mame/video/carpolo.c
@@ -231,7 +231,7 @@ UINT32 carpolo_state::screen_update_carpolo(screen_device &screen, bitmap_ind16
bitmap.plot_box(0,TOP_BORDER,RIGHT_BORDER+1,BOTTOM_BORDER-TOP_BORDER+1,FIELD_PEN);
/* car 1 */
- draw_sprite(screen.machine(), bitmap, cliprect,
+ draw_sprite(machine(), bitmap, cliprect,
m_spriteram[0x00], m_spriteram[0x01],
0, m_spriteram[0x0c] & 0x0f, CAR1_COLOR);
@@ -242,35 +242,35 @@ UINT32 carpolo_state::screen_update_carpolo(screen_device &screen, bitmap_ind16
bitmap.plot_box(RIGHT_BORDER,TOP_BORDER,1,BOTTOM_BORDER-TOP_BORDER+1,LINE_PEN);
/* car 4 */
- draw_sprite(screen.machine(), bitmap, cliprect,
+ draw_sprite(machine(), bitmap, cliprect,
m_spriteram[0x06], m_spriteram[0x07],
0, m_spriteram[0x0d] >> 4, CAR4_COLOR);
/* car 3 */
- draw_sprite(screen.machine(), bitmap, cliprect,
+ draw_sprite(machine(), bitmap, cliprect,
m_spriteram[0x04], m_spriteram[0x05],
0, m_spriteram[0x0d] & 0x0f, CAR3_COLOR);
/* car 2 */
- draw_sprite(screen.machine(), bitmap, cliprect,
+ draw_sprite(machine(), bitmap, cliprect,
m_spriteram[0x02], m_spriteram[0x03],
0, m_spriteram[0x0c] >> 4, CAR2_COLOR);
/* ball */
- draw_sprite(screen.machine(), bitmap, cliprect,
+ draw_sprite(machine(), bitmap, cliprect,
m_spriteram[0x08], m_spriteram[0x09],
1, m_spriteram[0x0e] & 0x0f, BALL_COLOR);
/* left goal - position determined by bit 6 of the
horizontal and vertical timing PROMs */
- drawgfxzoom_transpen(bitmap,cliprect,screen.machine().gfx[1],
+ drawgfxzoom_transpen(bitmap,cliprect,machine().gfx[1],
0,0,
0,0,
LEFT_GOAL_X,GOAL_Y,
0x20000,0x20000,0);
/* right goal */
- drawgfxzoom_transpen(bitmap,cliprect,screen.machine().gfx[1],
+ drawgfxzoom_transpen(bitmap,cliprect,machine().gfx[1],
0,1,
1,0,
RIGHT_GOAL_X,GOAL_Y,
@@ -282,7 +282,7 @@ UINT32 carpolo_state::screen_update_carpolo(screen_device &screen, bitmap_ind16
popmessage("WIDE!\n");
if (m_spriteram[0x0f] & 0x01)
- draw_sprite(screen.machine(), bitmap, cliprect,
+ draw_sprite(machine(), bitmap, cliprect,
m_spriteram[0x0a], m_spriteram[0x0b],
1, m_spriteram[0x0e] >> 4, SPECIAL_CHAR_COLOR);
@@ -293,14 +293,14 @@ UINT32 carpolo_state::screen_update_carpolo(screen_device &screen, bitmap_ind16
and bit 3 of the vertical timing PROM controls in
which quadrant the line will actually appear */
- draw_alpha_line(screen.machine(), bitmap, cliprect, 0, (0*4+0)*2 );
- draw_alpha_line(screen.machine(), bitmap, cliprect, 1, (0*4+0)*2+1);
- draw_alpha_line(screen.machine(), bitmap, cliprect, 2, (3*4+1)*2 );
- draw_alpha_line(screen.machine(), bitmap, cliprect, 3, (3*4+1)*2+1);
- draw_alpha_line(screen.machine(), bitmap, cliprect, 4, (1*4+2)*2 );
- draw_alpha_line(screen.machine(), bitmap, cliprect, 5, (1*4+2)*2+1);
- draw_alpha_line(screen.machine(), bitmap, cliprect, 6, (0*4+3)*2 );
- draw_alpha_line(screen.machine(), bitmap, cliprect, 7, (0*4+3)*2+1);
+ draw_alpha_line(machine(), bitmap, cliprect, 0, (0*4+0)*2 );
+ draw_alpha_line(machine(), bitmap, cliprect, 1, (0*4+0)*2+1);
+ draw_alpha_line(machine(), bitmap, cliprect, 2, (3*4+1)*2 );
+ draw_alpha_line(machine(), bitmap, cliprect, 3, (3*4+1)*2+1);
+ draw_alpha_line(machine(), bitmap, cliprect, 4, (1*4+2)*2 );
+ draw_alpha_line(machine(), bitmap, cliprect, 5, (1*4+2)*2+1);
+ draw_alpha_line(machine(), bitmap, cliprect, 6, (0*4+3)*2 );
+ draw_alpha_line(machine(), bitmap, cliprect, 7, (0*4+3)*2+1);
return 0;
}
@@ -563,139 +563,139 @@ void carpolo_state::screen_eof_carpolo(screen_device &screen, bool state)
car1_x = m_spriteram[0x00];
car1_y = m_spriteram[0x01];
- remap_sprite_code(screen.machine(), 0, m_spriteram[0x0c] & 0x0f, &car1_code, &car1_flipy);
+ remap_sprite_code(machine(), 0, m_spriteram[0x0c] & 0x0f, &car1_code, &car1_flipy);
car2_x = m_spriteram[0x02];
car2_y = m_spriteram[0x03];
- remap_sprite_code(screen.machine(), 0, m_spriteram[0x0c] >> 4, &car2_code, &car2_flipy);
+ remap_sprite_code(machine(), 0, m_spriteram[0x0c] >> 4, &car2_code, &car2_flipy);
car3_x = m_spriteram[0x04];
car3_y = m_spriteram[0x05];
- remap_sprite_code(screen.machine(), 0, m_spriteram[0x0d] & 0x0f, &car3_code, &car3_flipy);
+ remap_sprite_code(machine(), 0, m_spriteram[0x0d] & 0x0f, &car3_code, &car3_flipy);
car4_x = m_spriteram[0x06];
car4_y = m_spriteram[0x07];
- remap_sprite_code(screen.machine(), 0, m_spriteram[0x0d] >> 4, &car4_code, &car4_flipy);
+ remap_sprite_code(machine(), 0, m_spriteram[0x0d] >> 4, &car4_code, &car4_flipy);
ball_x = m_spriteram[0x08];
ball_y = m_spriteram[0x09];
- remap_sprite_code(screen.machine(), 1, m_spriteram[0x0e] & 0x0f, &ball_code, &ball_flipy);
+ remap_sprite_code(machine(), 1, m_spriteram[0x0e] & 0x0f, &ball_code, &ball_flipy);
/* cars 1 and 2 */
- if (check_sprite_sprite_collision(screen.machine(),
+ if (check_sprite_sprite_collision(machine(),
car1_x, car1_y, car1_code, car1_flipy,
car2_x, car2_y, car2_code, car2_flipy,
&col_x, &col_y))
- carpolo_generate_car_car_interrupt(screen.machine(), 0, 1);
+ carpolo_generate_car_car_interrupt(machine(), 0, 1);
/* cars 1 and 3 */
- else if (check_sprite_sprite_collision(screen.machine(),
+ else if (check_sprite_sprite_collision(machine(),
car1_x, car1_y, car1_code, car1_flipy,
car3_x, car3_y, car3_code, car3_flipy,
&col_x, &col_y))
- carpolo_generate_car_car_interrupt(screen.machine(), 0, 2);
+ carpolo_generate_car_car_interrupt(machine(), 0, 2);
/* cars 1 and 4 */
- else if (check_sprite_sprite_collision(screen.machine(),
+ else if (check_sprite_sprite_collision(machine(),
car1_x, car1_y, car1_code, car1_flipy,
car4_x, car4_y, car4_code, car4_flipy,
&col_x, &col_y))
- carpolo_generate_car_car_interrupt(screen.machine(), 0, 3);
+ carpolo_generate_car_car_interrupt(machine(), 0, 3);
/* cars 2 and 3 */
- else if (check_sprite_sprite_collision(screen.machine(),
+ else if (check_sprite_sprite_collision(machine(),
car2_x, car2_y, car2_code, car2_flipy,
car3_x, car3_y, car3_code, car3_flipy,
&col_x, &col_y))
- carpolo_generate_car_car_interrupt(screen.machine(), 1, 2);
+ carpolo_generate_car_car_interrupt(machine(), 1, 2);
/* cars 2 and 4 */
- else if (check_sprite_sprite_collision(screen.machine(),
+ else if (check_sprite_sprite_collision(machine(),
car2_x, car2_y, car2_code, car2_flipy,
car4_x, car4_y, car4_code, car4_flipy,
&col_x, &col_y))
- carpolo_generate_car_car_interrupt(screen.machine(), 1, 3);
+ carpolo_generate_car_car_interrupt(machine(), 1, 3);
/* cars 3 and 4 */
- else if (check_sprite_sprite_collision(screen.machine(),
+ else if (check_sprite_sprite_collision(machine(),
car3_x, car3_y, car3_code, car3_flipy,
car4_x, car4_y, car4_code, car4_flipy,
&col_x, &col_y))
- carpolo_generate_car_car_interrupt(screen.machine(), 2, 3);
+ carpolo_generate_car_car_interrupt(machine(), 2, 3);
/* check car-ball collision */
- if (check_sprite_sprite_collision(screen.machine(),
+ if (check_sprite_sprite_collision(machine(),
car1_x, car1_y, car1_code, car1_flipy,
ball_x, ball_y, ball_code, ball_flipy,
&col_x, &col_y))
- carpolo_generate_car_ball_interrupt(screen.machine(), 0, col_x, col_y);
+ carpolo_generate_car_ball_interrupt(machine(), 0, col_x, col_y);
- else if (check_sprite_sprite_collision(screen.machine(),
+ else if (check_sprite_sprite_collision(machine(),
car2_x, car2_y, car2_code, car2_flipy,
ball_x, ball_y, ball_code, ball_flipy,
&col_x, &col_y))
- carpolo_generate_car_ball_interrupt(screen.machine(), 1, col_x, col_y);
+ carpolo_generate_car_ball_interrupt(machine(), 1, col_x, col_y);
- else if (check_sprite_sprite_collision(screen.machine(),
+ else if (check_sprite_sprite_collision(machine(),
car3_x, car3_y, car3_code, car3_flipy,
ball_x, ball_y, ball_code, ball_flipy,
&col_x, &col_y))
- carpolo_generate_car_ball_interrupt(screen.machine(), 2, col_x, col_y);
+ carpolo_generate_car_ball_interrupt(machine(), 2, col_x, col_y);
- else if (check_sprite_sprite_collision(screen.machine(),
+ else if (check_sprite_sprite_collision(machine(),
car4_x, car4_y, car4_code, car4_flipy,
ball_x, ball_y, ball_code, ball_flipy,
&col_x, &col_y))
- carpolo_generate_car_ball_interrupt(screen.machine(), 3, col_x, col_y);
+ carpolo_generate_car_ball_interrupt(machine(), 3, col_x, col_y);
/* check car-goal collision */
- if (check_sprite_left_goal_collision(screen.machine(), car1_x, car1_y, car1_code, car1_flipy, 1))
- carpolo_generate_car_goal_interrupt(screen.machine(), 0, 0);
+ if (check_sprite_left_goal_collision(machine(), car1_x, car1_y, car1_code, car1_flipy, 1))
+ carpolo_generate_car_goal_interrupt(machine(), 0, 0);
- else if (check_sprite_right_goal_collision(screen.machine(), car1_x, car1_y, car1_code, car1_flipy, 1))
- carpolo_generate_car_goal_interrupt(screen.machine(), 0, 1);
+ else if (check_sprite_right_goal_collision(machine(), car1_x, car1_y, car1_code, car1_flipy, 1))
+ carpolo_generate_car_goal_interrupt(machine(), 0, 1);
- else if (check_sprite_left_goal_collision(screen.machine(), car2_x, car2_y, car2_code, car2_flipy, 1))
- carpolo_generate_car_goal_interrupt(screen.machine(), 1, 0);
+ else if (check_sprite_left_goal_collision(machine(), car2_x, car2_y, car2_code, car2_flipy, 1))
+ carpolo_generate_car_goal_interrupt(machine(), 1, 0);
- else if (check_sprite_right_goal_collision(screen.machine(), car2_x, car2_y, car2_code, car2_flipy, 1))
- carpolo_generate_car_goal_interrupt(screen.machine(), 1, 1);
+ else if (check_sprite_right_goal_collision(machine(), car2_x, car2_y, car2_code, car2_flipy, 1))
+ carpolo_generate_car_goal_interrupt(machine(), 1, 1);
- else if (check_sprite_left_goal_collision(screen.machine(), car3_x, car3_y, car3_code, car3_flipy, 1))
- carpolo_generate_car_goal_interrupt(screen.machine(), 2, 0);
+ else if (check_sprite_left_goal_collision(machine(), car3_x, car3_y, car3_code, car3_flipy, 1))
+ carpolo_generate_car_goal_interrupt(machine(), 2, 0);
- else if (check_sprite_right_goal_collision(screen.machine(), car3_x, car3_y, car3_code, car3_flipy, 1))
- carpolo_generate_car_goal_interrupt(screen.machine(), 2, 1);
+ else if (check_sprite_right_goal_collision(machine(), car3_x, car3_y, car3_code, car3_flipy, 1))
+ carpolo_generate_car_goal_interrupt(machine(), 2, 1);
- else if (check_sprite_left_goal_collision(screen.machine(), car4_x, car4_y, car4_code, car4_flipy, 1))
- carpolo_generate_car_goal_interrupt(screen.machine(), 3, 0);
+ else if (check_sprite_left_goal_collision(machine(), car4_x, car4_y, car4_code, car4_flipy, 1))
+ carpolo_generate_car_goal_interrupt(machine(), 3, 0);
- else if (check_sprite_right_goal_collision(screen.machine(), car4_x, car4_y, car4_code, car4_flipy, 1))
- carpolo_generate_car_goal_interrupt(screen.machine(), 3, 1);
+ else if (check_sprite_right_goal_collision(machine(), car4_x, car4_y, car4_code, car4_flipy, 1))
+ carpolo_generate_car_goal_interrupt(machine(), 3, 1);
/* check ball collision with static screen elements */
{
int col;
- col = check_sprite_left_goal_collision(screen.machine(), ball_x, ball_y, ball_code, ball_flipy, 0);
+ col = check_sprite_left_goal_collision(machine(), ball_x, ball_y, ball_code, ball_flipy, 0);
- if (col == 1) carpolo_generate_ball_screen_interrupt(screen.machine(), 0x05);
- if (col == 2) carpolo_generate_ball_screen_interrupt(screen.machine(), 0x03);
+ if (col == 1) carpolo_generate_ball_screen_interrupt(machine(), 0x05);
+ if (col == 2) carpolo_generate_ball_screen_interrupt(machine(), 0x03);
- col = check_sprite_right_goal_collision(screen.machine(), ball_x, ball_y, ball_code, ball_flipy, 0);
+ col = check_sprite_right_goal_collision(machine(), ball_x, ball_y, ball_code, ball_flipy, 0);
- if (col == 1) carpolo_generate_ball_screen_interrupt(screen.machine(), 0x05 | 0x08);
- if (col == 2) carpolo_generate_ball_screen_interrupt(screen.machine(), 0x03 | 0x08);
+ if (col == 1) carpolo_generate_ball_screen_interrupt(machine(), 0x05 | 0x08);
+ if (col == 2) carpolo_generate_ball_screen_interrupt(machine(), 0x03 | 0x08);
- if (check_sprite_border_collision(screen.machine(), ball_x, ball_y, ball_code, ball_flipy))
- carpolo_generate_ball_screen_interrupt(screen.machine(), 0x06);
+ if (check_sprite_border_collision(machine(), ball_x, ball_y, ball_code, ball_flipy))
+ carpolo_generate_ball_screen_interrupt(machine(), 0x06);
}
@@ -703,28 +703,28 @@ void carpolo_state::screen_eof_carpolo(screen_device &screen, bool state)
{
int col;
- col = check_sprite_border_collision(screen.machine(), car1_x, car1_y, car1_code, car1_flipy);
+ col = check_sprite_border_collision(machine(), car1_x, car1_y, car1_code, car1_flipy);
if (col)
- carpolo_generate_car_border_interrupt(screen.machine(), 0, (col == 2));
+ carpolo_generate_car_border_interrupt(machine(), 0, (col == 2));
else
{
- col = check_sprite_border_collision(screen.machine(), car2_x, car2_y, car2_code, car2_flipy);
+ col = check_sprite_border_collision(machine(), car2_x, car2_y, car2_code, car2_flipy);
if (col)
- carpolo_generate_car_border_interrupt(screen.machine(), 1, (col == 2));
+ carpolo_generate_car_border_interrupt(machine(), 1, (col == 2));
else
{
- col = check_sprite_border_collision(screen.machine(), car3_x, car3_y, car3_code, car3_flipy);
+ col = check_sprite_border_collision(machine(), car3_x, car3_y, car3_code, car3_flipy);
if (col)
- carpolo_generate_car_border_interrupt(screen.machine(), 2, (col == 2));
+ carpolo_generate_car_border_interrupt(machine(), 2, (col == 2));
else
{
- col = check_sprite_border_collision(screen.machine(), car4_x, car4_y, car4_code, car4_flipy);
+ col = check_sprite_border_collision(machine(), car4_x, car4_y, car4_code, car4_flipy);
if (col)
- carpolo_generate_car_border_interrupt(screen.machine(), 3, (col == 2));
+ carpolo_generate_car_border_interrupt(machine(), 3, (col == 2));
}
}
}
diff --git a/src/mame/video/cave.c b/src/mame/video/cave.c
index cff1a026d65..333e1003e2f 100644
--- a/src/mame/video/cave.c
+++ b/src/mame/video/cave.c
@@ -1532,7 +1532,7 @@ UINT32 cave_state::screen_update_cave(screen_device &screen, bitmap_ind16 &bitma
int pri, pri2, GFX;
int layers_ctrl = -1;
- set_pens(screen.machine());
+ set_pens(machine());
m_blit.baseaddr = reinterpret_cast<UINT8 *>(bitmap.raw_pixptr(0));
m_blit.line_offset = bitmap.rowbytes();
@@ -1553,22 +1553,22 @@ UINT32 cave_state::screen_update_cave(screen_device &screen, bitmap_ind16 &bitma
#ifdef MAME_DEBUG
{
- if ( screen.machine().input().code_pressed(KEYCODE_Z) || screen.machine().input().code_pressed(KEYCODE_X) || screen.machine().input().code_pressed(KEYCODE_C) ||
- screen.machine().input().code_pressed(KEYCODE_V) || screen.machine().input().code_pressed(KEYCODE_B) )
+ if ( machine().input().code_pressed(KEYCODE_Z) || machine().input().code_pressed(KEYCODE_X) || machine().input().code_pressed(KEYCODE_C) ||
+ machine().input().code_pressed(KEYCODE_V) || machine().input().code_pressed(KEYCODE_B) )
{
int msk = 0, val = 0;
- if (screen.machine().input().code_pressed(KEYCODE_X)) val = 1; // priority 0 only
- if (screen.machine().input().code_pressed(KEYCODE_C)) val = 2; // "" 1
- if (screen.machine().input().code_pressed(KEYCODE_V)) val = 4; // "" 2
- if (screen.machine().input().code_pressed(KEYCODE_B)) val = 8; // "" 3
- if (screen.machine().input().code_pressed(KEYCODE_Z)) val = 1|2|4|8; // All of the above priorities
-
- if (screen.machine().input().code_pressed(KEYCODE_Q)) msk |= val << 0; // for layer 0
- if (screen.machine().input().code_pressed(KEYCODE_W)) msk |= val << 4; // for layer 1
- if (screen.machine().input().code_pressed(KEYCODE_E)) msk |= val << 8; // for layer 2
- if (screen.machine().input().code_pressed(KEYCODE_R)) msk |= val << 12; // for layer 3
- if (screen.machine().input().code_pressed(KEYCODE_A)) msk |= val << 16; // for sprites
+ if (machine().input().code_pressed(KEYCODE_X)) val = 1; // priority 0 only
+ if (machine().input().code_pressed(KEYCODE_C)) val = 2; // "" 1
+ if (machine().input().code_pressed(KEYCODE_V)) val = 4; // "" 2
+ if (machine().input().code_pressed(KEYCODE_B)) val = 8; // "" 3
+ if (machine().input().code_pressed(KEYCODE_Z)) val = 1|2|4|8; // All of the above priorities
+
+ if (machine().input().code_pressed(KEYCODE_Q)) msk |= val << 0; // for layer 0
+ if (machine().input().code_pressed(KEYCODE_W)) msk |= val << 4; // for layer 1
+ if (machine().input().code_pressed(KEYCODE_E)) msk |= val << 8; // for layer 2
+ if (machine().input().code_pressed(KEYCODE_R)) msk |= val << 12; // for layer 3
+ if (machine().input().code_pressed(KEYCODE_A)) msk |= val << 16; // for sprites
if (msk != 0) layers_ctrl &= msk;
#if 1
@@ -1629,10 +1629,10 @@ UINT32 cave_state::screen_update_cave(screen_device &screen, bitmap_ind16 &bitma
for (pri2 = 0; pri2 <= 3; pri2++) // priority of the whole layer
{
- if (layers_ctrl & (1 << (pri + 0))) cave_tilemap_draw(screen.machine(), bitmap, cliprect, pri, 0, pri2, 0);
- if (layers_ctrl & (1 << (pri + 4))) cave_tilemap_draw(screen.machine(), bitmap, cliprect, pri, 0, pri2, 1);
- if (layers_ctrl & (1 << (pri + 8))) cave_tilemap_draw(screen.machine(), bitmap, cliprect, pri, 0, pri2, 2);
- if (layers_ctrl & (1 << (pri + 12))) cave_tilemap_draw(screen.machine(), bitmap, cliprect, pri, 0, pri2, 3);
+ if (layers_ctrl & (1 << (pri + 0))) cave_tilemap_draw(machine(), bitmap, cliprect, pri, 0, pri2, 0);
+ if (layers_ctrl & (1 << (pri + 4))) cave_tilemap_draw(machine(), bitmap, cliprect, pri, 0, pri2, 1);
+ if (layers_ctrl & (1 << (pri + 8))) cave_tilemap_draw(machine(), bitmap, cliprect, pri, 0, pri2, 2);
+ if (layers_ctrl & (1 << (pri + 12))) cave_tilemap_draw(machine(), bitmap, cliprect, pri, 0, pri2, 3);
}
}
return 0;
diff --git a/src/mame/video/cbasebal.c b/src/mame/video/cbasebal.c
index 117e62b91f3..4fd90f7cf94 100644
--- a/src/mame/video/cbasebal.c
+++ b/src/mame/video/cbasebal.c
@@ -177,7 +177,7 @@ UINT32 cbasebal_state::screen_update_cbasebal(screen_device &screen, bitmap_ind1
bitmap.fill(768, cliprect);
if (m_obj_on)
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
if (m_text_on)
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
diff --git a/src/mame/video/cbuster.c b/src/mame/video/cbuster.c
index 435ecbd1753..5ebd2226b9c 100644
--- a/src/mame/video/cbuster.c
+++ b/src/mame/video/cbuster.c
@@ -50,12 +50,12 @@ void cbuster_state::video_start()
UINT32 cbuster_state::screen_update_twocrude(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_spriteram16_buffer, 0x400);
+ machine().device<decospr_device>("spritegen")->draw_sprites(bitmap, cliprect, m_spriteram16_buffer, 0x400);
deco16ic_pf_update(m_deco_tilegen1, m_pf1_rowscroll, m_pf2_rowscroll);
@@ -63,8 +63,8 @@ UINT32 cbuster_state::screen_update_twocrude(screen_device &screen, bitmap_rgb32
/* Draw playfields & sprites */
deco16ic_tilemap_2_draw(m_deco_tilegen2, bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0);
- screen.machine().device<decospr_device>("spritegen")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0800, 0x0900, 0x100, 0x0ff);
- screen.machine().device<decospr_device>("spritegen")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0900, 0x0900, 0x500, 0x0ff);
+ machine().device<decospr_device>("spritegen")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0800, 0x0900, 0x100, 0x0ff);
+ machine().device<decospr_device>("spritegen")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0900, 0x0900, 0x500, 0x0ff);
if (m_pri)
{
@@ -77,8 +77,8 @@ UINT32 cbuster_state::screen_update_twocrude(screen_device &screen, bitmap_rgb32
deco16ic_tilemap_2_draw(m_deco_tilegen1, bitmap, cliprect, 0, 0);
}
- screen.machine().device<decospr_device>("spritegen")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0000, 0x0900, 0x100, 0x0ff);
- screen.machine().device<decospr_device>("spritegen")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0100, 0x0900, 0x500, 0x0ff);
+ machine().device<decospr_device>("spritegen")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0000, 0x0900, 0x100, 0x0ff);
+ machine().device<decospr_device>("spritegen")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0100, 0x0900, 0x500, 0x0ff);
deco16ic_tilemap_1_draw(m_deco_tilegen1, bitmap, cliprect, 0, 0);
return 0;
}
diff --git a/src/mame/video/ccastles.c b/src/mame/video/ccastles.c
index d67177ccca0..1a0f66a9174 100644
--- a/src/mame/video/ccastles.c
+++ b/src/mame/video/ccastles.c
@@ -261,7 +261,7 @@ UINT32 ccastles_state::screen_update_ccastles(screen_device &screen, bitmap_ind1
{
UINT8 *spriteaddr = &m_spriteram[m_video_control[7] * 0x100]; /* BUF1/BUF2 */
int flip = m_video_control[4] ? 0xff : 0x00; /* PLAYER2 */
- pen_t black = get_black_pen(screen.machine());
+ pen_t black = get_black_pen(machine());
int x, y, offs;
/* draw the sprites */
@@ -273,7 +273,7 @@ UINT32 ccastles_state::screen_update_ccastles(screen_device &screen, bitmap_ind1
int which = spriteaddr[offs];
int color = spriteaddr[offs + 2] >> 7;
- drawgfx_transpen(m_spritebitmap, cliprect, screen.machine().gfx[0], which, color, flip, flip, x, y, 7);
+ drawgfx_transpen(m_spritebitmap, cliprect, machine().gfx[0], which, color, flip, flip, x, y, 7);
}
/* draw the bitmap to the screen, looping over Y */
diff --git a/src/mame/video/cclimber.c b/src/mame/video/cclimber.c
index a5c76b29d08..d5284ba8669 100644
--- a/src/mame/video/cclimber.c
+++ b/src/mame/video/cclimber.c
@@ -658,20 +658,20 @@ static void swimmer_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect
UINT32 cclimber_state::screen_update_cclimber(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
bitmap.fill(CCLIMBER_BG_PEN, cliprect);
- draw_playfield(screen.machine(), bitmap, cliprect);
+ draw_playfield(machine(), bitmap, cliprect);
/* draw the "big sprite" under the regular sprites */
if ((m_bigsprite_control[0] & 0x01))
{
- cclimber_draw_bigsprite(screen.machine(), bitmap, cliprect);
- cclimber_draw_sprites(bitmap, cliprect, screen.machine().gfx[1]);
+ cclimber_draw_bigsprite(machine(), bitmap, cliprect);
+ cclimber_draw_sprites(bitmap, cliprect, machine().gfx[1]);
}
/* draw the "big sprite" over the regular sprites */
else
{
- cclimber_draw_sprites(bitmap, cliprect, screen.machine().gfx[1]);
- cclimber_draw_bigsprite(screen.machine(), bitmap, cliprect);
+ cclimber_draw_sprites(bitmap, cliprect, machine().gfx[1]);
+ cclimber_draw_bigsprite(machine(), bitmap, cliprect);
}
return 0;
@@ -680,7 +680,7 @@ UINT32 cclimber_state::screen_update_cclimber(screen_device &screen, bitmap_ind1
UINT32 cclimber_state::screen_update_yamato(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- cclimber_state *state = screen.machine().driver_data<cclimber_state>();
+ cclimber_state *state = machine().driver_data<cclimber_state>();
int i;
UINT8 *sky_rom = memregion("user1")->base() + 0x1200;
@@ -693,20 +693,20 @@ UINT32 cclimber_state::screen_update_yamato(screen_device &screen, bitmap_ind16
bitmap.pix16(j, (i - 8) & 0xff) = pen;
}
- draw_playfield(screen.machine(), bitmap, cliprect);
+ draw_playfield(machine(), bitmap, cliprect);
/* draw the "big sprite" under the regular sprites */
if ((m_bigsprite_control[0] & 0x01))
{
- cclimber_draw_bigsprite(screen.machine(), bitmap, cliprect);
- toprollr_draw_sprites(bitmap, cliprect, screen.machine().gfx[1]);
+ cclimber_draw_bigsprite(machine(), bitmap, cliprect);
+ toprollr_draw_sprites(bitmap, cliprect, machine().gfx[1]);
}
/* draw the "big sprite" over the regular sprites */
else
{
- toprollr_draw_sprites(bitmap, cliprect, screen.machine().gfx[1]);
- cclimber_draw_bigsprite(screen.machine(), bitmap, cliprect);
+ toprollr_draw_sprites(bitmap, cliprect, machine().gfx[1]);
+ cclimber_draw_bigsprite(machine(), bitmap, cliprect);
}
return 0;
@@ -715,8 +715,8 @@ UINT32 cclimber_state::screen_update_yamato(screen_device &screen, bitmap_ind16
UINT32 cclimber_state::screen_update_swimmer(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- cclimber_state *state = screen.machine().driver_data<cclimber_state>();
- swimmer_set_background_pen(screen.machine());
+ cclimber_state *state = machine().driver_data<cclimber_state>();
+ swimmer_set_background_pen(machine());
if (*m_swimmer_side_background_enabled & 0x01)
{
@@ -746,20 +746,20 @@ UINT32 cclimber_state::screen_update_swimmer(screen_device &screen, bitmap_ind16
else
bitmap.fill(CCLIMBER_BG_PEN, cliprect);
- draw_playfield(screen.machine(), bitmap, cliprect);
+ draw_playfield(machine(), bitmap, cliprect);
/* draw the "big sprite" under the regular sprites */
if ((m_bigsprite_control[0] & 0x01))
{
- cclimber_draw_bigsprite(screen.machine(), bitmap, cliprect);
- swimmer_draw_sprites(bitmap, cliprect, screen.machine().gfx[1]);
+ cclimber_draw_bigsprite(machine(), bitmap, cliprect);
+ swimmer_draw_sprites(bitmap, cliprect, machine().gfx[1]);
}
/* draw the "big sprite" over the regular sprites */
else
{
- swimmer_draw_sprites(bitmap, cliprect, screen.machine().gfx[1]);
- cclimber_draw_bigsprite(screen.machine(), bitmap, cliprect);
+ swimmer_draw_sprites(bitmap, cliprect, machine().gfx[1]);
+ cclimber_draw_bigsprite(machine(), bitmap, cliprect);
}
return 0;
@@ -768,7 +768,7 @@ UINT32 cclimber_state::screen_update_swimmer(screen_device &screen, bitmap_ind16
UINT32 cclimber_state::screen_update_toprollr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- cclimber_state *state = screen.machine().driver_data<cclimber_state>();
+ cclimber_state *state = machine().driver_data<cclimber_state>();
rectangle scroll_area_clip = cliprect;
scroll_area_clip.min_x = 4*8;
scroll_area_clip.max_x = 29*8-1;
@@ -784,15 +784,15 @@ UINT32 cclimber_state::screen_update_toprollr(screen_device &screen, bitmap_ind1
/* draw the "big sprite" over the regular sprites */
if ((m_bigsprite_control[1] & 0x20))
{
- toprollr_draw_sprites(bitmap, scroll_area_clip, screen.machine().gfx[1]);
- toprollr_draw_bigsprite(screen.machine(), bitmap, scroll_area_clip);
+ toprollr_draw_sprites(bitmap, scroll_area_clip, machine().gfx[1]);
+ toprollr_draw_bigsprite(machine(), bitmap, scroll_area_clip);
}
/* draw the "big sprite" under the regular sprites */
else
{
- toprollr_draw_bigsprite(screen.machine(), bitmap, scroll_area_clip);
- toprollr_draw_sprites(bitmap, scroll_area_clip, screen.machine().gfx[1]);
+ toprollr_draw_bigsprite(machine(), bitmap, scroll_area_clip);
+ toprollr_draw_sprites(bitmap, scroll_area_clip, machine().gfx[1]);
}
m_pf_tilemap->mark_all_dirty();
diff --git a/src/mame/video/centiped.c b/src/mame/video/centiped.c
index 517d897738e..541b068f38a 100644
--- a/src/mame/video/centiped.c
+++ b/src/mame/video/centiped.c
@@ -442,7 +442,7 @@ UINT32 centiped_state::screen_update_centiped(screen_device &screen, bitmap_ind1
int x = spriteram[offs + 0x20];
int y = 240 - spriteram[offs + 0x10];
- drawgfx_transmask(bitmap, spriteclip, screen.machine().gfx[1], code, color, flipx, flipy, x, y, m_penmask[color & 0x3f]);
+ drawgfx_transmask(bitmap, spriteclip, machine().gfx[1], code, color, flipx, flipy, x, y, m_penmask[color & 0x3f]);
}
return 0;
}
@@ -451,7 +451,7 @@ UINT32 centiped_state::screen_update_centiped(screen_device &screen, bitmap_ind1
UINT32 centiped_state::screen_update_warlords(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
UINT8 *spriteram = m_spriteram;
- int upright_mode = screen.machine().root_device().ioport("IN0")->read() & 0x80;
+ int upright_mode = machine().root_device().ioport("IN0")->read() & 0x80;
int offs;
/* if the cocktail/upright switch flipped, force refresh */
@@ -487,7 +487,7 @@ UINT32 centiped_state::screen_update_warlords(screen_device &screen, bitmap_ind1
flipx = !flipx;
}
- drawgfx_transpen(bitmap, cliprect, screen.machine().gfx[1], code, color, flipx, flipy, x, y, 0);
+ drawgfx_transpen(bitmap, cliprect, machine().gfx[1], code, color, flipx, flipy, x, y, 0);
}
return 0;
}
@@ -518,7 +518,7 @@ UINT32 centiped_state::screen_update_bullsdrt(screen_device &screen, bitmap_ind1
int x = spriteram[offs + 0x20];
int y = 240 - spriteram[offs + 0x10];
- drawgfx_transpen(bitmap, spriteclip, screen.machine().gfx[1], code, color & 0x3f, 1, flipy, x, y, 0);
+ drawgfx_transpen(bitmap, spriteclip, machine().gfx[1], code, color & 0x3f, 1, flipy, x, y, 0);
}
return 0;
}
@@ -555,7 +555,7 @@ UINT32 centiped_state::screen_update_milliped(screen_device &screen, bitmap_ind1
flipy = !flipy;
}
- drawgfx_transmask(bitmap, spriteclip, screen.machine().gfx[1], code, color, flipx, flipy, x, y, m_penmask[color & 0x3f]);
+ drawgfx_transmask(bitmap, spriteclip, machine().gfx[1], code, color, flipx, flipy, x, y, m_penmask[color & 0x3f]);
}
return 0;
}
diff --git a/src/mame/video/chaknpop.c b/src/mame/video/chaknpop.c
index f333773b429..7e20afb342a 100644
--- a/src/mame/video/chaknpop.c
+++ b/src/mame/video/chaknpop.c
@@ -257,7 +257,7 @@ UINT32 chaknpop_state::screen_update_chaknpop(screen_device &screen, bitmap_ind1
{
m_tx_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect);
- draw_bitmap(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
+ draw_bitmap(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/video/champbas.c b/src/mame/video/champbas.c
index c605f464ab3..0659961f58b 100644
--- a/src/mame/video/champbas.c
+++ b/src/mame/video/champbas.c
@@ -280,13 +280,13 @@ static void exctsccr_draw_sprites( running_machine &machine, bitmap_ind16 &bitma
UINT32 champbas_state::screen_update_champbas(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- champbas_draw_sprites(screen.machine(), bitmap, cliprect);
+ champbas_draw_sprites(machine(), bitmap, cliprect);
return 0;
}
UINT32 champbas_state::screen_update_exctsccr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- exctsccr_draw_sprites(screen.machine(), bitmap, cliprect);
+ exctsccr_draw_sprites(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/video/changela.c b/src/mame/video/changela.c
index 8ed79bebe9f..0d0bf2fb16c 100644
--- a/src/mame/video/changela.c
+++ b/src/mame/video/changela.c
@@ -727,7 +727,7 @@ UINT32 changela_state::screen_update_changela(screen_device &screen, bitmap_ind1
copybitmap_trans(bitmap, m_obj0_bitmap, 0, 0, 0, 0, cliprect, 0);
copybitmap_trans(bitmap, m_tree0_bitmap, 0, 0, 0, 0, cliprect, 0);
copybitmap_trans(bitmap, m_tree1_bitmap, 0, 0, 0, 0, cliprect, 0);
- draw_obj1(screen.machine(), bitmap);
+ draw_obj1(machine(), bitmap);
return 0;
}
diff --git a/src/mame/video/cheekyms.c b/src/mame/video/cheekyms.c
index f45e993f9de..0c7aef3fe6a 100644
--- a/src/mame/video/cheekyms.c
+++ b/src/mame/video/cheekyms.c
@@ -151,14 +151,14 @@ UINT32 cheekyms_state::screen_update_cheekyms(screen_device &screen, bitmap_ind1
int scrolly = ((*m_port_80 >> 3) & 0x07);
int flip = *m_port_80 & 0x80;
- screen.machine().tilemap().mark_all_dirty();
- screen.machine().tilemap().set_flip_all(flip ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0);
+ machine().tilemap().mark_all_dirty();
+ machine().tilemap().set_flip_all(flip ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0);
bitmap.fill(0, cliprect);
m_bitmap_buffer->fill(0, cliprect);
/* sprites go under the playfield */
- draw_sprites(screen.machine(), bitmap, cliprect, screen.machine().gfx[1], flip);
+ draw_sprites(machine(), bitmap, cliprect, machine().gfx[1], flip);
/* draw the tilemap to a temp bitmap */
m_cm_tilemap->draw(*m_bitmap_buffer, cliprect, 0, 0);
diff --git a/src/mame/video/cinemat.c b/src/mame/video/cinemat.c
index cced09493f3..ad18571bca5 100644
--- a/src/mame/video/cinemat.c
+++ b/src/mame/video/cinemat.c
@@ -212,7 +212,7 @@ UINT32 cinemat_state::screen_update_cinemat(screen_device &screen, bitmap_rgb32
SCREEN_UPDATE32_CALL(vector);
vector_clear_list();
- ccpu_wdt_timer_trigger(screen.machine().device("maincpu"));
+ ccpu_wdt_timer_trigger(machine().device("maincpu"));
return 0;
}
@@ -227,7 +227,7 @@ UINT32 cinemat_state::screen_update_cinemat(screen_device &screen, bitmap_rgb32
UINT32 cinemat_state::screen_update_spacewar(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- int sw_option = screen.machine().root_device().ioport("INPUTS")->read();
+ int sw_option = machine().root_device().ioport("INPUTS")->read();
SCREEN_UPDATE32_CALL_MEMBER(cinemat);
diff --git a/src/mame/video/circus.c b/src/mame/video/circus.c
index 7e36c0d1030..6573dee071e 100644
--- a/src/mame/video/circus.c
+++ b/src/mame/video/circus.c
@@ -111,8 +111,8 @@ static void circus_draw_fg( running_machine &machine, bitmap_ind16 &bitmap, cons
UINT32 circus_state::screen_update_circus(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- circus_draw_fg(screen.machine(), bitmap, cliprect);
- draw_sprite_collision(screen.machine(), bitmap, cliprect);
+ circus_draw_fg(machine(), bitmap, cliprect);
+ draw_sprite_collision(machine(), bitmap, cliprect);
return 0;
}
@@ -183,7 +183,7 @@ UINT32 circus_state::screen_update_robotbwl(screen_device &screen, bitmap_ind16
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
robotbwl_draw_scoreboard(bitmap, cliprect);
robotbwl_draw_bowling_alley(bitmap, cliprect);
- robotbwl_draw_ball(screen.machine(), bitmap, cliprect);
+ robotbwl_draw_ball(machine(), bitmap, cliprect);
return 0;
}
@@ -201,13 +201,13 @@ static void crash_draw_car( running_machine &machine, bitmap_ind16 &bitmap, cons
UINT32 circus_state::screen_update_crash(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- crash_draw_car(screen.machine(), bitmap, cliprect);
+ crash_draw_car(machine(), bitmap, cliprect);
return 0;
}
UINT32 circus_state::screen_update_ripcord(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprite_collision(screen.machine(), bitmap, cliprect);
+ draw_sprite_collision(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/video/circusc.c b/src/mame/video/circusc.c
index 7922789eca7..77f69443aee 100644
--- a/src/mame/video/circusc.c
+++ b/src/mame/video/circusc.c
@@ -206,7 +206,7 @@ UINT32 circusc_state::screen_update_circusc(screen_device &screen, bitmap_ind16
bitmap.fill(0, cliprect);
m_bg_tilemap->draw(bitmap, cliprect, 1, 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/video/citycon.c b/src/mame/video/citycon.c
index 91c19bc0a82..243c18af63b 100644
--- a/src/mame/video/citycon.c
+++ b/src/mame/video/citycon.c
@@ -146,7 +146,7 @@ UINT32 citycon_state::screen_update_citycon(screen_device &screen, bitmap_ind16
int i;
for (i = 0; i < 4; i++)
- changecolor_RRRRGGGGBBBBxxxx(screen.machine(), 640 + 4 * offs + i, 512 + 4 * indx + i);
+ changecolor_RRRRGGGGBBBBxxxx(machine(), 640 + 4 * offs + i, 512 + 4 * indx + i);
}
@@ -157,6 +157,6 @@ UINT32 citycon_state::screen_update_citycon(screen_device &screen, bitmap_ind16
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);
return 0;
}
diff --git a/src/mame/video/cloak.c b/src/mame/video/cloak.c
index ea1462aa758..ed42d95347f 100644
--- a/src/mame/video/cloak.c
+++ b/src/mame/video/cloak.c
@@ -224,9 +224,9 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
UINT32 cloak_state::screen_update_cloak(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- set_pens(screen.machine());
+ set_pens(machine());
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_bitmap(screen.machine(), bitmap, cliprect);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_bitmap(machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/video/cloud9.c b/src/mame/video/cloud9.c
index 35915d26ca5..2654bb2fc0d 100644
--- a/src/mame/video/cloud9.c
+++ b/src/mame/video/cloud9.c
@@ -245,7 +245,7 @@ UINT32 cloud9_state::screen_update_cloud9(screen_device &screen, bitmap_ind16 &b
{
UINT8 *spriteaddr = m_spriteram;
int flip = m_video_control[5] ? 0xff : 0x00; /* PLAYER2 */
- pen_t black = get_black_pen(screen.machine());
+ pen_t black = get_black_pen(machine());
int x, y, offs;
/* draw the sprites */
@@ -260,9 +260,9 @@ UINT32 cloud9_state::screen_update_cloud9(screen_device &screen, bitmap_ind16 &b
int which = spriteaddr[offs + 0x20];
int color = 0;
- drawgfx_transpen(m_spritebitmap, cliprect, screen.machine().gfx[0], which, color, xflip, yflip, x, y, 0);
+ drawgfx_transpen(m_spritebitmap, cliprect, machine().gfx[0], which, color, xflip, yflip, x, y, 0);
if (x >= 256 - 16)
- drawgfx_transpen(m_spritebitmap, cliprect, screen.machine().gfx[0], which, color, xflip, yflip, x - 256, y, 0);
+ drawgfx_transpen(m_spritebitmap, cliprect, machine().gfx[0], which, color, xflip, yflip, x - 256, y, 0);
}
/* draw the bitmap to the screen, looping over Y */
diff --git a/src/mame/video/clshroad.c b/src/mame/video/clshroad.c
index 008043044d3..53eecc12932 100644
--- a/src/mame/video/clshroad.c
+++ b/src/mame/video/clshroad.c
@@ -332,7 +332,7 @@ UINT32 clshroad_state::screen_update_clshroad(screen_device &screen, bitmap_ind1
m_tilemap_0a->draw(bitmap, cliprect, 0,0); // Opaque
m_tilemap_0b->draw(bitmap, cliprect, 0,0);
- draw_sprites(screen.machine(),bitmap,cliprect);
+ draw_sprites(machine(),bitmap,cliprect);
m_tilemap_1->draw(bitmap, cliprect, 0,0);
return 0;
}
diff --git a/src/mame/video/cninja.c b/src/mame/video/cninja.c
index 767127ca095..521f9763479 100644
--- a/src/mame/video/cninja.c
+++ b/src/mame/video/cninja.c
@@ -126,7 +126,7 @@ static void cninjabl_draw_sprites( running_machine &machine, bitmap_ind16 &bitma
UINT32 cninja_state::screen_update_cninja(screen_device &screen, bitmap_ind16 &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));
@@ -134,20 +134,20 @@ UINT32 cninja_state::screen_update_cninja(screen_device &screen, bitmap_ind16 &b
deco16ic_pf_update(m_deco_tilegen2, m_pf3_rowscroll, m_pf4_rowscroll);
/* Draw playfields */
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
bitmap.fill(512, cliprect);
deco16ic_tilemap_2_draw(m_deco_tilegen2, bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 1);
deco16ic_tilemap_1_draw(m_deco_tilegen2, bitmap, cliprect, 0, 2);
deco16ic_tilemap_2_draw(m_deco_tilegen1, bitmap, cliprect, TILEMAP_DRAW_LAYER1, 2);
deco16ic_tilemap_2_draw(m_deco_tilegen1, bitmap, cliprect, TILEMAP_DRAW_LAYER0, 4);
- 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_tilemap_1_draw(m_deco_tilegen1, bitmap, cliprect, 0, 0);
return 0;
}
UINT32 cninja_state::screen_update_cninjabl(screen_device &screen, bitmap_ind16 &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);
/* force layers to be enabled */
@@ -159,39 +159,39 @@ UINT32 cninja_state::screen_update_cninjabl(screen_device &screen, bitmap_ind16
deco16ic_pf_update(m_deco_tilegen2, m_pf3_rowscroll, m_pf4_rowscroll);
/* Draw playfields */
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
bitmap.fill(512, cliprect);
deco16ic_tilemap_2_draw(m_deco_tilegen2, bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 1);
deco16ic_tilemap_1_draw(m_deco_tilegen2, bitmap, cliprect, 0, 2);
deco16ic_tilemap_2_draw(m_deco_tilegen1, bitmap, cliprect, TILEMAP_DRAW_LAYER1, 2);
deco16ic_tilemap_2_draw(m_deco_tilegen1, bitmap, cliprect, TILEMAP_DRAW_LAYER0, 4);
- cninjabl_draw_sprites(screen.machine(), bitmap, cliprect);
+ cninjabl_draw_sprites(machine(), bitmap, cliprect);
deco16ic_tilemap_1_draw(m_deco_tilegen1, bitmap, cliprect, 0, 0);
return 0;
}
UINT32 cninja_state::screen_update_edrandy(screen_device &screen, bitmap_ind16 &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));
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, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
bitmap.fill(0, cliprect);
deco16ic_tilemap_2_draw(m_deco_tilegen2, bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 1);
deco16ic_tilemap_1_draw(m_deco_tilegen2, bitmap, cliprect, 0, 2);
deco16ic_tilemap_2_draw(m_deco_tilegen1, bitmap, cliprect, 0, 4);
- 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_tilemap_1_draw(m_deco_tilegen1, bitmap, cliprect, 0, 0);
return 0;
}
UINT32 cninja_state::screen_update_robocop2(screen_device &screen, bitmap_ind16 &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);
UINT16 priority = decocomn_priority_r(m_decocomn, space, 0, 0xffff);
@@ -215,7 +215,7 @@ UINT32 cninja_state::screen_update_robocop2(screen_device &screen, bitmap_ind16
deco16ic_pf_update(m_deco_tilegen2, m_pf3_rowscroll, m_pf4_rowscroll);
/* Draw playfields */
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
bitmap.fill(0x200, cliprect);
if ((priority & 4) == 0)
@@ -235,7 +235,7 @@ UINT32 cninja_state::screen_update_robocop2(screen_device &screen, bitmap_ind16
break;
}
- 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_tilemap_1_draw(m_deco_tilegen1, bitmap, cliprect, 0, 0);
return 0;
}
@@ -248,7 +248,7 @@ VIDEO_START_MEMBER(cninja_state,mutantf)
UINT32 cninja_state::screen_update_mutantf(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);
UINT16 priority = decocomn_priority_r(m_decocomn, space, 0, 0xffff);
@@ -260,10 +260,10 @@ UINT32 cninja_state::screen_update_mutantf(screen_device &screen, bitmap_rgb32 &
/* Draw playfields */
bitmap.fill(0x400, cliprect); /* Confirmed */
- screen.machine().device<decospr_device>("spritegen1")->set_alt_format(true);
- screen.machine().device<decospr_device>("spritegen2")->set_alt_format(true);
- screen.machine().device<decospr_device>("spritegen2")->draw_sprites(bitmap, cliprect, m_spriteram2->buffer(), 0x400, true);
- screen.machine().device<decospr_device>("spritegen1")->draw_sprites(bitmap, cliprect, m_spriteram->buffer(), 0x400, true);
+ machine().device<decospr_device>("spritegen1")->set_alt_format(true);
+ machine().device<decospr_device>("spritegen2")->set_alt_format(true);
+ machine().device<decospr_device>("spritegen2")->draw_sprites(bitmap, cliprect, m_spriteram2->buffer(), 0x400, true);
+ machine().device<decospr_device>("spritegen1")->draw_sprites(bitmap, cliprect, m_spriteram->buffer(), 0x400, true);
/* There is no priority prom on this board, but there is a
@@ -284,13 +284,13 @@ UINT32 cninja_state::screen_update_mutantf(screen_device &screen, bitmap_rgb32 &
if (priority & 1)
{
- screen.machine().device<decospr_device>("spritegen1")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0000, 0x0000, 0x100, 0x1ff);
- screen.machine().device<decospr_device>("spritegen2")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0000, 0x0000, 1024+768, 0x0ff, 0x80); // fixed alpha of 0x80 for this layer?
+ machine().device<decospr_device>("spritegen1")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0000, 0x0000, 0x100, 0x1ff);
+ machine().device<decospr_device>("spritegen2")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0000, 0x0000, 1024+768, 0x0ff, 0x80); // fixed alpha of 0x80 for this layer?
}
else
{
- screen.machine().device<decospr_device>("spritegen2")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0000, 0x0000, 1024+768, 0x0ff, 0x80); // fixed alpha of 0x80 for this layer?
- screen.machine().device<decospr_device>("spritegen1")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0000, 0x0000, 0x100, 0x1ff);
+ machine().device<decospr_device>("spritegen2")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0000, 0x0000, 1024+768, 0x0ff, 0x80); // fixed alpha of 0x80 for this layer?
+ machine().device<decospr_device>("spritegen1")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0000, 0x0000, 0x100, 0x1ff);
}
deco16ic_tilemap_1_draw(m_deco_tilegen1, bitmap, cliprect, 0, 0);
return 0;
diff --git a/src/mame/video/combatsc.c b/src/mame/video/combatsc.c
index 9f93e87bcc5..ed667a69c5d 100644
--- a/src/mame/video/combatsc.c
+++ b/src/mame/video/combatsc.c
@@ -397,9 +397,9 @@ UINT32 combatsc_state::screen_update_combatsc(screen_device &screen, bitmap_ind1
{
int i;
- set_pens(screen.machine());
+ set_pens(machine());
- address_space &space = screen.machine().driver_data()->generic_space();
+ address_space &space = machine().driver_data()->generic_space();
if (k007121_ctrlram_r(m_k007121_1, space, 1) & 0x02)
{
m_bg_tilemap[0]->set_scroll_rows(32);
@@ -427,7 +427,7 @@ UINT32 combatsc_state::screen_update_combatsc(screen_device &screen, bitmap_ind1
m_bg_tilemap[0]->set_scrolly(0, k007121_ctrlram_r(m_k007121_1, space, 2));
m_bg_tilemap[1]->set_scrolly(0, k007121_ctrlram_r(m_k007121_2, space, 2));
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
if (m_priority == 0)
{
@@ -437,8 +437,8 @@ UINT32 combatsc_state::screen_update_combatsc(screen_device &screen, bitmap_ind1
m_bg_tilemap[0]->draw(bitmap, cliprect, 1, 2);
/* we use the priority buffer so sprites are drawn front to back */
- draw_sprites(screen.machine(), bitmap, cliprect, m_spriteram[1], 1, 0x0f00);
- draw_sprites(screen.machine(), bitmap, cliprect, m_spriteram[0], 0, 0x4444);
+ draw_sprites(machine(), bitmap, cliprect, m_spriteram[1], 1, 0x0f00);
+ draw_sprites(machine(), bitmap, cliprect, m_spriteram[0], 0, 0x4444);
}
else
{
@@ -448,8 +448,8 @@ UINT32 combatsc_state::screen_update_combatsc(screen_device &screen, bitmap_ind1
m_bg_tilemap[1]->draw(bitmap, cliprect, 0, 8);
/* we use the priority buffer so sprites are drawn front to back */
- draw_sprites(screen.machine(), bitmap, cliprect, m_spriteram[1], 1, 0x0f00);
- draw_sprites(screen.machine(), bitmap, cliprect, m_spriteram[0], 0, 0x4444);
+ draw_sprites(machine(), bitmap, cliprect, m_spriteram[1], 1, 0x0f00);
+ draw_sprites(machine(), bitmap, cliprect, m_spriteram[0], 0, 0x4444);
}
if (k007121_ctrlram_r(m_k007121_1, space, 1) & 0x08)
@@ -555,7 +555,7 @@ UINT32 combatsc_state::screen_update_combatscb(screen_device &screen, bitmap_ind
{
int i;
- set_pens(screen.machine());
+ set_pens(machine());
for (i = 0; i < 32; i++)
{
@@ -568,16 +568,16 @@ UINT32 combatsc_state::screen_update_combatscb(screen_device &screen, bitmap_ind
if (m_priority == 0)
{
m_bg_tilemap[1]->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0);
- bootleg_draw_sprites(screen.machine(), bitmap,cliprect, m_page[0], 0);
+ bootleg_draw_sprites(machine(), bitmap,cliprect, m_page[0], 0);
m_bg_tilemap[0]->draw(bitmap, cliprect, 0 ,0);
- bootleg_draw_sprites(screen.machine(), bitmap,cliprect, m_page[1], 1);
+ bootleg_draw_sprites(machine(), bitmap,cliprect, m_page[1], 1);
}
else
{
m_bg_tilemap[0]->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0);
- bootleg_draw_sprites(screen.machine(), bitmap,cliprect, m_page[0], 0);
+ bootleg_draw_sprites(machine(), bitmap,cliprect, m_page[0], 0);
m_bg_tilemap[1]->draw(bitmap, cliprect, 0, 0);
- bootleg_draw_sprites(screen.machine(), bitmap,cliprect, m_page[1], 1);
+ bootleg_draw_sprites(machine(), bitmap,cliprect, m_page[1], 1);
}
m_textlayer->draw(bitmap, cliprect, 0, 0);
diff --git a/src/mame/video/commando.c b/src/mame/video/commando.c
index c3751ba4876..c927e27a517 100644
--- a/src/mame/video/commando.c
+++ b/src/mame/video/commando.c
@@ -130,7 +130,7 @@ UINT32 commando_state::screen_update_commando(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/video/compgolf.c b/src/mame/video/compgolf.c
index 4b0c5ebb0e6..6321d48e9aa 100644
--- a/src/mame/video/compgolf.c
+++ b/src/mame/video/compgolf.c
@@ -124,6 +124,6 @@ UINT32 compgolf_state::screen_update_compgolf(screen_device &screen, bitmap_ind1
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
m_text_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/video/contra.c b/src/mame/video/contra.c
index 72deced8842..302a7ec5845 100644
--- a/src/mame/video/contra.c
+++ b/src/mame/video/contra.c
@@ -308,7 +308,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
UINT32 contra_state::screen_update_contra(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- address_space &space = screen.machine().driver_data()->generic_space();
+ address_space &space = machine().driver_data()->generic_space();
UINT8 ctrl_1_0 = k007121_ctrlram_r(m_k007121_1, space, 0);
UINT8 ctrl_1_2 = k007121_ctrlram_r(m_k007121_1, space, 2);
UINT8 ctrl_2_0 = k007121_ctrlram_r(m_k007121_2, space, 0);
@@ -321,7 +321,7 @@ UINT32 contra_state::screen_update_contra(screen_device &screen, bitmap_ind16 &b
fg_finalclip &= cliprect;
tx_finalclip &= cliprect;
- set_pens(screen.machine());
+ set_pens(machine());
m_fg_tilemap->set_scrollx(0, ctrl_1_0 - 40);
m_fg_tilemap->set_scrolly(0, ctrl_1_2);
@@ -330,8 +330,8 @@ UINT32 contra_state::screen_update_contra(screen_device &screen, bitmap_ind16 &b
m_bg_tilemap->draw(bitmap, bg_finalclip, 0 ,0);
m_fg_tilemap->draw(bitmap, fg_finalclip, 0 ,0);
- draw_sprites(screen.machine(),bitmap,cliprect, 0);
- draw_sprites(screen.machine(),bitmap,cliprect, 1);
+ draw_sprites(machine(),bitmap,cliprect, 0);
+ draw_sprites(machine(),bitmap,cliprect, 1);
m_tx_tilemap->draw(bitmap, tx_finalclip, 0 ,0);
return 0;
}
diff --git a/src/mame/video/cop01.c b/src/mame/video/cop01.c
index 3ea4e1aed62..4059f6be5c9 100644
--- a/src/mame/video/cop01.c
+++ b/src/mame/video/cop01.c
@@ -207,7 +207,7 @@ UINT32 cop01_state::screen_update_cop01(screen_device &screen, bitmap_ind16 &bit
m_bg_tilemap->set_scrolly(0, m_vreg[3]);
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0);
m_fg_tilemap->draw(bitmap, cliprect, 0, 0 );
return 0;
diff --git a/src/mame/video/copsnrob.c b/src/mame/video/copsnrob.c
index e461a7546e6..317cebaeb2e 100644
--- a/src/mame/video/copsnrob.c
+++ b/src/mame/video/copsnrob.c
@@ -21,7 +21,7 @@ UINT32 copsnrob_state::screen_update_copsnrob(screen_device &screen, bitmap_ind1
sx = 31 - (offs % 32);
sy = offs / 32;
- drawgfx_opaque(bitmap,cliprect,screen.machine().gfx[0],
+ drawgfx_opaque(bitmap,cliprect,machine().gfx[0],
m_videoram[offs] & 0x3f,0,
0,0,
8*sx,8*sy);
@@ -30,25 +30,25 @@ UINT32 copsnrob_state::screen_update_copsnrob(screen_device &screen, bitmap_ind1
/* Draw the cars. Positioning was based on a screen shot */
if (m_cary[0])
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[1],
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[1],
m_carimage[0],0,
1,0,
0xe4,256 - m_cary[0],0);
if (m_cary[1])
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[1],
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[1],
m_carimage[1],0,
1,0,
0xc4,256 - m_cary[1],0);
if (m_cary[2])
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[1],
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[1],
m_carimage[2],0,
0,0,
0x24,256 - m_cary[2],0);
if (m_cary[3])
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[1],
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[1],
m_carimage[3],0,
0,0,
0x04,256 - m_cary[3],0);
@@ -77,7 +77,7 @@ UINT32 copsnrob_state::screen_update_copsnrob(screen_device &screen, bitmap_ind1
{
/* We've hit a truck's back end, so draw the truck. The front
end may be off the top of the screen, but we don't care. */
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[2],
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[2],
0,0,
0,0,
0x80,256 - (y + 31),0);
@@ -89,7 +89,7 @@ UINT32 copsnrob_state::screen_update_copsnrob(screen_device &screen, bitmap_ind1
{
/* We missed a truck's back end (it was off the bottom of the
screen) but have hit its front end, so draw the truck. */
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[2],
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[2],
0,0,
0,0,
0x80,256 - y,0);
diff --git a/src/mame/video/cosmic.c b/src/mame/video/cosmic.c
index 7f3e9c2eda2..49c331bbd65 100644
--- a/src/mame/video/cosmic.c
+++ b/src/mame/video/cosmic.c
@@ -549,7 +549,7 @@ static void nomnlnd_draw_background( screen_device &screen, bitmap_ind16 &bitmap
UINT32 cosmic_state::screen_update_cosmicg(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
bitmap.fill(0, cliprect);
- draw_bitmap(screen.machine(), bitmap, cliprect);
+ draw_bitmap(machine(), bitmap, cliprect);
return 0;
}
@@ -557,8 +557,8 @@ UINT32 cosmic_state::screen_update_cosmicg(screen_device &screen, bitmap_ind16 &
UINT32 cosmic_state::screen_update_panic(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
bitmap.fill(0, cliprect);
- draw_bitmap(screen.machine(), bitmap, cliprect);
- draw_sprites(screen.machine(), bitmap, cliprect, 0x07, 1);
+ draw_bitmap(machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect, 0x07, 1);
return 0;
}
@@ -567,8 +567,8 @@ UINT32 cosmic_state::screen_update_cosmica(screen_device &screen, bitmap_ind16 &
{
bitmap.fill(0, cliprect);
cosmica_draw_starfield(screen, bitmap, cliprect);
- draw_bitmap(screen.machine(), bitmap, cliprect);
- draw_sprites(screen.machine(), bitmap, cliprect, 0x0f, 0);
+ draw_bitmap(machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect, 0x0f, 0);
return 0;
}
@@ -576,8 +576,8 @@ UINT32 cosmic_state::screen_update_cosmica(screen_device &screen, bitmap_ind16 &
UINT32 cosmic_state::screen_update_magspot(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
bitmap.fill(0, cliprect);
- draw_bitmap(screen.machine(), bitmap, cliprect);
- draw_sprites(screen.machine(), bitmap, cliprect, 0x07, 0);
+ draw_bitmap(machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect, 0x07, 0);
return 0;
}
@@ -588,10 +588,10 @@ UINT32 cosmic_state::screen_update_devzone(screen_device &screen, bitmap_ind16 &
bitmap.fill(0, cliprect);
if (m_background_enable)
- devzone_draw_grid(screen.machine(), bitmap, cliprect);
+ devzone_draw_grid(machine(), bitmap, cliprect);
- draw_bitmap(screen.machine(), bitmap, cliprect);
- draw_sprites(screen.machine(), bitmap, cliprect, 0x07, 0);
+ draw_bitmap(machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect, 0x07, 0);
return 0;
}
@@ -603,8 +603,8 @@ UINT32 cosmic_state::screen_update_nomnlnd(screen_device &screen, bitmap_ind16 &
have the highest priority */
bitmap.fill(0, cliprect);
- draw_bitmap(screen.machine(), bitmap, cliprect);
- draw_sprites(screen.machine(), bitmap, cliprect, 0x07, 0);
+ draw_bitmap(machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect, 0x07, 0);
if (m_background_enable)
nomnlnd_draw_background(screen, bitmap, cliprect);
diff --git a/src/mame/video/cps1.c b/src/mame/video/cps1.c
index 53a490f10ab..3292db1217c 100644
--- a/src/mame/video/cps1.c
+++ b/src/mame/video/cps1.c
@@ -2800,17 +2800,17 @@ UINT32 cps_state::screen_update_cps1(screen_device &screen, bitmap_ind16 &bitmap
layercontrol = m_cps_b_regs[m_game_config->layer_control / 2];
/* Get video memory base registers */
- cps1_get_video_base(screen.machine());
+ cps1_get_video_base(machine());
/* Find the offset of the last sprite in the sprite table */
- cps1_find_last_sprite(screen.machine());
+ cps1_find_last_sprite(machine());
if (m_cps_version == 2)
{
- cps2_find_last_sprite(screen.machine());
+ cps2_find_last_sprite(machine());
}
- cps1_update_transmasks(screen.machine());
+ cps1_update_transmasks(machine());
m_bg_tilemap[0]->set_scrollx(0, m_scroll1x);
m_bg_tilemap[0]->set_scrolly(0, m_scroll1y);
@@ -2852,7 +2852,7 @@ UINT32 cps_state::screen_update_cps1(screen_device &screen, bitmap_ind16 &bitmap
// Maybe Capcom changed the background handling due to the problems that
// it caused on several monitors (because the background extended into the
// blanking area instead of going black, causing the monitor to clip).
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
}
cps1_render_stars(screen, bitmap, cliprect);
@@ -2862,26 +2862,26 @@ UINT32 cps_state::screen_update_cps1(screen_device &screen, bitmap_ind16 &bitmap
l1 = (layercontrol >> 0x08) & 03;
l2 = (layercontrol >> 0x0a) & 03;
l3 = (layercontrol >> 0x0c) & 03;
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
if (m_cps_version == 1)
{
- cps1_render_layer(screen.machine(), bitmap, cliprect, l0, 0);
+ cps1_render_layer(machine(), bitmap, cliprect, l0, 0);
if (l1 == 0)
- cps1_render_high_layer(screen.machine(), bitmap, cliprect, l0); /* prepare mask for sprites */
+ cps1_render_high_layer(machine(), bitmap, cliprect, l0); /* prepare mask for sprites */
- cps1_render_layer(screen.machine(), bitmap, cliprect, l1, 0);
+ cps1_render_layer(machine(), bitmap, cliprect, l1, 0);
if (l2 == 0)
- cps1_render_high_layer(screen.machine(), bitmap, cliprect, l1); /* prepare mask for sprites */
+ cps1_render_high_layer(machine(), bitmap, cliprect, l1); /* prepare mask for sprites */
- cps1_render_layer(screen.machine(), bitmap, cliprect, l2, 0);
+ cps1_render_layer(machine(), bitmap, cliprect, l2, 0);
if (l3 == 0)
- cps1_render_high_layer(screen.machine(), bitmap, cliprect, l2); /* prepare mask for sprites */
+ cps1_render_high_layer(machine(), bitmap, cliprect, l2); /* prepare mask for sprites */
- cps1_render_layer(screen.machine(), bitmap, cliprect, l3, 0);
+ cps1_render_layer(machine(), bitmap, cliprect, l3, 0);
}
else
{
@@ -2893,15 +2893,15 @@ UINT32 cps_state::screen_update_cps1(screen_device &screen, bitmap_ind16 &bitmap
l3pri = (m_pri_ctrl >> 4 * l3) & 0x0f;
#if 0
-if ( (cps2_port(screen.machine(), CPS2_OBJ_BASE) != 0x7080 && cps2_port(screen.machine(), CPS2_OBJ_BASE) != 0x7000) ||
- cps2_port(screen.machine(), CPS2_OBJ_UK1) != 0x807d ||
- (cps2_port(screen.machine(), CPS2_OBJ_UK2) != 0x0000 && cps2_port(screen.machine(), CPS2_OBJ_UK2) != 0x1101 && cps2_port(screen.machine(), CPS2_OBJ_UK2) != 0x0001))
+if ( (cps2_port(machine(), CPS2_OBJ_BASE) != 0x7080 && cps2_port(machine(), CPS2_OBJ_BASE) != 0x7000) ||
+ cps2_port(machine(), CPS2_OBJ_UK1) != 0x807d ||
+ (cps2_port(machine(), CPS2_OBJ_UK2) != 0x0000 && cps2_port(machine(), CPS2_OBJ_UK2) != 0x1101 && cps2_port(machine(), CPS2_OBJ_UK2) != 0x0001))
popmessage("base %04x uk1 %04x uk2 %04x",
- cps2_port(screen.machine(), CPS2_OBJ_BASE),
- cps2_port(screen.machine(), CPS2_OBJ_UK1),
- cps2_port(screen.machine(), CPS2_OBJ_UK2));
+ cps2_port(machine(), CPS2_OBJ_BASE),
+ cps2_port(machine(), CPS2_OBJ_UK1),
+ cps2_port(machine(), CPS2_OBJ_UK2));
-if (0 && screen.machine().input().code_pressed(KEYCODE_Z))
+if (0 && machine().input().code_pressed(KEYCODE_Z))
popmessage("order: %d (%d) %d (%d) %d (%d) %d (%d)",l0,l0pri,l1,l1pri,l2,l2pri,l3,l3pri);
#endif
@@ -2932,10 +2932,10 @@ if (0 && screen.machine().input().code_pressed(KEYCODE_Z))
}
}
- cps1_render_layer(screen.machine(), bitmap, cliprect, l0, 1);
- cps1_render_layer(screen.machine(), bitmap, cliprect, l1, 2);
- cps1_render_layer(screen.machine(), bitmap, cliprect, l2, 4);
- cps2_render_sprites(screen.machine(), bitmap, cliprect, primasks);
+ cps1_render_layer(machine(), bitmap, cliprect, l0, 1);
+ cps1_render_layer(machine(), bitmap, cliprect, l1, 2);
+ cps1_render_layer(machine(), bitmap, cliprect, l2, 4);
+ cps2_render_sprites(machine(), bitmap, cliprect, primasks);
}
return 0;
@@ -2948,7 +2948,7 @@ void cps_state::screen_eof_cps1(screen_device &screen, bool state)
{
/* Get video memory base registers */
- cps1_get_video_base(screen.machine());
+ cps1_get_video_base(machine());
if (m_cps_version == 1)
{
diff --git a/src/mame/video/crbaloon.c b/src/mame/video/crbaloon.c
index 8d10ce899b0..c32c3e1b914 100644
--- a/src/mame/video/crbaloon.c
+++ b/src/mame/video/crbaloon.c
@@ -148,7 +148,7 @@ UINT32 crbaloon_state::screen_update_crbaloon(screen_device &screen, bitmap_ind1
{
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprite_and_check_collision(screen.machine(), bitmap);
+ draw_sprite_and_check_collision(machine(), bitmap);
return 0;
}
diff --git a/src/mame/video/crgolf.c b/src/mame/video/crgolf.c
index 6bc6acfb99b..8c51b5dcb6a 100644
--- a/src/mame/video/crgolf.c
+++ b/src/mame/video/crgolf.c
@@ -115,7 +115,7 @@ UINT32 crgolf_state::screen_update_crgolf(screen_device &screen, bitmap_rgb32 &b
offs_t offs;
pen_t pens[NUM_PENS];
- get_pens(screen.machine(), pens);
+ get_pens(machine(), pens);
/* for each byte in the video RAM */
for (offs = 0; offs < VIDEORAM_SIZE / 3; offs++)
diff --git a/src/mame/video/crospang.c b/src/mame/video/crospang.c
index 73209c6d023..fd6729a1e98 100644
--- a/src/mame/video/crospang.c
+++ b/src/mame/video/crospang.c
@@ -119,6 +119,6 @@ UINT32 crospang_state::screen_update_crospang(screen_device &screen, bitmap_ind1
{
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/video/crshrace.c b/src/mame/video/crshrace.c
index ffbc77b62b7..55f45b7ab96 100644
--- a/src/mame/video/crshrace.c
+++ b/src/mame/video/crshrace.c
@@ -183,7 +183,7 @@ UINT32 crshrace_state::screen_update_crshrace(screen_device &screen, bitmap_ind1
if (m_gfxctrl & 0x04) /* display disable? */
{
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
return 0;
}
@@ -192,15 +192,15 @@ UINT32 crshrace_state::screen_update_crshrace(screen_device &screen, bitmap_ind1
switch (m_gfxctrl & 0xfb)
{
case 0x00: /* high score screen */
- draw_sprites(screen.machine(), bitmap, cliprect);
- draw_bg(screen.machine(), bitmap, cliprect);
- draw_fg(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
+ draw_bg(machine(), bitmap, cliprect);
+ draw_fg(machine(), bitmap, cliprect);
break;
case 0x01:
case 0x02:
- draw_bg(screen.machine(), bitmap, cliprect);
- draw_fg(screen.machine(), bitmap, cliprect);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_bg(machine(), bitmap, cliprect);
+ draw_fg(machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
break;
default:
popmessage("gfxctrl = %02x", m_gfxctrl);
diff --git a/src/mame/video/cvs.c b/src/mame/video/cvs.c
index 7a9ca846d43..f8a5b15653d 100644
--- a/src/mame/video/cvs.c
+++ b/src/mame/video/cvs.c
@@ -144,7 +144,7 @@ UINT32 cvs_state::screen_update_cvs(screen_device &screen, bitmap_ind16 &bitmap,
offs_t offs;
int scroll[8];
- set_pens(screen.machine());
+ set_pens(machine());
/* draw the background */
for (offs = 0; offs < 0x0400; offs++)
@@ -158,7 +158,7 @@ UINT32 cvs_state::screen_update_cvs(screen_device &screen, bitmap_ind16 &bitmap,
int gfxnum = (code < ram_based_char_start_indices[m_character_banking_mode]) ? 0 : 1;
- drawgfx_opaque(m_background_bitmap, m_background_bitmap.cliprect(), screen.machine().gfx[gfxnum],
+ drawgfx_opaque(m_background_bitmap, m_background_bitmap.cliprect(), machine().gfx[gfxnum],
code, color,
0, 0,
x, y);
@@ -174,7 +174,7 @@ UINT32 cvs_state::screen_update_cvs(screen_device &screen, bitmap_ind16 &bitmap,
collision_color = 0x102;
}
- drawgfx_opaque(m_collision_background, m_collision_background.cliprect(), screen.machine().gfx[gfxnum],
+ drawgfx_opaque(m_collision_background, m_collision_background.cliprect(), machine().gfx[gfxnum],
code, collision_color,
0, 0,
x, y);
@@ -216,7 +216,7 @@ UINT32 cvs_state::screen_update_cvs(screen_device &screen, bitmap_ind16 &bitmap,
m_collision_register |= 0x08;
/* Bullet/Background Collision */
- if (colortable_entry_get_value(screen.machine().colortable, m_scrolled_collision_background.pix16(offs, bx)))
+ if (colortable_entry_get_value(machine().colortable, m_scrolled_collision_background.pix16(offs, bx)))
m_collision_register |= 0x80;
bitmap.pix16(offs, bx) = BULLET_STAR_PEN;
@@ -251,7 +251,7 @@ UINT32 cvs_state::screen_update_cvs(screen_device &screen, bitmap_ind16 &bitmap,
if (S2636_IS_PIXEL_DRAWN(pixel0) && S2636_IS_PIXEL_DRAWN(pixel2)) m_collision_register |= 0x04;
/* S2636 vs. background collision detection */
- if (colortable_entry_get_value(screen.machine().colortable, m_scrolled_collision_background.pix16(y, x)))
+ if (colortable_entry_get_value(machine().colortable, m_scrolled_collision_background.pix16(y, x)))
{
if (S2636_IS_PIXEL_DRAWN(pixel0)) m_collision_register |= 0x10;
if (S2636_IS_PIXEL_DRAWN(pixel1)) m_collision_register |= 0x20;
@@ -264,7 +264,7 @@ UINT32 cvs_state::screen_update_cvs(screen_device &screen, bitmap_ind16 &bitmap,
/* stars circuit */
if (m_stars_on)
- cvs_update_stars(screen.machine(), bitmap, cliprect, BULLET_STAR_PEN, 0);
+ cvs_update_stars(machine(), bitmap, cliprect, BULLET_STAR_PEN, 0);
return 0;
}
diff --git a/src/mame/video/darkmist.c b/src/mame/video/darkmist.c
index 7a711c352f6..badaee544a1 100644
--- a/src/mame/video/darkmist.c
+++ b/src/mame/video/darkmist.c
@@ -133,14 +133,14 @@ UINT32 darkmist_state::screen_update_darkmist(screen_device &screen, bitmap_ind1
#define DM_GETSCROLL(n) (((m_scroll[(n)]<<1)&0xff) + ((m_scroll[(n)]&0x80)?1:0) +( ((m_scroll[(n)-1]<<4) | (m_scroll[(n)-1]<<12) )&0xff00))
- set_pens(screen.machine());
+ set_pens(machine());
m_bgtilemap->set_scrollx(0, DM_GETSCROLL(0x2));
m_bgtilemap->set_scrolly(0, DM_GETSCROLL(0x6));
m_fgtilemap->set_scrollx(0, DM_GETSCROLL(0xa));
m_fgtilemap->set_scrolly(0, DM_GETSCROLL(0xe));
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
if(m_hw & DISPLAY_BG)
m_bgtilemap->draw(bitmap, cliprect, 0,0);
@@ -175,13 +175,13 @@ UINT32 darkmist_state::screen_update_darkmist(screen_device &screen, bitmap_ind1
palette=((spriteram[i+1])>>1)&0xf;
if(spriteram[i+1]&0x1)
- palette=screen.machine().rand()&15;
+ palette=machine().rand()&15;
palette+=32;
drawgfx_transpen(
bitmap,cliprect,
- screen.machine().gfx[2],
+ machine().gfx[2],
tile,
palette,
fx,fy,
diff --git a/src/mame/video/darkseal.c b/src/mame/video/darkseal.c
index d69bcbd4c88..a0b34655405 100644
--- a/src/mame/video/darkseal.c
+++ b/src/mame/video/darkseal.c
@@ -62,9 +62,9 @@ void darkseal_state::video_start()
UINT32 darkseal_state::screen_update_darkseal(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- screen.machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
+ machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
deco16ic_pf_update(m_deco_tilegen1, m_pf1_rowscroll, m_pf1_rowscroll);
deco16ic_pf_update(m_deco_tilegen2, m_pf3_rowscroll, m_pf3_rowscroll);
@@ -73,7 +73,7 @@ UINT32 darkseal_state::screen_update_darkseal(screen_device &screen, bitmap_ind1
deco16ic_tilemap_2_draw(m_deco_tilegen2, bitmap, cliprect, 0, 0);
deco16ic_tilemap_1_draw(m_deco_tilegen1, bitmap, cliprect, 0, 0);
- 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_tilemap_2_draw(m_deco_tilegen1, bitmap, cliprect, 0, 0);
return 0;
diff --git a/src/mame/video/dassault.c b/src/mame/video/dassault.c
index f7b66d8c817..400f25bc27c 100644
--- a/src/mame/video/dassault.c
+++ b/src/mame/video/dassault.c
@@ -76,14 +76,14 @@ static void mixdassaultlayer(running_machine &machine, bitmap_rgb32 &bitmap, bit
/* are the priorities 100% correct? they're the same as they were before conversion to DECO52 sprite device, but if (for example) you walk to the side of the crates in the first part of the game you appear over them... */
UINT32 dassault_state::screen_update_dassault(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);
UINT16 priority = decocomn_priority_r(m_decocomn, space, 0, 0xffff);
- screen.machine().device<decospr_device>("spritegen2")->draw_sprites(bitmap, cliprect, m_spriteram2->buffer(), 0x400, false);
- screen.machine().device<decospr_device>("spritegen1")->draw_sprites(bitmap, cliprect, m_spriteram->buffer(), 0x400, false);
- bitmap_ind16* sprite_bitmap1 = &screen.machine().device<decospr_device>("spritegen1")->get_sprite_temp_bitmap();
- bitmap_ind16* sprite_bitmap2 = &screen.machine().device<decospr_device>("spritegen2")->get_sprite_temp_bitmap();
+ machine().device<decospr_device>("spritegen2")->draw_sprites(bitmap, cliprect, m_spriteram2->buffer(), 0x400, false);
+ machine().device<decospr_device>("spritegen1")->draw_sprites(bitmap, cliprect, m_spriteram->buffer(), 0x400, false);
+ bitmap_ind16* sprite_bitmap1 = &machine().device<decospr_device>("spritegen1")->get_sprite_temp_bitmap();
+ bitmap_ind16* sprite_bitmap2 = &machine().device<decospr_device>("spritegen2")->get_sprite_temp_bitmap();
/* Update tilemaps */
flip_screen_set(BIT(flip, 7));
@@ -91,41 +91,41 @@ UINT32 dassault_state::screen_update_dassault(screen_device &screen, bitmap_rgb3
deco16ic_pf_update(m_deco_tilegen2, 0, m_pf4_rowscroll);
/* Draw playfields/update priority bitmap */
- screen.machine().priority_bitmap.fill(0, cliprect);
- bitmap.fill(screen.machine().pens[3072], cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
+ bitmap.fill(machine().pens[3072], cliprect);
deco16ic_tilemap_2_draw(m_deco_tilegen2, bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0);
/* The middle playfields can be swapped priority-wise */
if ((priority & 3) == 0)
{
- mixdassaultlayer(screen.machine(), bitmap, sprite_bitmap1, cliprect, 0x0600, 0x0600, 0x400, 0xff); // 1
+ mixdassaultlayer(machine(), bitmap, sprite_bitmap1, cliprect, 0x0600, 0x0600, 0x400, 0xff); // 1
deco16ic_tilemap_2_draw(m_deco_tilegen1, bitmap, cliprect, 0, 2); // 2
- mixdassaultlayer(screen.machine(), bitmap, sprite_bitmap1, cliprect, 0x0400, 0x0600, 0x400, 0xff); // 8
+ mixdassaultlayer(machine(), bitmap, sprite_bitmap1, cliprect, 0x0400, 0x0600, 0x400, 0xff); // 8
deco16ic_tilemap_1_draw(m_deco_tilegen2, bitmap, cliprect, 0, 16); // 16
- mixdassaultlayer(screen.machine(), bitmap, sprite_bitmap1, cliprect, 0x0200, 0x0600, 0x400, 0xff); // 32
- mixdassaultlayer(screen.machine(), bitmap, sprite_bitmap2, cliprect, 0x0000, 0x0000, 0x800, 0x80); // 64?
- mixdassaultlayer(screen.machine(), bitmap, sprite_bitmap1, cliprect, 0x0000, 0x0600, 0x400, 0xff); // 128
+ mixdassaultlayer(machine(), bitmap, sprite_bitmap1, cliprect, 0x0200, 0x0600, 0x400, 0xff); // 32
+ mixdassaultlayer(machine(), bitmap, sprite_bitmap2, cliprect, 0x0000, 0x0000, 0x800, 0x80); // 64?
+ mixdassaultlayer(machine(), bitmap, sprite_bitmap1, cliprect, 0x0000, 0x0600, 0x400, 0xff); // 128
}
else if ((priority & 3) == 1)
{
- mixdassaultlayer(screen.machine(), bitmap, sprite_bitmap1, cliprect, 0x0600, 0x0600, 0x400, 0xff); // 1
+ mixdassaultlayer(machine(), bitmap, sprite_bitmap1, cliprect, 0x0600, 0x0600, 0x400, 0xff); // 1
deco16ic_tilemap_1_draw(m_deco_tilegen2, bitmap, cliprect, 0, 2); // 2
- mixdassaultlayer(screen.machine(), bitmap, sprite_bitmap1, cliprect, 0x0400, 0x0600, 0x400, 0xff); // 8
- mixdassaultlayer(screen.machine(), bitmap, sprite_bitmap2, cliprect, 0x0000, 0x0000, 0x800, 0x80); // 16?
- mixdassaultlayer(screen.machine(), bitmap, sprite_bitmap1, cliprect, 0x0200, 0x0600, 0x400, 0xff); // 32
+ mixdassaultlayer(machine(), bitmap, sprite_bitmap1, cliprect, 0x0400, 0x0600, 0x400, 0xff); // 8
+ mixdassaultlayer(machine(), bitmap, sprite_bitmap2, cliprect, 0x0000, 0x0000, 0x800, 0x80); // 16?
+ mixdassaultlayer(machine(), bitmap, sprite_bitmap1, cliprect, 0x0200, 0x0600, 0x400, 0xff); // 32
deco16ic_tilemap_2_draw(m_deco_tilegen1, bitmap, cliprect, 0, 64); // 64
- mixdassaultlayer(screen.machine(), bitmap, sprite_bitmap1, cliprect, 0x0000, 0x0600, 0x400, 0xff); // 128
+ mixdassaultlayer(machine(), bitmap, sprite_bitmap1, cliprect, 0x0000, 0x0600, 0x400, 0xff); // 128
}
else if ((priority & 3) == 3)
{
- mixdassaultlayer(screen.machine(), bitmap, sprite_bitmap1, cliprect, 0x0600, 0x0600, 0x400, 0xff); // 1
+ mixdassaultlayer(machine(), bitmap, sprite_bitmap1, cliprect, 0x0600, 0x0600, 0x400, 0xff); // 1
deco16ic_tilemap_1_draw(m_deco_tilegen2, bitmap, cliprect, 0, 2); // 2
- mixdassaultlayer(screen.machine(), bitmap, sprite_bitmap1, cliprect, 0x0400, 0x0600, 0x400, 0xff); // 8
+ mixdassaultlayer(machine(), bitmap, sprite_bitmap1, cliprect, 0x0400, 0x0600, 0x400, 0xff); // 8
deco16ic_tilemap_2_draw(m_deco_tilegen1, bitmap, cliprect, 0, 16); // 16
- mixdassaultlayer(screen.machine(), bitmap, sprite_bitmap1, cliprect, 0x0200, 0x0600, 0x400, 0xff); // 32
- mixdassaultlayer(screen.machine(), bitmap, sprite_bitmap2, cliprect, 0x0000, 0x0000, 0x800, 0x80); // 64?
- mixdassaultlayer(screen.machine(), bitmap, sprite_bitmap1, cliprect, 0x0000, 0x0600, 0x400, 0xff); // 128
+ mixdassaultlayer(machine(), bitmap, sprite_bitmap1, cliprect, 0x0200, 0x0600, 0x400, 0xff); // 32
+ mixdassaultlayer(machine(), bitmap, sprite_bitmap2, cliprect, 0x0000, 0x0000, 0x800, 0x80); // 64?
+ mixdassaultlayer(machine(), bitmap, sprite_bitmap1, cliprect, 0x0000, 0x0600, 0x400, 0xff); // 128
}
else
{
diff --git a/src/mame/video/dbz.c b/src/mame/video/dbz.c
index 72efa62e0ea..09d8438a92e 100644
--- a/src/mame/video/dbz.c
+++ b/src/mame/video/dbz.c
@@ -129,7 +129,7 @@ UINT32 dbz_state::screen_update_dbz(screen_device &screen, bitmap_ind16 &bitmap,
konami_sortlayers5(layer, m_layerpri);
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
for (plane = 0; plane < 5; plane++)
{
diff --git a/src/mame/video/dc.c b/src/mame/video/dc.c
index 75d65673c14..a68ccca561e 100644
--- a/src/mame/video/dc.c
+++ b/src/mame/video/dc.c
@@ -2658,7 +2658,7 @@ UINT32 dc_state::screen_update_dc(screen_device &screen, bitmap_rgb32 &bitmap, c
// int y,x;
#if DEBUG_PALRAM
- debug_paletteram(screen.machine());
+ debug_paletteram(machine());
#endif
// copy our fake framebuffer bitmap (where things have been rendered) to the screen
@@ -2677,10 +2677,10 @@ UINT32 dc_state::screen_update_dc(screen_device &screen, bitmap_rgb32 &bitmap, c
bitmap.fill(MAKE_ARGB(0xff,vo_border_R,vo_border_G,vo_border_B), cliprect); //FIXME: Chroma bit?
if(!spg_blank_video)
- pvr_drawframebuffer(screen.machine(),bitmap,cliprect);
+ pvr_drawframebuffer(machine(),bitmap,cliprect);
// update this here so we only do string lookup once per frame
- debug_dip_status = screen.machine().root_device().ioport("MAMEDEBUG")->read();
+ debug_dip_status = machine().root_device().ioport("MAMEDEBUG")->read();
return 0;
}
diff --git a/src/mame/video/dcon.c b/src/mame/video/dcon.c
index 57c62b66c0c..b6936ac284e 100644
--- a/src/mame/video/dcon.c
+++ b/src/mame/video/dcon.c
@@ -267,7 +267,7 @@ static void draw_sprites(running_machine& machine, bitmap_ind16 &bitmap,const re
UINT32 dcon_state::screen_update_dcon(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
/* Setup the tilemaps */
m_background_layer->set_scrollx(0, m_scroll_ram[0] );
@@ -286,14 +286,14 @@ UINT32 dcon_state::screen_update_dcon(screen_device &screen, bitmap_ind16 &bitma
m_foreground_layer->draw(bitmap, cliprect, 0,2);
m_text_layer->draw(bitmap, cliprect, 0,4);
- draw_sprites(screen.machine(),bitmap,cliprect);
+ draw_sprites(machine(),bitmap,cliprect);
return 0;
}
UINT32 dcon_state::screen_update_sdgndmps(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
/* Gfx banking */
if (m_last_gfx_bank!=m_gfx_bank_select)
@@ -321,6 +321,6 @@ UINT32 dcon_state::screen_update_sdgndmps(screen_device &screen, bitmap_ind16 &b
m_foreground_layer->draw(bitmap, cliprect, 0,2);
m_text_layer->draw(bitmap, cliprect, 0,4);
- draw_sprites(screen.machine(),bitmap,cliprect);
+ draw_sprites(machine(),bitmap,cliprect);
return 0;
}
diff --git a/src/mame/video/dday.c b/src/mame/video/dday.c
index 35605cc8659..d3743656446 100644
--- a/src/mame/video/dday.c
+++ b/src/mame/video/dday.c
@@ -324,7 +324,7 @@ UINT32 dday_state::screen_update_dday(screen_device &screen, bitmap_ind16 &bitma
UINT16 src_pixel = m_main_bitmap.pix16(y, x);
if (sl_bitmap.pix16(y, x) == 0xff)
- src_pixel += screen.machine().total_colors();
+ src_pixel += machine().total_colors();
bitmap.pix16(y, x) = src_pixel;
}
diff --git a/src/mame/video/ddragon.c b/src/mame/video/ddragon.c
index c3af28f2297..2b1349d7052 100644
--- a/src/mame/video/ddragon.c
+++ b/src/mame/video/ddragon.c
@@ -243,7 +243,7 @@ UINT32 ddragon_state::screen_update_ddragon(screen_device &screen, bitmap_ind16
m_bg_tilemap->set_scrolly(0, scrolly);
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/video/ddragon3.c b/src/mame/video/ddragon3.c
index 26b27e17908..1fad13f47bb 100644
--- a/src/mame/video/ddragon3.c
+++ b/src/mame/video/ddragon3.c
@@ -167,18 +167,18 @@ UINT32 ddragon3_state::screen_update_ddragon3(screen_device &screen, bitmap_ind1
{
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0);
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
}
else if ((m_vreg & 0x60) == 0x60)
{
m_fg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0);
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
}
else
{
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
}
return 0;
@@ -195,14 +195,14 @@ UINT32 ddragon3_state::screen_update_ctribe(screen_device &screen, bitmap_ind16
if(m_vreg & 8)
{
m_fg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
}
else
{
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0);
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
}
return 0;
}
diff --git a/src/mame/video/ddribble.c b/src/mame/video/ddribble.c
index 843f4c79793..d483a2a3adb 100644
--- a/src/mame/video/ddribble.c
+++ b/src/mame/video/ddribble.c
@@ -246,7 +246,7 @@ static void draw_sprites( running_machine& machine, bitmap_ind16 &bitmap, const
UINT32 ddribble_state::screen_update_ddribble(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- set_pens(screen.machine());
+ set_pens(machine());
m_fg_tilemap->set_flip((m_vregs[0][4] & 0x08) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
m_bg_tilemap->set_flip((m_vregs[1][4] & 0x08) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
@@ -258,8 +258,8 @@ UINT32 ddribble_state::screen_update_ddribble(screen_device &screen, bitmap_ind1
m_bg_tilemap->set_scrolly(0, m_vregs[1][0]);
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, m_spriteram_1, 0x07d, 2, m_vregs[0][4] & 0x08);
- draw_sprites(screen.machine(), bitmap, cliprect, m_spriteram_2, 0x140, 3, m_vregs[1][4] & 0x08);
+ draw_sprites(machine(), bitmap, cliprect, m_spriteram_1, 0x07d, 2, m_vregs[0][4] & 0x08);
+ draw_sprites(machine(), bitmap, cliprect, m_spriteram_2, 0x140, 3, m_vregs[1][4] & 0x08);
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
}
diff --git a/src/mame/video/deadang.c b/src/mame/video/deadang.c
index d0eece174aa..61188298ff5 100644
--- a/src/mame/video/deadang.c
+++ b/src/mame/video/deadang.c
@@ -149,12 +149,12 @@ UINT32 deadang_state::screen_update_deadang(screen_device &screen, bitmap_ind16
m_pf2_layer->enable(!(m_scroll_ram[0x34]&4));
flip_screen_set(m_scroll_ram[0x34]&0x40 );
- 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_pf3_layer->draw(bitmap, cliprect, 0,1);
m_pf1_layer->draw(bitmap, cliprect, 0,2);
m_pf2_layer->draw(bitmap, cliprect, 0,4);
- if (!(m_scroll_ram[0x34]&0x10)) draw_sprites(screen.machine(),bitmap,cliprect);
+ if (!(m_scroll_ram[0x34]&0x10)) draw_sprites(machine(),bitmap,cliprect);
m_text_layer->draw(bitmap, cliprect, 0,0);
return 0;
}
diff --git a/src/mame/video/dec0.c b/src/mame/video/dec0.c
index 2ac4016cbae..d46f0d2e663 100644
--- a/src/mame/video/dec0.c
+++ b/src/mame/video/dec0.c
@@ -49,14 +49,14 @@ UINT32 dec0_state::screen_update_hbarrel(screen_device &screen, bitmap_ind16 &bi
flip_screen_set(m_tilegen1->get_flip_state());
- m_tilegen3->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0x00, 0x00, 0x00, 0x00);
- m_spritegen->draw_sprites(screen.machine(), bitmap, cliprect, m_buffered_spriteram, 0x08, 0x08, 0x0f);
- m_tilegen2->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00);
+ m_tilegen3->deco_bac06_pf_draw(machine(),bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0x00, 0x00, 0x00, 0x00);
+ m_spritegen->draw_sprites(machine(), bitmap, cliprect, m_buffered_spriteram, 0x08, 0x08, 0x0f);
+ m_tilegen2->deco_bac06_pf_draw(machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00);
/* HB always keeps pf2 on top of pf3, no need explicitly support priority register */
- m_spritegen->draw_sprites(screen.machine(), bitmap, cliprect, m_buffered_spriteram, 0x08, 0x00, 0x0f);
- m_tilegen1->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00);
+ m_spritegen->draw_sprites(machine(), bitmap, cliprect, m_buffered_spriteram, 0x08, 0x00, 0x0f);
+ m_tilegen1->deco_bac06_pf_draw(machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00);
return 0;
}
@@ -69,32 +69,32 @@ UINT32 dec0_state::screen_update_baddudes(screen_device &screen, bitmap_ind16 &b
/* WARNING: inverted wrt Midnight Resistance */
if ((m_pri & 0x01) == 0)
{
- m_tilegen2->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0x00, 0x00, 0x00, 0x00);
- m_tilegen3->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00);
+ m_tilegen2->deco_bac06_pf_draw(machine(),bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0x00, 0x00, 0x00, 0x00);
+ m_tilegen3->deco_bac06_pf_draw(machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00);
if (m_pri & 2)
- m_tilegen2->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,0,0x08,0x08,0x08,0x08); // upper 8 pens of upper 8 priority marked tiles /* Foreground pens only */
+ m_tilegen2->deco_bac06_pf_draw(machine(),bitmap,cliprect,0,0x08,0x08,0x08,0x08); // upper 8 pens of upper 8 priority marked tiles /* Foreground pens only */
- m_spritegen->draw_sprites(screen.machine(), bitmap, cliprect, m_buffered_spriteram, 0x00, 0x00, 0x0f);
+ m_spritegen->draw_sprites(machine(), bitmap, cliprect, m_buffered_spriteram, 0x00, 0x00, 0x0f);
if (m_pri & 4)
- m_tilegen3->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,0,0x08,0x08,0x08,0x08); // upper 8 pens of upper 8 priority marked tiles /* Foreground pens only */
+ m_tilegen3->deco_bac06_pf_draw(machine(),bitmap,cliprect,0,0x08,0x08,0x08,0x08); // upper 8 pens of upper 8 priority marked tiles /* Foreground pens only */
}
else
{
- m_tilegen3->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0x00, 0x00, 0x00, 0x00);
- m_tilegen2->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00);
+ m_tilegen3->deco_bac06_pf_draw(machine(),bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0x00, 0x00, 0x00, 0x00);
+ m_tilegen2->deco_bac06_pf_draw(machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00);
if (m_pri & 2)
- m_tilegen3->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,0,0x08,0x08,0x08,0x08); // upper 8 pens of upper 8 priority marked tiles /* Foreground pens only */
+ m_tilegen3->deco_bac06_pf_draw(machine(),bitmap,cliprect,0,0x08,0x08,0x08,0x08); // upper 8 pens of upper 8 priority marked tiles /* Foreground pens only */
- m_spritegen->draw_sprites(screen.machine(), bitmap, cliprect, m_buffered_spriteram, 0x00, 0x00, 0x0f);
+ m_spritegen->draw_sprites(machine(), bitmap, cliprect, m_buffered_spriteram, 0x00, 0x00, 0x0f);
if (m_pri & 4)
- m_tilegen2->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,0,0x08,0x08,0x08,0x08); // upper 8 pens of upper 8 priority marked tiles /* Foreground pens only */
+ m_tilegen2->deco_bac06_pf_draw(machine(),bitmap,cliprect,0,0x08,0x08,0x08,0x08); // upper 8 pens of upper 8 priority marked tiles /* Foreground pens only */
}
- m_tilegen1->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00);
+ m_tilegen1->deco_bac06_pf_draw(machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00);
return 0;
}
@@ -117,29 +117,29 @@ UINT32 dec0_state::screen_update_robocop(screen_device &screen, bitmap_ind16 &bi
/* Robocop uses it only for the title screen, so this might be just */
/* completely wrong. The top 8 bits of the register might mean */
/* something (they are 0x80 in midres, 0x00 here) */
- m_tilegen2->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0x00, 0x00, 0x00, 0x00);
+ m_tilegen2->deco_bac06_pf_draw(machine(),bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0x00, 0x00, 0x00, 0x00);
if (m_pri & 0x02)
- m_spritegen->draw_sprites(screen.machine(), bitmap, cliprect, m_buffered_spriteram, 0x08, trans, 0x0f);
+ m_spritegen->draw_sprites(machine(), bitmap, cliprect, m_buffered_spriteram, 0x08, trans, 0x0f);
- m_tilegen3->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00);
+ m_tilegen3->deco_bac06_pf_draw(machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00);
}
else
{
- m_tilegen3->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0x00, 0x00, 0x00, 0x00);
+ m_tilegen3->deco_bac06_pf_draw(machine(),bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0x00, 0x00, 0x00, 0x00);
if (m_pri & 0x02)
- m_spritegen->draw_sprites(screen.machine(), bitmap, cliprect, m_buffered_spriteram, 0x08, trans, 0x0f);
+ m_spritegen->draw_sprites(machine(), bitmap, cliprect, m_buffered_spriteram, 0x08, trans, 0x0f);
- m_tilegen2->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00);
+ m_tilegen2->deco_bac06_pf_draw(machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00);
}
if (m_pri & 0x02)
- m_spritegen->draw_sprites(screen.machine(), bitmap, cliprect, m_buffered_spriteram, 0x08, trans^0x08, 0x0f);
+ m_spritegen->draw_sprites(machine(), bitmap, cliprect, m_buffered_spriteram, 0x08, trans^0x08, 0x0f);
else
- m_spritegen->draw_sprites(screen.machine(), bitmap, cliprect, m_buffered_spriteram, 0x00, 0x00, 0x0f);
+ m_spritegen->draw_sprites(machine(), bitmap, cliprect, m_buffered_spriteram, 0x00, 0x00, 0x0f);
- m_tilegen1->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00);
+ m_tilegen1->deco_bac06_pf_draw(machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00);
return 0;
}
@@ -151,7 +151,7 @@ UINT32 dec0_automat_state::screen_update_automat(screen_device &screen, bitmap_i
// layer enables seem different... where are they?
// the bootleg doesn't write these registers, I think they're hardcoded?, so fake them for compatibility with our implementation..
- address_space &space = screen.machine().driver_data()->generic_space();
+ address_space &space = machine().driver_data()->generic_space();
deco_bac06_pf_control_0_w(m_tilegen1,space,0,0x0003, 0x00ff); // 8x8
deco_bac06_pf_control_0_w(m_tilegen1,space,1,0x0003, 0x00ff);
deco_bac06_pf_control_0_w(m_tilegen1,space,2,0x0000, 0x00ff);
@@ -187,29 +187,29 @@ UINT32 dec0_automat_state::screen_update_automat(screen_device &screen, bitmap_i
if (m_pri & 0x01)
{
- m_tilegen2->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0x00, 0x00, 0x00, 0x00);
+ m_tilegen2->deco_bac06_pf_draw(machine(),bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0x00, 0x00, 0x00, 0x00);
if (m_pri & 0x02)
- m_spritegen->draw_sprites(screen.machine(), bitmap, cliprect, m_buffered_spriteram, 0x08, trans, 0x0f);
+ m_spritegen->draw_sprites(machine(), bitmap, cliprect, m_buffered_spriteram, 0x08, trans, 0x0f);
- m_tilegen3->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00);
+ m_tilegen3->deco_bac06_pf_draw(machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00);
}
else
{
- m_tilegen3->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0x00, 0x00, 0x00, 0x00);
+ m_tilegen3->deco_bac06_pf_draw(machine(),bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0x00, 0x00, 0x00, 0x00);
if (m_pri & 0x02)
- m_spritegen->draw_sprites(screen.machine(), bitmap, cliprect, m_buffered_spriteram, 0x08, trans, 0x0f);
+ m_spritegen->draw_sprites(machine(), bitmap, cliprect, m_buffered_spriteram, 0x08, trans, 0x0f);
- m_tilegen2->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00);
+ m_tilegen2->deco_bac06_pf_draw(machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00);
}
if (m_pri & 0x02)
- m_spritegen->draw_sprites_bootleg(screen.machine(), bitmap, cliprect, m_buffered_spriteram, 0x08, trans^0x08, 0x0f);
+ m_spritegen->draw_sprites_bootleg(machine(), bitmap, cliprect, m_buffered_spriteram, 0x08, trans^0x08, 0x0f);
else
- m_spritegen->draw_sprites_bootleg(screen.machine(), bitmap, cliprect, m_buffered_spriteram, 0x00, 0x00, 0x0f);
+ m_spritegen->draw_sprites_bootleg(machine(), bitmap, cliprect, m_buffered_spriteram, 0x00, 0x00, 0x0f);
- m_tilegen1->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00);
+ m_tilegen1->deco_bac06_pf_draw(machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00);
return 0;
}
@@ -219,7 +219,7 @@ UINT32 dec0_automat_state::screen_update_secretab(screen_device &screen, bitmap_
// layer enables seem different... where are they?
// the bootleg doesn't write these registers, I think they're hardcoded?, so fake them for compatibility with our implementation..
- address_space &space = screen.machine().driver_data()->generic_space();
+ address_space &space = machine().driver_data()->generic_space();
deco_bac06_pf_control_0_w(m_tilegen1,space,0,0x0003, 0x00ff); // 8x8
deco_bac06_pf_control_0_w(m_tilegen1,space,1,0x0003, 0x00ff);
deco_bac06_pf_control_0_w(m_tilegen1,space,2,0x0000, 0x00ff);
@@ -247,16 +247,16 @@ UINT32 dec0_automat_state::screen_update_secretab(screen_device &screen, bitmap_
flip_screen_set(m_tilegen1->get_flip_state());
- m_tilegen3->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0x00, 0x00, 0x00, 0x00);
- m_tilegen2->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00);
+ m_tilegen3->deco_bac06_pf_draw(machine(),bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0x00, 0x00, 0x00, 0x00);
+ m_tilegen2->deco_bac06_pf_draw(machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00);
- m_spritegen->draw_sprites_bootleg(screen.machine(), bitmap, cliprect, m_buffered_spriteram, 0x00, 0x00, 0x0f);
+ m_spritegen->draw_sprites_bootleg(machine(), bitmap, cliprect, m_buffered_spriteram, 0x00, 0x00, 0x0f);
/* Redraw top 8 pens of top 8 palettes over sprites */
if (m_pri&0x80)
- m_tilegen2->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,0,0x08,0x08,0x08,0x08); // upper 8 pens of upper 8 priority marked tiles
+ m_tilegen2->deco_bac06_pf_draw(machine(),bitmap,cliprect,0,0x08,0x08,0x08,0x08); // upper 8 pens of upper 8 priority marked tiles
- m_tilegen1->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00);
+ m_tilegen1->deco_bac06_pf_draw(machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00);
return 0;
}
@@ -270,10 +270,10 @@ UINT32 dec0_state::screen_update_birdtry(screen_device &screen, bitmap_ind16 &bi
/* This game doesn't have the extra playfield chip on the game board, but
the palette does show through. */
- bitmap.fill(screen.machine().pens[768], cliprect);
- m_tilegen2->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00);
- m_spritegen->draw_sprites(screen.machine(), bitmap, cliprect, m_buffered_spriteram, 0x00, 0x00, 0x0f);
- m_tilegen1->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00);
+ bitmap.fill(machine().pens[768], cliprect);
+ m_tilegen2->deco_bac06_pf_draw(machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00);
+ m_spritegen->draw_sprites(machine(), bitmap, cliprect, m_buffered_spriteram, 0x00, 0x00, 0x0f);
+ m_tilegen1->deco_bac06_pf_draw(machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00);
return 0;
}
@@ -285,17 +285,17 @@ UINT32 dec0_state::screen_update_hippodrm(screen_device &screen, bitmap_ind16 &b
if (m_pri & 0x01)
{
- m_tilegen2->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0x00, 0x00, 0x00, 0x00);
- m_tilegen3->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00);
+ m_tilegen2->deco_bac06_pf_draw(machine(),bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0x00, 0x00, 0x00, 0x00);
+ m_tilegen3->deco_bac06_pf_draw(machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00);
}
else
{
- m_tilegen3->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0x00, 0x00, 0x00, 0x00);
- m_tilegen2->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00);
+ m_tilegen3->deco_bac06_pf_draw(machine(),bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0x00, 0x00, 0x00, 0x00);
+ m_tilegen2->deco_bac06_pf_draw(machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00);
}
- m_spritegen->draw_sprites(screen.machine(), bitmap, cliprect, m_buffered_spriteram, 0x00, 0x00, 0x0f);
- m_tilegen1->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00);
+ m_spritegen->draw_sprites(machine(), bitmap, cliprect, m_buffered_spriteram, 0x00, 0x00, 0x0f);
+ m_tilegen1->deco_bac06_pf_draw(machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00);
return 0;
}
@@ -305,16 +305,16 @@ UINT32 dec0_state::screen_update_slyspy(screen_device &screen, bitmap_ind16 &bit
{
flip_screen_set(m_tilegen1->get_flip_state());
- m_tilegen3->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0x00, 0x00, 0x00, 0x00);
- m_tilegen2->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00);
+ m_tilegen3->deco_bac06_pf_draw(machine(),bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0x00, 0x00, 0x00, 0x00);
+ m_tilegen2->deco_bac06_pf_draw(machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00);
- m_spritegen->draw_sprites(screen.machine(), bitmap, cliprect, m_buffered_spriteram, 0x00, 0x00, 0x0f);
+ m_spritegen->draw_sprites(machine(), bitmap, cliprect, m_buffered_spriteram, 0x00, 0x00, 0x0f);
/* Redraw top 8 pens of top 8 palettes over sprites */
if (m_pri&0x80)
- m_tilegen2->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,0,0x08,0x08,0x08,0x08); // upper 8 pens of upper 8 priority marked tiles
+ m_tilegen2->deco_bac06_pf_draw(machine(),bitmap,cliprect,0,0x08,0x08,0x08,0x08); // upper 8 pens of upper 8 priority marked tiles
- m_tilegen1->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00);
+ m_tilegen1->deco_bac06_pf_draw(machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00);
return 0;
}
@@ -332,29 +332,29 @@ UINT32 dec0_state::screen_update_midres(screen_device &screen, bitmap_ind16 &bit
if (m_pri & 0x01)
{
- m_tilegen2->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0x00, 0x00, 0x00, 0x00);
+ m_tilegen2->deco_bac06_pf_draw(machine(),bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0x00, 0x00, 0x00, 0x00);
if (m_pri & 0x02)
- m_spritegen->draw_sprites(screen.machine(), bitmap, cliprect, m_buffered_spriteram, 0x08, trans, 0x0f);
+ m_spritegen->draw_sprites(machine(), bitmap, cliprect, m_buffered_spriteram, 0x08, trans, 0x0f);
- m_tilegen3->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00);
+ m_tilegen3->deco_bac06_pf_draw(machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00);
}
else
{
- m_tilegen3->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0x00, 0x00, 0x00, 0x00);
+ m_tilegen3->deco_bac06_pf_draw(machine(),bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0x00, 0x00, 0x00, 0x00);
if (m_pri & 0x02)
- m_spritegen->draw_sprites(screen.machine(), bitmap, cliprect, m_buffered_spriteram, 0x08, trans, 0x0f);
+ m_spritegen->draw_sprites(machine(), bitmap, cliprect, m_buffered_spriteram, 0x08, trans, 0x0f);
- m_tilegen2->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00);
+ m_tilegen2->deco_bac06_pf_draw(machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00);
}
if (m_pri & 0x02)
- m_spritegen->draw_sprites(screen.machine(), bitmap, cliprect, m_buffered_spriteram, 0x08, trans ^ 0x08, 0x0f);
+ m_spritegen->draw_sprites(machine(), bitmap, cliprect, m_buffered_spriteram, 0x08, trans ^ 0x08, 0x0f);
else
- m_spritegen->draw_sprites(screen.machine(), bitmap, cliprect, m_buffered_spriteram, 0x00, 0x00, 0x0f);
+ m_spritegen->draw_sprites(machine(), bitmap, cliprect, m_buffered_spriteram, 0x00, 0x00, 0x0f);
- m_tilegen1->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00);
+ m_tilegen1->deco_bac06_pf_draw(machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00);
return 0;
}
diff --git a/src/mame/video/dec8.c b/src/mame/video/dec8.c
index dff2c6fd915..ddbe37f83ba 100644
--- a/src/mame/video/dec8.c
+++ b/src/mame/video/dec8.c
@@ -268,10 +268,10 @@ UINT32 dec8_state::screen_update_cobracom(screen_device &screen, bitmap_ind16 &b
flip_screen_set(m_bg_control[0] >> 7);
- screen.machine().device<deco_bac06_device>("tilegen1")->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0x00, 0x00, 0x00, 0x00);
- screen.machine().device<deco_mxc06_device>("spritegen")->draw_sprites(screen.machine(), bitmap, cliprect, m_buffered_spriteram16, 0x04, 0x00, 0x03);
- screen.machine().device<deco_bac06_device>("tilegen2")->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00);
- screen.machine().device<deco_mxc06_device>("spritegen")->draw_sprites(screen.machine(), bitmap, cliprect, m_buffered_spriteram16, 0x04, 0x04, 0x03);
+ machine().device<deco_bac06_device>("tilegen1")->deco_bac06_pf_draw(machine(),bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0x00, 0x00, 0x00, 0x00);
+ machine().device<deco_mxc06_device>("spritegen")->draw_sprites(machine(), bitmap, cliprect, m_buffered_spriteram16, 0x04, 0x00, 0x03);
+ machine().device<deco_bac06_device>("tilegen2")->deco_bac06_pf_draw(machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00);
+ machine().device<deco_mxc06_device>("spritegen")->draw_sprites(machine(), bitmap, cliprect, m_buffered_spriteram16, 0x04, 0x04, 0x03);
m_fix_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
}
@@ -308,8 +308,8 @@ VIDEO_START_MEMBER(dec8_state,cobracom)
UINT32 dec8_state::screen_update_ghostb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- screen.machine().device<deco_bac06_device>("tilegen1")->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0x00, 0x00, 0x00, 0x00);
- screen.machine().device<deco_karnovsprites_device>("spritegen")->draw_sprites(screen.machine(), bitmap, cliprect, m_buffered_spriteram16, 0x400, 0);
+ machine().device<deco_bac06_device>("tilegen1")->deco_bac06_pf_draw(machine(),bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0x00, 0x00, 0x00, 0x00);
+ machine().device<deco_karnovsprites_device>("spritegen")->draw_sprites(machine(), bitmap, cliprect, m_buffered_spriteram16, 0x400, 0);
m_fix_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
}
@@ -343,9 +343,9 @@ UINT32 dec8_state::screen_update_oscar(screen_device &screen, bitmap_ind16 &bitm
flip_screen_set(m_bg_control[1] >> 7);
// we mimic the priority scheme in dec0.c, this was originally a bit different, so this could be wrong
- screen.machine().device<deco_bac06_device>("tilegen1")->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0x00, 0x00, 0x00, 0x00);
- screen.machine().device<deco_mxc06_device>("spritegen")->draw_sprites(screen.machine(), bitmap, cliprect, m_buffered_spriteram16, 0x00, 0x00, 0x0f);
- screen.machine().device<deco_bac06_device>("tilegen1")->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,0, 0x08,0x08,0x08,0x08);
+ machine().device<deco_bac06_device>("tilegen1")->deco_bac06_pf_draw(machine(),bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0x00, 0x00, 0x00, 0x00);
+ machine().device<deco_mxc06_device>("spritegen")->draw_sprites(machine(), bitmap, cliprect, m_buffered_spriteram16, 0x00, 0x00, 0x0f);
+ machine().device<deco_bac06_device>("tilegen1")->deco_bac06_pf_draw(machine(),bitmap,cliprect,0, 0x08,0x08,0x08,0x08);
m_fix_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
}
@@ -382,7 +382,7 @@ UINT32 dec8_state::screen_update_lastmisn(screen_device &screen, bitmap_ind16 &b
m_bg_tilemap->set_scrolly(0, ((m_scroll2[2] << 8)+ m_scroll2[3]));
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- screen.machine().device<deco_karnovsprites_device>("spritegen")->draw_sprites(screen.machine(), bitmap, cliprect, m_buffered_spriteram16, 0x400, 0);
+ machine().device<deco_karnovsprites_device>("spritegen")->draw_sprites(machine(), bitmap, cliprect, m_buffered_spriteram16, 0x400, 0);
m_fix_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
}
@@ -395,7 +395,7 @@ UINT32 dec8_state::screen_update_shackled(screen_device &screen, bitmap_ind16 &b
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 0, 0);
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 1, 0);
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 0, 0);
- screen.machine().device<deco_karnovsprites_device>("spritegen")->draw_sprites(screen.machine(), bitmap, cliprect, m_buffered_spriteram16, 0x400, 0);
+ machine().device<deco_karnovsprites_device>("spritegen")->draw_sprites(machine(), bitmap, cliprect, m_buffered_spriteram16, 0x400, 0);
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 1, 0);
m_fix_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
@@ -464,9 +464,9 @@ UINT32 dec8_state::screen_update_srdarwin(screen_device &screen, bitmap_ind16 &b
m_bg_tilemap->set_scrollx(0, (m_scroll2[0] << 8) + m_scroll2[1]);
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0);
- srdarwin_draw_sprites(screen.machine(), bitmap, cliprect, 0); //* (srdarwin37b5gre)
+ srdarwin_draw_sprites(machine(), bitmap, cliprect, 0); //* (srdarwin37b5gre)
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0);
- srdarwin_draw_sprites(screen.machine(), bitmap, cliprect, 1);
+ srdarwin_draw_sprites(machine(), bitmap, cliprect, 1);
m_fix_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
}
@@ -526,9 +526,9 @@ UINT32 dec8_state::screen_update_gondo(screen_device &screen, bitmap_ind16 &bitm
m_bg_tilemap->set_scrolly(0, ((m_scroll2[2] << 8) + m_scroll2[3]));
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0);
- screen.machine().device<deco_karnovsprites_device>("spritegen")->draw_sprites(screen.machine(), bitmap, cliprect, m_buffered_spriteram16, 0x400, 2);
+ machine().device<deco_karnovsprites_device>("spritegen")->draw_sprites(machine(), bitmap, cliprect, m_buffered_spriteram16, 0x400, 2);
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0);
- screen.machine().device<deco_karnovsprites_device>("spritegen")->draw_sprites(screen.machine(), bitmap, cliprect, m_buffered_spriteram16, 0x400, 1);
+ machine().device<deco_karnovsprites_device>("spritegen")->draw_sprites(machine(), bitmap, cliprect, m_buffered_spriteram16, 0x400, 1);
m_fix_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
}
@@ -539,7 +539,7 @@ UINT32 dec8_state::screen_update_garyoret(screen_device &screen, bitmap_ind16 &b
m_bg_tilemap->set_scrolly(0, ((m_scroll2[2] << 8) + m_scroll2[3]));
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- screen.machine().device<deco_karnovsprites_device>("spritegen")->draw_sprites(screen.machine(), bitmap, cliprect, m_buffered_spriteram16, 0x400, 0);
+ machine().device<deco_karnovsprites_device>("spritegen")->draw_sprites(machine(), bitmap, cliprect, m_buffered_spriteram16, 0x400, 0);
m_bg_tilemap->draw(bitmap, cliprect, 1, 0);
m_fix_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
diff --git a/src/mame/video/deco32.c b/src/mame/video/deco32.c
index 12646753783..ae3ac77e68e 100644
--- a/src/mame/video/deco32.c
+++ b/src/mame/video/deco32.c
@@ -573,13 +573,13 @@ void dragngun_state::screen_eof_dragngun(screen_device &screen, bool state)
UINT32 deco32_state::screen_update_captaven(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- m_deco_tilegen1 = screen.machine().device("tilegen1");
- m_deco_tilegen2 = screen.machine().device("tilegen2");
+ m_deco_tilegen1 = machine().device("tilegen1");
+ m_deco_tilegen2 = machine().device("tilegen2");
- screen.machine().tilemap().set_flip_all(flip_screen() ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
+ machine().tilemap().set_flip_all(flip_screen() ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
- screen.machine().priority_bitmap.fill(0, cliprect);
- bitmap.fill(screen.machine().pens[0x000], cliprect); // Palette index not confirmed
+ machine().priority_bitmap.fill(0, cliprect);
+ bitmap.fill(machine().pens[0x000], cliprect); // Palette index not confirmed
deco16ic_set_pf1_8bpp_mode(m_deco_tilegen2, 1);
@@ -601,18 +601,18 @@ UINT32 deco32_state::screen_update_captaven(screen_device &screen, bitmap_ind16
deco16ic_tilemap_1_draw(m_deco_tilegen1, bitmap, cliprect, 0, 4);
- screen.machine().device<decospr_device>("spritegen")->set_alt_format(true);
- screen.machine().device<decospr_device>("spritegen")->draw_sprites(bitmap, cliprect, m_spriteram16_buffered, 0x400);
+ machine().device<decospr_device>("spritegen")->set_alt_format(true);
+ machine().device<decospr_device>("spritegen")->draw_sprites(bitmap, cliprect, m_spriteram16_buffered, 0x400);
return 0;
}
UINT32 dragngun_state::screen_update_dragngun(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- m_deco_tilegen1 = screen.machine().device("tilegen1");
- m_deco_tilegen2 = screen.machine().device("tilegen2");
+ m_deco_tilegen1 = machine().device("tilegen1");
+ m_deco_tilegen2 = machine().device("tilegen2");
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
deco16ic_pf_update(m_deco_tilegen1, m_pf1_rowscroll, m_pf2_rowscroll);
deco16ic_pf_update(m_deco_tilegen2, m_pf3_rowscroll, m_pf4_rowscroll);
@@ -637,7 +637,7 @@ UINT32 dragngun_state::screen_update_dragngun(screen_device &screen, bitmap_rgb3
{
rectangle clip(cliprect.min_x, cliprect.max_x, 8, 247);
- dragngun_draw_sprites(screen.machine(),bitmap,clip,m_spriteram->buffer());
+ dragngun_draw_sprites(machine(),bitmap,clip,m_spriteram->buffer());
deco16ic_tilemap_1_draw(m_deco_tilegen1, bitmap, clip, 0, 0);
}
@@ -648,16 +648,16 @@ UINT32 dragngun_state::screen_update_dragngun(screen_device &screen, bitmap_rgb3
UINT32 deco32_state::screen_update_fghthist(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- m_deco_tilegen1 = screen.machine().device("tilegen1");
- m_deco_tilegen2 = screen.machine().device("tilegen2");
+ m_deco_tilegen1 = machine().device("tilegen1");
+ m_deco_tilegen2 = machine().device("tilegen2");
- screen.machine().priority_bitmap.fill(0, cliprect);
- bitmap.fill(screen.machine().pens[0x000], cliprect); // Palette index not confirmed
+ machine().priority_bitmap.fill(0, cliprect);
+ bitmap.fill(machine().pens[0x000], cliprect); // Palette index not confirmed
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().device<decospr_device>("spritegen")->draw_sprites(bitmap, cliprect, m_spriteram16_buffered, 0x800, true);
+ machine().device<decospr_device>("spritegen")->draw_sprites(bitmap, cliprect, m_spriteram16_buffered, 0x800, true);
/* Draw screen */
deco16ic_tilemap_2_draw(m_deco_tilegen2, bitmap, cliprect, 0, 1);
@@ -665,17 +665,17 @@ UINT32 deco32_state::screen_update_fghthist(screen_device &screen, bitmap_rgb32
if(m_pri&1)
{
deco16ic_tilemap_2_draw(m_deco_tilegen1, bitmap, cliprect, 0, 2);
- screen.machine().device<decospr_device>("spritegen")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0800, 0x0800, 1024, 0x1ff);
+ machine().device<decospr_device>("spritegen")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0800, 0x0800, 1024, 0x1ff);
deco16ic_tilemap_1_draw(m_deco_tilegen2, bitmap, cliprect, 0, 4);
}
else
{
deco16ic_tilemap_1_draw(m_deco_tilegen2, bitmap, cliprect, 0, 2);
- screen.machine().device<decospr_device>("spritegen")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0800, 0x0800, 1024, 0x1ff);
+ machine().device<decospr_device>("spritegen")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0800, 0x0800, 1024, 0x1ff);
deco16ic_tilemap_2_draw(m_deco_tilegen1, bitmap, cliprect, 0, 4);
}
- screen.machine().device<decospr_device>("spritegen")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0000, 0x0800, 1024, 0x1ff);
+ machine().device<decospr_device>("spritegen")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0000, 0x0800, 1024, 0x1ff);
deco16ic_tilemap_1_draw(m_deco_tilegen1, bitmap, cliprect, 0, 0);
return 0;
@@ -825,8 +825,8 @@ static void mixDualAlphaSprites(bitmap_rgb32 &bitmap, const rectangle &cliprect,
UINT32 deco32_state::screen_update_nslasher(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
int alphaTilemap=0;
- m_deco_tilegen1 = screen.machine().device("tilegen1");
- m_deco_tilegen2 = screen.machine().device("tilegen2");
+ m_deco_tilegen1 = machine().device("tilegen1");
+ m_deco_tilegen2 = machine().device("tilegen2");
deco16ic_pf_update(m_deco_tilegen1, m_pf1_rowscroll, m_pf2_rowscroll);
deco16ic_pf_update(m_deco_tilegen2, m_pf3_rowscroll, m_pf4_rowscroll);
@@ -836,18 +836,18 @@ UINT32 deco32_state::screen_update_nslasher(screen_device &screen, bitmap_rgb32
alphaTilemap=1;
if (m_ace_ram_dirty)
- updateAceRam(screen.machine());
+ updateAceRam(machine());
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
- bitmap.fill(screen.machine().pens[0x200], cliprect);
+ bitmap.fill(machine().pens[0x200], cliprect);
/* Draw sprites to temporary bitmaps, saving alpha & priority info for later mixing */
- screen.machine().device<decospr_device>("spritegen1")->set_pix_raw_shift(8);
- screen.machine().device<decospr_device>("spritegen2")->set_pix_raw_shift(8);
+ machine().device<decospr_device>("spritegen1")->set_pix_raw_shift(8);
+ machine().device<decospr_device>("spritegen2")->set_pix_raw_shift(8);
- screen.machine().device<decospr_device>("spritegen1")->draw_sprites(bitmap, cliprect, m_spriteram16_buffered, 0x800, true);
- screen.machine().device<decospr_device>("spritegen2")->draw_sprites(bitmap, cliprect, m_spriteram16_2_buffered, 0x800, true);
+ machine().device<decospr_device>("spritegen1")->draw_sprites(bitmap, cliprect, m_spriteram16_buffered, 0x800, true);
+ machine().device<decospr_device>("spritegen2")->draw_sprites(bitmap, cliprect, m_spriteram16_2_buffered, 0x800, true);
/* Render alpha-blended tilemap to separate buffer for proper mixing */
@@ -880,7 +880,7 @@ UINT32 deco32_state::screen_update_nslasher(screen_device &screen, bitmap_rgb32
}
}
- mixDualAlphaSprites(bitmap, cliprect, screen.machine().gfx[3], screen.machine().gfx[4], alphaTilemap);
+ mixDualAlphaSprites(bitmap, cliprect, machine().gfx[3], machine().gfx[4], alphaTilemap);
deco16ic_tilemap_1_draw(m_deco_tilegen1, bitmap, cliprect, 0, 0);
return 0;
diff --git a/src/mame/video/deco_mlc.c b/src/mame/video/deco_mlc.c
index 73e74d80807..aec942300f3 100644
--- a/src/mame/video/deco_mlc.c
+++ b/src/mame/video/deco_mlc.c
@@ -510,7 +510,7 @@ void deco_mlc_state::screen_eof_mlc(screen_device &screen, bool state)
UINT32 deco_mlc_state::screen_update_mlc(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
// temp_bitmap->fill(0, cliprect);
- bitmap.fill(screen.machine().pens[0], cliprect); /* Pen 0 fill colour confirmed from Skull Fang level 2 */
- draw_sprites(screen.machine(),bitmap,cliprect);
+ bitmap.fill(machine().pens[0], cliprect); /* Pen 0 fill colour confirmed from Skull Fang level 2 */
+ draw_sprites(machine(),bitmap,cliprect);
return 0;
}
diff --git a/src/mame/video/decocass.c b/src/mame/video/decocass.c
index dd3477b8d62..acc270c9d05 100644
--- a/src/mame/video/decocass.c
+++ b/src/mame/video/decocass.c
@@ -521,17 +521,17 @@ UINT32 decocass_state::screen_update_decocass(screen_device &screen, bitmap_ind1
int scrollx, scrolly_l, scrolly_r;
rectangle clip;
- if (0xc0 != (screen.machine().root_device().ioport("IN2")->read() & 0xc0)) /* coin slots assert an NMI */
+ if (0xc0 != (machine().root_device().ioport("IN2")->read() & 0xc0)) /* coin slots assert an NMI */
m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE);
if (0 == (m_watchdog_flip & 0x04))
- screen.machine().watchdog_reset();
+ machine().watchdog_reset();
else if (m_watchdog_count-- > 0)
- screen.machine().watchdog_reset();
+ machine().watchdog_reset();
#ifdef MAME_DEBUG
{
- if (screen.machine().input().code_pressed_once(KEYCODE_I))
+ if (machine().input().code_pressed_once(KEYCODE_I))
m_showmsg ^= 1;
if (m_showmsg)
popmessage("mode:$%02x cm:$%02x ccb:$%02x h:$%02x vl:$%02x vr:$%02x ph:$%02x pv:$%02x ch:$%02x cv:$%02x",
@@ -587,13 +587,13 @@ UINT32 decocass_state::screen_update_decocass(screen_device &screen, bitmap_ind1
if (m_mode_set & 0x20)
{
- draw_object(screen.machine(), bitmap, cliprect);
- draw_center(screen.machine(), bitmap, cliprect);
+ draw_object(machine(), bitmap, cliprect);
+ draw_center(machine(), bitmap, cliprect);
}
else
{
- draw_object(screen.machine(), bitmap, cliprect);
- draw_center(screen.machine(), bitmap, cliprect);
+ draw_object(machine(), bitmap, cliprect);
+ draw_center(machine(), bitmap, cliprect);
if (m_mode_set & 0x08) /* bkg_ena on ? */
{
clip = m_bg_tilemap_l_clip;
@@ -606,7 +606,7 @@ UINT32 decocass_state::screen_update_decocass(screen_device &screen, bitmap_ind1
}
}
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, (m_color_center_bot >> 1) & 1, 0, 0, m_fgvideoram, 0x20);
- draw_missiles(screen.machine(), bitmap, cliprect, 1, 0, m_colorram, 0x20);
+ draw_sprites(machine(), bitmap, cliprect, (m_color_center_bot >> 1) & 1, 0, 0, m_fgvideoram, 0x20);
+ draw_missiles(machine(), bitmap, cliprect, 1, 0, m_colorram, 0x20);
return 0;
}
diff --git a/src/mame/video/deniam.c b/src/mame/video/deniam.c
index 2ad1008dd94..8a96119f67f 100644
--- a/src/mame/video/deniam.c
+++ b/src/mame/video/deniam.c
@@ -373,30 +373,30 @@ UINT32 deniam_state::screen_update_deniam(screen_device &screen, bitmap_ind16 &b
bg_scrollx = m_textram[m_bg_scrollx_reg] - m_bg_scrollx_offs;
bg_scrolly = (m_textram[m_bg_scrolly_reg] & 0xff) - m_bg_scrolly_offs;
page = m_textram[m_bg_page_reg];
- set_bg_page(screen.machine(), 3, (page >>12) & 0x0f);
- set_bg_page(screen.machine(), 2, (page >> 8) & 0x0f);
- set_bg_page(screen.machine(), 1, (page >> 4) & 0x0f);
- set_bg_page(screen.machine(), 0, (page >> 0) & 0x0f);
+ set_bg_page(machine(), 3, (page >>12) & 0x0f);
+ set_bg_page(machine(), 2, (page >> 8) & 0x0f);
+ set_bg_page(machine(), 1, (page >> 4) & 0x0f);
+ set_bg_page(machine(), 0, (page >> 0) & 0x0f);
fg_scrollx = m_textram[m_fg_scrollx_reg] - m_fg_scrollx_offs;
fg_scrolly = (m_textram[m_fg_scrolly_reg] & 0xff) - m_fg_scrolly_offs;
page = m_textram[m_fg_page_reg];
- set_fg_page(screen.machine(), 3, (page >>12) & 0x0f);
- set_fg_page(screen.machine(), 2, (page >> 8) & 0x0f);
- set_fg_page(screen.machine(), 1, (page >> 4) & 0x0f);
- set_fg_page(screen.machine(), 0, (page >> 0) & 0x0f);
+ set_fg_page(machine(), 3, (page >>12) & 0x0f);
+ set_fg_page(machine(), 2, (page >> 8) & 0x0f);
+ set_fg_page(machine(), 1, (page >> 4) & 0x0f);
+ set_fg_page(machine(), 0, (page >> 0) & 0x0f);
m_bg_tilemap->set_scrollx(0, bg_scrollx & 0x1ff);
m_bg_tilemap->set_scrolly(0, bg_scrolly & 0x0ff);
m_fg_tilemap->set_scrollx(0, fg_scrollx & 0x1ff);
m_fg_tilemap->set_scrolly(0, fg_scrolly & 0x0ff);
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
m_bg_tilemap->draw(bitmap, cliprect, 0, 1);
m_fg_tilemap->draw(bitmap, cliprect, 0, 2);
m_tx_tilemap->draw(bitmap, cliprect, 0, 4);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/video/dietgo.c b/src/mame/video/dietgo.c
index da059b07652..9675d25a5cb 100644
--- a/src/mame/video/dietgo.c
+++ b/src/mame/video/dietgo.c
@@ -5,7 +5,7 @@
UINT32 dietgo_state::screen_update_dietgo(screen_device &screen, bitmap_ind16 &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));
@@ -16,6 +16,6 @@ UINT32 dietgo_state::screen_update_dietgo(screen_device &screen, bitmap_ind16 &b
deco16ic_tilemap_2_draw(m_deco_tilegen1, bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0);
deco16ic_tilemap_1_draw(m_deco_tilegen1, 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/video/digdug.c b/src/mame/video/digdug.c
index 4fe6d1ab456..e7ec009ee0e 100644
--- a/src/mame/video/digdug.c
+++ b/src/mame/video/digdug.c
@@ -313,6 +313,6 @@ UINT32 digdug_state::screen_update_digdug(screen_device &screen, bitmap_ind16 &b
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);
return 0;
}
diff --git a/src/mame/video/djmain.c b/src/mame/video/djmain.c
index e83e748e6a9..dbc08285a04 100644
--- a/src/mame/video/djmain.c
+++ b/src/mame/video/djmain.c
@@ -145,8 +145,8 @@ void djmain_state::video_start()
UINT32 djmain_state::screen_update_djmain(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- device_t *k056832 = screen.machine().device("k056832");
- device_t *k055555 = screen.machine().device("k055555");
+ device_t *k056832 = machine().device("k056832");
+ device_t *k055555 = machine().device("k055555");
int enables = k055555_read_register(k055555, K55_INPUT_ENABLES);
int pri[NUM_LAYERS + 1];
int order[NUM_LAYERS + 1];
@@ -169,7 +169,7 @@ UINT32 djmain_state::screen_update_djmain(screen_device &screen, bitmap_rgb32 &b
order[j] = temp;
}
- bitmap.fill(screen.machine().pens[0], cliprect);
+ bitmap.fill(machine().pens[0], cliprect);
for (i = 0; i < NUM_LAYERS + 1; i++)
{
@@ -178,7 +178,7 @@ UINT32 djmain_state::screen_update_djmain(screen_device &screen, bitmap_rgb32 &b
if (layer == NUM_LAYERS)
{
if (enables & K55_INP_SUB2)
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
}
else
{
diff --git a/src/mame/video/dkong.c b/src/mame/video/dkong.c
index 5a9dc2a2a54..7dd9080e1dd 100644
--- a/src/mame/video/dkong.c
+++ b/src/mame/video/dkong.c
@@ -955,7 +955,7 @@ VIDEO_START_MEMBER(dkong_state,dkong)
UINT32 dkong_state::screen_update_dkong(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- screen.machine().tilemap().set_flip_all(m_flip ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0);
+ machine().tilemap().set_flip_all(m_flip ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0);
m_bg_tilemap->set_scrollx(0, m_flip ? 0 : 0);
m_bg_tilemap->set_scrolly(0, m_flip ? -8 : 0);
@@ -963,15 +963,15 @@ UINT32 dkong_state::screen_update_dkong(screen_device &screen, bitmap_ind16 &bit
{
case HARDWARE_TKG02:
case HARDWARE_TKG04:
- check_palette(screen.machine());
+ check_palette(machine());
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 0x40, 1);
+ draw_sprites(machine(), bitmap, cliprect, 0x40, 1);
break;
case HARDWARE_TRS01:
case HARDWARE_TRS02:
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 0x40, 1);
- radarscp_draw_background(screen.machine(), this, bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect, 0x40, 1);
+ radarscp_draw_background(machine(), this, bitmap, cliprect);
break;
default:
fatalerror("Invalid hardware type in dkong_video_update\n");
@@ -990,7 +990,7 @@ UINT32 dkong_state::screen_update_pestplce(screen_device &screen, bitmap_ind16 &
{
if (m_sprite_ram[offs])
{
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[1],
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[1],
m_sprite_ram[offs + 2],
(m_sprite_ram[offs + 1] & 0x0f) + 16 * m_palette_bank,
m_sprite_ram[offs + 1] & 0x80,m_sprite_ram[offs + 1] & 0x40,
@@ -1006,6 +1006,6 @@ UINT32 dkong_state::screen_update_spclforc(screen_device &screen, bitmap_ind16 &
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
/* it uses sprite_ram[offs + 2] & 0x10 for sprite bank */
- draw_sprites(screen.machine(), bitmap, cliprect, 0x10, 3);
+ draw_sprites(machine(), bitmap, cliprect, 0x10, 3);
return 0;
}
diff --git a/src/mame/video/docastle.c b/src/mame/video/docastle.c
index 0b9ee5132fb..ffe8caff4a8 100644
--- a/src/mame/video/docastle.c
+++ b/src/mame/video/docastle.c
@@ -222,7 +222,7 @@ UINT32 docastle_state::screen_update_docastle(screen_device &screen, bitmap_ind1
{
m_do_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
m_do_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0);
return 0;
}
diff --git a/src/mame/video/dogfgt.c b/src/mame/video/dogfgt.c
index c0d96ab617f..19d280fdb1a 100644
--- a/src/mame/video/dogfgt.c
+++ b/src/mame/video/dogfgt.c
@@ -215,7 +215,7 @@ UINT32 dogfgt_state::screen_update_dogfgt(screen_device &screen, bitmap_ind16 &b
if (m_lastflip != flip_screen() || m_lastpixcolor != m_pixcolor)
{
- address_space &space = *screen.machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
m_lastflip = flip_screen();
m_lastpixcolor = m_pixcolor;
@@ -227,7 +227,7 @@ UINT32 dogfgt_state::screen_update_dogfgt(screen_device &screen, bitmap_ind16 &b
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
copybitmap_trans(bitmap, m_pixbitmap, 0, 0, 0, 0, cliprect, PIXMAP_COLOR_BASE + 8 * m_pixcolor);
return 0;
diff --git a/src/mame/video/dooyong.c b/src/mame/video/dooyong.c
index 0175a8d5b00..78913419de0 100644
--- a/src/mame/video/dooyong.c
+++ b/src/mame/video/dooyong.c
@@ -500,48 +500,48 @@ static void rshark_draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,
UINT32 dooyong_state::screen_update_lastday(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_bg_tilemap->draw(bitmap, cliprect, 0, 1);
m_fg_tilemap->draw(bitmap, cliprect, 0, 2);
m_tx_tilemap->draw(bitmap, cliprect, 0, 4);
if (!m_sprites_disabled)
- draw_sprites(screen.machine(), bitmap, cliprect, 0);
+ draw_sprites(machine(), bitmap, cliprect, 0);
return 0;
}
UINT32 dooyong_state::screen_update_gulfstrm(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_bg_tilemap->draw(bitmap, cliprect, 0, 1);
m_fg_tilemap->draw(bitmap, cliprect, 0, 2);
m_tx_tilemap->draw(bitmap, cliprect, 0, 4);
- draw_sprites(screen.machine(), bitmap, cliprect, 1);
+ draw_sprites(machine(), bitmap, cliprect, 1);
return 0;
}
UINT32 dooyong_state::screen_update_pollux(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_bg_tilemap->draw(bitmap, cliprect, 0, 1);
m_fg_tilemap->draw(bitmap, cliprect, 0, 2);
m_tx_tilemap->draw(bitmap, cliprect, 0, 4);
- draw_sprites(screen.machine(), bitmap, cliprect, 2);
+ draw_sprites(machine(), bitmap, cliprect, 2);
return 0;
}
UINT32 dooyong_state::screen_update_flytiger(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);
if (m_flytiger_pri)
{
@@ -555,28 +555,28 @@ UINT32 dooyong_state::screen_update_flytiger(screen_device &screen, bitmap_ind16
}
m_tx_tilemap->draw(bitmap, cliprect, 0, 4);
- draw_sprites(screen.machine(), bitmap, cliprect, 4);
+ draw_sprites(machine(), bitmap, cliprect, 4);
return 0;
}
UINT32 dooyong_state::screen_update_bluehawk(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_bg_tilemap->draw(bitmap, cliprect, 0, 1);
m_fg_tilemap->draw(bitmap, cliprect, 0, 2);
m_fg2_tilemap->draw(bitmap, cliprect, 0, 4);
m_tx_tilemap->draw(bitmap, cliprect, 0, 4);
- draw_sprites(screen.machine(), bitmap, cliprect, 3);
+ draw_sprites(machine(), bitmap, cliprect, 3);
return 0;
}
UINT32 dooyong_state::screen_update_primella(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);
if (m_tx_pri) m_tx_tilemap->draw(bitmap, cliprect, 0, 0);
@@ -587,26 +587,26 @@ UINT32 dooyong_state::screen_update_primella(screen_device &screen, bitmap_ind16
UINT32 dooyong_state::screen_update_rshark(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_bg_tilemap->draw(bitmap, cliprect, 0, 1);
m_bg2_tilemap->draw(bitmap, cliprect, 0, (m_rshark_pri ? 2 : 1));
m_fg_tilemap->draw(bitmap, cliprect, 0, 2);
m_fg2_tilemap->draw(bitmap, cliprect, 0, 2);
- rshark_draw_sprites(screen.machine(), bitmap, cliprect);
+ rshark_draw_sprites(machine(), bitmap, cliprect);
return 0;
}
UINT32 dooyong_state::screen_update_popbingo(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_bg_tilemap->draw(bitmap, cliprect, 0, 1);
- rshark_draw_sprites(screen.machine(), bitmap, cliprect);
+ rshark_draw_sprites(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/video/drgnmst.c b/src/mame/video/drgnmst.c
index b26ba49bb2c..8d91d360b8b 100644
--- a/src/mame/video/drgnmst.c
+++ b/src/mame/video/drgnmst.c
@@ -186,7 +186,7 @@ UINT32 drgnmst_state::screen_update_drgnmst(screen_device &screen, bitmap_ind16
}
- draw_sprites(screen.machine(),bitmap,cliprect);
+ draw_sprites(machine(),bitmap,cliprect);
// popmessage ("x %04x x %04x x %04x x %04x x %04x", m_vidregs2[0], m_vidregs[12], m_vidregs[13], m_vidregs[14], m_vidregs[15]);
// popmessage ("x %04x x %04x y %04x y %04x z %04x z %04x",m_vidregs[0],m_vidregs[1],m_vidregs[2],m_vidregs[3],m_vidregs[4],m_vidregs[5]);
diff --git a/src/mame/video/dribling.c b/src/mame/video/dribling.c
index 2af552efa46..aa3ed58bfc0 100644
--- a/src/mame/video/dribling.c
+++ b/src/mame/video/dribling.c
@@ -59,7 +59,7 @@ WRITE8_MEMBER(dribling_state::dribling_colorram_w)
UINT32 dribling_state::screen_update_dribling(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- UINT8 *prombase = screen.machine().root_device().memregion("proms")->base();
+ UINT8 *prombase = machine().root_device().memregion("proms")->base();
UINT8 *gfxbase = memregion("gfx1")->base();
int x, y;
diff --git a/src/mame/video/drmicro.c b/src/mame/video/drmicro.c
index 55b3a5ee3b4..8cf47fc1eb5 100644
--- a/src/mame/video/drmicro.c
+++ b/src/mame/video/drmicro.c
@@ -146,7 +146,7 @@ UINT32 drmicro_state::screen_update_drmicro(screen_device &screen, bitmap_ind16
else
x = (240 - x) & 0xff;
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[3-g],
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[3-g],
chr,
col,
fx,fy,
@@ -154,7 +154,7 @@ UINT32 drmicro_state::screen_update_drmicro(screen_device &screen, bitmap_ind16
if (x > 240)
{
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[3-g],
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[3-g],
chr,
col,
fx,fy,
diff --git a/src/mame/video/dynax.c b/src/mame/video/dynax.c
index a27a93ab2ee..b2ad4ce364b 100644
--- a/src/mame/video/dynax.c
+++ b/src/mame/video/dynax.c
@@ -1243,10 +1243,10 @@ UINT32 dynax_state::screen_update_hanamai(screen_device &screen, bitmap_ind16 &b
int layers_ctrl = ~m_layer_enable;
int lay[4];
- if (debug_viewer(screen.machine(), bitmap, cliprect))
+ if (debug_viewer(machine(), bitmap, cliprect))
return 0;
- layers_ctrl &= debug_mask(screen.machine());
+ layers_ctrl &= debug_mask(machine());
bitmap.fill((m_blit_backpen & 0xff) + (m_blit_palbank & 1) * 256, cliprect);
@@ -1265,10 +1265,10 @@ UINT32 dynax_state::screen_update_hanamai(screen_device &screen, bitmap_ind16 &b
case 0x15: lay[0] = 0; lay[1] = 2; lay[2] = 3; lay[3] = 1; break;
}
- if (BIT(layers_ctrl, lay[0])) hanamai_copylayer(screen.machine(), bitmap, cliprect, lay[0]);
- if (BIT(layers_ctrl, lay[1])) hanamai_copylayer(screen.machine(), bitmap, cliprect, lay[1]);
- if (BIT(layers_ctrl, lay[2])) hanamai_copylayer(screen.machine(), bitmap, cliprect, lay[2]);
- if (BIT(layers_ctrl, lay[3])) hanamai_copylayer(screen.machine(), bitmap, cliprect, lay[3]);
+ if (BIT(layers_ctrl, lay[0])) hanamai_copylayer(machine(), bitmap, cliprect, lay[0]);
+ if (BIT(layers_ctrl, lay[1])) hanamai_copylayer(machine(), bitmap, cliprect, lay[1]);
+ if (BIT(layers_ctrl, lay[2])) hanamai_copylayer(machine(), bitmap, cliprect, lay[2]);
+ if (BIT(layers_ctrl, lay[3])) hanamai_copylayer(machine(), bitmap, cliprect, lay[3]);
return 0;
}
@@ -1279,10 +1279,10 @@ UINT32 dynax_state::screen_update_hnoridur(screen_device &screen, bitmap_ind16 &
int lay[4];
int pri;
- if (debug_viewer(screen.machine(), bitmap, cliprect))
+ if (debug_viewer(machine(), bitmap, cliprect))
return 0;
- layers_ctrl &= debug_mask(screen.machine());
+ layers_ctrl &= debug_mask(machine());
bitmap.fill((m_blit_backpen & 0xff) + (m_blit_palbank & 0x0f) * 256, cliprect);
@@ -1300,10 +1300,10 @@ UINT32 dynax_state::screen_update_hnoridur(screen_device &screen, bitmap_ind16 &
lay[2] = (pri >> 4) & 3;
lay[3] = (pri >> 0) & 3;
- if (BIT(layers_ctrl, lay[0])) hanamai_copylayer(screen.machine(), bitmap, cliprect, lay[0]);
- if (BIT(layers_ctrl, lay[1])) hanamai_copylayer(screen.machine(), bitmap, cliprect, lay[1]);
- if (BIT(layers_ctrl, lay[2])) hanamai_copylayer(screen.machine(), bitmap, cliprect, lay[2]);
- if (BIT(layers_ctrl, lay[3])) hanamai_copylayer(screen.machine(), bitmap, cliprect, lay[3]);
+ if (BIT(layers_ctrl, lay[0])) hanamai_copylayer(machine(), bitmap, cliprect, lay[0]);
+ if (BIT(layers_ctrl, lay[1])) hanamai_copylayer(machine(), bitmap, cliprect, lay[1]);
+ if (BIT(layers_ctrl, lay[2])) hanamai_copylayer(machine(), bitmap, cliprect, lay[2]);
+ if (BIT(layers_ctrl, lay[3])) hanamai_copylayer(machine(), bitmap, cliprect, lay[3]);
return 0;
}
@@ -1313,16 +1313,16 @@ UINT32 dynax_state::screen_update_sprtmtch(screen_device &screen, bitmap_ind16 &
{
int layers_ctrl = ~m_layer_enable;
- if (debug_viewer(screen.machine(),bitmap,cliprect))
+ if (debug_viewer(machine(),bitmap,cliprect))
return 0;
- layers_ctrl &= debug_mask(screen.machine());
+ layers_ctrl &= debug_mask(machine());
bitmap.fill((m_blit_backpen & 0xff) + (m_blit_palbank & 1) * 256, cliprect);
- if (BIT(layers_ctrl, 0)) hanamai_copylayer(screen.machine(), bitmap, cliprect, 0);
- if (BIT(layers_ctrl, 1)) hanamai_copylayer(screen.machine(), bitmap, cliprect, 1);
- if (BIT(layers_ctrl, 2)) hanamai_copylayer(screen.machine(), bitmap, cliprect, 2);
+ if (BIT(layers_ctrl, 0)) hanamai_copylayer(machine(), bitmap, cliprect, 0);
+ if (BIT(layers_ctrl, 1)) hanamai_copylayer(machine(), bitmap, cliprect, 1);
+ if (BIT(layers_ctrl, 2)) hanamai_copylayer(machine(), bitmap, cliprect, 2);
return 0;
}
@@ -1330,17 +1330,17 @@ UINT32 dynax_state::screen_update_jantouki_top(screen_device &screen, bitmap_ind
{
int layers_ctrl = m_layer_enable;
- if (debug_viewer(screen.machine(), bitmap, cliprect))
+ if (debug_viewer(machine(), bitmap, cliprect))
return 0;
- layers_ctrl &= debug_mask(screen.machine());
+ layers_ctrl &= debug_mask(machine());
bitmap.fill((m_blit_backpen & 0xff) + (m_blit_palbank & 1) * 256, cliprect);
-// if (BIT(layers_ctrl, 0)) jantouki_copylayer(screen.machine(), bitmap, cliprect, 3, 0);
- if (BIT(layers_ctrl, 1)) jantouki_copylayer(screen.machine(), bitmap, cliprect, 2, 0);
- if (BIT(layers_ctrl, 2)) jantouki_copylayer(screen.machine(), bitmap, cliprect, 1, 0);
- if (BIT(layers_ctrl, 3)) jantouki_copylayer(screen.machine(), bitmap, cliprect, 0, 0);
+// if (BIT(layers_ctrl, 0)) jantouki_copylayer(machine(), bitmap, cliprect, 3, 0);
+ if (BIT(layers_ctrl, 1)) jantouki_copylayer(machine(), bitmap, cliprect, 2, 0);
+ if (BIT(layers_ctrl, 2)) jantouki_copylayer(machine(), bitmap, cliprect, 1, 0);
+ if (BIT(layers_ctrl, 3)) jantouki_copylayer(machine(), bitmap, cliprect, 0, 0);
return 0;
}
@@ -1348,18 +1348,18 @@ UINT32 dynax_state::screen_update_jantouki_bottom(screen_device &screen, bitmap_
{
int layers_ctrl = m_layer_enable;
- if (debug_viewer(screen.machine(), bitmap, cliprect))
+ if (debug_viewer(machine(), bitmap, cliprect))
return 0;
- layers_ctrl &= debug_mask(screen.machine());
+ layers_ctrl &= debug_mask(machine());
bitmap.fill((m_blit_backpen & 0xff) + (m_blit_palbank & 1) * 256, cliprect);
- if (BIT(layers_ctrl, 0)) jantouki_copylayer(screen.machine(), bitmap, cliprect, 3, 0);
- if (BIT(layers_ctrl, 4)) jantouki_copylayer(screen.machine(), bitmap, cliprect, 7, 0);
- if (BIT(layers_ctrl, 5)) jantouki_copylayer(screen.machine(), bitmap, cliprect, 6, 0);
- if (BIT(layers_ctrl, 6)) jantouki_copylayer(screen.machine(), bitmap, cliprect, 5, 0);
- if (BIT(layers_ctrl, 7)) jantouki_copylayer(screen.machine(), bitmap, cliprect, 4, 0);
+ if (BIT(layers_ctrl, 0)) jantouki_copylayer(machine(), bitmap, cliprect, 3, 0);
+ if (BIT(layers_ctrl, 4)) jantouki_copylayer(machine(), bitmap, cliprect, 7, 0);
+ if (BIT(layers_ctrl, 5)) jantouki_copylayer(machine(), bitmap, cliprect, 6, 0);
+ if (BIT(layers_ctrl, 6)) jantouki_copylayer(machine(), bitmap, cliprect, 5, 0);
+ if (BIT(layers_ctrl, 7)) jantouki_copylayer(machine(), bitmap, cliprect, 4, 0);
return 0;
}
@@ -1368,15 +1368,15 @@ UINT32 dynax_state::screen_update_mjdialq2(screen_device &screen, bitmap_ind16 &
{
int layers_ctrl = ~m_layer_enable;
- if (debug_viewer(screen.machine(), bitmap, cliprect))
+ if (debug_viewer(machine(), bitmap, cliprect))
return 0;
- layers_ctrl &= debug_mask(screen.machine());
+ layers_ctrl &= debug_mask(machine());
bitmap.fill((m_blit_backpen & 0xff) + (m_blit_palbank & 1) * 256, cliprect);
- if (BIT(layers_ctrl, 0)) mjdialq2_copylayer(screen.machine(), bitmap, cliprect, 0);
- if (BIT(layers_ctrl, 1)) mjdialq2_copylayer(screen.machine(), bitmap, cliprect, 1);
+ if (BIT(layers_ctrl, 0)) mjdialq2_copylayer(machine(), bitmap, cliprect, 0);
+ if (BIT(layers_ctrl, 1)) mjdialq2_copylayer(machine(), bitmap, cliprect, 1);
return 0;
}
@@ -1397,7 +1397,7 @@ UINT32 dynax_state::screen_update_htengoku(screen_device &screen, bitmap_ind16 &
for (layer = 0; layer < 4; layer++)
{
bitmap.fill(0, cliprect);
- hanamai_copylayer(screen.machine(), bitmap, cliprect, layer);
+ hanamai_copylayer(machine(), bitmap, cliprect, layer);
for (y = 0; y < 256; y++)
for (x = 0; x < 512; x++)
diff --git a/src/mame/video/dynduke.c b/src/mame/video/dynduke.c
index 57c402d13d9..f601468f71e 100644
--- a/src/mame/video/dynduke.c
+++ b/src/mame/video/dynduke.c
@@ -228,14 +228,14 @@ UINT32 dynduke_state::screen_update_dynduke(screen_device &screen, bitmap_ind16
m_tx_layer->enable(m_txt_enable);
- draw_background(screen.machine(), bitmap, cliprect,0x00);
- draw_sprites(screen.machine(),bitmap,cliprect,0); // Untested: does anything use it? Could be behind background
- draw_sprites(screen.machine(),bitmap,cliprect,1);
- draw_background(screen.machine(), bitmap, cliprect,0x20);
+ draw_background(machine(), bitmap, cliprect,0x00);
+ draw_sprites(machine(),bitmap,cliprect,0); // Untested: does anything use it? Could be behind background
+ draw_sprites(machine(),bitmap,cliprect,1);
+ draw_background(machine(), bitmap, cliprect,0x20);
- draw_sprites(screen.machine(),bitmap,cliprect,2);
+ draw_sprites(machine(),bitmap,cliprect,2);
m_fg_layer->draw(bitmap, cliprect, 0,0);
- draw_sprites(screen.machine(),bitmap,cliprect,3);
+ draw_sprites(machine(),bitmap,cliprect,3);
m_tx_layer->draw(bitmap, cliprect, 0,0);
return 0;
diff --git a/src/mame/video/epos.c b/src/mame/video/epos.c
index 5f8978f0b4f..0ead11ed588 100644
--- a/src/mame/video/epos.c
+++ b/src/mame/video/epos.c
@@ -76,7 +76,7 @@ UINT32 epos_state::screen_update_epos(screen_device &screen, bitmap_rgb32 &bitma
pen_t pens[0x20];
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/video/eprom.c b/src/mame/video/eprom.c
index ecb8f21a17c..96ff13cae1e 100644
--- a/src/mame/video/eprom.c
+++ b/src/mame/video/eprom.c
@@ -237,11 +237,11 @@ UINT32 eprom_state::screen_update_eprom(screen_device &screen, bitmap_ind16 &bit
if (m_video_disable)
{
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
return 0;
}
- update_palette(screen.machine());
+ update_palette(machine());
/* draw the playfield */
m_playfield_tilemap->draw(bitmap, cliprect, 0, 0);
@@ -391,11 +391,11 @@ UINT32 eprom_state::screen_update_guts(screen_device &screen, bitmap_ind16 &bitm
if (m_video_disable)
{
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
return 0;
}
- update_palette(screen.machine());
+ update_palette(machine());
/* draw the playfield */
m_playfield_tilemap->draw(bitmap, cliprect, 0, 0);
diff --git a/src/mame/video/equites.c b/src/mame/video/equites.c
index 78c97ad2518..02df5fd7b43 100644
--- a/src/mame/video/equites.c
+++ b/src/mame/video/equites.c
@@ -455,7 +455,7 @@ UINT32 equites_state::screen_update_equites(screen_device &screen, bitmap_ind16
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- equites_draw_sprites(screen.machine(), bitmap, cliprect);
+ equites_draw_sprites(machine(), bitmap, cliprect);
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
@@ -466,12 +466,12 @@ UINT32 equites_state::screen_update_splndrbt(screen_device &screen, bitmap_ind16
{
bitmap.fill(m_bgcolor, cliprect);
- splndrbt_copy_bg(screen.machine(), bitmap, cliprect);
+ splndrbt_copy_bg(machine(), bitmap, cliprect);
if (m_fg_char_bank)
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
- splndrbt_draw_sprites(screen.machine(), bitmap, cliprect);
+ splndrbt_draw_sprites(machine(), bitmap, cliprect);
if (!m_fg_char_bank)
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
diff --git a/src/mame/video/esd16.c b/src/mame/video/esd16.c
index 024932eb235..730da3f89e3 100644
--- a/src/mame/video/esd16.c
+++ b/src/mame/video/esd16.c
@@ -167,15 +167,15 @@ UINT32 esd16_state::screen_update_hedpanic(screen_device &screen, bitmap_ind16 &
{
int layers_ctrl = -1;
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
#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_A)) msk |= 4;
+ if (machine().input().code_pressed(KEYCODE_Q)) msk |= 1;
+ if (machine().input().code_pressed(KEYCODE_W)) msk |= 2;
+ if (machine().input().code_pressed(KEYCODE_A)) msk |= 4;
if (msk != 0) layers_ctrl &= msk;
}
#endif
@@ -218,7 +218,7 @@ if (screen.machine().input().code_pressed(KEYCODE_Z))
}
- if (layers_ctrl & 4) screen.machine().device<decospr_device>("spritegen")->draw_sprites(bitmap, cliprect, m_spriteram, 0x400);
+ if (layers_ctrl & 4) machine().device<decospr_device>("spritegen")->draw_sprites(bitmap, cliprect, m_spriteram, 0x400);
// popmessage("%04x %04x %04x %04x %04x",head_unknown1[0],head_layersize[0],head_unknown3[0],head_unknown4[0],head_unknown5[0]);
return 0;
diff --git a/src/mame/video/espial.c b/src/mame/video/espial.c
index dae88c368a2..3903a35222a 100644
--- a/src/mame/video/espial.c
+++ b/src/mame/video/espial.c
@@ -229,6 +229,6 @@ UINT32 espial_state::screen_update_espial(screen_device &screen, bitmap_ind16 &b
{
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/video/exedexes.c b/src/mame/video/exedexes.c
index b141fc13ebc..ae4fcc80e39 100644
--- a/src/mame/video/exedexes.c
+++ b/src/mame/video/exedexes.c
@@ -222,7 +222,7 @@ UINT32 exedexes_state::screen_update_exedexes(screen_device &screen, bitmap_ind1
else
bitmap.fill(0, cliprect);
- draw_sprites(screen.machine(), bitmap, cliprect, 1);
+ draw_sprites(machine(), bitmap, cliprect, 1);
if (m_sc1on)
{
@@ -231,7 +231,7 @@ UINT32 exedexes_state::screen_update_exedexes(screen_device &screen, bitmap_ind1
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
}
- draw_sprites(screen.machine(), bitmap, cliprect, 0);
+ draw_sprites(machine(), bitmap, cliprect, 0);
if (m_chon)
m_tx_tilemap->draw(bitmap, cliprect, 0, 0);
diff --git a/src/mame/video/exerion.c b/src/mame/video/exerion.c
index ddf5b53dc48..0e2aa7ebefb 100644
--- a/src/mame/video/exerion.c
+++ b/src/mame/video/exerion.c
@@ -353,7 +353,7 @@ UINT32 exerion_state::screen_update_exerion(screen_device &screen, bitmap_ind16
int sx, sy, offs, i;
/* draw background */
- draw_background(screen.machine(), bitmap, cliprect);
+ draw_background(machine(), bitmap, cliprect);
/* draw sprites */
for (i = 0; i < m_spriteram.bytes(); i += 4)
@@ -370,7 +370,7 @@ UINT32 exerion_state::screen_update_exerion(screen_device &screen, bitmap_ind16
int code2 = code;
int color = ((flags >> 1) & 0x03) | ((code >> 5) & 0x04) | (code & 0x08) | (m_sprite_palette * 16);
- gfx_element *gfx = doubled ? screen.machine().gfx[2] : screen.machine().gfx[1];
+ gfx_element *gfx = doubled ? machine().gfx[2] : machine().gfx[1];
if (m_cocktail_flip)
{
@@ -389,11 +389,11 @@ UINT32 exerion_state::screen_update_exerion(screen_device &screen, bitmap_ind16
code &= ~0x10, code2 |= 0x10;
drawgfx_transmask(bitmap, cliprect, gfx, code2, color, xflip, yflip, x, y + gfx->height(),
- colortable_get_transpen_mask(screen.machine().colortable, gfx, color, 0x10));
+ colortable_get_transpen_mask(machine().colortable, gfx, color, 0x10));
}
drawgfx_transmask(bitmap, cliprect, gfx, code, color, xflip, yflip, x, y,
- colortable_get_transpen_mask(screen.machine().colortable, gfx, color, 0x10));
+ colortable_get_transpen_mask(machine().colortable, gfx, color, 0x10));
if (doubled) i += 4;
}
@@ -406,7 +406,7 @@ UINT32 exerion_state::screen_update_exerion(screen_device &screen, bitmap_ind16
int y = m_cocktail_flip ? (31*8 - 8*sy) : 8*sy;
offs = sx + sy * 64;
- drawgfx_transpen(bitmap, cliprect, screen.machine().gfx[0],
+ drawgfx_transpen(bitmap, cliprect, machine().gfx[0],
m_videoram[offs] + 256 * m_char_bank,
((m_videoram[offs] & 0xf0) >> 4) + m_char_palette * 16,
m_cocktail_flip, m_cocktail_flip, x, y, 0);
diff --git a/src/mame/video/exidy.c b/src/mame/video/exidy.c
index c0a5c242f9a..3ce33d5341d 100644
--- a/src/mame/video/exidy.c
+++ b/src/mame/video/exidy.c
@@ -359,17 +359,17 @@ static void check_collision(running_machine &machine)
UINT32 exidy_state::screen_update_exidy(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
/* refresh the colors from the palette (static or dynamic) */
- set_colors(screen.machine());
+ set_colors(machine());
/* update the background and draw it */
- draw_background(screen.machine());
+ draw_background(machine());
copybitmap(bitmap, m_background_bitmap, 0, 0, 0, 0, cliprect);
/* draw the sprites */
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
/* check for collision, this will set the appropriate bits in collision_mask */
- check_collision(screen.machine());
+ check_collision(machine());
return 0;
}
diff --git a/src/mame/video/exidy440.c b/src/mame/video/exidy440.c
index 9c2d81ee367..1e0fa28790d 100644
--- a/src/mame/video/exidy440.c
+++ b/src/mame/video/exidy440.c
@@ -433,8 +433,8 @@ UINT32 exidy440_state::screen_update_exidy440(screen_device &screen, bitmap_ind1
{
int i;
- int beamx = ((screen.machine().root_device().ioport("AN0")->read() & 0xff) * (HBSTART - HBEND)) >> 8;
- int beamy = ((screen.machine().root_device().ioport("AN1")->read() & 0xff) * (VBSTART - VBEND)) >> 8;
+ int beamx = ((machine().root_device().ioport("AN0")->read() & 0xff) * (HBSTART - HBEND)) >> 8;
+ int beamy = ((machine().root_device().ioport("AN1")->read() & 0xff) * (VBSTART - VBEND)) >> 8;
/* The timing of this FIRQ is very important. The games look for an FIRQ
and then wait about 650 cycles, clear the old FIRQ, and wait a
@@ -446,7 +446,7 @@ UINT32 exidy440_state::screen_update_exidy440(screen_device &screen, bitmap_ind1
attotime time = screen.time_until_pos(beamy, beamx) - increment * 6;
for (i = 0; i <= 12; i++)
{
- screen.machine().scheduler().timer_set(time, FUNC(beam_firq_callback), beamx);
+ machine().scheduler().timer_set(time, FUNC(beam_firq_callback), beamx);
time += increment;
}
}
diff --git a/src/mame/video/exprraid.c b/src/mame/video/exprraid.c
index 0cc58f99c71..551e391cfb9 100644
--- a/src/mame/video/exprraid.c
+++ b/src/mame/video/exprraid.c
@@ -131,7 +131,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
UINT32 exprraid_state::screen_update_exprraid(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);
m_bg_tilemap->draw(bitmap, cliprect, 1, 0);
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
diff --git a/src/mame/video/exzisus.c b/src/mame/video/exzisus.c
index 9fa88507fe5..5db3d518d74 100644
--- a/src/mame/video/exzisus.c
+++ b/src/mame/video/exzisus.c
@@ -136,7 +136,7 @@ UINT32 exzisus_state::screen_update_exzisus(screen_device &screen, bitmap_ind16
y = 248 - y;
}
- drawgfx_transpen(bitmap, cliprect, screen.machine().gfx[0],
+ drawgfx_transpen(bitmap, cliprect, machine().gfx[0],
code & 0x3fff,
color,
flip_screen(), flip_screen(),
@@ -205,7 +205,7 @@ UINT32 exzisus_state::screen_update_exzisus(screen_device &screen, bitmap_ind16
y = 248 - y;
}
- drawgfx_transpen(bitmap, cliprect, screen.machine().gfx[1],
+ drawgfx_transpen(bitmap, cliprect, machine().gfx[1],
code & 0x3fff,
color,
flip_screen(), flip_screen(),
diff --git a/src/mame/video/f1gp.c b/src/mame/video/f1gp.c
index af8dca8fdeb..82146c285cb 100644
--- a/src/mame/video/f1gp.c
+++ b/src/mame/video/f1gp.c
@@ -239,7 +239,7 @@ static void f1gp_draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, c
UINT32 f1gp_state::screen_update_f1gp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
k053936_zoom_draw(m_k053936, bitmap, cliprect, m_roz_tilemap, 0, 0, 1);
@@ -248,13 +248,13 @@ UINT32 f1gp_state::screen_update_f1gp(screen_device &screen, bitmap_ind16 &bitma
/* quick kludge for "continue" screen priority */
if (m_gfxctrl == 0x00)
{
- f1gp_draw_sprites(screen.machine(), bitmap, cliprect, 0, 0x02);
- f1gp_draw_sprites(screen.machine(), bitmap, cliprect, 1, 0x02);
+ f1gp_draw_sprites(machine(), bitmap, cliprect, 0, 0x02);
+ f1gp_draw_sprites(machine(), bitmap, cliprect, 1, 0x02);
}
else
{
- f1gp_draw_sprites(screen.machine(), bitmap, cliprect, 0, 0x00);
- f1gp_draw_sprites(screen.machine(), bitmap, cliprect, 1, 0x02);
+ f1gp_draw_sprites(machine(), bitmap, cliprect, 0, 0x00);
+ f1gp_draw_sprites(machine(), bitmap, cliprect, 1, 0x02);
}
return 0;
}
@@ -341,7 +341,7 @@ UINT32 f1gp_state::screen_update_f1gpb(screen_device &screen, bitmap_ind16 &bitm
m_fg_tilemap->set_scrolly(0, m_fgregs[0] + 8);
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
m_roz_tilemap->draw_roz(bitmap, cliprect,
startx << 13, starty << 13,
@@ -350,7 +350,7 @@ UINT32 f1gp_state::screen_update_f1gpb(screen_device &screen, bitmap_ind16 &bitm
m_fg_tilemap->draw(bitmap, cliprect, 0, 1);
- f1gpb_draw_sprites(screen.machine(), bitmap, cliprect);
+ f1gpb_draw_sprites(machine(), bitmap, cliprect);
return 0;
}
@@ -432,25 +432,25 @@ UINT32 f1gp_state::screen_update_f1gp2(screen_device &screen, bitmap_ind16 &bitm
{
if (m_gfxctrl & 4) /* blank screen */
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
else
{
switch (m_gfxctrl & 3)
{
case 0:
k053936_zoom_draw(m_k053936, bitmap, cliprect, m_roz_tilemap, TILEMAP_DRAW_OPAQUE, 0, 1);
- f1gp2_draw_sprites(screen.machine(), bitmap, cliprect);
+ f1gp2_draw_sprites(machine(), bitmap, cliprect);
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
break;
case 1:
k053936_zoom_draw(m_k053936, bitmap, cliprect, m_roz_tilemap, TILEMAP_DRAW_OPAQUE, 0, 1);
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
- f1gp2_draw_sprites(screen.machine(), bitmap, cliprect);
+ f1gp2_draw_sprites(machine(), bitmap, cliprect);
break;
case 2:
m_fg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0);
k053936_zoom_draw(m_k053936, bitmap, cliprect, m_roz_tilemap, 0, 0, 1);
- f1gp2_draw_sprites(screen.machine(), bitmap, cliprect);
+ f1gp2_draw_sprites(machine(), bitmap, cliprect);
break;
#ifdef MAME_DEBUG
case 3:
diff --git a/src/mame/video/fantland.c b/src/mame/video/fantland.c
index 360369c76f1..19302b88727 100644
--- a/src/mame/video/fantland.c
+++ b/src/mame/video/fantland.c
@@ -142,7 +142,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,const re
UINT32 fantland_state::screen_update_fantland(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
bitmap.fill(0, cliprect);
- draw_sprites(screen.machine(),bitmap,cliprect);
+ draw_sprites(machine(),bitmap,cliprect);
return 0;
}
diff --git a/src/mame/video/fastfred.c b/src/mame/video/fastfred.c
index a1fbadbf190..48dd6b1c323 100644
--- a/src/mame/video/fastfred.c
+++ b/src/mame/video/fastfred.c
@@ -299,7 +299,7 @@ UINT32 fastfred_state::screen_update_fastfred(screen_device &screen, bitmap_ind1
{
bitmap.fill(*m_background_color, cliprect);
m_bg_tilemap->draw(bitmap, cliprect, 0,0);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
return 0;
}
@@ -364,9 +364,9 @@ VIDEO_START_MEMBER(fastfred_state,imago)
UINT32 fastfred_state::screen_update_imago(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
m_web_tilemap->draw(bitmap, cliprect, 0,0);
- galaxold_draw_stars(screen.machine(), bitmap, cliprect);
+ galaxold_draw_stars(machine(), bitmap, cliprect);
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/video/fastlane.c b/src/mame/video/fastlane.c
index 244de5c0ea8..d0dfafc1767 100644
--- a/src/mame/video/fastlane.c
+++ b/src/mame/video/fastlane.c
@@ -159,10 +159,10 @@ UINT32 fastlane_state::screen_update_fastlane(screen_device &screen, bitmap_ind1
finalclip0 &= cliprect;
finalclip1 &= cliprect;
- set_pens(screen.machine());
+ set_pens(machine());
/* set scroll registers */
- address_space &space = screen.machine().driver_data()->generic_space();
+ address_space &space = machine().driver_data()->generic_space();
xoffs = k007121_ctrlram_r(m_k007121, space, 0);
for (i = 0; i < 32; i++)
m_layer0->set_scrollx(i, m_k007121_regs[0x20 + i] + xoffs - 40);
@@ -170,7 +170,7 @@ UINT32 fastlane_state::screen_update_fastlane(screen_device &screen, bitmap_ind1
m_layer0->set_scrolly(0, k007121_ctrlram_r(m_k007121, space, 2));
m_layer0->draw(bitmap, finalclip0, 0, 0);
- k007121_sprites_draw(m_k007121, bitmap, cliprect, screen.machine().gfx[0], screen.machine().colortable, m_spriteram, 0, 40, 0, (UINT32)-1);
+ k007121_sprites_draw(m_k007121, bitmap, cliprect, machine().gfx[0], machine().colortable, m_spriteram, 0, 40, 0, (UINT32)-1);
m_layer1->draw(bitmap, finalclip1, 0, 0);
return 0;
}
diff --git a/src/mame/video/fcombat.c b/src/mame/video/fcombat.c
index 01583bd3bc6..d3f012eb07a 100644
--- a/src/mame/video/fcombat.c
+++ b/src/mame/video/fcombat.c
@@ -160,7 +160,7 @@ UINT32 fcombat_state::screen_update_fcombat(screen_device &screen, bitmap_ind16
int code2 = code;
int color = ((flags >> 1) & 0x03) | ((code >> 5) & 0x04) | (code & 0x08) | (m_sprite_palette * 16);
- gfx_element *gfx = screen.machine().gfx[1];
+ gfx_element *gfx = machine().gfx[1];
if (m_cocktail_flip)
{
@@ -202,7 +202,7 @@ UINT32 fcombat_state::screen_update_fcombat(screen_device &screen, bitmap_ind16
int y = m_cocktail_flip ? (31 * 8 - 8 * sy) : 8 * sy;
offs = sx + sy * 64;
- drawgfx_transpen(bitmap, cliprect, screen.machine().gfx[0],
+ drawgfx_transpen(bitmap, cliprect, machine().gfx[0],
m_videoram[offs] + 256 * m_char_bank,
((m_videoram[offs] & 0xf0) >> 4) + m_char_palette * 16,
m_cocktail_flip, m_cocktail_flip, x, y, 0);
diff --git a/src/mame/video/fgoal.c b/src/mame/video/fgoal.c
index 88002ebc2f1..5a74d6f0622 100644
--- a/src/mame/video/fgoal.c
+++ b/src/mame/video/fgoal.c
@@ -46,16 +46,16 @@ UINT32 fgoal_state::screen_update_fgoal(screen_device &screen, bitmap_ind16 &bit
/* draw color overlay foreground and background */
- if (m_fgoal_player == 1 && (screen.machine().root_device().ioport("IN1")->read() & 0x40))
+ if (m_fgoal_player == 1 && (machine().root_device().ioport("IN1")->read() & 0x40))
{
- drawgfxzoom_opaque(m_fgbitmap, cliprect, screen.machine().gfx[0],
+ drawgfxzoom_opaque(m_fgbitmap, cliprect, machine().gfx[0],
0, (m_fgoal_player << 2) | m_current_color,
1, 1,
0, 16,
0x40000,
0x40000);
- drawgfxzoom_opaque(m_bgbitmap, cliprect, screen.machine().gfx[1],
+ drawgfxzoom_opaque(m_bgbitmap, cliprect, machine().gfx[1],
0, 0,
1, 1,
0, 16,
@@ -64,14 +64,14 @@ UINT32 fgoal_state::screen_update_fgoal(screen_device &screen, bitmap_ind16 &bit
}
else
{
- drawgfxzoom_opaque(m_fgbitmap, cliprect, screen.machine().gfx[0],
+ drawgfxzoom_opaque(m_fgbitmap, cliprect, machine().gfx[0],
0, (m_fgoal_player << 2) | m_current_color,
0, 0,
0, 0,
0x40000,
0x40000);
- drawgfxzoom_opaque(m_bgbitmap, cliprect, screen.machine().gfx[1],
+ drawgfxzoom_opaque(m_bgbitmap, cliprect, machine().gfx[1],
0, 0,
0, 0,
0, 0,
diff --git a/src/mame/video/finalizr.c b/src/mame/video/finalizr.c
index d68730fe951..23fa0ac84fa 100644
--- a/src/mame/video/finalizr.c
+++ b/src/mame/video/finalizr.c
@@ -94,8 +94,8 @@ UINT32 finalizr_state::screen_update_finalizr(screen_device &screen, bitmap_ind1
/* Draw the sprites. */
{
- gfx_element *gfx1 = screen.machine().gfx[1];
- gfx_element *gfx2 = screen.machine().gfx[2];
+ gfx_element *gfx1 = machine().gfx[1];
+ gfx_element *gfx2 = machine().gfx[2];
UINT8 *sr = m_spriterambank ? m_spriteram_2 : m_spriteram;
diff --git a/src/mame/video/firetrap.c b/src/mame/video/firetrap.c
index edb7859eb7a..c872448f390 100644
--- a/src/mame/video/firetrap.c
+++ b/src/mame/video/firetrap.c
@@ -265,7 +265,7 @@ UINT32 firetrap_state::screen_update_firetrap(screen_device &screen, bitmap_ind1
{
m_bg2_tilemap->draw(bitmap, cliprect, 0, 0);
m_bg1_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/video/firetrk.c b/src/mame/video/firetrk.c
index 3db35af7d54..d33d4db0362 100644
--- a/src/mame/video/firetrk.c
+++ b/src/mame/video/firetrk.c
@@ -349,7 +349,7 @@ static void check_collision(firetrk_state *state, int which)
UINT32 firetrk_state::screen_update_firetrk(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- screen.machine().tilemap().mark_all_dirty();
+ machine().tilemap().mark_all_dirty();
m_tilemap1->set_scrollx(0, *m_scroll_x - 37);
m_tilemap2->set_scrollx(0, *m_scroll_x - 37);
m_tilemap1->set_scrolly(0, *m_scroll_y);
@@ -357,21 +357,21 @@ UINT32 firetrk_state::screen_update_firetrk(screen_device &screen, bitmap_ind16
bitmap.fill(0, cliprect);
m_tilemap1->draw(bitmap, playfield_window, 0, 0);
- firetrk_draw_car(screen.machine(), bitmap, playfield_window, screen.machine().gfx, 0, m_flash);
- firetrk_draw_car(screen.machine(), bitmap, playfield_window, screen.machine().gfx, 1, m_flash);
- draw_text(bitmap, cliprect, screen.machine().gfx, m_alpha_num_ram + 0x00, 296, 0x10, 0x10);
- draw_text(bitmap, cliprect, screen.machine().gfx, m_alpha_num_ram + 0x10, 8, 0x10, 0x10);
+ firetrk_draw_car(machine(), bitmap, playfield_window, machine().gfx, 0, m_flash);
+ firetrk_draw_car(machine(), bitmap, playfield_window, machine().gfx, 1, m_flash);
+ draw_text(bitmap, cliprect, machine().gfx, m_alpha_num_ram + 0x00, 296, 0x10, 0x10);
+ draw_text(bitmap, cliprect, machine().gfx, m_alpha_num_ram + 0x10, 8, 0x10, 0x10);
if (cliprect.max_y == screen.visible_area().max_y)
{
m_tilemap2->draw(m_helper1, playfield_window, 0, 0);
m_helper2.fill(0xff, playfield_window);
- firetrk_draw_car(screen.machine(), m_helper2, playfield_window, screen.machine().gfx, 0, FALSE);
+ firetrk_draw_car(machine(), m_helper2, playfield_window, machine().gfx, 0, FALSE);
check_collision(this, 0);
m_helper2.fill(0xff, playfield_window);
- firetrk_draw_car(screen.machine(), m_helper2, playfield_window, screen.machine().gfx, 1, FALSE);
+ firetrk_draw_car(machine(), m_helper2, playfield_window, machine().gfx, 1, FALSE);
check_collision(this, 1);
*m_blink = FALSE;
@@ -383,7 +383,7 @@ UINT32 firetrk_state::screen_update_firetrk(screen_device &screen, bitmap_ind16
UINT32 firetrk_state::screen_update_superbug(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- screen.machine().tilemap().mark_all_dirty();
+ machine().tilemap().mark_all_dirty();
m_tilemap1->set_scrollx(0, *m_scroll_x - 37);
m_tilemap2->set_scrollx(0, *m_scroll_x - 37);
m_tilemap1->set_scrolly(0, *m_scroll_y);
@@ -391,16 +391,16 @@ UINT32 firetrk_state::screen_update_superbug(screen_device &screen, bitmap_ind16
bitmap.fill(0, cliprect);
m_tilemap1->draw(bitmap, playfield_window, 0, 0);
- superbug_draw_car(screen.machine(), bitmap, playfield_window, screen.machine().gfx, m_flash);
- draw_text(bitmap, cliprect, screen.machine().gfx, m_alpha_num_ram + 0x00, 296, 0x10, 0x10);
- draw_text(bitmap, cliprect, screen.machine().gfx, m_alpha_num_ram + 0x10, 8, 0x10, 0x10);
+ superbug_draw_car(machine(), bitmap, playfield_window, machine().gfx, m_flash);
+ draw_text(bitmap, cliprect, machine().gfx, m_alpha_num_ram + 0x00, 296, 0x10, 0x10);
+ draw_text(bitmap, cliprect, machine().gfx, m_alpha_num_ram + 0x10, 8, 0x10, 0x10);
if (cliprect.max_y == screen.visible_area().max_y)
{
m_tilemap2->draw(m_helper1, playfield_window, 0, 0);
m_helper2.fill(0xff, playfield_window);
- superbug_draw_car(screen.machine(), m_helper2, playfield_window, screen.machine().gfx, FALSE);
+ superbug_draw_car(machine(), m_helper2, playfield_window, machine().gfx, FALSE);
check_collision(this, 0);
*m_blink = FALSE;
@@ -412,7 +412,7 @@ UINT32 firetrk_state::screen_update_superbug(screen_device &screen, bitmap_ind16
UINT32 firetrk_state::screen_update_montecar(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- screen.machine().tilemap().mark_all_dirty();
+ machine().tilemap().mark_all_dirty();
m_tilemap1->set_scrollx(0, *m_scroll_x - 37);
m_tilemap2->set_scrollx(0, *m_scroll_x - 37);
m_tilemap1->set_scrolly(0, *m_scroll_y);
@@ -420,21 +420,21 @@ UINT32 firetrk_state::screen_update_montecar(screen_device &screen, bitmap_ind16
bitmap.fill(0x2c, cliprect);
m_tilemap1->draw(bitmap, playfield_window, 0, 0);
- montecar_draw_car(screen.machine(), bitmap, playfield_window, screen.machine().gfx, 0, FALSE);
- montecar_draw_car(screen.machine(), bitmap, playfield_window, screen.machine().gfx, 1, FALSE);
- draw_text(bitmap, cliprect, screen.machine().gfx, m_alpha_num_ram + 0x00, 24, 0x20, 0x08);
- draw_text(bitmap, cliprect, screen.machine().gfx, m_alpha_num_ram + 0x20, 16, 0x20, 0x08);
+ montecar_draw_car(machine(), bitmap, playfield_window, machine().gfx, 0, FALSE);
+ montecar_draw_car(machine(), bitmap, playfield_window, machine().gfx, 1, FALSE);
+ draw_text(bitmap, cliprect, machine().gfx, m_alpha_num_ram + 0x00, 24, 0x20, 0x08);
+ draw_text(bitmap, cliprect, machine().gfx, m_alpha_num_ram + 0x20, 16, 0x20, 0x08);
if (cliprect.max_y == screen.visible_area().max_y)
{
m_tilemap2->draw(m_helper1, playfield_window, 0, 0);
m_helper2.fill(0xff, playfield_window);
- montecar_draw_car(screen.machine(), m_helper2, playfield_window, screen.machine().gfx, 0, TRUE);
+ montecar_draw_car(machine(), m_helper2, playfield_window, machine().gfx, 0, TRUE);
check_collision(this, 0);
m_helper2.fill(0xff, playfield_window);
- montecar_draw_car(screen.machine(), m_helper2, playfield_window, screen.machine().gfx, 1, TRUE);
+ montecar_draw_car(machine(), m_helper2, playfield_window, machine().gfx, 1, TRUE);
check_collision(this, 1);
}
diff --git a/src/mame/video/fitfight.c b/src/mame/video/fitfight.c
index ffb80c13877..c41d7b62d73 100644
--- a/src/mame/video/fitfight.c
+++ b/src/mame/video/fitfight.c
@@ -118,15 +118,15 @@ UINT32 fitfight_state::screen_update_fitfight(screen_device &screen, bitmap_ind1
vblank = (m_fof_700000[0] & 0x8000);
if (vblank > 0)
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
else {
-// if (screen.machine().input().code_pressed(KEYCODE_Q))
+// if (machine().input().code_pressed(KEYCODE_Q))
// scrollbak = ((m_fof_a00000[0] & 0xff00) >> 5) - ((m_fof_700000[0] & 0x0038) >> 3);
-// else if (screen.machine().input().code_pressed(KEYCODE_W))
+// else if (machine().input().code_pressed(KEYCODE_W))
// scrollbak = ((m_fof_a00000[0] & 0xff00) >> 5) + ((m_fof_700000[0] & 0x01c0) >> 6);
-// else if (screen.machine().input().code_pressed(KEYCODE_E))
+// else if (machine().input().code_pressed(KEYCODE_E))
// scrollbak = ((m_fof_a00000[0] & 0xff00) >> 5) - ((m_fof_700000[0] & 0x01c0) >> 6);
-// else if (screen.machine().input().code_pressed(KEYCODE_R))
+// else if (machine().input().code_pressed(KEYCODE_R))
// scrollbak = ((m_fof_a00000[0] & 0xff00) >> 5) + ((m_fof_700000[0] & 0x0038) >> 3);
// else
scrollbak = ((m_fof_a00000[0] & 0xffe0) >> 5);
@@ -134,24 +134,24 @@ UINT32 fitfight_state::screen_update_fitfight(screen_device &screen, bitmap_ind1
m_fof_bak_tilemap->set_scrolly(0, m_fof_a00000[0] & 0xff);
m_fof_bak_tilemap->draw(bitmap, cliprect, 0, 0);
- 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))
// scrollmid = ((m_fof_900000[0] & 0xff00) >> 5) - ((m_fof_700000[0] & 0x01c0) >> 6);
-// else if (screen.machine().input().code_pressed(KEYCODE_S))
+// else if (machine().input().code_pressed(KEYCODE_S))
// scrollmid = ((m_fof_900000[0] & 0xff00) >> 5) + ((m_fof_700000[0] & 0x0038) >> 3);
-// else if (screen.machine().input().code_pressed(KEYCODE_D))
+// else if (machine().input().code_pressed(KEYCODE_D))
// scrollmid = ((m_fof_900000[0] & 0xff00) >> 5) - ((m_fof_700000[0] & 0x0038) >> 3);
-// else if (screen.machine().input().code_pressed(KEYCODE_F))
+// else if (machine().input().code_pressed(KEYCODE_F))
// scrollmid = ((m_fof_900000[0] & 0xff00) >> 5) + ((m_fof_700000[0] & 0x01c0) >> 6);
// else
scrollmid = ((m_fof_900000[0] & 0xffe0) >> 5);
m_fof_mid_tilemap->set_scrollx(0, scrollmid );
m_fof_mid_tilemap->set_scrolly(0, m_fof_900000[0] & 0xff);
-// if (!screen.machine().input().code_pressed(KEYCODE_F))
+// if (!machine().input().code_pressed(KEYCODE_F))
m_fof_mid_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 1);
+ draw_sprites(machine(), bitmap, cliprect, 1);
m_fof_txt_tilemap->draw(bitmap, cliprect, 0, 0);
}
diff --git a/src/mame/video/flkatck.c b/src/mame/video/flkatck.c
index 1a4b98684cc..2de79271af0 100644
--- a/src/mame/video/flkatck.c
+++ b/src/mame/video/flkatck.c
@@ -132,7 +132,7 @@ UINT32 flkatck_state::screen_update_flkatck(screen_device &screen, bitmap_ind16
rectangle clip[2];
const rectangle &visarea = screen.visible_area();
- address_space &space = screen.machine().driver_data()->generic_space();
+ address_space &space = machine().driver_data()->generic_space();
if (m_flipscreen)
{
clip[0] = visarea;
@@ -165,7 +165,7 @@ UINT32 flkatck_state::screen_update_flkatck(screen_device &screen, bitmap_ind16
/* draw the graphics */
m_k007121_tilemap[0]->draw(bitmap, clip[0], 0, 0);
- k007121_sprites_draw(m_k007121, bitmap, cliprect, screen.machine().gfx[0], NULL, &m_k007121_ram[0x1000], 0, 40, 0, (UINT32)-1);
+ k007121_sprites_draw(m_k007121, bitmap, cliprect, machine().gfx[0], NULL, &m_k007121_ram[0x1000], 0, 40, 0, (UINT32)-1);
m_k007121_tilemap[1]->draw(bitmap, clip[1], 0, 0);
return 0;
}
diff --git a/src/mame/video/flower.c b/src/mame/video/flower.c
index d8d491089c4..89ba2b61bdc 100644
--- a/src/mame/video/flower.c
+++ b/src/mame/video/flower.c
@@ -170,7 +170,7 @@ UINT32 flower_state::screen_update_flower(screen_device &screen, bitmap_ind16 &b
m_bg0_tilemap->draw(bitmap, cliprect, 0,0);
m_bg1_tilemap->draw(bitmap, cliprect, 0,0);
- draw_sprites(screen.machine(),bitmap,cliprect);
+ draw_sprites(machine(),bitmap,cliprect);
if(flip_screen())
{
diff --git a/src/mame/video/flstory.c b/src/mame/video/flstory.c
index 666ddae901a..5d2d171d753 100644
--- a/src/mame/video/flstory.c
+++ b/src/mame/video/flstory.c
@@ -208,9 +208,9 @@ UINT32 flstory_state::screen_update_flstory(screen_device &screen, bitmap_ind16
{
m_bg_tilemap->draw(bitmap, cliprect, 0 | TILEMAP_DRAW_LAYER1, 0);
m_bg_tilemap->draw(bitmap, cliprect, 1 | TILEMAP_DRAW_LAYER1, 0);
- flstory_draw_sprites(screen.machine(), bitmap, cliprect, 0x00);
+ flstory_draw_sprites(machine(), bitmap, cliprect, 0x00);
m_bg_tilemap->draw(bitmap, cliprect, 0 | TILEMAP_DRAW_LAYER0, 0);
- flstory_draw_sprites(screen.machine(), bitmap, cliprect, 0x80);
+ flstory_draw_sprites(machine(), bitmap, cliprect, 0x80);
m_bg_tilemap->draw(bitmap, cliprect, 1 | TILEMAP_DRAW_LAYER0, 0);
return 0;
}
@@ -263,7 +263,7 @@ static void victnine_draw_sprites( running_machine &machine, bitmap_ind16 &bitma
UINT32 flstory_state::screen_update_victnine(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- victnine_draw_sprites(screen.machine(), bitmap, cliprect);
+ victnine_draw_sprites(machine(), bitmap, cliprect);
return 0;
}
@@ -271,9 +271,9 @@ UINT32 flstory_state::screen_update_rumba(screen_device &screen, bitmap_ind16 &b
{
m_bg_tilemap->draw(bitmap, cliprect, 0 | TILEMAP_DRAW_LAYER1, 0);
m_bg_tilemap->draw(bitmap, cliprect, 1 | TILEMAP_DRAW_LAYER1, 0);
- victnine_draw_sprites(screen.machine(), bitmap, cliprect);
+ victnine_draw_sprites(machine(), bitmap, cliprect);
m_bg_tilemap->draw(bitmap, cliprect, 0 | TILEMAP_DRAW_LAYER0, 0);
- victnine_draw_sprites(screen.machine(), bitmap, cliprect);
+ victnine_draw_sprites(machine(), bitmap, cliprect);
m_bg_tilemap->draw(bitmap, cliprect, 1 | TILEMAP_DRAW_LAYER0, 0);
return 0;
}
diff --git a/src/mame/video/foodf.c b/src/mame/video/foodf.c
index 15818d347e6..792074731e6 100644
--- a/src/mame/video/foodf.c
+++ b/src/mame/video/foodf.c
@@ -114,8 +114,8 @@ WRITE16_MEMBER(foodf_state::foodf_paletteram_w)
UINT32 foodf_state::screen_update_foodf(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
int offs;
- gfx_element *gfx = screen.machine().gfx[1];
- bitmap_ind8 &priority_bitmap = screen.machine().priority_bitmap;
+ gfx_element *gfx = machine().gfx[1];
+ bitmap_ind8 &priority_bitmap = machine().priority_bitmap;
UINT16 *spriteram16 = m_spriteram;
/* first draw the playfield opaquely */
diff --git a/src/mame/video/freekick.c b/src/mame/video/freekick.c
index 8a08c33acc0..73e82048a89 100644
--- a/src/mame/video/freekick.c
+++ b/src/mame/video/freekick.c
@@ -134,20 +134,20 @@ static void freekick_draw_sprites( running_machine &machine, bitmap_ind16 &bitma
UINT32 freekick_state::screen_update_gigas(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
m_freek_tilemap->draw(bitmap, cliprect, 0, 0);
- gigas_draw_sprites(screen.machine(), bitmap, cliprect);
+ gigas_draw_sprites(machine(), bitmap, cliprect);
return 0;
}
UINT32 freekick_state::screen_update_pbillrd(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
m_freek_tilemap->draw(bitmap, cliprect, 0, 0);
- pbillrd_draw_sprites(screen.machine(), bitmap, cliprect);
+ pbillrd_draw_sprites(machine(), bitmap, cliprect);
return 0;
}
UINT32 freekick_state::screen_update_freekick(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
m_freek_tilemap->draw(bitmap, cliprect, 0, 0);
- freekick_draw_sprites(screen.machine(), bitmap, cliprect);
+ freekick_draw_sprites(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/video/funkybee.c b/src/mame/video/funkybee.c
index d8509334585..70e8a8b5035 100644
--- a/src/mame/video/funkybee.c
+++ b/src/mame/video/funkybee.c
@@ -158,7 +158,7 @@ static void draw_columns( running_machine &machine, bitmap_ind16 &bitmap, const
UINT32 funkybee_state::screen_update_funkybee(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect);
- draw_columns(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
+ draw_columns(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/video/funkyjet.c b/src/mame/video/funkyjet.c
index d0c88f7f19f..4560915f452 100644
--- a/src/mame/video/funkyjet.c
+++ b/src/mame/video/funkyjet.c
@@ -13,7 +13,7 @@
UINT32 funkyjet_state::screen_update_funkyjet(screen_device &screen, bitmap_ind16 &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));
@@ -22,6 +22,6 @@ UINT32 funkyjet_state::screen_update_funkyjet(screen_device &screen, bitmap_ind1
bitmap.fill(768, cliprect);
deco16ic_tilemap_2_draw(m_deco_tilegen1, bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0);
deco16ic_tilemap_1_draw(m_deco_tilegen1, 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/video/funybubl.c b/src/mame/video/funybubl.c
index 1d5ac4040e2..fa8872ffbf0 100644
--- a/src/mame/video/funybubl.c
+++ b/src/mame/video/funybubl.c
@@ -77,7 +77,7 @@ UINT32 funybubl_state::screen_update_funybubl(screen_device &screen, bitmap_ind1
int x, y, offs;
offs = 0;
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
/* tilemap .. convert it .. banking makes it slightly more annoying but still easy */
for (y = 0; y < 32; y++)
@@ -87,15 +87,15 @@ UINT32 funybubl_state::screen_update_funybubl(screen_device &screen, bitmap_ind1
int data;
data = m_banked_vram[offs] | (m_banked_vram[offs + 1] << 8);
- drawgfx_transpen(bitmap, cliprect, screen.machine().gfx[0], data & 0x7fff, (data & 0x8000) ? 2 : 1, 0, 0, x*8, y*8, 0);
+ drawgfx_transpen(bitmap, cliprect, machine().gfx[0], data & 0x7fff, (data & 0x8000) ? 2 : 1, 0, 0, x*8, y*8, 0);
offs += 2;
}
}
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
#if 0
- if ( screen.machine().input().code_pressed_once(KEYCODE_W) )
+ if ( machine().input().code_pressed_once(KEYCODE_W) )
{
FILE *fp;
diff --git a/src/mame/video/fuukifg2.c b/src/mame/video/fuukifg2.c
index a0ddeacff3c..fdc844d99b7 100644
--- a/src/mame/video/fuukifg2.c
+++ b/src/mame/video/fuukifg2.c
@@ -333,15 +333,15 @@ UINT32 fuuki16_state::screen_update_fuuki16(screen_device &screen, bitmap_ind16
/* The backmost tilemap decides the background color(s) but sprites can
go below the opaque pixels of that tilemap. We thus need to mark the
transparent pixels of this layer with a different priority value */
-// fuuki16_draw_layer(screen.machine(), bitmap, cliprect, tm_back, TILEMAP_DRAW_OPAQUE, 0);
+// fuuki16_draw_layer(machine(), bitmap, cliprect, tm_back, TILEMAP_DRAW_OPAQUE, 0);
/* Actually, bg colour is simply the last pen i.e. 0x1fff -pjp */
bitmap.fill((0x800 * 4) - 1, cliprect);
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
- fuuki16_draw_layer(screen.machine(), bitmap, cliprect, tm_back, 0, 1);
- fuuki16_draw_layer(screen.machine(), bitmap, cliprect, tm_middle, 0, 2);
- fuuki16_draw_layer(screen.machine(), bitmap, cliprect, tm_front, 0, 4);
+ fuuki16_draw_layer(machine(), bitmap, cliprect, tm_back, 0, 1);
+ fuuki16_draw_layer(machine(), bitmap, cliprect, tm_middle, 0, 2);
+ fuuki16_draw_layer(machine(), bitmap, cliprect, tm_front, 0, 4);
draw_sprites(screen, bitmap, cliprect);
diff --git a/src/mame/video/fuukifg3.c b/src/mame/video/fuukifg3.c
index a4566419ca6..7bb0eb9262f 100644
--- a/src/mame/video/fuukifg3.c
+++ b/src/mame/video/fuukifg3.c
@@ -355,11 +355,11 @@ UINT32 fuuki32_state::screen_update_fuuki32(screen_device &screen, bitmap_ind16
/* The bg colour is the last pen i.e. 0x1fff */
bitmap.fill((0x800 * 4) - 1, cliprect);
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
- fuuki32_draw_layer(screen.machine(), bitmap, cliprect, tm_back, 0, 1);
- fuuki32_draw_layer(screen.machine(), bitmap, cliprect, tm_middle, 0, 2);
- fuuki32_draw_layer(screen.machine(), bitmap, cliprect, tm_front, 0, 4);
+ fuuki32_draw_layer(machine(), bitmap, cliprect, tm_back, 0, 1);
+ fuuki32_draw_layer(machine(), bitmap, cliprect, tm_middle, 0, 2);
+ fuuki32_draw_layer(machine(), bitmap, cliprect, tm_front, 0, 4);
draw_sprites(screen, bitmap, cliprect);
return 0;
diff --git a/src/mame/video/gaelco.c b/src/mame/video/gaelco.c
index 2ec22409a26..9ae28f7d4b1 100644
--- a/src/mame/video/gaelco.c
+++ b/src/mame/video/gaelco.c
@@ -191,7 +191,7 @@ UINT32 gaelco_state::screen_update_maniacsq(screen_device &screen, bitmap_ind16
m_tilemap[1]->set_scrolly(0, m_vregs[2]);
m_tilemap[1]->set_scrollx(0, m_vregs[3]);
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
bitmap.fill(0, cliprect);
m_tilemap[1]->draw(bitmap, cliprect, 3, 0);
@@ -206,7 +206,7 @@ UINT32 gaelco_state::screen_update_maniacsq(screen_device &screen, bitmap_ind16
m_tilemap[1]->draw(bitmap, cliprect, 0, 4);
m_tilemap[0]->draw(bitmap, cliprect, 0, 4);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
return 0;
}
@@ -219,7 +219,7 @@ UINT32 gaelco_state::screen_update_bigkarnk(screen_device &screen, bitmap_ind16
m_tilemap[1]->set_scrolly(0, m_vregs[2]);
m_tilemap[1]->set_scrollx(0, m_vregs[3]);
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
bitmap.fill(0, cliprect);
m_tilemap[1]->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 3, 0);
@@ -246,6 +246,6 @@ UINT32 gaelco_state::screen_update_bigkarnk(screen_device &screen, bitmap_ind16
m_tilemap[1]->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 0, 8);
m_tilemap[0]->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 0, 8);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/video/gaelco3d.c b/src/mame/video/gaelco3d.c
index b5e6ea07ac3..2de7f349c49 100644
--- a/src/mame/video/gaelco3d.c
+++ b/src/mame/video/gaelco3d.c
@@ -432,26 +432,26 @@ UINT32 gaelco3d_state::screen_update_gaelco3d(screen_device &screen, bitmap_ind1
int ret;
/*
- if (DISPLAY_TEXTURE && (screen.machine().input().code_pressed(KEYCODE_Z) || screen.machine().input().code_pressed(KEYCODE_X)))
+ if (DISPLAY_TEXTURE && (machine().input().code_pressed(KEYCODE_Z) || machine().input().code_pressed(KEYCODE_X)))
{
static int xv = 0, yv = 0x1000;
UINT8 *base = m_texture;
int length = m_texture_size;
- if (screen.machine().input().code_pressed(KEYCODE_X))
+ if (machine().input().code_pressed(KEYCODE_X))
{
base = m_texmask;
length = m_texmask_size;
}
- if (screen.machine().input().code_pressed(KEYCODE_LEFT) && xv >= 4)
+ if (machine().input().code_pressed(KEYCODE_LEFT) && xv >= 4)
xv -= 4;
- if (screen.machine().input().code_pressed(KEYCODE_RIGHT) && xv < 4096 - 4)
+ if (machine().input().code_pressed(KEYCODE_RIGHT) && xv < 4096 - 4)
xv += 4;
- if (screen.machine().input().code_pressed(KEYCODE_UP) && yv >= 4)
+ if (machine().input().code_pressed(KEYCODE_UP) && yv >= 4)
yv -= 4;
- if (screen.machine().input().code_pressed(KEYCODE_DOWN) && yv < 0x40000)
+ if (machine().input().code_pressed(KEYCODE_DOWN) && yv < 0x40000)
yv += 4;
for (y = cliprect.min_y; y <= cliprect.max_y; y++)
diff --git a/src/mame/video/gaiden.c b/src/mame/video/gaiden.c
index 624e45779d9..e61b1f5fd91 100644
--- a/src/mame/video/gaiden.c
+++ b/src/mame/video/gaiden.c
@@ -643,7 +643,7 @@ static void drgnbowl_draw_sprites(running_machine &machine, bitmap_ind16 &bitmap
UINT32 gaiden_state::screen_update_gaiden(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
m_tile_bitmap_bg.fill(0x200, cliprect);
m_tile_bitmap_fg.fill(0, cliprect);
@@ -658,17 +658,17 @@ UINT32 gaiden_state::screen_update_gaiden(screen_device &screen, bitmap_rgb32 &b
m_text_layer->draw(m_tile_bitmap_fg, cliprect, 0, 4);
/* draw sprites into a 16-bit bitmap */
- gaiden_draw_sprites(screen.machine(), m_tile_bitmap_bg, m_tile_bitmap_fg, m_sprite_bitmap, cliprect);
+ gaiden_draw_sprites(machine(), m_tile_bitmap_bg, m_tile_bitmap_fg, m_sprite_bitmap, cliprect);
/* mix & blend the tilemaps and sprites into a 32-bit bitmap */
- blendbitmaps(screen.machine(), bitmap, m_tile_bitmap_bg, m_tile_bitmap_fg, m_sprite_bitmap, 0, 0, cliprect);
+ blendbitmaps(machine(), bitmap, m_tile_bitmap_bg, m_tile_bitmap_fg, m_sprite_bitmap, 0, 0, cliprect);
return 0;
}
UINT32 gaiden_state::screen_update_raiga(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
m_tile_bitmap_bg.fill(0x200, cliprect);
m_tile_bitmap_fg.fill(0, cliprect);
@@ -683,20 +683,20 @@ UINT32 gaiden_state::screen_update_raiga(screen_device &screen, bitmap_rgb32 &bi
m_text_layer->draw(m_tile_bitmap_fg, cliprect, 0, 4);
/* draw sprites into a 16-bit bitmap */
- raiga_draw_sprites(screen.machine(), m_tile_bitmap_bg, m_tile_bitmap_fg, m_sprite_bitmap, cliprect);
+ raiga_draw_sprites(machine(), m_tile_bitmap_bg, m_tile_bitmap_fg, m_sprite_bitmap, cliprect);
/* mix & blend the tilemaps and sprites into a 32-bit bitmap */
- blendbitmaps(screen.machine(), bitmap, m_tile_bitmap_bg, m_tile_bitmap_fg, m_sprite_bitmap, 0, 0, cliprect);
+ blendbitmaps(machine(), bitmap, m_tile_bitmap_bg, m_tile_bitmap_fg, m_sprite_bitmap, 0, 0, cliprect);
return 0;
}
UINT32 gaiden_state::screen_update_drgnbowl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
m_background->draw(bitmap, cliprect, 0, 1);
m_foreground->draw(bitmap, cliprect, 0, 2);
m_text_layer->draw(bitmap, cliprect, 0, 4);
- drgnbowl_draw_sprites(screen.machine(), bitmap, cliprect);
+ drgnbowl_draw_sprites(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/video/galaga.c b/src/mame/video/galaga.c
index e7920d5f35f..4c6cec97056 100644
--- a/src/mame/video/galaga.c
+++ b/src/mame/video/galaga.c
@@ -565,9 +565,9 @@ static void draw_stars(running_machine &machine, bitmap_ind16 &bitmap, const rec
UINT32 galaga_state::screen_update_galaga(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
- draw_stars(screen.machine(),bitmap,cliprect);
- draw_sprites(screen.machine(),bitmap,cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
+ draw_stars(machine(),bitmap,cliprect);
+ draw_sprites(machine(),bitmap,cliprect);
m_fg_tilemap->draw(bitmap, cliprect, 0,0);
return 0;
}
diff --git a/src/mame/video/galastrm.c b/src/mame/video/galastrm.c
index 2119a8c7ef4..25b65371d57 100644
--- a/src/mame/video/galastrm.c
+++ b/src/mame/video/galastrm.c
@@ -434,13 +434,13 @@ static void tc0610_rotate_draw(running_machine &machine, bitmap_ind16 &bitmap, b
UINT32 galastrm_state::screen_update_galastrm(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- device_t *tc0100scn = screen.machine().device("tc0100scn");
- device_t *tc0480scp = screen.machine().device("tc0480scp");
+ device_t *tc0100scn = machine().device("tc0100scn");
+ device_t *tc0480scp = machine().device("tc0480scp");
UINT8 layer[5];
UINT8 pivlayer[3];
UINT16 priority;
static const int primasks[4] = {0xfffc, 0xfff0, 0xff00, 0x0};
- bitmap_ind8 &priority_bitmap = screen.machine().priority_bitmap;
+ bitmap_ind8 &priority_bitmap = machine().priority_bitmap;
rectangle clip(0, screen.width() -1, 0, screen.height() -1);
@@ -468,17 +468,17 @@ UINT32 galastrm_state::screen_update_galastrm(screen_device &screen, bitmap_ind1
#if 0
if (layer[0]==0 && layer[1]==3 && layer[2]==2 && layer[3]==1)
{
- if (!screen.machine().input().code_pressed(KEYCODE_Z)) tc0480scp_tilemap_draw(tc0480scp, m_tmpbitmaps, clip, layer[0], 0, 1);
- if (!screen.machine().input().code_pressed(KEYCODE_X)) tc0480scp_tilemap_draw(tc0480scp, m_tmpbitmaps, clip, layer[1], 0, 4);
- if (!screen.machine().input().code_pressed(KEYCODE_C)) tc0480scp_tilemap_draw(tc0480scp, m_tmpbitmaps, clip, layer[2], 0, 4);
- if (!screen.machine().input().code_pressed(KEYCODE_V)) tc0480scp_tilemap_draw(tc0480scp, m_tmpbitmaps, clip, layer[3], 0, 4);
+ if (!machine().input().code_pressed(KEYCODE_Z)) tc0480scp_tilemap_draw(tc0480scp, m_tmpbitmaps, clip, layer[0], 0, 1);
+ if (!machine().input().code_pressed(KEYCODE_X)) tc0480scp_tilemap_draw(tc0480scp, m_tmpbitmaps, clip, layer[1], 0, 4);
+ if (!machine().input().code_pressed(KEYCODE_C)) tc0480scp_tilemap_draw(tc0480scp, m_tmpbitmaps, clip, layer[2], 0, 4);
+ if (!machine().input().code_pressed(KEYCODE_V)) tc0480scp_tilemap_draw(tc0480scp, m_tmpbitmaps, clip, layer[3], 0, 4);
}
else
{
- if (!screen.machine().input().code_pressed(KEYCODE_Z)) tc0480scp_tilemap_draw(tc0480scp, m_tmpbitmaps, clip, layer[0], 0, 1);
- if (!screen.machine().input().code_pressed(KEYCODE_X)) tc0480scp_tilemap_draw(tc0480scp, m_tmpbitmaps, clip, layer[1], 0, 2);
- if (!screen.machine().input().code_pressed(KEYCODE_C)) tc0480scp_tilemap_draw(tc0480scp, m_tmpbitmaps, clip, layer[2], 0, 4);
- if (!screen.machine().input().code_pressed(KEYCODE_V)) tc0480scp_tilemap_draw(tc0480scp, m_tmpbitmaps, clip, layer[3], 0, 8);
+ if (!machine().input().code_pressed(KEYCODE_Z)) tc0480scp_tilemap_draw(tc0480scp, m_tmpbitmaps, clip, layer[0], 0, 1);
+ if (!machine().input().code_pressed(KEYCODE_X)) tc0480scp_tilemap_draw(tc0480scp, m_tmpbitmaps, clip, layer[1], 0, 2);
+ if (!machine().input().code_pressed(KEYCODE_C)) tc0480scp_tilemap_draw(tc0480scp, m_tmpbitmaps, clip, layer[2], 0, 4);
+ if (!machine().input().code_pressed(KEYCODE_V)) tc0480scp_tilemap_draw(tc0480scp, m_tmpbitmaps, clip, layer[3], 0, 8);
}
if (layer[0]==3 && layer[1]==0 && layer[2]==1 && layer[3]==2)
@@ -497,18 +497,18 @@ UINT32 galastrm_state::screen_update_galastrm(screen_device &screen, bitmap_ind1
}
}
- draw_sprites_pre(screen.machine(), 42-X_OFFSET, -571+Y_OFFSET);
- draw_sprites(screen.machine(),m_tmpbitmaps,clip,primasks,1);
+ draw_sprites_pre(machine(), 42-X_OFFSET, -571+Y_OFFSET);
+ draw_sprites(machine(),m_tmpbitmaps,clip,primasks,1);
copybitmap_trans(bitmap,m_polybitmap,0,0, 0,0,cliprect,0);
m_polybitmap->fill(0, clip);
- tc0610_rotate_draw(screen.machine(),m_polybitmap,m_tmpbitmaps,cliprect);
+ tc0610_rotate_draw(machine(),m_polybitmap,m_tmpbitmaps,cliprect);
priority_bitmap.fill(0, cliprect);
- draw_sprites(screen.machine(),bitmap,cliprect,primasks,0);
+ draw_sprites(machine(),bitmap,cliprect,primasks,0);
- if (!screen.machine().input().code_pressed(KEYCODE_B)) tc0480scp_tilemap_draw(tc0480scp, bitmap, cliprect, layer[4], 0, 0);
- if (!screen.machine().input().code_pressed(KEYCODE_M)) tc0100scn_tilemap_draw(tc0100scn, bitmap, cliprect, pivlayer[2], 0, 0);
+ if (!machine().input().code_pressed(KEYCODE_B)) tc0480scp_tilemap_draw(tc0480scp, bitmap, cliprect, layer[4], 0, 0);
+ if (!machine().input().code_pressed(KEYCODE_M)) tc0100scn_tilemap_draw(tc0100scn, bitmap, cliprect, pivlayer[2], 0, 0);
@@ -544,15 +544,15 @@ UINT32 galastrm_state::screen_update_galastrm(screen_device &screen, bitmap_ind1
}
}
- draw_sprites_pre(screen.machine(), 42-X_OFFSET, -571+Y_OFFSET);
- draw_sprites(screen.machine(),m_tmpbitmaps,clip,primasks,1);
+ draw_sprites_pre(machine(), 42-X_OFFSET, -571+Y_OFFSET);
+ draw_sprites(machine(),m_tmpbitmaps,clip,primasks,1);
copybitmap_trans(bitmap,m_polybitmap,0,0, 0,0,cliprect,0);
m_polybitmap.fill(0, clip);
- tc0610_rotate_draw(screen.machine(),m_polybitmap,m_tmpbitmaps,cliprect);
+ tc0610_rotate_draw(machine(),m_polybitmap,m_tmpbitmaps,cliprect);
priority_bitmap.fill(0, cliprect);
- draw_sprites(screen.machine(),bitmap,cliprect,primasks,0);
+ draw_sprites(machine(),bitmap,cliprect,primasks,0);
tc0480scp_tilemap_draw(tc0480scp, bitmap, cliprect, layer[4], 0, 0);
tc0100scn_tilemap_draw(tc0100scn, bitmap, cliprect, pivlayer[2], 0, 0);
diff --git a/src/mame/video/galaxia.c b/src/mame/video/galaxia.c
index 8c764d6607b..47b44665dbd 100644
--- a/src/mame/video/galaxia.c
+++ b/src/mame/video/galaxia.c
@@ -111,12 +111,12 @@ UINT32 galaxia_state::screen_update_galaxia(screen_device &screen, bitmap_ind16
{
int x, y;
- bitmap_ind16 &s2636_0_bitmap = s2636_update(screen.machine().device("s2636_0"), cliprect);
- bitmap_ind16 &s2636_1_bitmap = s2636_update(screen.machine().device("s2636_1"), cliprect);
- bitmap_ind16 &s2636_2_bitmap = s2636_update(screen.machine().device("s2636_2"), cliprect);
+ bitmap_ind16 &s2636_0_bitmap = s2636_update(machine().device("s2636_0"), cliprect);
+ bitmap_ind16 &s2636_1_bitmap = s2636_update(machine().device("s2636_1"), cliprect);
+ bitmap_ind16 &s2636_2_bitmap = s2636_update(machine().device("s2636_2"), cliprect);
bitmap.fill(0, cliprect);
- cvs_update_stars(screen.machine(), bitmap, cliprect, STAR_PEN, 1);
+ cvs_update_stars(machine(), bitmap, cliprect, STAR_PEN, 1);
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
for (y = cliprect.min_y; y <= cliprect.max_y; y++)
@@ -177,10 +177,10 @@ UINT32 galaxia_state::screen_update_astrowar(screen_device &screen, bitmap_ind16
// astrowar has only one S2636
int x, y;
- bitmap_ind16 &s2636_0_bitmap = s2636_update(screen.machine().device("s2636_0"), cliprect);
+ bitmap_ind16 &s2636_0_bitmap = s2636_update(machine().device("s2636_0"), cliprect);
bitmap.fill(0, cliprect);
- cvs_update_stars(screen.machine(), bitmap, cliprect, STAR_PEN, 1);
+ cvs_update_stars(machine(), bitmap, cliprect, STAR_PEN, 1);
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
copybitmap(m_temp_bitmap, bitmap, 0, 0, 0, 0, cliprect);
diff --git a/src/mame/video/galaxian.c b/src/mame/video/galaxian.c
index 2425a1e78d2..4c9a8d436b1 100644
--- a/src/mame/video/galaxian.c
+++ b/src/mame/video/galaxian.c
@@ -453,18 +453,18 @@ static void state_save_register(running_machine &machine)
UINT32 galaxian_state::screen_update_galaxian(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
/* draw the background layer (including stars) */
- (*m_draw_background_ptr)(screen.machine(), bitmap, cliprect);
+ (*m_draw_background_ptr)(machine(), bitmap, cliprect);
/* draw the tilemap characters over top */
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
/* render the sprites next. Some custom pcbs (eg. zigzag, fantastc) have more than one sprite generator (ideally, this should be rendered in parallel) */
for (int i = 0; i < m_numspritegens; i++)
- sprites_draw(screen.machine(), bitmap, cliprect, &m_spriteram[0x40 + i * 0x20]);
+ sprites_draw(machine(), bitmap, cliprect, &m_spriteram[0x40 + i * 0x20]);
/* if we have bullets to draw, render them following */
if (m_draw_bullet_ptr != NULL)
- bullets_draw(screen.machine(), bitmap, cliprect, &m_spriteram[m_bullets_base]);
+ bullets_draw(machine(), bitmap, cliprect, &m_spriteram[m_bullets_base]);
return 0;
}
diff --git a/src/mame/video/galaxold.c b/src/mame/video/galaxold.c
index 9e9285c474a..434c7121649 100644
--- a/src/mame/video/galaxold.c
+++ b/src/mame/video/galaxold.c
@@ -1756,11 +1756,11 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, UINT8 *
UINT32 galaxold_state::screen_update_galaxold(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- (*m_draw_background)(screen.machine(), bitmap, cliprect);
+ (*m_draw_background)(machine(), bitmap, cliprect);
if (m_stars_on)
{
- (*m_draw_stars)(screen.machine(), bitmap, cliprect);
+ (*m_draw_stars)(machine(), bitmap, cliprect);
}
@@ -1768,15 +1768,15 @@ UINT32 galaxold_state::screen_update_galaxold(screen_device &screen, bitmap_ind1
if (m_draw_bullets)
{
- draw_bullets_common(screen.machine(), bitmap, cliprect);
+ draw_bullets_common(machine(), bitmap, cliprect);
}
- draw_sprites(screen.machine(), bitmap, m_spriteram, m_spriteram.bytes());
+ draw_sprites(machine(), bitmap, m_spriteram, m_spriteram.bytes());
if (m_spriteram2_present)
{
- draw_sprites(screen.machine(), bitmap, m_spriteram2, m_spriteram2.bytes());
+ draw_sprites(machine(), bitmap, m_spriteram2, m_spriteram2.bytes());
}
return 0;
}
@@ -1787,11 +1787,11 @@ UINT32 galaxold_state::screen_update_dambustr(screen_device &screen, bitmap_ind1
int i, j;
UINT8 color;
- (*m_draw_background)(screen.machine(), bitmap, cliprect);
+ (*m_draw_background)(machine(), bitmap, cliprect);
if (m_stars_on)
{
- (*m_draw_stars)(screen.machine(), bitmap, cliprect);
+ (*m_draw_stars)(machine(), bitmap, cliprect);
}
/* save the background for drawing it again later, if background has priority over characters */
@@ -1801,15 +1801,15 @@ UINT32 galaxold_state::screen_update_dambustr(screen_device &screen, bitmap_ind1
if (m_draw_bullets)
{
- draw_bullets_common(screen.machine(), bitmap, cliprect);
+ draw_bullets_common(machine(), bitmap, cliprect);
}
- draw_sprites(screen.machine(), bitmap, m_spriteram, m_spriteram.bytes());
+ draw_sprites(machine(), bitmap, m_spriteram, m_spriteram.bytes());
if (m_dambustr_bg_priority)
{
/* draw the upper part of the background, as it has priority */
- dambustr_draw_upper_background(screen.machine(), bitmap, cliprect);
+ dambustr_draw_upper_background(machine(), bitmap, cliprect);
/* only rows with color code > 3 are stronger than the background */
memset(m_dambustr_videoram2, 0x20, 0x0400);
diff --git a/src/mame/video/galivan.c b/src/mame/video/galivan.c
index d89b827e8e2..af640267dde 100644
--- a/src/mame/video/galivan.c
+++ b/src/mame/video/galivan.c
@@ -351,11 +351,11 @@ UINT32 galivan_state::screen_update_galivan(screen_device &screen, bitmap_ind16
{
m_tx_tilemap->draw(bitmap, cliprect, 0, 0);
m_tx_tilemap->draw(bitmap, cliprect, 1, 0);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
}
else
{
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
m_tx_tilemap->draw(bitmap, cliprect, 0, 0);
m_tx_tilemap->draw(bitmap, cliprect, 1, 0);
}
@@ -375,7 +375,7 @@ UINT32 galivan_state::screen_update_ninjemak(screen_device &screen, bitmap_ind16
else
m_bg_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/video/galpani2.c b/src/mame/video/galpani2.c
index bc593d6a77c..6d33df9cd98 100644
--- a/src/mame/video/galpani2.c
+++ b/src/mame/video/galpani2.c
@@ -142,19 +142,19 @@ UINT32 galpani2_state::screen_update_galpani2(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_A)) 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_A)) msk |= 8;
if (msk != 0) layers_ctrl &= msk;
}
#endif
bitmap.fill(0, cliprect);
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
if (layers_ctrl & 0x1)
{
@@ -189,6 +189,6 @@ if (screen.machine().input().code_pressed(KEYCODE_Z))
cliprect,0x4000 + 0);
}
- if (layers_ctrl & 0x8) m_kaneko_spr->kaneko16_render_sprites(screen.machine(), bitmap, cliprect, m_spriteram, m_spriteram.bytes());
+ if (layers_ctrl & 0x8) m_kaneko_spr->kaneko16_render_sprites(machine(), bitmap, cliprect, m_spriteram, m_spriteram.bytes());
return 0;
}
diff --git a/src/mame/video/galpanic.c b/src/mame/video/galpanic.c
index 6dbec6a1d7a..f05b0b6e950 100644
--- a/src/mame/video/galpanic.c
+++ b/src/mame/video/galpanic.c
@@ -102,12 +102,12 @@ static void draw_fgbitmap(running_machine &machine, bitmap_ind16 &bitmap, const
UINT32 galpanic_state::screen_update_galpanic(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- device_t *pandora = screen.machine().device("pandora");
+ device_t *pandora = machine().device("pandora");
/* copy the temporary bitmap to the screen */
copybitmap(bitmap,m_bitmap,0,0,0,0,cliprect);
- draw_fgbitmap(screen.machine(), bitmap, cliprect);
+ draw_fgbitmap(machine(), bitmap, cliprect);
pandora_update(pandora, bitmap, cliprect);
@@ -119,18 +119,18 @@ UINT32 galpanic_state::screen_update_comad(screen_device &screen, bitmap_ind16 &
/* copy the temporary bitmap to the screen */
copybitmap(bitmap,m_bitmap,0,0,0,0,cliprect);
- draw_fgbitmap(screen.machine(), bitmap, cliprect);
+ draw_fgbitmap(machine(), bitmap, cliprect);
// if(galpanic_clear_sprites)
{
m_sprites_bitmap.fill(0, cliprect);
- comad_draw_sprites(screen.machine(),bitmap,cliprect);
+ comad_draw_sprites(machine(),bitmap,cliprect);
}
// else
// {
// /* keep sprites on the bitmap without clearing them */
-// comad_draw_sprites(screen.machine(),m_sprites_bitmap,0);
+// comad_draw_sprites(machine(),m_sprites_bitmap,0);
// copybitmap_trans(bitmap,m_sprites_bitmap,0,0,0,0,cliprect,0);
// }
return 0;
diff --git a/src/mame/video/galspnbl.c b/src/mame/video/galspnbl.c
index 45b35b4758d..cf13be57631 100644
--- a/src/mame/video/galspnbl.c
+++ b/src/mame/video/galspnbl.c
@@ -105,9 +105,9 @@ UINT32 galspnbl_state::screen_update_galspnbl(screen_device &screen, bitmap_ind1
{
int offs;
- draw_background(screen.machine(), bitmap, cliprect);
+ draw_background(machine(), bitmap, cliprect);
- draw_sprites(screen.machine(), bitmap, cliprect, 0);
+ draw_sprites(machine(), bitmap, cliprect, 0);
for (offs = 0; offs < 0x1000 / 2; offs++)
{
@@ -122,7 +122,7 @@ UINT32 galspnbl_state::screen_update_galspnbl(screen_device &screen, bitmap_ind1
/* What is this? A priority/half transparency marker? */
if (!(attr & 0x0008))
{
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[0],
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[0],
code,
color,
0,0,
@@ -131,6 +131,6 @@ UINT32 galspnbl_state::screen_update_galspnbl(screen_device &screen, bitmap_ind1
}
}
- draw_sprites(screen.machine(), bitmap, cliprect, 1);
+ draw_sprites(machine(), bitmap, cliprect, 1);
return 0;
}
diff --git a/src/mame/video/gaplus.c b/src/mame/video/gaplus.c
index 0de92d7df08..086edc97469 100644
--- a/src/mame/video/gaplus.c
+++ b/src/mame/video/gaplus.c
@@ -310,12 +310,12 @@ UINT32 gaplus_state::screen_update_gaplus(screen_device &screen, bitmap_ind16 &b
bitmap.fill(0, cliprect);
- starfield_render(screen.machine(), bitmap);
+ starfield_render(machine(), bitmap);
/* draw the low priority characters */
m_bg_tilemap->draw(bitmap, cliprect, 0,0);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
/* draw the high priority characters */
/* (I don't know if this feature is used by Gaplus, but it's shown in the schematics) */
@@ -332,8 +332,8 @@ void gaplus_state::screen_eof_gaplus(screen_device &screen, bool state)/* update
struct star *stars = m_stars;
int i;
- int width = screen.machine().primary_screen->width();
- int height = screen.machine().primary_screen->height();
+ int width = machine().primary_screen->width();
+ int height = machine().primary_screen->height();
/* check if we're running */
if ( ( m_starfield_control[0] & 1 ) == 0 )
diff --git a/src/mame/video/gberet.c b/src/mame/video/gberet.c
index f621e857429..44b987120e2 100644
--- a/src/mame/video/gberet.c
+++ b/src/mame/video/gberet.c
@@ -167,7 +167,7 @@ UINT32 gberet_state::screen_update_gberet(screen_device &screen, bitmap_ind16 &b
{
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE | TILEMAP_DRAW_ALL_CATEGORIES, 0);
- gberet_draw_sprites(screen.machine(), bitmap, cliprect);
+ gberet_draw_sprites(machine(), bitmap, cliprect);
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
}
@@ -220,7 +220,7 @@ static void gberetb_draw_sprites( running_machine &machine, bitmap_ind16 &bitmap
UINT32 gberet_state::screen_update_gberetb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE | TILEMAP_DRAW_ALL_CATEGORIES, 0);
- gberetb_draw_sprites(screen.machine(), bitmap, cliprect);
+ gberetb_draw_sprites(machine(), bitmap, cliprect);
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
}
diff --git a/src/mame/video/gcpinbal.c b/src/mame/video/gcpinbal.c
index 04529684d14..14db801cac0 100644
--- a/src/mame/video/gcpinbal.c
+++ b/src/mame/video/gcpinbal.c
@@ -250,19 +250,19 @@ UINT32 gcpinbal_state::screen_update_gcpinbal(screen_device &screen, bitmap_ind1
UINT8 layer[3];
#ifdef MAME_DEBUG
- if (screen.machine().input().code_pressed_once(KEYCODE_V))
+ if (machine().input().code_pressed_once(KEYCODE_V))
{
m_dislayer[0] ^= 1;
popmessage("bg0: %01x", m_dislayer[0]);
}
- if (screen.machine().input().code_pressed_once(KEYCODE_B))
+ if (machine().input().code_pressed_once(KEYCODE_B))
{
m_dislayer[1] ^= 1;
popmessage("bg1: %01x", m_dislayer[1]);
}
- if (screen.machine().input().code_pressed_once(KEYCODE_N))
+ if (machine().input().code_pressed_once(KEYCODE_N))
{
m_dislayer[2] ^= 1;
popmessage("fg: %01x", m_dislayer[2]);
@@ -286,7 +286,7 @@ UINT32 gcpinbal_state::screen_update_gcpinbal(screen_device &screen, bitmap_ind1
m_tilemap[i]->set_scrolly(0, m_scrolly[i]);
}
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
bitmap.fill(0, cliprect);
layer[0] = 0;
@@ -310,7 +310,7 @@ UINT32 gcpinbal_state::screen_update_gcpinbal(screen_device &screen, bitmap_ind1
m_tilemap[layer[2]]->draw(bitmap, cliprect, 0, 4);
- draw_sprites(screen.machine(), bitmap, cliprect, 16);
+ draw_sprites(machine(), bitmap, cliprect, 16);
#if 0
{
diff --git a/src/mame/video/gijoe.c b/src/mame/video/gijoe.c
index a6cacfddc30..e6c57dbff49 100644
--- a/src/mame/video/gijoe.c
+++ b/src/mame/video/gijoe.c
@@ -156,8 +156,8 @@ UINT32 gijoe_state::screen_update_gijoe(screen_device &screen, bitmap_ind16 &bit
konami_sortlayers4(layer, m_layer_pri);
- 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);
k056832_tilemap_draw(m_k056832, bitmap, cliprect, layer[0], 0, 1);
k056832_tilemap_draw(m_k056832, bitmap, cliprect, layer[1], 0, 2);
diff --git a/src/mame/video/ginganin.c b/src/mame/video/ginganin.c
index 6be05fa22f6..40e567beec4 100644
--- a/src/mame/video/ginganin.c
+++ b/src/mame/video/ginganin.c
@@ -244,14 +244,14 @@ UINT32 ginganin_state::screen_update_ginganin(screen_device &screen, bitmap_ind1
int layers_ctrl1 = m_layers_ctrl;
#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 |= 0xfff1;}
- if (screen.machine().input().code_pressed(KEYCODE_W)) { msk |= 0xfff2;}
- if (screen.machine().input().code_pressed(KEYCODE_E)) { msk |= 0xfff4;}
- if (screen.machine().input().code_pressed(KEYCODE_A)) { msk |= 0xfff8;}
+ if (machine().input().code_pressed(KEYCODE_Q)) { msk |= 0xfff1;}
+ if (machine().input().code_pressed(KEYCODE_W)) { msk |= 0xfff2;}
+ if (machine().input().code_pressed(KEYCODE_E)) { msk |= 0xfff4;}
+ if (machine().input().code_pressed(KEYCODE_A)) { msk |= 0xfff8;}
if (msk != 0) layers_ctrl1 &= msk;
#define SETSCROLL \
@@ -261,11 +261,11 @@ if (screen.machine().input().code_pressed(KEYCODE_Z))
m_fg_tilemap->set_scrolly(0, m_posy); \
popmessage("B>%04X:%04X F>%04X:%04X",m_posx%(BG_NX*16),m_posy%(BG_NY*16),m_posx%(FG_NX*16),m_posy%(FG_NY*16));
- if (screen.machine().input().code_pressed(KEYCODE_L)) { m_posx +=8; SETSCROLL }
- if (screen.machine().input().code_pressed(KEYCODE_J)) { m_posx -=8; SETSCROLL }
- if (screen.machine().input().code_pressed(KEYCODE_K)) { m_posy +=8; SETSCROLL }
- if (screen.machine().input().code_pressed(KEYCODE_I)) { m_posy -=8; SETSCROLL }
- if (screen.machine().input().code_pressed(KEYCODE_H)) { m_posx = m_posy = 0; SETSCROLL }
+ if (machine().input().code_pressed(KEYCODE_L)) { m_posx +=8; SETSCROLL }
+ if (machine().input().code_pressed(KEYCODE_J)) { m_posx -=8; SETSCROLL }
+ if (machine().input().code_pressed(KEYCODE_K)) { m_posy +=8; SETSCROLL }
+ if (machine().input().code_pressed(KEYCODE_I)) { m_posy -=8; SETSCROLL }
+ if (machine().input().code_pressed(KEYCODE_H)) { m_posx = m_posy = 0; SETSCROLL }
}
#endif
@@ -279,7 +279,7 @@ if (screen.machine().input().code_pressed(KEYCODE_Z))
if (layers_ctrl1 & 2)
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
if (layers_ctrl1 & 8)
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
if (layers_ctrl1 & 4)
m_tx_tilemap->draw(bitmap, cliprect, 0, 0);
diff --git a/src/mame/video/gladiatr.c b/src/mame/video/gladiatr.c
index a8594d6cd6f..0f071fc8c0c 100644
--- a/src/mame/video/gladiatr.c
+++ b/src/mame/video/gladiatr.c
@@ -243,7 +243,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
UINT32 gladiatr_state::screen_update_ppking(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);
/* the fg layer just selects the upper palette bank on underlying pixels */
{
@@ -290,10 +290,10 @@ UINT32 gladiatr_state::screen_update_gladiatr(screen_device &screen, bitmap_ind1
m_fg_tilemap->set_scrolly(0, m_fg_scrolly);
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);
}
else
- bitmap.fill(get_black_pen(screen.machine()), cliprect );
+ bitmap.fill(get_black_pen(machine()), cliprect );
return 0;
}
diff --git a/src/mame/video/glass.c b/src/mame/video/glass.c
index 91348190f63..59e9349d7ad 100644
--- a/src/mame/video/glass.c
+++ b/src/mame/video/glass.c
@@ -199,10 +199,10 @@ UINT32 glass_state::screen_update_glass(screen_device &screen, bitmap_ind16 &bit
m_pant[1]->set_scrollx(0, m_vregs[3]);
/* draw layers + sprites */
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
copybitmap(bitmap, *m_screen_bitmap, 0, 0, 0x18, 0x24, cliprect);
m_pant[1]->draw(bitmap, cliprect, 0, 0);
m_pant[0]->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/video/gng.c b/src/mame/video/gng.c
index 2ad1b6063ab..7f9a4ea9c6e 100644
--- a/src/mame/video/gng.c
+++ b/src/mame/video/gng.c
@@ -137,7 +137,7 @@ UINT32 gng_state::screen_update_gng(screen_device &screen, bitmap_ind16 &bitmap,
{
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0);
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
diff --git a/src/mame/video/goal92.c b/src/mame/video/goal92.c
index 18142f24883..007dffc4fc4 100644
--- a/src/mame/video/goal92.c
+++ b/src/mame/video/goal92.c
@@ -159,21 +159,21 @@ UINT32 goal92_state::screen_update_goal92(screen_device &screen, bitmap_ind16 &b
m_fg_layer->set_scrolly(0, m_scrollram[3] + 8);
}
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
m_bg_layer->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 2);
+ draw_sprites(machine(), bitmap, cliprect, 2);
if (!(m_fg_bank & 0xff))
- draw_sprites(screen.machine(), bitmap, cliprect, 1);
+ draw_sprites(machine(), bitmap, cliprect, 1);
m_fg_layer->draw(bitmap, cliprect, 0, 0);
if(m_fg_bank & 0xff)
- draw_sprites(screen.machine(), bitmap, cliprect, 1);
+ draw_sprites(machine(), bitmap, cliprect, 1);
- draw_sprites(screen.machine(), bitmap, cliprect, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 3);
+ draw_sprites(machine(), bitmap, cliprect, 0);
+ draw_sprites(machine(), bitmap, cliprect, 3);
m_tx_layer->draw(bitmap, cliprect, 0, 0);
return 0;
}
diff --git a/src/mame/video/goindol.c b/src/mame/video/goindol.c
index 33165944d8d..ae3352cfb02 100644
--- a/src/mame/video/goindol.c
+++ b/src/mame/video/goindol.c
@@ -125,7 +125,7 @@ UINT32 goindol_state::screen_update_goindol(screen_device &screen, bitmap_ind16
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 1, m_spriteram);
- draw_sprites(screen.machine(), bitmap, cliprect, 0, m_spriteram2);
+ draw_sprites(machine(), bitmap, cliprect, 1, m_spriteram);
+ draw_sprites(machine(), bitmap, cliprect, 0, m_spriteram2);
return 0;
}
diff --git a/src/mame/video/goldstar.c b/src/mame/video/goldstar.c
index eec990ab6e2..ba87d69743d 100644
--- a/src/mame/video/goldstar.c
+++ b/src/mame/video/goldstar.c
@@ -366,7 +366,7 @@ UINT32 goldstar_state::screen_update_goldstar(screen_device &screen, bitmap_ind1
{
int i;
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
if (!(m_cm_enable_reg &0x01))
return 0;
@@ -393,9 +393,9 @@ UINT32 goldstar_state::screen_update_goldstar(screen_device &screen, bitmap_ind1
if (m_cm_enable_reg &0x04)
{
- if (screen.machine().root_device().memregion("user1")->base())
+ if (machine().root_device().memregion("user1")->base())
{
- gfx_element *gfx = screen.machine().gfx[2];
+ gfx_element *gfx = machine().gfx[2];
int girlyscroll = (INT8)((m_cm_girl_scroll & 0xf0));
int girlxscroll = (INT8)((m_cm_girl_scroll & 0x0f)<<4);
@@ -416,7 +416,7 @@ UINT32 goldstar_state::screen_update_bingowng(screen_device &screen, bitmap_ind1
{
int i;
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
if (!(m_cm_enable_reg &0x01))
return 0;
@@ -435,9 +435,9 @@ UINT32 goldstar_state::screen_update_bingowng(screen_device &screen, bitmap_ind1
if (m_cm_enable_reg &0x04)
{
- if (screen.machine().root_device().memregion("user1")->base())
+ if (machine().root_device().memregion("user1")->base())
{
- gfx_element *gfx = screen.machine().gfx[2];
+ gfx_element *gfx = machine().gfx[2];
int girlyscroll = (INT8)((m_cm_girl_scroll & 0xf0));
int girlxscroll = (INT8)((m_cm_girl_scroll & 0x0f)<<4);
@@ -458,7 +458,7 @@ UINT32 goldstar_state::screen_update_magical(screen_device &screen, bitmap_ind16
{
int i;
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
if (!(m_cm_enable_reg &0x01))
return 0;
@@ -516,7 +516,7 @@ UINT32 goldstar_state::screen_update_unkch(screen_device &screen, bitmap_ind16 &
{
int i;
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
if (!(m_cm_enable_reg &0x01))
return 0;
@@ -569,7 +569,7 @@ UINT32 goldstar_state::screen_update_cmast91(screen_device &screen, bitmap_ind16
{
int i;
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
if (!(m_cm_enable_reg &0x01))
return 0;
@@ -604,7 +604,7 @@ UINT32 goldstar_state::screen_update_amcoe1a(screen_device &screen, bitmap_ind16
{
int i;
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
if (!(m_cm_enable_reg &0x01))
return 0;
diff --git a/src/mame/video/gomoku.c b/src/mame/video/gomoku.c
index 2fd330dccbc..301db2286f8 100644
--- a/src/mame/video/gomoku.c
+++ b/src/mame/video/gomoku.c
@@ -146,8 +146,8 @@ void gomoku_state::video_start()
UINT32 gomoku_state::screen_update_gomoku(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- UINT8 *GOMOKU_BG_X = screen.machine().root_device().memregion( "user1" )->base();
- UINT8 *GOMOKU_BG_Y = screen.machine().root_device().memregion( "user2" )->base();
+ UINT8 *GOMOKU_BG_X = machine().root_device().memregion( "user1" )->base();
+ UINT8 *GOMOKU_BG_Y = machine().root_device().memregion( "user2" )->base();
UINT8 *GOMOKU_BG_D = memregion( "user3" )->base();
int x, y;
int bgram;
diff --git a/src/mame/video/gotcha.c b/src/mame/video/gotcha.c
index 87db6ebd01a..94e01733f08 100644
--- a/src/mame/video/gotcha.c
+++ b/src/mame/video/gotcha.c
@@ -103,6 +103,6 @@ UINT32 gotcha_state::screen_update_gotcha(screen_device &screen, bitmap_ind16 &b
{
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
m_fg_tilemap->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/video/gottlieb.c b/src/mame/video/gottlieb.c
index ac911e8285d..8b42b90ed84 100644
--- a/src/mame/video/gottlieb.c
+++ b/src/mame/video/gottlieb.c
@@ -246,10 +246,10 @@ UINT32 gottlieb_state::screen_update_gottlieb(screen_device &screen, bitmap_rgb3
if (!m_background_priority)
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0);
else
- bitmap.fill(screen.machine().pens[0], cliprect);
+ bitmap.fill(machine().pens[0], cliprect);
/* draw the sprites */
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
/* if the background has higher priority, render it now */
if (m_background_priority)
diff --git a/src/mame/video/gotya.c b/src/mame/video/gotya.c
index 78985e5f1db..6dcd951fd0b 100644
--- a/src/mame/video/gotya.c
+++ b/src/mame/video/gotya.c
@@ -177,7 +177,7 @@ UINT32 gotya_state::screen_update_gotya(screen_device &screen, bitmap_ind16 &bit
{
m_bg_tilemap->set_scrollx(0, -(*m_scroll + (m_scroll_bit_8 * 256)) - 2 * 8);
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect);
- draw_status(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
+ draw_status(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/video/gradius3.c b/src/mame/video/gradius3.c
index 4678a2ade68..72d2da6f469 100644
--- a/src/mame/video/gradius3.c
+++ b/src/mame/video/gradius3.c
@@ -125,13 +125,13 @@ UINT32 gradius3_state::screen_update_gradius3(screen_device &screen, bitmap_ind1
{
/* TODO: this kludge enforces the char banks. For some reason, they don't work otherwise. */
- address_space &space = screen.machine().driver_data()->generic_space();
+ address_space &space = machine().driver_data()->generic_space();
k052109_w(m_k052109, space, 0x1d80, 0x10);
k052109_w(m_k052109, space, 0x1f00, 0x32);
k052109_tilemap_update(m_k052109);
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
if (m_priority == 0)
{
k052109_tilemap_draw(m_k052109, bitmap, cliprect, 1, TILEMAP_DRAW_OPAQUE, 2);
diff --git a/src/mame/video/grchamp.c b/src/mame/video/grchamp.c
index 8c2108eea82..949f53fdcfb 100644
--- a/src/mame/video/grchamp.c
+++ b/src/mame/video/grchamp.c
@@ -357,8 +357,8 @@ UINT32 grchamp_state::screen_update_grchamp(screen_device &screen, bitmap_rgb32
MAKE_RGB(RGB_MAX,RGB_MAX,RGB_MAX)
};
- const UINT8 *amedata = screen.machine().root_device().memregion("gfx5")->base();
- const UINT8 *headdata = screen.machine().root_device().memregion("gfx6")->base();
+ const UINT8 *amedata = machine().root_device().memregion("gfx5")->base();
+ const UINT8 *headdata = machine().root_device().memregion("gfx6")->base();
const UINT8 *pldata = memregion("gfx7")->base();
bitmap_ind16 &lpixmap = m_left_tilemap->pixmap();
bitmap_ind16 &rpixmap = m_right_tilemap->pixmap();
@@ -399,7 +399,7 @@ UINT32 grchamp_state::screen_update_grchamp(screen_device &screen, bitmap_rgb32
UINT8 objdata[256];
/* draw the objects for this scanline */
- draw_objects(screen.machine(), this, y, objdata);
+ draw_objects(machine(), this, y, objdata);
/* iterate over columns */
for (x = cliprect.min_x; x <= cliprect.max_x; x++)
diff --git a/src/mame/video/gridlee.c b/src/mame/video/gridlee.c
index a613e852bf0..bfe8ca8647e 100644
--- a/src/mame/video/gridlee.c
+++ b/src/mame/video/gridlee.c
@@ -131,7 +131,7 @@ WRITE8_MEMBER(gridlee_state::gridlee_palette_select_w)
UINT32 gridlee_state::screen_update_gridlee(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- const pen_t *pens = &screen.machine().pens[m_palettebank_vis * 32];
+ const pen_t *pens = &machine().pens[m_palettebank_vis * 32];
UINT8 *gfx;
int x, y, i;
@@ -156,7 +156,7 @@ UINT32 gridlee_state::screen_update_gridlee(screen_device &screen, bitmap_ind16
}
/* draw the sprite images */
- gfx = screen.machine().root_device().memregion("gfx1")->base();
+ gfx = machine().root_device().memregion("gfx1")->base();
for (i = 0; i < 32; i++)
{
UINT8 *sprite = m_spriteram + i * 4;
diff --git a/src/mame/video/groundfx.c b/src/mame/video/groundfx.c
index ab5126348c2..705f53bbb12 100644
--- a/src/mame/video/groundfx.c
+++ b/src/mame/video/groundfx.c
@@ -197,9 +197,9 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,const re
UINT32 groundfx_state::screen_update_groundfx(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- address_space &space = screen.machine().driver_data()->generic_space();
- device_t *tc0100scn = screen.machine().device("tc0100scn");
- device_t *tc0480scp = screen.machine().device("tc0480scp");
+ address_space &space = machine().driver_data()->generic_space();
+ device_t *tc0100scn = machine().device("tc0100scn");
+ device_t *tc0480scp = machine().device("tc0480scp");
UINT8 layer[5];
UINT8 pivlayer[3];
UINT16 priority;
@@ -219,7 +219,7 @@ UINT32 groundfx_state::screen_update_groundfx(screen_device &screen, bitmap_ind1
pivlayer[1] = pivlayer[0]^1;
pivlayer[2] = 2;
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
bitmap.fill(0, cliprect); /* wrong color? */
tc0100scn_tilemap_draw(tc0100scn, bitmap, cliprect, pivlayer[0], TILEMAP_DRAW_OPAQUE, 0);
@@ -252,7 +252,7 @@ UINT32 groundfx_state::screen_update_groundfx(screen_device &screen, bitmap_ind1
if (tc0480scp_long_r(tc0480scp, space, 0x20 / 4, 0xffffffff) != 0x240866) /* Stupid hack for start of race */
tc0480scp_tilemap_draw(tc0480scp, bitmap, m_hack_cliprect, layer[0], 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 1, 44, -574);
+ draw_sprites(machine(), bitmap, cliprect, 1, 44, -574);
}
else
{
@@ -263,7 +263,7 @@ UINT32 groundfx_state::screen_update_groundfx(screen_device &screen, bitmap_ind1
tc0100scn_tilemap_draw(tc0100scn, bitmap, cliprect, pivlayer[2], 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 0, 44, -574);
+ draw_sprites(machine(), bitmap, cliprect, 0, 44, -574);
}
tc0480scp_tilemap_draw(tc0480scp, bitmap, cliprect, layer[4], 0, 0); /* TC0480SCP text layer */
diff --git a/src/mame/video/gstriker.c b/src/mame/video/gstriker.c
index b381973713f..63ef623ea99 100644
--- a/src/mame/video/gstriker.c
+++ b/src/mame/video/gstriker.c
@@ -527,17 +527,17 @@ WRITE16_MEMBER(gstriker_state::gsx_videoram3_w)
UINT32 gstriker_state::screen_update_gstriker(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
// Sandwitched screen/sprite0/score/sprite1. Surely wrong, probably
// needs sprite orthogonality
- MB60553_draw(screen.machine(), 0, bitmap,cliprect, 0);
+ MB60553_draw(machine(), 0, bitmap,cliprect, 0);
- CG10103_draw(screen.machine(), 0, bitmap, cliprect, 0);
+ CG10103_draw(machine(), 0, bitmap, cliprect, 0);
VS920A_draw(this, 0, bitmap, cliprect, 0);
- CG10103_draw(screen.machine(), 0, bitmap, cliprect, 1);
+ CG10103_draw(machine(), 0, bitmap, cliprect, 1);
#if 0
popmessage("%04x %04x %04x %04x %04x %04x %04x %04x",
diff --git a/src/mame/video/gsword.c b/src/mame/video/gsword.c
index 7513a28d112..1a43ad44485 100644
--- a/src/mame/video/gsword.c
+++ b/src/mame/video/gsword.c
@@ -205,6 +205,6 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
UINT32 gsword_state::screen_update_gsword(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/video/gunbustr.c b/src/mame/video/gunbustr.c
index 16688ecb636..5124ed5c258 100644
--- a/src/mame/video/gunbustr.c
+++ b/src/mame/video/gunbustr.c
@@ -203,7 +203,7 @@ logerror("Sprite number %04x had %02x invalid chunks\n",tilenum,bad_chunks);
UINT32 gunbustr_state::screen_update_gunbustr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- device_t *tc0480scp = screen.machine().device("tc0480scp");
+ device_t *tc0480scp = machine().device("tc0480scp");
UINT8 layer[5];
UINT16 priority;
static const int primasks[4] = {0xfffc, 0xfff0, 0xff00, 0x0};
@@ -217,25 +217,25 @@ UINT32 gunbustr_state::screen_update_gunbustr(screen_device &screen, bitmap_ind1
layer[3] = (priority & 0x000f) >> 0; /* tells us which is top */
layer[4] = 4; /* text layer always over bg layers */
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
/* We have to assume 2nd to bottom layer is always underneath
sprites as pdrawgfx cannot yet cope with more than 4 layers */
#ifdef MAME_DEBUG
- if (!screen.machine().input().code_pressed (KEYCODE_Z)) tc0480scp_tilemap_draw(tc0480scp, bitmap, cliprect, layer[0],TILEMAP_DRAW_OPAQUE, 0);
- if (!screen.machine().input().code_pressed (KEYCODE_X)) tc0480scp_tilemap_draw(tc0480scp, bitmap, cliprect, layer[1], 0, 1);
- if (!screen.machine().input().code_pressed (KEYCODE_C)) tc0480scp_tilemap_draw(tc0480scp, bitmap, cliprect, layer[2], 0, 2);
- if (!screen.machine().input().code_pressed (KEYCODE_V)) tc0480scp_tilemap_draw(tc0480scp, bitmap, cliprect, layer[3], 0, 4);
- if (!screen.machine().input().code_pressed (KEYCODE_B)) tc0480scp_tilemap_draw(tc0480scp, bitmap, cliprect, layer[4], 0, 8);
- if (!screen.machine().input().code_pressed (KEYCODE_N)) draw_sprites(screen.machine(), bitmap, cliprect, primasks, 48, -116);
+ if (!machine().input().code_pressed (KEYCODE_Z)) tc0480scp_tilemap_draw(tc0480scp, bitmap, cliprect, layer[0],TILEMAP_DRAW_OPAQUE, 0);
+ if (!machine().input().code_pressed (KEYCODE_X)) tc0480scp_tilemap_draw(tc0480scp, bitmap, cliprect, layer[1], 0, 1);
+ if (!machine().input().code_pressed (KEYCODE_C)) tc0480scp_tilemap_draw(tc0480scp, bitmap, cliprect, layer[2], 0, 2);
+ if (!machine().input().code_pressed (KEYCODE_V)) tc0480scp_tilemap_draw(tc0480scp, bitmap, cliprect, layer[3], 0, 4);
+ if (!machine().input().code_pressed (KEYCODE_B)) tc0480scp_tilemap_draw(tc0480scp, bitmap, cliprect, layer[4], 0, 8);
+ if (!machine().input().code_pressed (KEYCODE_N)) draw_sprites(machine(), bitmap, cliprect, primasks, 48, -116);
#else
tc0480scp_tilemap_draw(tc0480scp, bitmap, cliprect, layer[0], TILEMAP_DRAW_OPAQUE, 0);
tc0480scp_tilemap_draw(tc0480scp, bitmap, cliprect, layer[1], 0, 1);
tc0480scp_tilemap_draw(tc0480scp, bitmap, cliprect, layer[2], 0, 2);
tc0480scp_tilemap_draw(tc0480scp, bitmap, cliprect, layer[3], 0, 4);
tc0480scp_tilemap_draw(tc0480scp, bitmap, cliprect, layer[4], 0, 8); /* text layer */
- draw_sprites(screen.machine(), bitmap, cliprect, primasks, 48, -116);
+ draw_sprites(machine(), bitmap, cliprect, primasks, 48, -116);
#endif
return 0;
}
diff --git a/src/mame/video/gunsmoke.c b/src/mame/video/gunsmoke.c
index 20a75c4cf80..c2789f6191a 100644
--- a/src/mame/video/gunsmoke.c
+++ b/src/mame/video/gunsmoke.c
@@ -177,10 +177,10 @@ UINT32 gunsmoke_state::screen_update_gunsmoke(screen_device &screen, bitmap_ind1
if (m_bgon)
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
else
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
if (m_objon)
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
if (m_chon)
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
diff --git a/src/mame/video/gyruss.c b/src/mame/video/gyruss.c
index 9aabd2b8842..be761159d8c 100644
--- a/src/mame/video/gyruss.c
+++ b/src/mame/video/gyruss.c
@@ -153,12 +153,12 @@ UINT32 gyruss_state::screen_update_gyruss(screen_device &screen, bitmap_ind16 &b
if (cliprect.min_y == screen.visible_area().min_y)
{
- screen.machine().tilemap().mark_all_dirty();
- screen.machine().tilemap().set_flip_all((*m_flipscreen & 0x01) ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0);
+ machine().tilemap().mark_all_dirty();
+ machine().tilemap().set_flip_all((*m_flipscreen & 0x01) ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0);
}
m_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, screen.machine().gfx);
+ draw_sprites(machine(), bitmap, cliprect, machine().gfx);
m_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
diff --git a/src/mame/video/hcastle.c b/src/mame/video/hcastle.c
index 4259cf7534b..4f1a8a6e08c 100644
--- a/src/mame/video/hcastle.c
+++ b/src/mame/video/hcastle.c
@@ -217,7 +217,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
UINT32 hcastle_state::screen_update_hcastle(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- address_space &space = screen.machine().driver_data()->generic_space();
+ address_space &space = machine().driver_data()->generic_space();
UINT8 ctrl_1_0 = k007121_ctrlram_r(m_k007121_1, space, 0);
UINT8 ctrl_1_1 = k007121_ctrlram_r(m_k007121_1, space, 1);
@@ -228,7 +228,7 @@ UINT32 hcastle_state::screen_update_hcastle(screen_device &screen, bitmap_ind16
UINT8 ctrl_2_2 = k007121_ctrlram_r(m_k007121_2, space, 2);
UINT8 ctrl_2_3 = k007121_ctrlram_r(m_k007121_2, space, 3);
- set_pens(screen.machine());
+ set_pens(machine());
m_pf1_bankbase = 0x0000;
m_pf2_bankbase = 0x4000 * ((m_gfx_bank & 2) >> 1);
@@ -257,16 +257,16 @@ UINT32 hcastle_state::screen_update_hcastle(screen_device &screen, bitmap_ind16
if ((m_gfx_bank & 0x04) == 0)
{
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, m_spriteram->buffer(), 0);
- draw_sprites(screen.machine(), bitmap, cliprect, m_spriteram2->buffer(), 1);
+ draw_sprites(machine(), bitmap, cliprect, m_spriteram->buffer(), 0);
+ draw_sprites(machine(), bitmap, cliprect, m_spriteram2->buffer(), 1);
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
}
else
{
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, m_spriteram->buffer(), 0);
- draw_sprites(screen.machine(), bitmap, cliprect, m_spriteram2->buffer(), 1);
+ draw_sprites(machine(), bitmap, cliprect, m_spriteram->buffer(), 0);
+ draw_sprites(machine(), bitmap, cliprect, m_spriteram2->buffer(), 1);
}
return 0;
}
diff --git a/src/mame/video/higemaru.c b/src/mame/video/higemaru.c
index d80a364ca1f..6f14971b996 100644
--- a/src/mame/video/higemaru.c
+++ b/src/mame/video/higemaru.c
@@ -144,6 +144,6 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
UINT32 higemaru_state::screen_update_higemaru(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/video/himesiki.c b/src/mame/video/himesiki.c
index 14324996fda..839cc5e8b40 100644
--- a/src/mame/video/himesiki.c
+++ b/src/mame/video/himesiki.c
@@ -118,7 +118,7 @@ UINT32 himesiki_state::screen_update_himesiki(screen_device &screen, bitmap_ind1
m_bg_tilemap->set_scrolldx(x, x);
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0);
- himesiki_draw_sprites(screen.machine(), bitmap, cliprect);
+ himesiki_draw_sprites(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/video/hnayayoi.c b/src/mame/video/hnayayoi.c
index 2f351b44848..581c1829692 100644
--- a/src/mame/video/hnayayoi.c
+++ b/src/mame/video/hnayayoi.c
@@ -266,15 +266,15 @@ UINT32 hnayayoi_state::screen_update_hnayayoi(screen_device &screen, bitmap_ind1
if (m_total_pixmaps == 4)
{
- draw_layer_interleaved(screen.machine(), bitmap, cliprect, 3, 2, col1, 0);
- draw_layer_interleaved(screen.machine(), bitmap, cliprect, 1, 0, col0, 1);
+ draw_layer_interleaved(machine(), bitmap, cliprect, 3, 2, col1, 0);
+ draw_layer_interleaved(machine(), bitmap, cliprect, 1, 0, col0, 1);
}
else /* total_pixmaps == 8 */
{
- draw_layer_interleaved(screen.machine(), bitmap, cliprect, 7, 6, col3, 0);
- draw_layer_interleaved(screen.machine(), bitmap, cliprect, 5, 4, col2, 1);
- draw_layer_interleaved(screen.machine(), bitmap, cliprect, 3, 2, col1, 1);
- draw_layer_interleaved(screen.machine(), bitmap, cliprect, 1, 0, col0, 1);
+ draw_layer_interleaved(machine(), bitmap, cliprect, 7, 6, col3, 0);
+ draw_layer_interleaved(machine(), bitmap, cliprect, 5, 4, col2, 1);
+ draw_layer_interleaved(machine(), bitmap, cliprect, 3, 2, col1, 1);
+ draw_layer_interleaved(machine(), bitmap, cliprect, 1, 0, col0, 1);
}
return 0;
}
diff --git a/src/mame/video/hng64.c b/src/mame/video/hng64.c
index e9cc6aa1207..92044f829ba 100644
--- a/src/mame/video/hng64.c
+++ b/src/mame/video/hng64.c
@@ -1444,15 +1444,15 @@ UINT32 hng64_state::screen_update_hng64(screen_device &screen, bitmap_rgb32 &bit
// press in sams64_2 attract mode for a nice debug screen from the game
// not sure how functional it is, and it doesn't appear to test everything (rowscroll modes etc.)
// but it could be useful
- if ( screen.machine().input().code_pressed_once(KEYCODE_L) )
+ if ( machine().input().code_pressed_once(KEYCODE_L) )
{
- address_space &space = *screen.machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
space.write_byte(0x2f27c8, 0x2);
}
#endif
- bitmap.fill(hng64_tcram[0x50/4] & 0x10000 ? get_black_pen(screen.machine()) : screen.machine().pens[0], cliprect); //FIXME: Is the register correct? check with HW tests
- screen.machine().priority_bitmap.fill(0x00, cliprect);
+ bitmap.fill(hng64_tcram[0x50/4] & 0x10000 ? get_black_pen(machine()) : machine().pens[0], cliprect); //FIXME: Is the register correct? check with HW tests
+ machine().priority_bitmap.fill(0x00, cliprect);
if (m_screen_dis)
return 0;
@@ -1522,10 +1522,10 @@ UINT32 hng64_state::screen_update_hng64(screen_device &screen, bitmap_rgb32 &bit
//hng64_mark_all_tiles_dirty(this, 2);
//hng64_mark_all_tiles_dirty(this, 3);
- hng64_drawtilemap(screen.machine(),bitmap,cliprect, 3);
- hng64_drawtilemap(screen.machine(),bitmap,cliprect, 2);
- hng64_drawtilemap(screen.machine(),bitmap,cliprect, 1);
- hng64_drawtilemap(screen.machine(),bitmap,cliprect, 0);
+ hng64_drawtilemap(machine(),bitmap,cliprect, 3);
+ hng64_drawtilemap(machine(),bitmap,cliprect, 2);
+ hng64_drawtilemap(machine(),bitmap,cliprect, 1);
+ hng64_drawtilemap(machine(),bitmap,cliprect, 0);
// 3d really shouldn't be last, but you don't see some cool stuff right now if it's put before sprites.
{
@@ -1549,10 +1549,10 @@ UINT32 hng64_state::screen_update_hng64(screen_device &screen, bitmap_rgb32 &bit
//printf("NEW FRAME!\n"); /* Debug - ajg */
}
- draw_sprites(screen.machine(), bitmap,cliprect);
+ draw_sprites(machine(), bitmap,cliprect);
if(0)
- transition_control(screen.machine(), bitmap, cliprect);
+ transition_control(machine(), bitmap, cliprect);
if (0)
popmessage("%08x %08x %08x %08x %08x", m_spriteregs[0], m_spriteregs[1], m_spriteregs[2], m_spriteregs[3], m_spriteregs[4]);
@@ -1612,22 +1612,22 @@ UINT32 hng64_state::screen_update_hng64(screen_device &screen, bitmap_rgb32 &bit
hng64_tcram[0x58/4],
hng64_tcram[0x5c/4]);
- if ( screen.machine().input().code_pressed_once(KEYCODE_T) )
+ if ( machine().input().code_pressed_once(KEYCODE_T) )
{
m_additive_tilemap_debug ^= 1;
popmessage("blend changed %02x", m_additive_tilemap_debug);
}
- if ( screen.machine().input().code_pressed_once(KEYCODE_Y) )
+ if ( machine().input().code_pressed_once(KEYCODE_Y) )
{
m_additive_tilemap_debug ^= 2;
popmessage("blend changed %02x", m_additive_tilemap_debug);
}
- if ( screen.machine().input().code_pressed_once(KEYCODE_U) )
+ if ( machine().input().code_pressed_once(KEYCODE_U) )
{
m_additive_tilemap_debug ^= 4;
popmessage("blend changed %02x", m_additive_tilemap_debug);
}
- if ( screen.machine().input().code_pressed_once(KEYCODE_I) )
+ if ( machine().input().code_pressed_once(KEYCODE_I) )
{
m_additive_tilemap_debug ^= 8;
popmessage("blend changed %02x", m_additive_tilemap_debug);
@@ -1640,7 +1640,7 @@ void hng64_state::screen_eof_hng64(screen_device &screen, bool state)
{
// rising edge
if (state)
- clear3d(screen.machine());
+ clear3d(machine());
}
void hng64_state::video_start()
diff --git a/src/mame/video/holeland.c b/src/mame/video/holeland.c
index a40159c6502..f622b420194 100644
--- a/src/mame/video/holeland.c
+++ b/src/mame/video/holeland.c
@@ -184,7 +184,7 @@ UINT32 holeland_state::screen_update_holeland(screen_device &screen, bitmap_ind1
{
/*m_bg_tilemap->mark_all_dirty(); */
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0);
- holeland_draw_sprites(screen.machine(), bitmap, cliprect);
+ holeland_draw_sprites(machine(), bitmap, cliprect);
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0);
return 0;
}
@@ -192,6 +192,6 @@ UINT32 holeland_state::screen_update_holeland(screen_device &screen, bitmap_ind1
UINT32 holeland_state::screen_update_crzrally(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- crzrally_draw_sprites(screen.machine(), bitmap, cliprect);
+ crzrally_draw_sprites(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/video/homedata.c b/src/mame/video/homedata.c
index 71603a01301..6535c8d9d21 100644
--- a/src/mame/video/homedata.c
+++ b/src/mame/video/homedata.c
@@ -808,7 +808,7 @@ UINT32 homedata_state::screen_update_mrokumei(screen_device &screen, bitmap_ind1
/* blank screen */
if (m_vreg[0x3] == 0xc1 && m_vreg[0x4] == 0xc0 && m_vreg[0x5] == 0xff)
{
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
return 0;
}
@@ -816,7 +816,7 @@ UINT32 homedata_state::screen_update_mrokumei(screen_device &screen, bitmap_ind1
if (flags != m_flipscreen)
{
m_flipscreen = flags;
- screen.machine().tilemap().mark_all_dirty();
+ machine().tilemap().mark_all_dirty();
}
switch (m_vreg[0x3])
@@ -866,11 +866,11 @@ UINT32 homedata_state::screen_update_reikaids(screen_device &screen, bitmap_ind1
if (flags != m_flipscreen)
{
m_flipscreen = flags;
- screen.machine().tilemap().mark_all_dirty();
+ machine().tilemap().mark_all_dirty();
}
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
pri = (m_bank & 0x70) >> 4;
for (i = 0; i < 4; i++)
@@ -912,11 +912,11 @@ UINT32 homedata_state::screen_update_reikaids(screen_device &screen, bitmap_ind1
if (flags != m_flipscreen)
{
m_flipscreen = flags;
- screen.machine().tilemap().mark_all_dirty();
+ machine().tilemap().mark_all_dirty();
}
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
pri = (m_blitter_bank & 0x70) >> 4;
for (i = 0; i < 4; i++)
@@ -933,7 +933,7 @@ UINT32 homedata_state::screen_update_pteacher(screen_device &screen, bitmap_ind1
/* blank screen */
if (m_vreg[0x3] == 0xc1 && m_vreg[0x4] == 0xc0 && m_vreg[0x5] == 0xff)
{
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
return 0;
}
@@ -941,7 +941,7 @@ UINT32 homedata_state::screen_update_pteacher(screen_device &screen, bitmap_ind1
if (flags != m_flipscreen)
{
m_flipscreen = flags;
- screen.machine().tilemap().mark_all_dirty();
+ machine().tilemap().mark_all_dirty();
}
/* bit 2 of blitter_bank stretches characters horizontally by 3/2,
diff --git a/src/mame/video/homerun.c b/src/mame/video/homerun.c
index 767310ae324..c5d53a70adb 100644
--- a/src/mame/video/homerun.c
+++ b/src/mame/video/homerun.c
@@ -141,7 +141,7 @@ UINT32 homerun_state::screen_update_homerun(screen_device &screen, bitmap_ind16
m_tilemap->set_scrollx(0, m_scrollx);
m_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/video/hyperspt.c b/src/mame/video/hyperspt.c
index 4b5f599a2e0..43062babbc5 100644
--- a/src/mame/video/hyperspt.c
+++ b/src/mame/video/hyperspt.c
@@ -183,7 +183,7 @@ UINT32 hyperspt_state::screen_update_hyperspt(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/video/hyprduel.c b/src/mame/video/hyprduel.c
index 83f936d7f3f..37460ad0569 100644
--- a/src/mame/video/hyprduel.c
+++ b/src/mame/video/hyprduel.c
@@ -694,9 +694,9 @@ UINT32 hyprduel_state::screen_update_hyprduel(screen_device &screen, bitmap_ind1
if (dirty)
{
- dirty_tiles(screen.machine(), 0, m_vram_0);
- dirty_tiles(screen.machine(), 1, m_vram_1);
- dirty_tiles(screen.machine(), 2, m_vram_2);
+ dirty_tiles(machine(), 0, m_vram_0);
+ dirty_tiles(machine(), 1, m_vram_1);
+ dirty_tiles(machine(), 2, m_vram_2);
}
}
@@ -704,7 +704,7 @@ UINT32 hyprduel_state::screen_update_hyprduel(screen_device &screen, bitmap_ind1
m_sprite_yoffs = m_videoregs[0x04 / 2] - screen.height() / 2 - m_sprite_yoffs_sub;
/* The background color is selected by a register */
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
bitmap.fill((m_videoregs[0x12 / 2] & 0x0fff) + 0x1000, cliprect);
/* Screen Control Register:
@@ -723,12 +723,12 @@ UINT32 hyprduel_state::screen_update_hyprduel(screen_device &screen, bitmap_ind1
flip_screen_set(screenctrl & 1);
#if 0
-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 |= 0x01;
- if (screen.machine().input().code_pressed(KEYCODE_W)) msk |= 0x02;
- if (screen.machine().input().code_pressed(KEYCODE_E)) msk |= 0x04;
- if (screen.machine().input().code_pressed(KEYCODE_A)) msk |= 0x08;
+ if (machine().input().code_pressed(KEYCODE_Q)) msk |= 0x01;
+ if (machine().input().code_pressed(KEYCODE_W)) msk |= 0x02;
+ if (machine().input().code_pressed(KEYCODE_E)) msk |= 0x04;
+ if (machine().input().code_pressed(KEYCODE_A)) msk |= 0x08;
if (msk != 0)
{
bitmap.fill(0, cliprect);
@@ -743,10 +743,10 @@ if (screen.machine().input().code_pressed(KEYCODE_Z))
#endif
for (pri = 3; pri >= 0; pri--)
- draw_layers(screen.machine(), bitmap, cliprect, pri, layers_ctrl);
+ draw_layers(machine(), bitmap, cliprect, pri, layers_ctrl);
if (layers_ctrl & 0x08)
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/video/ikki.c b/src/mame/video/ikki.c
index f1800dd2667..7c07baf9517 100644
--- a/src/mame/video/ikki.c
+++ b/src/mame/video/ikki.c
@@ -175,14 +175,14 @@ UINT32 ikki_state::screen_update_ikki(screen_device &screen, bitmap_ind16 &bitma
bank = (color & 0xe0) << 3;
color = ((color & 0x1f)<<0) | ((color & 0x80) >> 2);
- drawgfx_opaque(bitmap,cliprect,screen.machine().gfx[0],
+ drawgfx_opaque(bitmap,cliprect,machine().gfx[0],
m_videoram[offs * 2 + 1] + bank,
color,
m_flipscreen,m_flipscreen,
x,y);
}
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
/* mask sprites */
@@ -210,7 +210,7 @@ UINT32 ikki_state::screen_update_ikki(screen_device &screen, bitmap_ind16 &bitma
bank = (color & 0xe0) << 3;
color = ((color & 0x1f)<<0) | ((color & 0x80) >> 2);
- drawgfx_opaque(bitmap,cliprect,screen.machine().gfx[0],
+ drawgfx_opaque(bitmap,cliprect,machine().gfx[0],
m_videoram[offs * 2 + 1] + bank,
color,
m_flipscreen,m_flipscreen,
diff --git a/src/mame/video/inufuku.c b/src/mame/video/inufuku.c
index ca2ba986e7b..2339055f793 100644
--- a/src/mame/video/inufuku.c
+++ b/src/mame/video/inufuku.c
@@ -229,8 +229,8 @@ UINT32 inufuku_state::screen_update_inufuku(screen_device &screen, bitmap_ind16
{
int i;
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
- screen.machine().priority_bitmap.fill(0);
+ bitmap.fill(get_black_pen(machine()), cliprect);
+ machine().priority_bitmap.fill(0);
if (m_bg_raster)
{
@@ -250,6 +250,6 @@ UINT32 inufuku_state::screen_update_inufuku(screen_device &screen, bitmap_ind16
m_tx_tilemap->set_scrolly(0, m_tx_scrolly);
m_tx_tilemap->draw(bitmap, cliprect, 0, 4);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/video/irobot.c b/src/mame/video/irobot.c
index 865d6f5d1fe..50afe10be6c 100644
--- a/src/mame/video/irobot.c
+++ b/src/mame/video/irobot.c
@@ -363,7 +363,7 @@ UINT32 irobot_state::screen_update_irobot(screen_device &screen, bitmap_ind16 &b
int code = videoram[offs] & 0x3f;
int color = ((videoram[offs] & 0xc0) >> 6) | (m_alphamap >> 3);
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[0],
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[0],
code, color,
0,0,
8*x,8*y,0);
diff --git a/src/mame/video/ironhors.c b/src/mame/video/ironhors.c
index dc384af0367..4e58887bef2 100644
--- a/src/mame/video/ironhors.c
+++ b/src/mame/video/ironhors.c
@@ -242,7 +242,7 @@ UINT32 ironhors_state::screen_update_ironhors(screen_device &screen, bitmap_ind1
m_bg_tilemap->set_scrollx(row, m_scroll[row]);
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
return 0;
}
@@ -352,7 +352,7 @@ UINT32 ironhors_state::screen_update_farwest(screen_device &screen, bitmap_ind16
m_bg_tilemap->set_scrollx(row, m_scroll[row]);
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- farwest_draw_sprites(screen.machine(), bitmap, cliprect);
+ farwest_draw_sprites(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/video/itech8.c b/src/mame/video/itech8.c
index 8e5432b1371..9b38a56e305 100644
--- a/src/mame/video/itech8.c
+++ b/src/mame/video/itech8.c
@@ -607,7 +607,7 @@ UINT32 itech8_state::screen_update_itech8_2layer(screen_device &screen, bitmap_r
struct tms34061_display &tms_state = m_tms_state;
UINT32 page_offset;
int x, y;
- const rgb_t *pens = tlc34076_get_pens(screen.machine().device("tlc34076"));
+ const rgb_t *pens = tlc34076_get_pens(machine().device("tlc34076"));
/* first get the current display state */
tms34061_get_display_state(&tms_state);
@@ -615,7 +615,7 @@ UINT32 itech8_state::screen_update_itech8_2layer(screen_device &screen, bitmap_r
/* if we're blanked, just fill with black */
if (tms_state.blanked)
{
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
return 0;
}
@@ -651,7 +651,7 @@ UINT32 itech8_state::screen_update_itech8_grmatch(screen_device &screen, bitmap_
/* if we're blanked, just fill with black */
if (tms_state.blanked)
{
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
return 0;
}
@@ -692,7 +692,7 @@ UINT32 itech8_state::screen_update_itech8_2page(screen_device &screen, bitmap_rg
struct tms34061_display &tms_state = m_tms_state;
UINT32 page_offset;
int x, y;
- const rgb_t *pens = tlc34076_get_pens(screen.machine().device("tlc34076"));
+ const rgb_t *pens = tlc34076_get_pens(machine().device("tlc34076"));
/* first get the current display state */
tms34061_get_display_state(&tms_state);
@@ -700,7 +700,7 @@ UINT32 itech8_state::screen_update_itech8_2page(screen_device &screen, bitmap_rg
/* if we're blanked, just fill with black */
if (tms_state.blanked)
{
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
return 0;
}
@@ -724,7 +724,7 @@ UINT32 itech8_state::screen_update_itech8_2page_large(screen_device &screen, bit
struct tms34061_display &tms_state = m_tms_state;
UINT32 page_offset;
int x, y;
- const rgb_t *pens = tlc34076_get_pens(screen.machine().device("tlc34076"));
+ const rgb_t *pens = tlc34076_get_pens(machine().device("tlc34076"));
/* first get the current display state */
tms34061_get_display_state(&tms_state);
@@ -732,7 +732,7 @@ UINT32 itech8_state::screen_update_itech8_2page_large(screen_device &screen, bit
/* if we're blanked, just fill with black */
if (tms_state.blanked)
{
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
return 0;
}
diff --git a/src/mame/video/jack.c b/src/mame/video/jack.c
index 7284058511b..b9ed9d86185 100644
--- a/src/mame/video/jack.c
+++ b/src/mame/video/jack.c
@@ -96,7 +96,7 @@ static void jack_draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, c
UINT32 jack_state::screen_update_jack(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- jack_draw_sprites(screen.machine(), bitmap, cliprect);
+ jack_draw_sprites(machine(), bitmap, cliprect);
return 0;
}
@@ -179,6 +179,6 @@ static void joinem_draw_sprites( running_machine &machine, bitmap_ind16 &bitmap,
UINT32 jack_state::screen_update_joinem(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- joinem_draw_sprites(screen.machine(), bitmap, cliprect);
+ joinem_draw_sprites(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/video/jackal.c b/src/mame/video/jackal.c
index 83629267432..076fc8be20a 100644
--- a/src/mame/video/jackal.c
+++ b/src/mame/video/jackal.c
@@ -225,8 +225,8 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
UINT32 jackal_state::screen_update_jackal(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- set_pens(screen.machine());
- draw_background(screen.machine(), bitmap, cliprect);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ set_pens(machine());
+ draw_background(machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/video/jailbrek.c b/src/mame/video/jailbrek.c
index 9f9721057d1..19afcaeb290 100644
--- a/src/mame/video/jailbrek.c
+++ b/src/mame/video/jailbrek.c
@@ -118,6 +118,6 @@ UINT32 jailbrek_state::screen_update_jailbrek(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/video/jedi.c b/src/mame/video/jedi.c
index c73092c9acf..b0892f36829 100644
--- a/src/mame/video/jedi.c
+++ b/src/mame/video/jedi.c
@@ -334,8 +334,8 @@ UINT32 jedi_state::screen_update_jedi(screen_device &screen, bitmap_rgb32 &bitma
{
/* draw the background/text layers, followed by the sprites
- it needs to be done in this order*/
- draw_background_and_text(screen.machine(), this, bitmap, cliprect);
- draw_sprites(screen.machine(), this, bitmap, cliprect);
+ draw_background_and_text(machine(), this, bitmap, cliprect);
+ draw_sprites(machine(), this, bitmap, cliprect);
do_pen_lookup(this, bitmap, cliprect);
}
diff --git a/src/mame/video/kan_panb.c b/src/mame/video/kan_panb.c
index dcd39cf8285..19052c8de77 100644
--- a/src/mame/video/kan_panb.c
+++ b/src/mame/video/kan_panb.c
@@ -45,7 +45,7 @@ UINT32 snowbros_state::screen_update_honeydol(screen_device &screen, bitmap_ind1
sy = y;
}
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[1],
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[1],
tile,
tilecolour,
flipx, flipy,
@@ -79,7 +79,7 @@ UINT32 snowbros_state::screen_update_honeydol(screen_device &screen, bitmap_ind1
tilecolour = (tilecolour&0x03f0) >> 4;
tilecolour ^=0x3f; // unusual, but correct..
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[0],
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[0],
tile,
tilecolour,
flipx, flipy,
@@ -134,7 +134,7 @@ UINT32 snowbros_state::screen_update_twinadv(screen_device &screen, bitmap_ind16
tilecolour = (tilecolour&0x00f0) >> 4;
tilecolour ^=0xf; // unusual, but correct..
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[0],
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[0],
tile,
tilecolour,
flipx, flipy,
@@ -149,7 +149,7 @@ UINT32 snowbros_state::screen_update_wintbob(screen_device &screen, bitmap_ind16
UINT16 *spriteram16 = m_bootleg_spriteram16;
int offs;
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
for (offs = 0;offs < m_bootleg_spriteram16.bytes()/2;offs += 8)
{
@@ -176,7 +176,7 @@ UINT32 snowbros_state::screen_update_wintbob(screen_device &screen, bitmap_ind16
if ((xpos > -16) && (ypos > 0) && (xpos < 256) && (ypos < 240) && (disbl !=2))
{
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[0],
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[0],
tilen,
colr,
flipx, flipy,
@@ -216,11 +216,11 @@ UINT32 snowbros_state::screen_update_snowbro3(screen_device &screen, bitmap_ind1
/* This clears & redraws the entire screen each pass */
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
for (offs = 0;offs < m_bootleg_spriteram16.bytes()/2;offs += 8)
{
- gfx_element *gfx = screen.machine().gfx[0];
+ gfx_element *gfx = machine().gfx[0];
int dx = spriteram16[offs+4] & 0xff;
int dy = spriteram16[offs+5] & 0xff;
int tilecolour = spriteram16[offs+3];
@@ -260,7 +260,7 @@ UINT32 snowbros_state::screen_update_snowbro3(screen_device &screen, bitmap_ind1
if (offs < 0x800) /* i guess this is the right way */
{
- gfx = screen.machine().gfx[1];
+ gfx = machine().gfx[1];
tilecolour = 0x10;
}
diff --git a/src/mame/video/kaneko16.c b/src/mame/video/kaneko16.c
index 4df40e41d6f..45b15a1cef4 100644
--- a/src/mame/video/kaneko16.c
+++ b/src/mame/video/kaneko16.c
@@ -48,7 +48,7 @@ UINT32 kaneko16_state::screen_update_common(screen_device &screen, bitmap_ind16
{
int i;
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
if (m_view2_0) m_view2_0->kaneko16_prepare(bitmap, cliprect);
if (m_view2_1) m_view2_1->kaneko16_prepare(bitmap, cliprect);
@@ -68,13 +68,13 @@ UINT32 kaneko16_state::screen_update_common(screen_device &screen, bitmap_ind16
UINT32 kaneko16_state::screen_update_kaneko16(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- kaneko16_fill_bitmap(screen.machine(),bitmap,cliprect);
+ kaneko16_fill_bitmap(machine(),bitmap,cliprect);
// if the display is disabled, do nothing?
if (!m_disp_enable) return 0;
SCREEN_UPDATE16_CALL_MEMBER(common);
- 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;
}
@@ -192,12 +192,12 @@ static void kaneko16_render_15bpp_bitmap(running_machine &machine, bitmap_ind16
UINT32 kaneko16_berlwall_state::screen_update_berlwall(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
// berlwall uses a 15bpp bitmap as a bg, not a solid fill
- kaneko16_render_15bpp_bitmap(screen.machine(),bitmap,cliprect);
+ kaneko16_render_15bpp_bitmap(machine(),bitmap,cliprect);
// if the display is disabled, do nothing?
if (!m_disp_enable) return 0;
SCREEN_UPDATE16_CALL_MEMBER(common);
- 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/video/karnov.c b/src/mame/video/karnov.c
index 60332083a11..5699728f2cf 100644
--- a/src/mame/video/karnov.c
+++ b/src/mame/video/karnov.c
@@ -126,8 +126,8 @@ static void draw_background( running_machine &machine, bitmap_ind16 &bitmap, con
UINT32 karnov_state::screen_update_karnov(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- draw_background(screen.machine(), bitmap, cliprect);
- screen.machine().device<deco_karnovsprites_device>("spritegen")->draw_sprites(screen.machine(), bitmap, cliprect, m_spriteram->buffer(), 0x800, 0);
+ draw_background(machine(), bitmap, cliprect);
+ machine().device<deco_karnovsprites_device>("spritegen")->draw_sprites(machine(), bitmap, cliprect, m_spriteram->buffer(), 0x800, 0);
m_fix_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
}
diff --git a/src/mame/video/kchamp.c b/src/mame/video/kchamp.c
index b6f0e4b23e3..b88fb121b31 100644
--- a/src/mame/video/kchamp.c
+++ b/src/mame/video/kchamp.c
@@ -128,7 +128,7 @@ UINT32 kchamp_state::screen_update_kchamp(screen_device &screen, bitmap_ind16 &b
{
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- kchamp_draw_sprites(screen.machine(), bitmap, cliprect);
+ kchamp_draw_sprites(machine(), bitmap, cliprect);
return 0;
}
@@ -136,6 +136,6 @@ UINT32 kchamp_state::screen_update_kchampvs(screen_device &screen, bitmap_ind16
{
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- kchampvs_draw_sprites(screen.machine(), bitmap, cliprect);
+ kchampvs_draw_sprites(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/video/kickgoal.c b/src/mame/video/kickgoal.c
index 4145e000156..186dd73e49c 100644
--- a/src/mame/video/kickgoal.c
+++ b/src/mame/video/kickgoal.c
@@ -175,7 +175,7 @@ UINT32 kickgoal_state::screen_update_kickgoal(screen_device &screen, bitmap_ind1
m_bg2tm->draw(bitmap, cliprect, 0, 0);
m_bgtm->draw(bitmap, cliprect, 0, 0);
- kickgoal_draw_sprites(screen.machine(), bitmap, cliprect);
+ kickgoal_draw_sprites(machine(), bitmap, cliprect);
m_fgtm->draw(bitmap, cliprect, 0, 0);
diff --git a/src/mame/video/kingobox.c b/src/mame/video/kingobox.c
index 6fc27ca2202..c029a476796 100644
--- a/src/mame/video/kingobox.c
+++ b/src/mame/video/kingobox.c
@@ -245,7 +245,7 @@ UINT32 kingofb_state::screen_update_kingofb(screen_device &screen, bitmap_ind16
m_bg_tilemap->set_scrolly(0, -(*m_scroll_y));
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- kingofb_draw_sprites(screen.machine(), bitmap, cliprect);
+ kingofb_draw_sprites(machine(), bitmap, cliprect);
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
}
@@ -304,7 +304,7 @@ UINT32 kingofb_state::screen_update_ringking(screen_device &screen, bitmap_ind16
m_bg_tilemap->set_scrolly(0, -(*m_scroll_y));
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- ringking_draw_sprites(screen.machine(), bitmap, cliprect);
+ ringking_draw_sprites(machine(), bitmap, cliprect);
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
}
diff --git a/src/mame/video/kncljoe.c b/src/mame/video/kncljoe.c
index 9a6d2d67ce7..7345dc7be0e 100644
--- a/src/mame/video/kncljoe.c
+++ b/src/mame/video/kncljoe.c
@@ -238,6 +238,6 @@ UINT32 kncljoe_state::screen_update_kncljoe(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/video/konamigx.c b/src/mame/video/konamigx.c
index 407a2d82aa2..3867c05a275 100644
--- a/src/mame/video/konamigx.c
+++ b/src/mame/video/konamigx.c
@@ -2433,7 +2433,7 @@ UINT32 konamigx_state::screen_update_konamigx(screen_device &screen, bitmap_rgb3
if (gx_specialrozenable==3)
{
- konamigx_mixer(screen.machine(), bitmap, cliprect, gx_psac_tilemap, GXSUB_8BPP,0,0, 0, 0, gx_rushingheroes_hack);
+ konamigx_mixer(machine(), bitmap, cliprect, gx_psac_tilemap, GXSUB_8BPP,0,0, 0, 0, gx_rushingheroes_hack);
}
// hack, draw the roz tilemap if W is held
// todo: fix so that it works with the mixer without crashing(!)
@@ -2448,11 +2448,11 @@ UINT32 konamigx_state::screen_update_konamigx(screen_device &screen, bitmap_rgb3
else K053936_0_zoom_draw(*type3_roz_temp_bitmap, temprect,gx_psac_tilemap, 0,0,0); // soccerss playfield
- konamigx_mixer(screen.machine(), bitmap, cliprect, 0, 0, 0, 0, 0, type3_roz_temp_bitmap, gx_rushingheroes_hack);
+ konamigx_mixer(machine(), bitmap, cliprect, 0, 0, 0, 0, 0, type3_roz_temp_bitmap, gx_rushingheroes_hack);
}
else
{
- konamigx_mixer(screen.machine(), bitmap, cliprect, 0, 0, 0, 0, 0, 0, gx_rushingheroes_hack);
+ konamigx_mixer(machine(), bitmap, cliprect, 0, 0, 0, 0, 0, 0, gx_rushingheroes_hack);
}
@@ -2460,9 +2460,9 @@ UINT32 konamigx_state::screen_update_konamigx(screen_device &screen, bitmap_rgb3
/* Hack! draw type-1 roz layer here for testing purposes only */
if (gx_specialrozenable == 1)
{
- const pen_t *paldata = screen.machine().pens;
+ const pen_t *paldata = machine().pens;
- if ( screen.machine().input().code_pressed(KEYCODE_W) )
+ if ( machine().input().code_pressed(KEYCODE_W) )
{
int y,x;
@@ -2510,8 +2510,8 @@ UINT32 konamigx_state::screen_update_konamigx_left(screen_device &screen, bitmap
{
UINT32 coldat = m_generic_paletteram_32[offset];
- set_color_555(screen.machine(), offset*2, 0, 5, 10,coldat >> 16);
- set_color_555(screen.machine(), offset*2+1, 0, 5, 10,coldat & 0xffff);
+ set_color_555(machine(), offset*2, 0, 5, 10,coldat >> 16);
+ set_color_555(machine(), offset*2+1, 0, 5, 10,coldat & 0xffff);
}
}
else
@@ -2524,7 +2524,7 @@ UINT32 konamigx_state::screen_update_konamigx_left(screen_device &screen, bitmap
g = (m_generic_paletteram_32[offset] >> 8) & 0xff;
b = (m_generic_paletteram_32[offset] >> 0) & 0xff;
- palette_set_color(screen.machine(),offset,MAKE_RGB(r,g,b));
+ palette_set_color(machine(),offset,MAKE_RGB(r,g,b));
}
}
@@ -2557,8 +2557,8 @@ UINT32 konamigx_state::screen_update_konamigx_right(screen_device &screen, bitma
{
UINT32 coldat = m_subpaletteram32[offset];
- set_color_555(screen.machine(), offset*2, 0, 5, 10,coldat >> 16);
- set_color_555(screen.machine(), offset*2+1, 0, 5, 10,coldat & 0xffff);
+ set_color_555(machine(), offset*2, 0, 5, 10,coldat >> 16);
+ set_color_555(machine(), offset*2+1, 0, 5, 10,coldat & 0xffff);
}
}
else
@@ -2571,7 +2571,7 @@ UINT32 konamigx_state::screen_update_konamigx_right(screen_device &screen, bitma
g = (m_subpaletteram32[offset] >> 8) & 0xff;
b = (m_subpaletteram32[offset] >> 0) & 0xff;
- palette_set_color(screen.machine(),offset,MAKE_RGB(r,g,b));
+ palette_set_color(machine(),offset,MAKE_RGB(r,g,b));
}
}
diff --git a/src/mame/video/ksayakyu.c b/src/mame/video/ksayakyu.c
index 65eb2893346..b1c21aa9a6e 100644
--- a/src/mame/video/ksayakyu.c
+++ b/src/mame/video/ksayakyu.c
@@ -129,6 +129,6 @@ UINT32 ksayakyu_state::screen_update_ksayakyu(screen_device &screen, bitmap_ind1
m_tilemap->draw(bitmap, cliprect, 0, 0);
m_textmap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/video/kyugo.c b/src/mame/video/kyugo.c
index dda41eddc6a..8e50fe8249f 100644
--- a/src/mame/video/kyugo.c
+++ b/src/mame/video/kyugo.c
@@ -220,7 +220,7 @@ UINT32 kyugo_state::screen_update_kyugo(screen_device &screen, bitmap_ind16 &bit
m_bg_tilemap->set_scrolly(0, m_scroll_y);
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/video/labyrunr.c b/src/mame/video/labyrunr.c
index a02f8b7deae..aff17d31dd5 100644
--- a/src/mame/video/labyrunr.c
+++ b/src/mame/video/labyrunr.c
@@ -178,14 +178,14 @@ WRITE8_MEMBER(labyrunr_state::labyrunr_vram2_w)
UINT32 labyrunr_state::screen_update_labyrunr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- address_space &space = screen.machine().driver_data()->generic_space();
+ address_space &space = machine().driver_data()->generic_space();
UINT8 ctrl_0 = k007121_ctrlram_r(m_k007121, space, 0);
rectangle finalclip0, finalclip1;
- set_pens(screen.machine());
+ set_pens(machine());
- screen.machine().priority_bitmap.fill(0, cliprect);
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
if (~k007121_ctrlram_r(m_k007121, space, 3) & 0x20)
{
@@ -210,7 +210,7 @@ UINT32 labyrunr_state::screen_update_labyrunr(screen_device &screen, bitmap_ind1
}
m_layer0->draw(bitmap, finalclip0, TILEMAP_DRAW_OPAQUE, 0);
- k007121_sprites_draw(m_k007121, bitmap, cliprect, screen.machine().gfx[0], screen.machine().colortable, m_spriteram,(k007121_ctrlram_r(m_k007121, space, 6) & 0x30) * 2, 40,0,(k007121_ctrlram_r(m_k007121, space, 3) & 0x40) >> 5);
+ k007121_sprites_draw(m_k007121, bitmap, cliprect, machine().gfx[0], machine().colortable, m_spriteram,(k007121_ctrlram_r(m_k007121, space, 6) & 0x30) * 2, 40,0,(k007121_ctrlram_r(m_k007121, space, 3) & 0x40) >> 5);
/* we ignore the transparency because layer1 is drawn only at the top of the screen also covering sprites */
m_layer1->draw(bitmap, finalclip1, TILEMAP_DRAW_OPAQUE, 0);
}
@@ -280,7 +280,7 @@ UINT32 labyrunr_state::screen_update_labyrunr(screen_device &screen, bitmap_ind1
if(use_clip3[1])
m_layer1->draw(bitmap, finalclip3, 0, 1);
- k007121_sprites_draw(m_k007121, bitmap, cliprect, screen.machine().gfx[0], screen.machine().colortable, m_spriteram, (k007121_ctrlram_r(m_k007121, space, 6) & 0x30) * 2,40,0,(k007121_ctrlram_r(m_k007121, space, 3) & 0x40) >> 5);
+ k007121_sprites_draw(m_k007121, bitmap, cliprect, machine().gfx[0], machine().colortable, m_spriteram, (k007121_ctrlram_r(m_k007121, space, 6) & 0x30) * 2,40,0,(k007121_ctrlram_r(m_k007121, space, 3) & 0x40) >> 5);
}
return 0;
}
diff --git a/src/mame/video/ladybug.c b/src/mame/video/ladybug.c
index 1d8bf73e888..ae0cf3c51de 100644
--- a/src/mame/video/ladybug.c
+++ b/src/mame/video/ladybug.c
@@ -297,7 +297,7 @@ UINT32 ladybug_state::screen_update_ladybug(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;
}
@@ -305,7 +305,7 @@ void ladybug_state::screen_eof_sraider(screen_device &screen, bool state)/* upda
{
// falling edge
if (!state)
- redclash_update_stars_state(screen.machine());
+ redclash_update_stars_state(machine());
}
UINT32 ladybug_state::screen_update_sraider(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
@@ -333,12 +333,12 @@ UINT32 ladybug_state::screen_update_sraider(screen_device &screen, bitmap_ind16
// draw the stars
if (flip_screen())
- redclash_draw_stars(screen.machine(), bitmap, cliprect, 0x60, 1, 0x27, 0xff);
+ redclash_draw_stars(machine(), bitmap, cliprect, 0x60, 1, 0x27, 0xff);
else
- redclash_draw_stars(screen.machine(), bitmap, cliprect, 0x60, 1, 0x00, 0xd8);
+ redclash_draw_stars(machine(), bitmap, cliprect, 0x60, 1, 0x00, 0xd8);
// draw the gridlines
- colortable_palette_set_color(screen.machine().colortable, 0x40, MAKE_RGB(m_grid_color & 0x40 ? 0xff : 0,
+ colortable_palette_set_color(machine().colortable, 0x40, MAKE_RGB(m_grid_color & 0x40 ? 0xff : 0,
m_grid_color & 0x20 ? 0xff : 0,
m_grid_color & 0x10 ? 0xff : 0));
m_grid_tilemap->draw(bitmap, cliprect, 0, flip_screen());
@@ -361,7 +361,7 @@ UINT32 ladybug_state::screen_update_sraider(screen_device &screen, bitmap_ind16
m_bg_tilemap->draw(bitmap, cliprect, 0, flip_screen());
// now the sprites
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/video/ladyfrog.c b/src/mame/video/ladyfrog.c
index 0bf49c4f50b..d0b3fabd9d8 100644
--- a/src/mame/video/ladyfrog.c
+++ b/src/mame/video/ladyfrog.c
@@ -161,6 +161,6 @@ UINT32 ladyfrog_state::screen_update_ladyfrog(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/video/lasso.c b/src/mame/video/lasso.c
index f6dcf34c18e..43f534416b6 100644
--- a/src/mame/video/lasso.c
+++ b/src/mame/video/lasso.c
@@ -361,23 +361,23 @@ static void draw_lasso( running_machine &machine, bitmap_ind16 &bitmap, const re
UINT32 lasso_state::screen_update_lasso(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- palette_set_color(screen.machine(), 0, get_color(*m_back_color));
+ palette_set_color(machine(), 0, get_color(*m_back_color));
bitmap.fill(0, cliprect);
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_lasso(screen.machine(), bitmap, cliprect);
- draw_sprites(screen.machine(), bitmap, cliprect, 0);
+ draw_lasso(machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect, 0);
return 0;
}
UINT32 lasso_state::screen_update_chameleo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- palette_set_color(screen.machine(), 0, get_color(*m_back_color));
+ palette_set_color(machine(), 0, get_color(*m_back_color));
bitmap.fill(0, cliprect);
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 0);
+ draw_sprites(machine(), bitmap, cliprect, 0);
return 0;
}
@@ -385,8 +385,8 @@ UINT32 lasso_state::screen_update_chameleo(screen_device &screen, bitmap_ind16 &
UINT32 lasso_state::screen_update_wwjgtin(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- colortable_palette_set_color(screen.machine().colortable, 0, get_color(*m_back_color));
- wwjgtin_set_last_four_colors(screen.machine(), screen.machine().colortable);
+ colortable_palette_set_color(machine().colortable, 0, get_color(*m_back_color));
+ wwjgtin_set_last_four_colors(machine(), machine().colortable);
m_track_tilemap->set_scrollx(0, m_track_scroll[0] + m_track_scroll[1] * 256);
m_track_tilemap->set_scrolly(0, m_track_scroll[2] + m_track_scroll[3] * 256);
@@ -394,9 +394,9 @@ UINT32 lasso_state::screen_update_wwjgtin(screen_device &screen, bitmap_ind16 &b
if (m_track_enable)
m_track_tilemap->draw(bitmap, cliprect, 0, 0);
else
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
- draw_sprites(screen.machine(), bitmap, cliprect, 1); // reverse order
+ draw_sprites(machine(), bitmap, cliprect, 1); // reverse order
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
diff --git a/src/mame/video/lastduel.c b/src/mame/video/lastduel.c
index 7af80556dbd..31778382de9 100644
--- a/src/mame/video/lastduel.c
+++ b/src/mame/video/lastduel.c
@@ -260,9 +260,9 @@ UINT32 lastduel_state::screen_update_lastduel(screen_device &screen, bitmap_ind1
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
m_fg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 0);
+ draw_sprites(machine(), bitmap, cliprect, 0);
m_fg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 1);
+ draw_sprites(machine(), bitmap, cliprect, 1);
m_tx_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
}
@@ -273,18 +273,18 @@ UINT32 lastduel_state::screen_update_madgear(screen_device &screen, bitmap_ind16
if (m_tilemap_priority)
{
m_fg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | TILEMAP_DRAW_OPAQUE, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 0);
+ draw_sprites(machine(), bitmap, cliprect, 0);
m_fg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0);
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 1);
+ draw_sprites(machine(), bitmap, cliprect, 1);
}
else
{
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0);
m_fg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 0);
+ draw_sprites(machine(), bitmap, cliprect, 0);
m_fg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 1);
+ draw_sprites(machine(), bitmap, cliprect, 1);
}
m_tx_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
diff --git a/src/mame/video/lazercmd.c b/src/mame/video/lazercmd.c
index c9e99c5fe7d..6a0ad4dfeca 100644
--- a/src/mame/video/lazercmd.c
+++ b/src/mame/video/lazercmd.c
@@ -54,7 +54,7 @@ UINT32 lazercmd_state::screen_update_lazercmd(screen_device &screen, bitmap_ind1
{
int i, x, y;
- int video_inverted = screen.machine().root_device().ioport("DSW")->read() & 0x20;
+ int video_inverted = machine().root_device().ioport("DSW")->read() & 0x20;
/* The first row of characters are invisible */
for (i = 0; i < (VERT_RES - 1) * HORZ_RES; i++)
@@ -67,7 +67,7 @@ UINT32 lazercmd_state::screen_update_lazercmd(screen_device &screen, bitmap_ind1
sx *= HORZ_CHR;
sy *= VERT_CHR;
- drawgfx_opaque(bitmap, cliprect,screen.machine().gfx[0],
+ drawgfx_opaque(bitmap, cliprect,machine().gfx[0],
m_videoram[i], video_inverted ? 1 : 0,
0,0,
sx,sy);
@@ -75,7 +75,7 @@ UINT32 lazercmd_state::screen_update_lazercmd(screen_device &screen, bitmap_ind1
x = m_marker_x - 1; /* normal video lags marker by 1 pixel */
y = vert_scale(m_marker_y) - VERT_CHR; /* first line used as scratch pad */
- plot_pattern(screen.machine(), bitmap, x, y);
+ plot_pattern(machine(), bitmap, x, y);
return 0;
}
diff --git a/src/mame/video/legionna.c b/src/mame/video/legionna.c
index 4ae69d68374..5cf7d713d2b 100644
--- a/src/mame/video/legionna.c
+++ b/src/mame/video/legionna.c
@@ -421,8 +421,8 @@ UINT32 legionna_state::screen_update_legionna(screen_device &screen, bitmap_ind1
m_text_layer->set_scrollx(0, 0/*m_scrollram16[6]*/ );
m_text_layer->set_scrolly(0, 0/*m_scrollram16[7]*/ );
- screen.machine().priority_bitmap.fill(0, cliprect);
- bitmap.fill(get_black_pen(screen.machine()), cliprect); /* wrong color? */
+ machine().priority_bitmap.fill(0, cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect); /* wrong color? */
/* m_layer_disable is a guess based on 'stage 1' screen in heatbrl */
@@ -431,7 +431,7 @@ UINT32 legionna_state::screen_update_legionna(screen_device &screen, bitmap_ind1
if (!(m_layer_disable&0x0002)) m_background_layer->draw(bitmap, cliprect, 0, 1);
if (!(m_layer_disable&0x0001)) m_text_layer->draw(bitmap, cliprect, 0, 2);
- draw_sprites(screen.machine(),bitmap,cliprect);
+ draw_sprites(machine(),bitmap,cliprect);
return 0;
@@ -454,14 +454,14 @@ UINT32 legionna_state::screen_update_godzilla(screen_device &screen, bitmap_ind1
bitmap.fill(0x0200, cliprect);
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
if (!(m_layer_disable&0x0001)) m_background_layer->draw(bitmap, cliprect, 0,0);
if (!(m_layer_disable&0x0002)) m_midground_layer->draw(bitmap, cliprect, 0,0);
if (!(m_layer_disable&0x0004)) m_foreground_layer->draw(bitmap, cliprect, 0,1);
if (!(m_layer_disable&0x0008)) m_text_layer->draw(bitmap, cliprect, 0,2);
- draw_sprites(screen.machine(),bitmap,cliprect);
+ draw_sprites(machine(),bitmap,cliprect);
return 0;
}
@@ -478,8 +478,8 @@ UINT32 legionna_state::screen_update_grainbow(screen_device &screen, bitmap_ind1
m_text_layer->set_scrollx(0, 0/*m_scrollram16[6]*/ );
m_text_layer->set_scrolly(0, 0/*m_scrollram16[7]*/ );
- 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);
if(!(m_layer_disable & 1))
m_background_layer->draw(bitmap, cliprect, 0,1);
@@ -493,7 +493,7 @@ UINT32 legionna_state::screen_update_grainbow(screen_device &screen, bitmap_ind1
if(!(m_layer_disable & 8))
m_text_layer->draw(bitmap, cliprect, 0,8);
- draw_sprites(screen.machine(),bitmap,cliprect);
+ draw_sprites(machine(),bitmap,cliprect);
return 0;
}
diff --git a/src/mame/video/leland.c b/src/mame/video/leland.c
index 122902926d6..770d17c4eab 100644
--- a/src/mame/video/leland.c
+++ b/src/mame/video/leland.c
@@ -389,8 +389,8 @@ UINT32 leland_state::screen_update_leland(screen_device &screen, bitmap_ind16 &b
{
int y;
- const UINT8 *bg_prom = screen.machine().root_device().memregion("user1")->base();
- const UINT8 *bg_gfx = screen.machine().root_device().memregion("gfx1")->base();
+ const UINT8 *bg_prom = machine().root_device().memregion("user1")->base();
+ const UINT8 *bg_gfx = machine().root_device().memregion("gfx1")->base();
offs_t bg_gfx_bank_page_size = memregion("gfx1")->bytes() / 3;
offs_t char_bank = (((m_gfxbank >> 4) & 0x03) * 0x2000) & (bg_gfx_bank_page_size - 1);
offs_t prom_bank = ((m_gfxbank >> 3) & 0x01) * 0x2000;
@@ -457,7 +457,7 @@ UINT32 leland_state::screen_update_ataxx(screen_device &screen, bitmap_ind16 &bi
{
int y;
- const UINT8 *bg_gfx = screen.machine().root_device().memregion("gfx1")->base();
+ const UINT8 *bg_gfx = machine().root_device().memregion("gfx1")->base();
offs_t bg_gfx_bank_page_size = memregion("gfx1")->bytes() / 6;
offs_t bg_gfx_offs_mask = bg_gfx_bank_page_size - 1;
diff --git a/src/mame/video/lemmings.c b/src/mame/video/lemmings.c
index 01a801c9a09..19e677d52ec 100644
--- a/src/mame/video/lemmings.c
+++ b/src/mame/video/lemmings.c
@@ -136,31 +136,31 @@ UINT32 lemmings_state::screen_update_lemmings(screen_device &screen, bitmap_rgb3
rect.max_y = cliprect.max_y;
rect.min_y = cliprect.min_y;
- screen.machine().device<decospr_device>("spritegen")->draw_sprites(bitmap, cliprect, m_sprite_triple_buffer_1, 0x400, true);
- screen.machine().device<decospr_device>("spritegen2")->draw_sprites(bitmap, cliprect, m_sprite_triple_buffer_0, 0x400, true);
+ machine().device<decospr_device>("spritegen")->draw_sprites(bitmap, cliprect, m_sprite_triple_buffer_1, 0x400, true);
+ machine().device<decospr_device>("spritegen2")->draw_sprites(bitmap, cliprect, m_sprite_triple_buffer_0, 0x400, true);
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
- screen.machine().device<decospr_device>("spritegen")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0800, 0x0800, 0x300, 0xff);
+ bitmap.fill(get_black_pen(machine()), cliprect);
+ machine().device<decospr_device>("spritegen")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0800, 0x0800, 0x300, 0xff);
/* Pixel layer can be windowed in hardware (two player mode) */
if ((m_control_data[6] & 2) == 0)
{
- lemmings_copy_bitmap(screen.machine(), bitmap, m_bitmap0, &x1, &y, cliprect);
+ lemmings_copy_bitmap(machine(), bitmap, m_bitmap0, &x1, &y, cliprect);
}
else
{
rect.max_x = 159;
rect.min_x = 0;
- lemmings_copy_bitmap(screen.machine(), bitmap, m_bitmap0, &x0, &y, rect);
+ lemmings_copy_bitmap(machine(), bitmap, m_bitmap0, &x0, &y, rect);
rect.max_x = 319;
rect.min_x = 160;
- lemmings_copy_bitmap(screen.machine(), bitmap, m_bitmap0, &x1, &y, rect);
+ lemmings_copy_bitmap(machine(), bitmap, m_bitmap0, &x1, &y, rect);
}
- screen.machine().device<decospr_device>("spritegen2")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0800, 0x0800, 0x200, 0xff);
- screen.machine().device<decospr_device>("spritegen")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0000, 0x0800, 0x300, 0xff);
+ machine().device<decospr_device>("spritegen2")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0800, 0x0800, 0x200, 0xff);
+ machine().device<decospr_device>("spritegen")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0000, 0x0800, 0x300, 0xff);
m_vram_tilemap->draw(bitmap, cliprect, 0, 0);
- screen.machine().device<decospr_device>("spritegen2")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0000, 0x0800, 0x200, 0xff);
+ machine().device<decospr_device>("spritegen2")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0000, 0x0800, 0x200, 0xff);
return 0;
}
diff --git a/src/mame/video/lethal.c b/src/mame/video/lethal.c
index fb5b36adf48..f2d13a0de64 100644
--- a/src/mame/video/lethal.c
+++ b/src/mame/video/lethal.c
@@ -104,7 +104,7 @@ UINT32 lethal_state::screen_update_lethalen(screen_device &screen, bitmap_ind16
{
bitmap.fill(7168, cliprect);
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
k056832_tilemap_draw(m_k056832, bitmap, cliprect, 3, K056832_DRAW_FLAG_MIRROR, 1);
k056832_tilemap_draw(m_k056832, bitmap, cliprect, 2, K056832_DRAW_FLAG_MIRROR, 2);
diff --git a/src/mame/video/liberate.c b/src/mame/video/liberate.c
index 22bd68bd9a1..8374dc00c71 100644
--- a/src/mame/video/liberate.c
+++ b/src/mame/video/liberate.c
@@ -510,7 +510,7 @@ UINT32 liberate_state::screen_update_prosoccr(screen_device &screen, bitmap_ind1
m_back_tilemap->draw(bitmap, cliprect, 0, 0);
m_fix_tilemap->draw(bitmap, cliprect, 0, 0);
- prosoccr_draw_sprites(screen.machine(), bitmap, cliprect);
+ prosoccr_draw_sprites(machine(), bitmap, cliprect);
return 0;
}
@@ -549,11 +549,11 @@ UINT32 liberate_state::screen_update_prosport(screen_device &screen, bitmap_ind1
my = (offs) % 32;
mx = (offs) / 32;
- drawgfx_transpen(bitmap, cliprect,screen.machine().gfx[gfx_region],
+ drawgfx_transpen(bitmap, cliprect,machine().gfx[gfx_region],
tile, 1, 0, 0, 248 - 8 * mx, 8 * my, 0);
}
- prosport_draw_sprites(screen.machine(), bitmap, cliprect);
+ prosport_draw_sprites(machine(), bitmap, cliprect);
return 0;
}
@@ -568,11 +568,11 @@ UINT32 liberate_state::screen_update_boomrang(screen_device &screen, bitmap_ind1
else
m_back_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0);
- boomrang_draw_sprites(screen.machine(),bitmap,cliprect,8);
+ boomrang_draw_sprites(machine(),bitmap,cliprect,8);
if (!m_background_disable)
m_back_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0);
- boomrang_draw_sprites(screen.machine(), bitmap, cliprect, 0);
+ boomrang_draw_sprites(machine(), bitmap, cliprect, 0);
m_fix_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
}
@@ -587,7 +587,7 @@ UINT32 liberate_state::screen_update_liberate(screen_device &screen, bitmap_ind1
else
m_back_tilemap->draw(bitmap, cliprect, 0, 0);
- liberate_draw_sprites(screen.machine(), bitmap, cliprect);
+ liberate_draw_sprites(machine(), bitmap, cliprect);
m_fix_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
}
diff --git a/src/mame/video/lkage.c b/src/mame/video/lkage.c
index a0af65a4a0f..91d1c60c17b 100644
--- a/src/mame/video/lkage.c
+++ b/src/mame/video/lkage.c
@@ -209,13 +209,13 @@ UINT32 lkage_state::screen_update_lkage(screen_device &screen, bitmap_ind16 &bit
m_bg_tilemap->set_scrollx(0, m_scroll[4]);
m_bg_tilemap->set_scrolly(0, m_scroll[5]);
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
if ((m_vreg[2] & 0xf0) == 0xf0)
{
m_bg_tilemap->draw(bitmap, cliprect, 0, 1);
m_fg_tilemap->draw(bitmap, cliprect, 0, (m_vreg[1] & 2) ? 2 : 4);
m_tx_tilemap->draw(bitmap, cliprect, 0, 4);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
}
else
{
diff --git a/src/mame/video/lockon.c b/src/mame/video/lockon.c
index cfe26d55002..b2e172b0821 100644
--- a/src/mame/video/lockon.c
+++ b/src/mame/video/lockon.c
@@ -926,18 +926,18 @@ UINT32 lockon_state::screen_update_lockon(screen_device &screen, bitmap_ind16 &b
/* If screen output is disabled, fill with black */
if (!BIT(m_ctrl_reg, 7))
{
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
return 0;
}
/* Scan out the frame buffer in rotated order */
- rotate_draw(screen.machine(), bitmap, cliprect);
+ rotate_draw(machine(), bitmap, cliprect);
/* Draw the character tilemap */
m_tilemap->draw(bitmap, cliprect, 0, 0);
/* Draw the HUD */
- hud_draw(screen.machine(), bitmap, cliprect);
+ hud_draw(machine(), bitmap, cliprect);
return 0;
}
@@ -954,8 +954,8 @@ void lockon_state::screen_eof_lockon(screen_device &screen, bool state)
m_back_buffer = tmp;
/* Draw the frame buffer layers */
- scene_draw(screen.machine());
- ground_draw(screen.machine());
- objects_draw(screen.machine());
+ scene_draw(machine());
+ ground_draw(machine());
+ objects_draw(machine());
}
}
diff --git a/src/mame/video/lordgun.c b/src/mame/video/lordgun.c
index d849b7eba71..e6ed3786244 100644
--- a/src/mame/video/lordgun.c
+++ b/src/mame/video/lordgun.c
@@ -322,22 +322,22 @@ UINT32 lordgun_state::screen_update_lordgun(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 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 (screen.machine().input().code_pressed(KEYCODE_A)) msk |= 16;
+ 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 (machine().input().code_pressed(KEYCODE_A)) msk |= 16;
if (msk != 0) layers_ctrl &= msk;
}
#endif
if (m_whitescreen)
{
- bitmap.fill(get_white_pen(screen.machine()), cliprect);
+ bitmap.fill(get_white_pen(machine()), cliprect);
return 0;
}
@@ -373,7 +373,7 @@ UINT32 lordgun_state::screen_update_lordgun(screen_device &screen, bitmap_ind16
if (layers_ctrl & 2) m_tilemap[1]->draw(*m_bitmaps[1], cliprect, 0, 0);
if (layers_ctrl & 4) m_tilemap[2]->draw(*m_bitmaps[2], cliprect, 0, 0);
if (layers_ctrl & 8) m_tilemap[3]->draw(*m_bitmaps[3], cliprect, 0, 0);
- if (layers_ctrl & 16) draw_sprites(screen.machine(), *m_bitmaps[4], cliprect);
+ if (layers_ctrl & 16) draw_sprites(machine(), *m_bitmaps[4], cliprect);
// copy to screen bitmap
diff --git a/src/mame/video/lsasquad.c b/src/mame/video/lsasquad.c
index c875b95b584..4371761dd1a 100644
--- a/src/mame/video/lsasquad.c
+++ b/src/mame/video/lsasquad.c
@@ -202,10 +202,10 @@ UINT32 lsasquad_state::screen_update_lsasquad(screen_device &screen, bitmap_ind1
{
bitmap.fill(511, cliprect);
- draw_layer(screen.machine(), bitmap, cliprect, m_scrollram + 0x000);
- draw_layer(screen.machine(), bitmap, cliprect, m_scrollram + 0x080);
- draw_sprites(screen.machine(), bitmap, cliprect);
- draw_layer(screen.machine(), bitmap, cliprect, m_scrollram + 0x100);
+ draw_layer(machine(), bitmap, cliprect, m_scrollram + 0x000);
+ draw_layer(machine(), bitmap, cliprect, m_scrollram + 0x080);
+ draw_sprites(machine(), bitmap, cliprect);
+ draw_layer(machine(), bitmap, cliprect, m_scrollram + 0x100);
return 0;
}
@@ -213,8 +213,8 @@ UINT32 lsasquad_state::screen_update_lsasquad(screen_device &screen, bitmap_ind1
UINT32 lsasquad_state::screen_update_daikaiju(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
bitmap.fill(511, cliprect);
- drawbg(screen.machine(), bitmap, cliprect, 0); // bottom
- draw_sprites(screen.machine(), bitmap, cliprect);
- drawbg(screen.machine(), bitmap, cliprect, 1); // top = palette $d ?
+ drawbg(machine(), bitmap, cliprect, 0); // bottom
+ draw_sprites(machine(), bitmap, cliprect);
+ drawbg(machine(), bitmap, cliprect, 1); // top = palette $d ?
return 0;
}
diff --git a/src/mame/video/lwings.c b/src/mame/video/lwings.c
index a8045206b88..e8b7a915fc7 100644
--- a/src/mame/video/lwings.c
+++ b/src/mame/video/lwings.c
@@ -261,7 +261,7 @@ UINT32 lwings_state::screen_update_lwings(screen_device &screen, bitmap_ind16 &b
{
m_bg1_tilemap->draw(bitmap, cliprect, 0, 0);
- lwings_draw_sprites(screen.machine(), bitmap, cliprect);
+ lwings_draw_sprites(machine(), bitmap, cliprect);
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
}
@@ -271,7 +271,7 @@ UINT32 lwings_state::screen_update_trojan(screen_device &screen, bitmap_ind16 &b
m_bg2_tilemap->draw(bitmap, cliprect, 0, 0);
m_bg1_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0);
- trojan_draw_sprites(screen.machine(), bitmap, cliprect);
+ trojan_draw_sprites(machine(), bitmap, cliprect);
m_bg1_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0);
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
diff --git a/src/mame/video/m10.c b/src/mame/video/m10.c
index 4eed90ddda5..4e5cf2f2ced 100644
--- a/src/mame/video/m10.c
+++ b/src/mame/video/m10.c
@@ -150,7 +150,7 @@ UINT32 m10_state::screen_update_m10(screen_device &screen, bitmap_ind16 &bitmap,
int y;
for (y = IREMM10_VBEND; y < IREMM10_VBSTART; y++)
- plot_pixel_m10(screen.machine(), bitmap, 16, y, 1);
+ plot_pixel_m10(machine(), bitmap, 16, y, 1);
}
for (offs = m_videoram.bytes() - 1; offs >= 0; offs--)
diff --git a/src/mame/video/m107.c b/src/mame/video/m107.c
index 6a566225650..9f28ef582ea 100644
--- a/src/mame/video/m107.c
+++ b/src/mame/video/m107.c
@@ -382,8 +382,8 @@ WRITE16_MEMBER(m107_state::m107_spritebuffer_w)
UINT32 m107_state::screen_update_m107(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- m107_update_scroll_positions(screen.machine());
- m107_screenrefresh(screen.machine(), bitmap, cliprect);
+ m107_update_scroll_positions(machine());
+ m107_screenrefresh(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/video/m52.c b/src/mame/video/m52.c
index c4a49795470..2d981e82076 100644
--- a/src/mame/video/m52.c
+++ b/src/mame/video/m52.c
@@ -360,13 +360,13 @@ UINT32 m52_state::screen_update_m52(screen_device &screen, bitmap_ind16 &bitmap,
if (!(m_bgcontrol & 0x20))
{
if (!(m_bgcontrol & 0x10))
- draw_background(screen.machine(), bitmap, cliprect, m_bg2xpos, m_bg2ypos, 2); /* distant mountains */
+ draw_background(machine(), bitmap, cliprect, m_bg2xpos, m_bg2ypos, 2); /* distant mountains */
if (!(m_bgcontrol & 0x02))
- draw_background(screen.machine(), bitmap, cliprect, m_bg1xpos, m_bg1ypos, 3); /* hills */
+ draw_background(machine(), bitmap, cliprect, m_bg1xpos, m_bg1ypos, 3); /* hills */
if (!(m_bgcontrol & 0x04))
- draw_background(screen.machine(), bitmap, cliprect, m_bg1xpos, m_bg1ypos, 4); /* cityscape */
+ draw_background(machine(), bitmap, cliprect, m_bg1xpos, m_bg1ypos, 4); /* cityscape */
}
m_bg_tilemap->set_flip(flip_screen() ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0);
@@ -413,9 +413,9 @@ UINT32 m52_state::screen_update_m52(screen_device &screen, bitmap_ind16 &bitmap,
clip = cliprect;
#endif
- drawgfx_transmask(bitmap, clip, screen.machine().gfx[1],
+ drawgfx_transmask(bitmap, clip, machine().gfx[1],
code, color, flipx, flipy, sx, sy,
- colortable_get_transpen_mask(screen.machine().colortable, screen.machine().gfx[1], color, 512 + 32));
+ colortable_get_transpen_mask(machine().colortable, machine().gfx[1], color, 512 + 32));
}
return 0;
}
diff --git a/src/mame/video/m57.c b/src/mame/video/m57.c
index a98e15f9df0..45c4b9f10eb 100644
--- a/src/mame/video/m57.c
+++ b/src/mame/video/m57.c
@@ -266,7 +266,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
UINT32 m57_state::screen_update_m57(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- draw_background(screen.machine(), bitmap, cliprect);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_background(machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/video/m58.c b/src/mame/video/m58.c
index 0146a792b1b..d39f0ca16ea 100644
--- a/src/mame/video/m58.c
+++ b/src/mame/video/m58.c
@@ -307,7 +307,7 @@ UINT32 m58_state::screen_update_yard(screen_device &screen, bitmap_ind16 &bitmap
m_bg_tilemap->set_scrolly(0, *m_yard_scroll_y_low);
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect);
- draw_panel(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
+ draw_panel(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/video/m62.c b/src/mame/video/m62.c
index 316ea167af2..2e7fc535a81 100644
--- a/src/mame/video/m62.c
+++ b/src/mame/video/m62.c
@@ -475,7 +475,7 @@ UINT32 m62_state::screen_update_kungfum(screen_device &screen, bitmap_ind16 &bit
m_bg_tilemap->set_scrollx(i, m_m62_background_hscroll);
}
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 0x1f, 0x00, 0x00);
+ draw_sprites(machine(), bitmap, cliprect, 0x1f, 0x00, 0x00);
m_bg_tilemap->draw(bitmap, cliprect, 1, 0);
return 0;
}
@@ -515,9 +515,9 @@ UINT32 m62_state::screen_update_ldrun(screen_device &screen, bitmap_ind16 &bitma
m_bg_tilemap->set_scrolly(0, m_m62_background_vscroll);
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 0x0f, 0x10, 0x00);
+ draw_sprites(machine(), bitmap, cliprect, 0x0f, 0x10, 0x00);
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 0x0f, 0x10, 0x10);
+ draw_sprites(machine(), bitmap, cliprect, 0x0f, 0x10, 0x10);
return 0;
}
@@ -563,11 +563,11 @@ UINT32 m62_state::screen_update_ldrun3(screen_device &screen, bitmap_ind16 &bitm
my_cliprect.min_y = 0 * 8;
my_cliprect.max_y = 1 * 8 - 1;
- bitmap.fill(get_black_pen(screen.machine()), my_cliprect);
+ bitmap.fill(get_black_pen(machine()), my_cliprect);
my_cliprect.min_y = 31 * 8;
my_cliprect.max_y = 32 * 8 - 1;
- bitmap.fill(get_black_pen(screen.machine()), my_cliprect);
+ bitmap.fill(get_black_pen(machine()), my_cliprect);
}
return 0;
@@ -619,9 +619,9 @@ UINT32 m62_state::screen_update_battroad(screen_device &screen, bitmap_ind16 &bi
m_fg_tilemap->set_transparent_pen(0);
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 0x0f, 0x10, 0x00);
+ draw_sprites(machine(), bitmap, cliprect, 0x0f, 0x10, 0x00);
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 0x0f, 0x10, 0x10);
+ draw_sprites(machine(), bitmap, cliprect, 0x0f, 0x10, 0x10);
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
}
@@ -648,7 +648,7 @@ UINT32 m62_state::screen_update_ldrun4(screen_device &screen, bitmap_ind16 &bitm
m_bg_tilemap->set_scrollx(0, m_m62_background_hscroll - 2);
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 0x1f, 0x00, 0x00);
+ draw_sprites(machine(), bitmap, cliprect, 0x1f, 0x00, 0x00);
return 0;
}
@@ -693,7 +693,7 @@ UINT32 m62_state::screen_update_lotlot(screen_device &screen, bitmap_ind16 &bitm
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 0x1f, 0x00, 0x00);
+ draw_sprites(machine(), bitmap, cliprect, 0x1f, 0x00, 0x00);
return 0;
}
@@ -756,7 +756,7 @@ UINT32 m62_state::screen_update_kidniki(screen_device &screen, bitmap_ind16 &bit
m_fg_tilemap->set_transparent_pen(0);
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 0x1f, 0x00, 0x00);
+ draw_sprites(machine(), bitmap, cliprect, 0x1f, 0x00, 0x00);
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0);
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
@@ -807,7 +807,7 @@ UINT32 m62_state::screen_update_spelunkr(screen_device &screen, bitmap_ind16 &bi
m_fg_tilemap->set_transparent_pen(0);
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 0x1f, 0x00, 0x00);
+ draw_sprites(machine(), bitmap, cliprect, 0x1f, 0x00, 0x00);
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
}
@@ -849,7 +849,7 @@ UINT32 m62_state::screen_update_spelunk2(screen_device &screen, bitmap_ind16 &bi
m_fg_tilemap->set_transparent_pen(0);
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 0x1f, 0x00, 0x00);
+ draw_sprites(machine(), bitmap, cliprect, 0x1f, 0x00, 0x00);
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
}
@@ -893,7 +893,7 @@ UINT32 m62_state::screen_update_youjyudn(screen_device &screen, bitmap_ind16 &bi
m_fg_tilemap->set_transparent_pen(0);
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 0x1f, 0x00, 0x00);
+ draw_sprites(machine(), bitmap, cliprect, 0x1f, 0x00, 0x00);
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0);
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
@@ -934,7 +934,7 @@ UINT32 m62_state::screen_update_horizon(screen_device &screen, bitmap_ind16 &bit
m_bg_tilemap->set_scrollx(i, m_scrollram[i << 1] | (m_scrollram[(i << 1) | 1] << 8));
}
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 0x1f, 0x00, 0x00);
+ draw_sprites(machine(), bitmap, cliprect, 0x1f, 0x00, 0x00);
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0);
return 0;
}
diff --git a/src/mame/video/m72.c b/src/mame/video/m72.c
index 642e1d9e50d..953f43862fc 100644
--- a/src/mame/video/m72.c
+++ b/src/mame/video/m72.c
@@ -519,7 +519,7 @@ UINT32 m72_state::screen_update_m72(screen_device &screen, bitmap_ind16 &bitmap,
{
if (m_video_off)
{
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
return 0;
}
@@ -531,7 +531,7 @@ UINT32 m72_state::screen_update_m72(screen_device &screen, bitmap_ind16 &bitmap,
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1,0);
m_fg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1,0);
- m72_draw_sprites(screen.machine(), bitmap,cliprect);
+ m72_draw_sprites(machine(), bitmap,cliprect);
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0,0);
m_fg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0,0);
return 0;
@@ -544,7 +544,7 @@ UINT32 m72_state::screen_update_majtitle(screen_device &screen, bitmap_ind16 &bi
if (m_video_off)
{
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
return 0;
}
@@ -567,8 +567,8 @@ UINT32 m72_state::screen_update_majtitle(screen_device &screen, bitmap_ind16 &bi
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1,0);
m_fg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1,0);
- majtitle_draw_sprites(screen.machine(), bitmap,cliprect);
- m72_draw_sprites(screen.machine(), bitmap,cliprect);
+ majtitle_draw_sprites(machine(), bitmap,cliprect);
+ m72_draw_sprites(machine(), bitmap,cliprect);
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0,0);
m_fg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0,0);
return 0;
diff --git a/src/mame/video/m90.c b/src/mame/video/m90.c
index a64e33a2fba..8066a8321dd 100644
--- a/src/mame/video/m90.c
+++ b/src/mame/video/m90.c
@@ -357,7 +357,7 @@ UINT32 m90_state::screen_update_m90(screen_device &screen, bitmap_ind16 &bitmap,
m_pf2_wide_layer->set_scrollx(0, m_video_control_data[3]+256-2 );
}
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
if (video_enable)
{
@@ -448,10 +448,10 @@ UINT32 m90_state::screen_update_m90(screen_device &screen, bitmap_ind16 &bitmap,
}
}
- draw_sprites(screen.machine(),bitmap,cliprect);
+ draw_sprites(machine(),bitmap,cliprect);
} else {
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
}
return 0;
@@ -460,8 +460,8 @@ UINT32 m90_state::screen_update_m90(screen_device &screen, bitmap_ind16 &bitmap,
UINT32 m90_state::screen_update_bomblord(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
int i;
- screen.machine().priority_bitmap.fill(0, cliprect);
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
/* Setup scrolling */
if (m_video_control_data[6]&0x20) {
@@ -504,15 +504,15 @@ UINT32 m90_state::screen_update_bomblord(screen_device &screen, bitmap_ind16 &bi
m_pf1_layer->draw(bitmap, cliprect, 1,1);
}
- bomblord_draw_sprites(screen.machine(),bitmap,cliprect);
+ bomblord_draw_sprites(machine(),bitmap,cliprect);
return 0;
}
UINT32 m90_state::screen_update_dynablsb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- screen.machine().priority_bitmap.fill(0, cliprect);
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
if (!(m_video_data[0xf008/2] & 0x4000)) {
m_pf1_wide_layer->mark_all_dirty();
@@ -546,7 +546,7 @@ UINT32 m90_state::screen_update_dynablsb(screen_device &screen, bitmap_ind16 &bi
m_pf2_layer->draw(bitmap, cliprect, 1,1);
}
- dynablsb_draw_sprites(screen.machine(),bitmap,cliprect);
+ dynablsb_draw_sprites(machine(),bitmap,cliprect);
return 0;
}
diff --git a/src/mame/video/m92.c b/src/mame/video/m92.c
index b2e2e9c8321..7dff4bf6eeb 100644
--- a/src/mame/video/m92.c
+++ b/src/mame/video/m92.c
@@ -533,15 +533,15 @@ static void m92_draw_tiles(running_machine &machine, bitmap_ind16 &bitmap,const
UINT32 m92_state::screen_update_m92(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);
- m92_update_scroll_positions(screen.machine());
- m92_draw_tiles(screen.machine(), bitmap, cliprect);
+ m92_update_scroll_positions(machine());
+ m92_draw_tiles(machine(), bitmap, cliprect);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
/* Flipscreen appears hardwired to the dipswitch - strange */
- if (screen.machine().root_device().ioport("DSW")->read() & 0x100)
+ if (machine().root_device().ioport("DSW")->read() & 0x100)
flip_screen_set(0);
else
flip_screen_set(1);
@@ -550,15 +550,15 @@ UINT32 m92_state::screen_update_m92(screen_device &screen, bitmap_ind16 &bitmap,
UINT32 m92_state::screen_update_ppan(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);
- m92_update_scroll_positions(screen.machine());
- m92_draw_tiles(screen.machine(), bitmap, cliprect);
+ m92_update_scroll_positions(machine());
+ m92_draw_tiles(machine(), bitmap, cliprect);
- ppan_draw_sprites(screen.machine(), bitmap, cliprect);
+ ppan_draw_sprites(machine(), bitmap, cliprect);
/* Flipscreen appears hardwired to the dipswitch - strange */
- if (screen.machine().root_device().ioport("DSW")->read() & 0x100)
+ if (machine().root_device().ioport("DSW")->read() & 0x100)
flip_screen_set(0);
else
flip_screen_set(1);
diff --git a/src/mame/video/macrossp.c b/src/mame/video/macrossp.c
index 8d56725d87e..4c9de3b7bf5 100644
--- a/src/mame/video/macrossp.c
+++ b/src/mame/video/macrossp.c
@@ -382,7 +382,7 @@ UINT32 macrossp_state::screen_update_macrossp(screen_device &screen, bitmap_rgb3
{
int layers[3],layerpri[3];
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
layers[0] = 0;
layerpri[0] = (m_scra_videoregs[0] & 0x0000c000) >> 14;
@@ -393,13 +393,13 @@ UINT32 macrossp_state::screen_update_macrossp(screen_device &screen, bitmap_rgb3
sortlayers(layers, layerpri);
- draw_layer(screen.machine(), bitmap, cliprect, layers[0]);
- draw_sprites(screen.machine(), bitmap, cliprect, 0);
- draw_layer(screen.machine(), bitmap, cliprect, layers[1]);
- draw_sprites(screen.machine(), bitmap, cliprect, 1);
- draw_layer(screen.machine(), bitmap, cliprect, layers[2]);
- draw_sprites(screen.machine(), bitmap, cliprect, 2);
- draw_sprites(screen.machine(), bitmap, cliprect, 3);
+ draw_layer(machine(), bitmap, cliprect, layers[0]);
+ draw_sprites(machine(), bitmap, cliprect, 0);
+ draw_layer(machine(), bitmap, cliprect, layers[1]);
+ draw_sprites(machine(), bitmap, cliprect, 1);
+ draw_layer(machine(), bitmap, cliprect, layers[2]);
+ draw_sprites(machine(), bitmap, cliprect, 2);
+ draw_sprites(machine(), bitmap, cliprect, 3);
m_text_tilemap->draw(bitmap, cliprect, 0, 0);
#if 0
diff --git a/src/mame/video/madalien.c b/src/mame/video/madalien.c
index 503be731ce2..349ad08c5bc 100644
--- a/src/mame/video/madalien.c
+++ b/src/mame/video/madalien.c
@@ -251,7 +251,7 @@ WRITE8_MEMBER(madalien_state::madalien_charram_w)
UINT32 madalien_state::screen_update_madalien(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- int flip = BIT(screen.machine().root_device().ioport("DSW")->read(), 6) && BIT(*m_video_control, 0);
+ int flip = BIT(machine().root_device().ioport("DSW")->read(), 6) && BIT(*m_video_control, 0);
// bits #0 and #1 define scrolling mode
//
@@ -263,8 +263,8 @@ UINT32 madalien_state::screen_update_madalien(screen_device &screen, bitmap_ind1
int scroll_mode = *m_scroll & 3;
bitmap.fill(0, cliprect);
- draw_edges(screen.machine(), bitmap, cliprect, flip, scroll_mode);
- draw_foreground(screen.machine(), bitmap, cliprect, flip);
+ draw_edges(machine(), bitmap, cliprect, flip, scroll_mode);
+ draw_foreground(machine(), bitmap, cliprect, flip);
/* highlight section A (outside of tunnels).
* also, bit 1 of the video_flags register (6A) is
@@ -298,7 +298,7 @@ UINT32 madalien_state::screen_update_madalien(screen_device &screen, bitmap_ind1
bitmap.pix16(y, x) |= 8;
}
- draw_headlight(screen.machine(), bitmap, cliprect, flip);
+ draw_headlight(machine(), bitmap, cliprect, flip);
return 0;
}
diff --git a/src/mame/video/madmotor.c b/src/mame/video/madmotor.c
index c083cfc2ee9..e72f0372008 100644
--- a/src/mame/video/madmotor.c
+++ b/src/mame/video/madmotor.c
@@ -24,13 +24,13 @@ void madmotor_state::video_start()
UINT32 madmotor_state::screen_update_madmotor(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- flip_screen_set(screen.machine().device<deco_bac06_device>("tilegen1")->get_flip_state());
+ flip_screen_set(machine().device<deco_bac06_device>("tilegen1")->get_flip_state());
-// screen.machine().tilemap().set_flip_all(screen.machine().device<deco_bac06_device>("tilegen1")->get_flip_state() ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
+// machine().tilemap().set_flip_all(machine().device<deco_bac06_device>("tilegen1")->get_flip_state() ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
- screen.machine().device<deco_bac06_device>("tilegen3")->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0x00, 0x00, 0x00, 0x00);
- screen.machine().device<deco_bac06_device>("tilegen2")->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00);
- screen.machine().device<deco_mxc06_device>("spritegen")->draw_sprites(screen.machine(), bitmap, cliprect, m_spriteram, 0x00, 0x00, 0x0f);
- screen.machine().device<deco_bac06_device>("tilegen1")->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00);
+ machine().device<deco_bac06_device>("tilegen3")->deco_bac06_pf_draw(machine(),bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0x00, 0x00, 0x00, 0x00);
+ machine().device<deco_bac06_device>("tilegen2")->deco_bac06_pf_draw(machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00);
+ machine().device<deco_mxc06_device>("spritegen")->draw_sprites(machine(), bitmap, cliprect, m_spriteram, 0x00, 0x00, 0x0f);
+ machine().device<deco_bac06_device>("tilegen1")->deco_bac06_pf_draw(machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00);
return 0;
}
diff --git a/src/mame/video/magmax.c b/src/mame/video/magmax.c
index fda1b443996..b9607fc6e5d 100644
--- a/src/mame/video/magmax.c
+++ b/src/mame/video/magmax.c
@@ -200,12 +200,12 @@ UINT32 magmax_state::screen_update_magmax(screen_device &screen, bitmap_ind16 &b
if (code & 0x80) /* sprite bankswitch */
code += (*m_vreg & 0x30) * 0x8;
- drawgfx_transmask(bitmap, cliprect, screen.machine().gfx[1],
+ drawgfx_transmask(bitmap, cliprect, machine().gfx[1],
code,
color,
flipx, flipy,
sx, sy,
- colortable_get_transpen_mask(screen.machine().colortable, screen.machine().gfx[1], color, 0x1f));
+ colortable_get_transpen_mask(machine().colortable, machine().gfx[1], color, 0x1f));
}
}
@@ -230,7 +230,7 @@ UINT32 magmax_state::screen_update_magmax(screen_device &screen, bitmap_ind16 &b
sy = 31 - sy;
}
- drawgfx_transpen(bitmap, cliprect, screen.machine().gfx[0],
+ drawgfx_transpen(bitmap, cliprect, machine().gfx[0],
code,
0,
m_flipscreen, m_flipscreen,
diff --git a/src/mame/video/mainevt.c b/src/mame/video/mainevt.c
index bc0479d766c..d2a3a8f6255 100644
--- a/src/mame/video/mainevt.c
+++ b/src/mame/video/mainevt.c
@@ -96,7 +96,7 @@ UINT32 mainevt_state::screen_update_mainevt(screen_device &screen, bitmap_ind16
k052109_tilemap_update(m_k052109);
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
k052109_tilemap_draw(m_k052109, bitmap, cliprect, 1, TILEMAP_DRAW_OPAQUE, 1);
k052109_tilemap_draw(m_k052109, bitmap, cliprect, 2, 1, 2); /* low priority part of layer */
k052109_tilemap_draw(m_k052109, bitmap, cliprect, 2, 0, 4); /* high priority part of layer */
diff --git a/src/mame/video/mainsnk.c b/src/mame/video/mainsnk.c
index a17e0011d61..16377f6d54a 100644
--- a/src/mame/video/mainsnk.c
+++ b/src/mame/video/mainsnk.c
@@ -167,7 +167,7 @@ UINT32 mainsnk_state::screen_update_mainsnk(screen_device &screen, bitmap_ind16
{
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);
return 0;
diff --git a/src/mame/video/malzak.c b/src/mame/video/malzak.c
index 2159d38fd78..a5eba9ef2bc 100644
--- a/src/mame/video/malzak.c
+++ b/src/mame/video/malzak.c
@@ -39,7 +39,7 @@ UINT32 malzak_state::screen_update_malzak(screen_device &screen, bitmap_rgb32 &b
if (sx < -15*2)
sx += 256*2;
- drawgfxzoom_transpen(bitmap,cliprect, screen.machine().gfx[0], m_playfield_code[x * 16 + y], 2, 0, 0, sx, sy, 0x20000, 0x20000, 0);
+ drawgfxzoom_transpen(bitmap,cliprect, machine().gfx[0], m_playfield_code[x * 16 + y], 2, 0, 0, sx, sy, 0x20000, 0x20000, 0);
}
/* update the S2636 chips */
diff --git a/src/mame/video/mappy.c b/src/mame/video/mappy.c
index 9fb6df3260f..32fdeeeeebc 100644
--- a/src/mame/video/mappy.c
+++ b/src/mame/video/mappy.c
@@ -541,7 +541,7 @@ UINT32 mappy_state::screen_update_superpac(screen_device &screen, bitmap_ind16 &
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE | TILEMAP_DRAW_ALL_CATEGORIES,0);
sprite_bitmap.fill(15, cliprect);
- mappy_draw_sprites(screen.machine(),sprite_bitmap,cliprect,m_spriteram);
+ mappy_draw_sprites(machine(),sprite_bitmap,cliprect,m_spriteram);
copybitmap_trans(bitmap,sprite_bitmap,0,0,0,0,cliprect,15);
/* Redraw the high priority characters */
@@ -553,7 +553,7 @@ UINT32 mappy_state::screen_update_superpac(screen_device &screen, bitmap_ind16 &
for (x = 0;x < sprite_bitmap.width();x++)
{
int spr_entry = sprite_bitmap.pix16(y, x);
- int spr_pen = colortable_entry_get_value(screen.machine().colortable, spr_entry);
+ int spr_pen = colortable_entry_get_value(machine().colortable, spr_entry);
if (spr_pen == 0 || spr_pen == 1)
bitmap.pix16(y, x) = spr_entry;
}
@@ -569,7 +569,7 @@ UINT32 mappy_state::screen_update_phozon(screen_device &screen, bitmap_ind16 &bi
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE | TILEMAP_DRAW_ALL_CATEGORIES,0);
- phozon_draw_sprites(screen.machine(),bitmap,cliprect,m_spriteram);
+ phozon_draw_sprites(machine(),bitmap,cliprect,m_spriteram);
/* Redraw the high priority characters */
m_bg_tilemap->draw(bitmap, cliprect, 1,0);
@@ -585,7 +585,7 @@ UINT32 mappy_state::screen_update_mappy(screen_device &screen, bitmap_ind16 &bit
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE | TILEMAP_DRAW_ALL_CATEGORIES,0);
- mappy_draw_sprites(screen.machine(),bitmap,cliprect,m_spriteram);
+ mappy_draw_sprites(machine(),bitmap,cliprect,m_spriteram);
/* Redraw the high priority characters */
m_bg_tilemap->draw(bitmap, cliprect, 1,0);
diff --git a/src/mame/video/marineb.c b/src/mame/video/marineb.c
index 196320aee98..6fa44c6dc83 100644
--- a/src/mame/video/marineb.c
+++ b/src/mame/video/marineb.c
@@ -173,7 +173,7 @@ UINT32 marineb_state::screen_update_marineb(screen_device &screen, bitmap_ind16
{
int offs;
- set_tilemap_scrolly(screen.machine(), 24);
+ set_tilemap_scrolly(machine(), 24);
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
/* draw the sprites */
@@ -211,7 +211,7 @@ UINT32 marineb_state::screen_update_marineb(screen_device &screen, bitmap_ind16
if (!m_flipscreen_y)
{
- sy = 256 - screen.machine().gfx[gfx]->width() - sy;
+ sy = 256 - machine().gfx[gfx]->width() - sy;
flipy = !flipy;
}
@@ -220,7 +220,7 @@ UINT32 marineb_state::screen_update_marineb(screen_device &screen, bitmap_ind16
sx++;
}
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[gfx],
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[gfx],
code,
col,
flipx,flipy,
@@ -234,7 +234,7 @@ UINT32 marineb_state::screen_update_changes(screen_device &screen, bitmap_ind16
{
int offs, sx, sy, code, col, flipx, flipy;
- set_tilemap_scrolly(screen.machine(), 26);
+ set_tilemap_scrolly(machine(), 26);
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
/* draw the small sprites */
@@ -253,7 +253,7 @@ UINT32 marineb_state::screen_update_changes(screen_device &screen, bitmap_ind16
if (!m_flipscreen_y)
{
- sy = 256 - screen.machine().gfx[1]->width() - sy;
+ sy = 256 - machine().gfx[1]->width() - sy;
flipy = !flipy;
}
@@ -262,7 +262,7 @@ UINT32 marineb_state::screen_update_changes(screen_device &screen, bitmap_ind16
sx++;
}
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[1],
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[1],
code >> 2,
col,
flipx,flipy,
@@ -280,7 +280,7 @@ UINT32 marineb_state::screen_update_changes(screen_device &screen, bitmap_ind16
if (!m_flipscreen_y)
{
- sy = 256 - screen.machine().gfx[2]->width() - sy;
+ sy = 256 - machine().gfx[2]->width() - sy;
flipy = !flipy;
}
@@ -291,7 +291,7 @@ UINT32 marineb_state::screen_update_changes(screen_device &screen, bitmap_ind16
code >>= 4;
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[2],
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[2],
code,
col,
flipx,flipy,
@@ -299,7 +299,7 @@ UINT32 marineb_state::screen_update_changes(screen_device &screen, bitmap_ind16
/* draw again for wrap around */
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[2],
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[2],
code,
col,
flipx,flipy,
@@ -312,7 +312,7 @@ UINT32 marineb_state::screen_update_springer(screen_device &screen, bitmap_ind16
{
int offs;
- set_tilemap_scrolly(screen.machine(), 0);
+ set_tilemap_scrolly(machine(), 0);
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
/* draw the sprites */
@@ -348,7 +348,7 @@ UINT32 marineb_state::screen_update_springer(screen_device &screen, bitmap_ind16
if (!m_flipscreen_y)
{
- sy = 256 - screen.machine().gfx[gfx]->width() - sy;
+ sy = 256 - machine().gfx[gfx]->width() - sy;
flipy = !flipy;
}
@@ -357,7 +357,7 @@ UINT32 marineb_state::screen_update_springer(screen_device &screen, bitmap_ind16
sx--;
}
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[gfx],
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[gfx],
code,
col,
flipx,flipy,
@@ -371,7 +371,7 @@ UINT32 marineb_state::screen_update_hoccer(screen_device &screen, bitmap_ind16 &
{
int offs;
- set_tilemap_scrolly(screen.machine(), 0);
+ set_tilemap_scrolly(machine(), 0);
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
/* draw the sprites */
@@ -390,17 +390,17 @@ UINT32 marineb_state::screen_update_hoccer(screen_device &screen, bitmap_ind16 &
if (!m_flipscreen_y)
{
- sy = 256 - screen.machine().gfx[1]->width() - sy;
+ sy = 256 - machine().gfx[1]->width() - sy;
flipy = !flipy;
}
if (m_flipscreen_x)
{
- sx = 256 - screen.machine().gfx[1]->width() - sx;
+ sx = 256 - machine().gfx[1]->width() - sx;
flipx = !flipx;
}
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[1],
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[1],
code >> 2,
col,
flipx,flipy,
@@ -414,7 +414,7 @@ UINT32 marineb_state::screen_update_hopprobo(screen_device &screen, bitmap_ind16
{
int offs;
- set_tilemap_scrolly(screen.machine(), 0);
+ set_tilemap_scrolly(machine(), 0);
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
/* draw the sprites */
@@ -449,7 +449,7 @@ UINT32 marineb_state::screen_update_hopprobo(screen_device &screen, bitmap_ind16
if (!m_flipscreen_y)
{
- sy = 256 - screen.machine().gfx[gfx]->width() - sy;
+ sy = 256 - machine().gfx[gfx]->width() - sy;
flipy = !flipy;
}
@@ -458,7 +458,7 @@ UINT32 marineb_state::screen_update_hopprobo(screen_device &screen, bitmap_ind16
sx--;
}
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[gfx],
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[gfx],
code,
col,
flipx,flipy,
diff --git a/src/mame/video/mario.c b/src/mame/video/mario.c
index ccc352e6073..8b985a32021 100644
--- a/src/mame/video/mario.c
+++ b/src/mame/video/mario.c
@@ -206,18 +206,18 @@ UINT32 mario_state::screen_update_mario(screen_device &screen, bitmap_ind16 &bit
{
int t;
- t = screen.machine().root_device().ioport("MONITOR")->read();
+ t = machine().root_device().ioport("MONITOR")->read();
if (t != m_monitor)
{
m_monitor = t;
- screen.machine().tilemap().mark_all_dirty();
+ machine().tilemap().mark_all_dirty();
}
m_bg_tilemap->set_scrollx(0, m_flip ? (HTOTAL-HBSTART) : 0);
m_bg_tilemap->set_scrolly(0, m_gfx_scroll - (m_flip ? 8 : 0));
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/video/markham.c b/src/mame/video/markham.c
index ce0927ecacf..57b192b12d3 100644
--- a/src/mame/video/markham.c
+++ b/src/mame/video/markham.c
@@ -128,6 +128,6 @@ UINT32 markham_state::screen_update_markham(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/video/matmania.c b/src/mame/video/matmania.c
index 759f94ba47a..0410f71b6d3 100644
--- a/src/mame/video/matmania.c
+++ b/src/mame/video/matmania.c
@@ -137,7 +137,7 @@ UINT32 matmania_state::screen_update_matmania(screen_device &screen, bitmap_ind1
int sx = 15 - offs / 32;
int sy = offs % 32;
- drawgfx_opaque(*m_tmpbitmap, m_tmpbitmap->cliprect(), screen.machine().gfx[1],
+ drawgfx_opaque(*m_tmpbitmap, m_tmpbitmap->cliprect(), machine().gfx[1],
m_videoram[offs] + ((m_colorram[offs] & 0x08) << 5),
(m_colorram[offs] & 0x30) >> 4,
0,sy >= 16, /* flip horizontally tiles on the right half of the bitmap */
@@ -150,7 +150,7 @@ UINT32 matmania_state::screen_update_matmania(screen_device &screen, bitmap_ind1
int sx = 15 - offs / 32;
int sy = offs % 32;
- drawgfx_opaque(*m_tmpbitmap2, m_tmpbitmap2->cliprect(), screen.machine().gfx[1],
+ drawgfx_opaque(*m_tmpbitmap2, m_tmpbitmap2->cliprect(), machine().gfx[1],
m_videoram3[offs] + ((m_colorram3[offs] & 0x08) << 5),
(m_colorram3[offs] & 0x30) >> 4,
0,sy >= 16, /* flip horizontally tiles on the right half of the bitmap */
@@ -172,7 +172,7 @@ UINT32 matmania_state::screen_update_matmania(screen_device &screen, bitmap_ind1
{
if (spriteram[offs] & 0x01)
{
- drawgfx_transpen(bitmap, cliprect, screen.machine().gfx[2],
+ drawgfx_transpen(bitmap, cliprect, machine().gfx[2],
spriteram[offs + 1] + ((spriteram[offs] & 0xf0) << 4),
(spriteram[offs] & 0x08) >> 3,
spriteram[offs] & 0x04, spriteram[offs] & 0x02,
@@ -187,7 +187,7 @@ UINT32 matmania_state::screen_update_matmania(screen_device &screen, bitmap_ind1
int sx = 31 - offs / 32;
int sy = offs % 32;
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[0],
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[0],
m_videoram2[offs] + 256 * (m_colorram2[offs] & 0x07),
(m_colorram2[offs] & 0x30) >> 4,
0,0,
@@ -208,7 +208,7 @@ UINT32 matmania_state::screen_update_maniach(screen_device &screen, bitmap_ind16
int sx = 15 - offs / 32;
int sy = offs % 32;
- drawgfx_opaque(*m_tmpbitmap, m_tmpbitmap->cliprect(), screen.machine().gfx[1],
+ drawgfx_opaque(*m_tmpbitmap, m_tmpbitmap->cliprect(), machine().gfx[1],
m_videoram[offs] + ((m_colorram[offs] & 0x03) << 8),
(m_colorram[offs] & 0x30) >> 4,
0,sy >= 16, /* flip horizontally tiles on the right half of the bitmap */
@@ -221,7 +221,7 @@ UINT32 matmania_state::screen_update_maniach(screen_device &screen, bitmap_ind16
int sx = 15 - offs / 32;
int sy = offs % 32;
- drawgfx_opaque(*m_tmpbitmap2, m_tmpbitmap2->cliprect(), screen.machine().gfx[1],
+ drawgfx_opaque(*m_tmpbitmap2, m_tmpbitmap2->cliprect(), machine().gfx[1],
m_videoram3[offs] + ((m_colorram3[offs] & 0x03) << 8),
(m_colorram3[offs] & 0x30) >> 4,
0,sy >= 16, /* flip horizontally tiles on the right half of the bitmap */
@@ -245,7 +245,7 @@ UINT32 matmania_state::screen_update_maniach(screen_device &screen, bitmap_ind16
{
if (spriteram[offs] & 0x01)
{
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[2],
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[2],
spriteram[offs+1] + ((spriteram[offs] & 0xf0) << 4),
(spriteram[offs] & 0x08) >> 3,
spriteram[offs] & 0x04,spriteram[offs] & 0x02,
@@ -260,7 +260,7 @@ UINT32 matmania_state::screen_update_maniach(screen_device &screen, bitmap_ind16
int sx = 31 - offs / 32;
int sy = offs % 32;
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[0],
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[0],
m_videoram2[offs] + 256 * (m_colorram2[offs] & 0x07),
(m_colorram2[offs] & 0x30) >> 4,
0,0,
diff --git a/src/mame/video/mcatadv.c b/src/mame/video/mcatadv.c
index c80c5691985..ab0c939b737 100644
--- a/src/mame/video/mcatadv.c
+++ b/src/mame/video/mcatadv.c
@@ -202,8 +202,8 @@ UINT32 mcatadv_state::screen_update_mcatadv(screen_device &screen, bitmap_ind16
{
int i;
- 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);
if (m_scroll1[2] != m_palette_bank1)
{
@@ -228,21 +228,21 @@ UINT32 mcatadv_state::screen_update_mcatadv(screen_device &screen, bitmap_ind16
for (i = 0; i <= 3; i++)
{
#ifdef MAME_DEBUG
- if (!screen.machine().input().code_pressed(KEYCODE_Q))
+ if (!machine().input().code_pressed(KEYCODE_Q))
#endif
mcatadv_draw_tilemap_part(m_scroll1, m_videoram1, i, m_tilemap1, bitmap, cliprect);
#ifdef MAME_DEBUG
- if (!screen.machine().input().code_pressed(KEYCODE_W))
+ if (!machine().input().code_pressed(KEYCODE_W))
#endif
mcatadv_draw_tilemap_part(m_scroll2, m_videoram2, i, m_tilemap2, bitmap, cliprect);
}
g_profiler.start(PROFILER_USER1);
#ifdef MAME_DEBUG
- if (!screen.machine().input().code_pressed(KEYCODE_E))
+ if (!machine().input().code_pressed(KEYCODE_E))
#endif
- draw_sprites (screen.machine(), bitmap, cliprect);
+ draw_sprites (machine(), bitmap, cliprect);
g_profiler.stop();
return 0;
}
diff --git a/src/mame/video/mcr.c b/src/mame/video/mcr.c
index 0ce4b2f56aa..b87f510a8f3 100644
--- a/src/mame/video/mcr.c
+++ b/src/mame/video/mcr.c
@@ -401,7 +401,7 @@ UINT32 mcr_state::screen_update_mcr(screen_device &screen, bitmap_ind16 &bitmap,
bg_tilemap->set_flip(mcr_cocktail_flip ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0);
/* draw the background */
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
bg_tilemap->draw(bitmap, cliprect, 0, 0x00);
bg_tilemap->draw(bitmap, cliprect, 1, 0x10);
bg_tilemap->draw(bitmap, cliprect, 2, 0x20);
@@ -411,18 +411,18 @@ UINT32 mcr_state::screen_update_mcr(screen_device &screen, bitmap_ind16 &bitmap,
switch (mcr_sprite_board)
{
case 91399:
- render_sprites_91399(screen.machine(), bitmap, cliprect);
+ render_sprites_91399(machine(), bitmap, cliprect);
break;
case 91464:
if (mcr_cpu_board == 91442)
- render_sprites_91464(screen.machine(), bitmap, cliprect, 0x00, 0x30, 0x00);
+ render_sprites_91464(machine(), bitmap, cliprect, 0x00, 0x30, 0x00);
else if (mcr_cpu_board == 91475)
- render_sprites_91464(screen.machine(), bitmap, cliprect, 0x00, 0x30, 0x40);
+ render_sprites_91464(machine(), bitmap, cliprect, 0x00, 0x30, 0x40);
else if (mcr_cpu_board == 91490)
- render_sprites_91464(screen.machine(), bitmap, cliprect, 0x00, 0x30, 0x00);
+ render_sprites_91464(machine(), bitmap, cliprect, 0x00, 0x30, 0x00);
else if (mcr_cpu_board == 91721)
- render_sprites_91464(screen.machine(), bitmap, cliprect, 0x00, 0x30, 0x00);
+ render_sprites_91464(machine(), bitmap, cliprect, 0x00, 0x30, 0x00);
break;
}
return 0;
diff --git a/src/mame/video/mcr3.c b/src/mame/video/mcr3.c
index 5bee1f3ad5d..2fd1b18b4e1 100644
--- a/src/mame/video/mcr3.c
+++ b/src/mame/video/mcr3.c
@@ -278,7 +278,7 @@ UINT32 mcr3_state::screen_update_mcr3(screen_device &screen, bitmap_ind16 &bitma
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
/* draw the sprites */
- mcr3_update_sprites(screen.machine(), bitmap, cliprect, 0x03, 0, 0, 0);
+ mcr3_update_sprites(machine(), bitmap, cliprect, 0x03, 0, 0, 0);
return 0;
}
@@ -292,7 +292,7 @@ UINT32 mcr3_state::screen_update_spyhunt(screen_device &screen, bitmap_ind16 &bi
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
/* draw the sprites */
- mcr3_update_sprites(screen.machine(), bitmap, cliprect, m_spyhunt_sprite_color_mask, 0, -12, 0);
+ mcr3_update_sprites(machine(), bitmap, cliprect, m_spyhunt_sprite_color_mask, 0, -12, 0);
/* render any characters on top */
m_alpha_tilemap->draw(bitmap, cliprect, 0, 0);
diff --git a/src/mame/video/mcr68.c b/src/mame/video/mcr68.c
index 26ad332f8c2..12d105ace36 100644
--- a/src/mame/video/mcr68.c
+++ b/src/mame/video/mcr68.c
@@ -320,13 +320,13 @@ UINT32 mcr68_state::screen_update_mcr68(screen_device &screen, bitmap_ind16 &bit
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE | TILEMAP_DRAW_ALL_CATEGORIES, 0);
/* draw the low-priority sprites */
- mcr68_update_sprites(screen.machine(), bitmap, cliprect, 0);
+ mcr68_update_sprites(machine(), bitmap, cliprect, 0);
/* redraw tiles with priority over sprites */
m_bg_tilemap->draw(bitmap, cliprect, 1, 0);
/* draw the high-priority sprites */
- mcr68_update_sprites(screen.machine(), bitmap, cliprect, 1);
+ mcr68_update_sprites(machine(), bitmap, cliprect, 1);
return 0;
}
@@ -337,12 +337,12 @@ UINT32 mcr68_state::screen_update_zwackery(screen_device &screen, bitmap_ind16 &
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
/* draw the low-priority sprites */
- zwackery_update_sprites(screen.machine(), bitmap, cliprect, 0);
+ zwackery_update_sprites(machine(), bitmap, cliprect, 0);
/* redraw tiles with priority over sprites */
m_fg_tilemap->draw(bitmap, cliprect, 1, 0);
/* draw the high-priority sprites */
- zwackery_update_sprites(screen.machine(), bitmap, cliprect, 1);
+ zwackery_update_sprites(machine(), bitmap, cliprect, 1);
return 0;
}
diff --git a/src/mame/video/meadows.c b/src/mame/video/meadows.c
index b39785337bb..3df3bd138ea 100644
--- a/src/mame/video/meadows.c
+++ b/src/mame/video/meadows.c
@@ -107,7 +107,7 @@ UINT32 meadows_state::screen_update_meadows(screen_device &screen, bitmap_ind16
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
/* draw the sprites */
- if (screen.machine().gfx[1])
- draw_sprites(screen.machine(), bitmap, cliprect);
+ if (machine().gfx[1])
+ draw_sprites(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/video/megasys1.c b/src/mame/video/megasys1.c
index f68d3356b09..03ce9e60ad5 100644
--- a/src/mame/video/megasys1.c
+++ b/src/mame/video/megasys1.c
@@ -952,7 +952,7 @@ UINT32 megasys1_state::screen_update_megasys1(screen_device &screen, bitmap_ind1
active_layers |= 1 << ((pri & 0xf0000) >> 16); // bottom layer can't be disabled
}
- screen.machine().tilemap().set_flip_all((m_screen_flag & 1) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0 );
+ machine().tilemap().set_flip_all((m_screen_flag & 1) ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0 );
for (i = 0;i < 3;i++)
{
@@ -965,7 +965,7 @@ UINT32 megasys1_state::screen_update_megasys1(screen_device &screen, bitmap_ind1
}
}
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
flag = TILEMAP_DRAW_OPAQUE;
primask = 0;
@@ -1008,7 +1008,7 @@ UINT32 megasys1_state::screen_update_megasys1(screen_device &screen, bitmap_ind1
}
if (active_layers & 0x08)
- draw_sprites(screen.machine(),bitmap,cliprect);
+ draw_sprites(machine(),bitmap,cliprect);
return 0;
}
diff --git a/src/mame/video/megazone.c b/src/mame/video/megazone.c
index 03fa8cc0771..cfc892e5d37 100644
--- a/src/mame/video/megazone.c
+++ b/src/mame/video/megazone.c
@@ -133,7 +133,7 @@ UINT32 megazone_state::screen_update_megazone(screen_device &screen, bitmap_ind1
flipy = !flipy;
}
- drawgfx_opaque(*m_tmpbitmap, m_tmpbitmap->cliprect(), screen.machine().gfx[1],
+ drawgfx_opaque(*m_tmpbitmap, m_tmpbitmap->cliprect(), machine().gfx[1],
((int)m_videoram[offs]) + ((m_colorram[offs] & (1 << 7) ? 256 : 0) ),
(m_colorram[offs] & 0x0f) + 0x10,
flipx,flipy,
@@ -180,12 +180,12 @@ UINT32 megazone_state::screen_update_megazone(screen_device &screen, bitmap_ind1
else
sx = sx + 32;
- drawgfx_transmask(bitmap,cliprect,screen.machine().gfx[0],
+ drawgfx_transmask(bitmap,cliprect,machine().gfx[0],
spriteram[offs + 2],
color,
flipx,flipy,
sx,sy,
- colortable_get_transpen_mask(screen.machine().colortable, screen.machine().gfx[0], color, 0));
+ colortable_get_transpen_mask(machine().colortable, machine().gfx[0], color, 0));
}
}
@@ -213,7 +213,7 @@ UINT32 megazone_state::screen_update_megazone(screen_device &screen, bitmap_ind1
- drawgfx_opaque(bitmap, cliprect, screen.machine().gfx[1],
+ drawgfx_opaque(bitmap, cliprect, machine().gfx[1],
((int)m_videoram2[offs]) + ((m_colorram2[offs] & (1 << 7) ? 256 : 0) ),
(m_colorram2[offs] & 0x0f) + 0x10,
flipx,flipy,
diff --git a/src/mame/video/mermaid.c b/src/mame/video/mermaid.c
index 350a3541949..71ed4d9e8cd 100644
--- a/src/mame/video/mermaid.c
+++ b/src/mame/video/mermaid.c
@@ -226,7 +226,7 @@ UINT32 mermaid_state::screen_update_mermaid(screen_device &screen, bitmap_ind16
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);
return 0;
}
@@ -257,7 +257,7 @@ void mermaid_state::screen_eof_mermaid(screen_device &screen, bool state)
// rising edge
if (state)
{
- const rectangle &visarea = screen.machine().primary_screen->visible_area();
+ const rectangle &visarea = machine().primary_screen->visible_area();
UINT8 *spriteram = m_spriteram;
int offs, offs2;
@@ -302,8 +302,8 @@ void mermaid_state::screen_eof_mermaid(screen_device &screen, bool state)
rect.min_x = sx;
rect.min_y = sy;
- rect.max_x = sx + screen.machine().gfx[1]->width() - 1;
- rect.max_y = sy + screen.machine().gfx[1]->height() - 1;
+ rect.max_x = sx + machine().gfx[1]->width() - 1;
+ rect.max_y = sy + machine().gfx[1]->height() - 1;
rect &= visarea;
@@ -314,9 +314,9 @@ void mermaid_state::screen_eof_mermaid(screen_device &screen, bool state)
m_bg_tilemap->draw(m_helper, rect, 0, 0);
- drawgfx_transpen(m_helper2, rect, screen.machine().gfx[1], code, 0, flipx, flipy, sx, sy, 0);
+ drawgfx_transpen(m_helper2, rect, machine().gfx[1], code, 0, flipx, flipy, sx, sy, 0);
- m_coll_bit2 |= collision_check(screen.machine(), rect);
+ m_coll_bit2 |= collision_check(machine(), rect);
// check collision sprite - foreground
@@ -325,9 +325,9 @@ void mermaid_state::screen_eof_mermaid(screen_device &screen, bool state)
m_fg_tilemap->draw(m_helper, rect, 0, 0);
- drawgfx_transpen(m_helper2, rect, screen.machine().gfx[1], code, 0, flipx, flipy, sx, sy, 0);
+ drawgfx_transpen(m_helper2, rect, machine().gfx[1], code, 0, flipx, flipy, sx, sy, 0);
- m_coll_bit1 |= collision_check(screen.machine(), rect);
+ m_coll_bit1 |= collision_check(machine(), rect);
// check collision sprite - sprite
@@ -363,12 +363,12 @@ void mermaid_state::screen_eof_mermaid(screen_device &screen, bool state)
sy2 = 240 - sy2;
}
- drawgfx_transpen(m_helper, rect, screen.machine().gfx[1], code2, 0, flipx2, flipy2, sx2, sy2, 0);
+ drawgfx_transpen(m_helper, rect, machine().gfx[1], code2, 0, flipx2, flipy2, sx2, sy2, 0);
}
- drawgfx_transpen(m_helper2, rect, screen.machine().gfx[1], code, 0, flipx, flipy, sx, sy, 0);
+ drawgfx_transpen(m_helper2, rect, machine().gfx[1], code, 0, flipx, flipy, sx, sy, 0);
- m_coll_bit0 |= collision_check(screen.machine(), rect);
+ m_coll_bit0 |= collision_check(machine(), rect);
}
// check for bit 3 (sprite-sprite)
@@ -405,8 +405,8 @@ void mermaid_state::screen_eof_mermaid(screen_device &screen, bool state)
rect.min_x = sx;
rect.min_y = sy;
- rect.max_x = sx + screen.machine().gfx[1]->width() - 1;
- rect.max_y = sy + screen.machine().gfx[1]->height() - 1;
+ rect.max_x = sx + machine().gfx[1]->width() - 1;
+ rect.max_y = sy + machine().gfx[1]->height() - 1;
rect &= visarea;
@@ -444,12 +444,12 @@ void mermaid_state::screen_eof_mermaid(screen_device &screen, bool state)
sy2 = 240 - sy2;
}
- drawgfx_transpen(m_helper, rect, screen.machine().gfx[1], code2, 0, flipx2, flipy2, sx2, sy2, 0);
+ drawgfx_transpen(m_helper, rect, machine().gfx[1], code2, 0, flipx2, flipy2, sx2, sy2, 0);
}
- drawgfx_transpen(m_helper2, rect, screen.machine().gfx[1], code, 0, flipx, flipy, sx, sy, 0);
+ drawgfx_transpen(m_helper2, rect, machine().gfx[1], code, 0, flipx, flipy, sx, sy, 0);
- m_coll_bit3 |= collision_check(screen.machine(), rect);
+ m_coll_bit3 |= collision_check(machine(), rect);
}
// check for bit 6
@@ -486,8 +486,8 @@ void mermaid_state::screen_eof_mermaid(screen_device &screen, bool state)
rect.min_x = sx;
rect.min_y = sy;
- rect.max_x = sx + screen.machine().gfx[1]->width() - 1;
- rect.max_y = sy + screen.machine().gfx[1]->height() - 1;
+ rect.max_x = sx + machine().gfx[1]->width() - 1;
+ rect.max_y = sy + machine().gfx[1]->height() - 1;
rect &= visarea;
@@ -525,12 +525,12 @@ void mermaid_state::screen_eof_mermaid(screen_device &screen, bool state)
sy2 = 240 - sy2;
}
- drawgfx_transpen(m_helper, rect, screen.machine().gfx[1], code2, 0, flipx2, flipy2, sx2, sy2, 0);
+ drawgfx_transpen(m_helper, rect, machine().gfx[1], code2, 0, flipx2, flipy2, sx2, sy2, 0);
}
- drawgfx_transpen(m_helper2, rect, screen.machine().gfx[1], code, 0, flipx, flipy, sx, sy, 0);
+ drawgfx_transpen(m_helper2, rect, machine().gfx[1], code, 0, flipx, flipy, sx, sy, 0);
- m_coll_bit6 |= collision_check(screen.machine(), rect);
+ m_coll_bit6 |= collision_check(machine(), rect);
}
}
}
diff --git a/src/mame/video/metlclsh.c b/src/mame/video/metlclsh.c
index 3a71526fc14..dc3b5e65f04 100644
--- a/src/mame/video/metlclsh.c
+++ b/src/mame/video/metlclsh.c
@@ -249,7 +249,7 @@ UINT32 metlclsh_state::screen_update_metlclsh(screen_device &screen, bitmap_ind1
m_bg_tilemap->set_scrollx(0, m_scrollx[1] + ((m_scrollx[0] & 0x02) << 7) );
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
}
- draw_sprites(screen.machine(), bitmap, cliprect); // sprites
+ draw_sprites(machine(), bitmap, cliprect); // sprites
m_fg_tilemap->draw(bitmap, cliprect, 2, 0); // high priority tiles of foreground
// popmessage("%02X", m_scrollx[0]);
diff --git a/src/mame/video/metro.c b/src/mame/video/metro.c
index fd8ff352a36..1675745d170 100644
--- a/src/mame/video/metro.c
+++ b/src/mame/video/metro.c
@@ -723,7 +723,7 @@ UINT32 metro_state::screen_update_metro(screen_device &screen, bitmap_ind16 &bit
m_sprite_yoffs = m_videoregs[0x04 / 2] - screen.height() / 2;
/* The background color is selected by a register */
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
bitmap.fill((m_videoregs[0x12/2] & 0x0fff) + 0x1000, cliprect);
/* Screen Control Register:
@@ -761,13 +761,13 @@ UINT32 metro_state::screen_update_metro(screen_device &screen, bitmap_ind16 &bit
#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_A)) 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_A)) msk |= 8;
if (msk != 0)
{
bitmap.fill(0, cliprect);
@@ -785,9 +785,9 @@ if (screen.machine().input().code_pressed(KEYCODE_Z))
k053936_zoom_draw(m_k053936, bitmap, cliprect, m_k053936_tilemap, 0, 0, 1);
for (pri = 3; pri >= 0; pri--)
- draw_layers(screen.machine(), bitmap, cliprect, pri, layers_ctrl);
+ draw_layers(machine(), bitmap, cliprect, pri, layers_ctrl);
if (layers_ctrl & 0x08)
- metro_draw_sprites(screen.machine(), bitmap, cliprect);
+ metro_draw_sprites(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/video/mexico86.c b/src/mame/video/mexico86.c
index 1a5967d54a8..14876bcf36d 100644
--- a/src/mame/video/mexico86.c
+++ b/src/mame/video/mexico86.c
@@ -86,7 +86,7 @@ UINT32 mexico86_state::screen_update_mexico86(screen_device &screen, bitmap_ind1
x = (sx + xc * 8) & 0xff;
y = (sy + yc * 8) & 0xff;
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[0],
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[0],
code,
color,
flipx,flipy,
@@ -106,7 +106,7 @@ UINT32 mexico86_state::screen_update_kikikai(screen_device &screen, bitmap_ind16
int goffs, code, color, y;
int tx, ty;
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
sx = 0;
for (offs = 0; offs < m_objectram.bytes(); offs += 4)
{
@@ -144,7 +144,7 @@ UINT32 mexico86_state::screen_update_kikikai(screen_device &screen, bitmap_ind16
color = (m_videoram[goffs + 1] & 0xe0) >> 5;
goffs += 0x40;
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[0],
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[0],
code,
color,
0,0,
@@ -153,7 +153,7 @@ UINT32 mexico86_state::screen_update_kikikai(screen_device &screen, bitmap_ind16
code = m_videoram[goffs] + ((m_videoram[goffs + 1] & 0x1f) << 8);
color = (m_videoram[goffs + 1] & 0xe0) >> 5;
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[0],
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[0],
code,
color,
0,0,
diff --git a/src/mame/video/midzeus.c b/src/mame/video/midzeus.c
index 559b5cfcb1b..5e4a0d439b4 100644
--- a/src/mame/video/midzeus.c
+++ b/src/mame/video/midzeus.c
@@ -336,7 +336,7 @@ UINT32 midzeus_state::screen_update_midzeus(screen_device &screen, bitmap_ind16
poly_wait(poly, "VIDEO_UPDATE");
/* normal update case */
- if (!screen.machine().input().code_pressed(KEYCODE_W))
+ if (!machine().input().code_pressed(KEYCODE_W))
{
const void *base = waveram1_ptr_from_expanded_addr(m_zeusbase[0xcc]);
int xoffs = screen.visible_area().min_x;
@@ -353,10 +353,10 @@ UINT32 midzeus_state::screen_update_midzeus(screen_device &screen, bitmap_ind16
{
const void *base;
- if (screen.machine().input().code_pressed(KEYCODE_DOWN)) yoffs += screen.machine().input().code_pressed(KEYCODE_LSHIFT) ? 0x40 : 1;
- if (screen.machine().input().code_pressed(KEYCODE_UP)) yoffs -= screen.machine().input().code_pressed(KEYCODE_LSHIFT) ? 0x40 : 1;
- if (screen.machine().input().code_pressed(KEYCODE_LEFT) && texel_width > 4) { texel_width >>= 1; while (screen.machine().input().code_pressed(KEYCODE_LEFT)) ; }
- if (screen.machine().input().code_pressed(KEYCODE_RIGHT) && texel_width < 512) { texel_width <<= 1; while (screen.machine().input().code_pressed(KEYCODE_RIGHT)) ; }
+ if (machine().input().code_pressed(KEYCODE_DOWN)) yoffs += machine().input().code_pressed(KEYCODE_LSHIFT) ? 0x40 : 1;
+ if (machine().input().code_pressed(KEYCODE_UP)) yoffs -= machine().input().code_pressed(KEYCODE_LSHIFT) ? 0x40 : 1;
+ if (machine().input().code_pressed(KEYCODE_LEFT) && texel_width > 4) { texel_width >>= 1; while (machine().input().code_pressed(KEYCODE_LEFT)) ; }
+ if (machine().input().code_pressed(KEYCODE_RIGHT) && texel_width < 512) { texel_width <<= 1; while (machine().input().code_pressed(KEYCODE_RIGHT)) ; }
if (yoffs < 0) yoffs = 0;
base = waveram0_ptr_from_block_addr(yoffs << 12);
diff --git a/src/mame/video/midzeus2.c b/src/mame/video/midzeus2.c
index cbf00e56786..9a43ef799c7 100644
--- a/src/mame/video/midzeus2.c
+++ b/src/mame/video/midzeus2.c
@@ -363,11 +363,11 @@ UINT32 midzeus_state::screen_update_midzeus2(screen_device &screen, bitmap_rgb32
poly_wait(poly, "VIDEO_UPDATE");
-if (screen.machine().input().code_pressed(KEYCODE_UP)) { zbase += 1.0f; popmessage("Zbase = %f", zbase); }
-if (screen.machine().input().code_pressed(KEYCODE_DOWN)) { zbase -= 1.0f; popmessage("Zbase = %f", zbase); }
+if (machine().input().code_pressed(KEYCODE_UP)) { zbase += 1.0f; popmessage("Zbase = %f", zbase); }
+if (machine().input().code_pressed(KEYCODE_DOWN)) { zbase -= 1.0f; popmessage("Zbase = %f", zbase); }
/* normal update case */
- if (!screen.machine().input().code_pressed(KEYCODE_W))
+ if (!machine().input().code_pressed(KEYCODE_W))
{
const void *base = waveram1_ptr_from_expanded_addr(m_zeusbase[0x38]);
int xoffs = screen.visible_area().min_x;
@@ -384,10 +384,10 @@ if (screen.machine().input().code_pressed(KEYCODE_DOWN)) { zbase -= 1.0f; popmes
{
const UINT64 *base;
- if (screen.machine().input().code_pressed(KEYCODE_DOWN)) yoffs += screen.machine().input().code_pressed(KEYCODE_LSHIFT) ? 0x40 : 1;
- if (screen.machine().input().code_pressed(KEYCODE_UP)) yoffs -= screen.machine().input().code_pressed(KEYCODE_LSHIFT) ? 0x40 : 1;
- if (screen.machine().input().code_pressed(KEYCODE_LEFT) && texel_width > 4) { texel_width >>= 1; while (screen.machine().input().code_pressed(KEYCODE_LEFT)) ; }
- if (screen.machine().input().code_pressed(KEYCODE_RIGHT) && texel_width < 512) { texel_width <<= 1; while (screen.machine().input().code_pressed(KEYCODE_RIGHT)) ; }
+ if (machine().input().code_pressed(KEYCODE_DOWN)) yoffs += machine().input().code_pressed(KEYCODE_LSHIFT) ? 0x40 : 1;
+ if (machine().input().code_pressed(KEYCODE_UP)) yoffs -= machine().input().code_pressed(KEYCODE_LSHIFT) ? 0x40 : 1;
+ if (machine().input().code_pressed(KEYCODE_LEFT) && texel_width > 4) { texel_width >>= 1; while (machine().input().code_pressed(KEYCODE_LEFT)) ; }
+ if (machine().input().code_pressed(KEYCODE_RIGHT) && texel_width < 512) { texel_width <<= 1; while (machine().input().code_pressed(KEYCODE_RIGHT)) ; }
if (yoffs < 0) yoffs = 0;
base = (const UINT64 *)waveram0_ptr_from_expanded_addr(yoffs << 16);
diff --git a/src/mame/video/mikie.c b/src/mame/video/mikie.c
index 8a73204e905..ab1ecec67b3 100644
--- a/src/mame/video/mikie.c
+++ b/src/mame/video/mikie.c
@@ -174,7 +174,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
UINT32 mikie_state::screen_update_mikie(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_CATEGORY(0), 0);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_CATEGORY(1), 0);
return 0;
}
diff --git a/src/mame/video/mitchell.c b/src/mame/video/mitchell.c
index 5528fa85e98..2c471c543bb 100644
--- a/src/mame/video/mitchell.c
+++ b/src/mame/video/mitchell.c
@@ -315,6 +315,6 @@ UINT32 mitchell_state::screen_update_pang(screen_device &screen, bitmap_ind16 &b
bitmap.fill(0, 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/video/mjkjidai.c b/src/mame/video/mjkjidai.c
index 99d5eb08ab4..ab15bc7b2fe 100644
--- a/src/mame/video/mjkjidai.c
+++ b/src/mame/video/mjkjidai.c
@@ -128,11 +128,11 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,const re
UINT32 mjkjidai_state::screen_update_mjkjidai(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
if (!m_display_enable)
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
else
{
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/video/model1.c b/src/mame/video/model1.c
index ffe5eba5a03..c438fa5c075 100644
--- a/src/mame/video/model1.c
+++ b/src/mame/video/model1.c
@@ -1474,35 +1474,35 @@ UINT32 model1_state::screen_update_model1(screen_device &screen, bitmap_rgb32 &b
double delta;
delta = 1;
- if(screen.machine().input().code_pressed(KEYCODE_F)) {
+ if(machine().input().code_pressed(KEYCODE_F)) {
mod = 1;
view->vxx -= delta;
}
- if(screen.machine().input().code_pressed(KEYCODE_G)) {
+ if(machine().input().code_pressed(KEYCODE_G)) {
mod = 1;
view->vxx += delta;
}
- if(screen.machine().input().code_pressed(KEYCODE_H)) {
+ if(machine().input().code_pressed(KEYCODE_H)) {
mod = 1;
view->vyy -= delta;
}
- if(screen.machine().input().code_pressed(KEYCODE_J)) {
+ if(machine().input().code_pressed(KEYCODE_J)) {
mod = 1;
view->vyy += delta;
}
- if(screen.machine().input().code_pressed(KEYCODE_K)) {
+ if(machine().input().code_pressed(KEYCODE_K)) {
mod = 1;
view->vzz -= delta;
}
- if(screen.machine().input().code_pressed(KEYCODE_L)) {
+ if(machine().input().code_pressed(KEYCODE_L)) {
mod = 1;
view->vzz += delta;
}
- if(screen.machine().input().code_pressed(KEYCODE_U)) {
+ if(machine().input().code_pressed(KEYCODE_U)) {
mod = 1;
view->ayy -= 0.05;
}
- if(screen.machine().input().code_pressed(KEYCODE_I)) {
+ if(machine().input().code_pressed(KEYCODE_I)) {
mod = 1;
view->ayy += 0.05;
}
@@ -1514,16 +1514,16 @@ UINT32 model1_state::screen_update_model1(screen_device &screen, bitmap_rgb32 &b
view->ayyc = cos(view->ayy);
view->ayys = sin(view->ayy);
- screen.machine().priority_bitmap.fill(0);
- bitmap.fill(screen.machine().pens[0], cliprect);
+ machine().priority_bitmap.fill(0);
+ bitmap.fill(machine().pens[0], cliprect);
- segas24_tile *tile = screen.machine().device<segas24_tile>("tile");
+ segas24_tile *tile = machine().device<segas24_tile>("tile");
tile->draw(bitmap, cliprect, 6, 0, 0);
tile->draw(bitmap, cliprect, 4, 0, 0);
tile->draw(bitmap, cliprect, 2, 0, 0);
tile->draw(bitmap, cliprect, 0, 0, 0);
- tgp_render(screen.machine(), bitmap, cliprect);
+ tgp_render(machine(), bitmap, cliprect);
tile->draw(bitmap, cliprect, 7, 0, 0);
tile->draw(bitmap, cliprect, 5, 0, 0);
@@ -1538,8 +1538,8 @@ void model1_state::screen_eof_model1(screen_device &screen, bool state)
// on rising edge
if (state)
{
- tgp_scan(screen.machine());
- end_frame(screen.machine());
+ tgp_scan(machine());
+ end_frame(machine());
LOG_TGP(("TGP: vsync\n"));
}
}
diff --git a/src/mame/video/model2.c b/src/mame/video/model2.c
index a4888b77f10..f9ef9ba291c 100644
--- a/src/mame/video/model2.c
+++ b/src/mame/video/model2.c
@@ -2721,10 +2721,10 @@ UINT32 model2_state::screen_update_model2(screen_device &screen, bitmap_rgb32 &b
{
logerror("--- frame ---\n");
- bitmap.fill(screen.machine().pens[0], cliprect);
+ bitmap.fill(machine().pens[0], cliprect);
m_sys24_bitmap.fill(0, cliprect);
- segas24_tile *tile = screen.machine().device<segas24_tile>("tile");
+ segas24_tile *tile = machine().device<segas24_tile>("tile");
tile->draw(m_sys24_bitmap, cliprect, 7, 0, 0);
tile->draw(m_sys24_bitmap, cliprect, 6, 0, 0);
tile->draw(m_sys24_bitmap, cliprect, 5, 0, 0);
diff --git a/src/mame/video/model3.c b/src/mame/video/model3.c
index 21564b4406d..8fb01139b04 100644
--- a/src/mame/video/model3.c
+++ b/src/mame/video/model3.c
@@ -361,25 +361,25 @@ UINT32 model3_state::screen_update_model3(screen_device &screen, bitmap_ind16 &b
if( m_tick >= 5 ) {
m_tick = 0;
- if( screen.machine().input().code_pressed(KEYCODE_Y) )
+ if( machine().input().code_pressed(KEYCODE_Y) )
m_debug_layer_disable ^= 0x1;
- if( screen.machine().input().code_pressed(KEYCODE_U) )
+ if( machine().input().code_pressed(KEYCODE_U) )
m_debug_layer_disable ^= 0x2;
- if( screen.machine().input().code_pressed(KEYCODE_I) )
+ if( machine().input().code_pressed(KEYCODE_I) )
m_debug_layer_disable ^= 0x4;
- if( screen.machine().input().code_pressed(KEYCODE_O) )
+ if( machine().input().code_pressed(KEYCODE_O) )
m_debug_layer_disable ^= 0x8;
- if( screen.machine().input().code_pressed(KEYCODE_T) )
+ if( machine().input().code_pressed(KEYCODE_T) )
m_debug_layer_disable ^= 0x10;
}
bitmap.fill(0, cliprect);
if (!(m_debug_layer_disable & 0x8))
- draw_layer(screen.machine(), bitmap, cliprect, 3, (m_layer_enable >> 3) & 0x1);
+ draw_layer(machine(), bitmap, cliprect, 3, (m_layer_enable >> 3) & 0x1);
if (!(m_debug_layer_disable & 0x4))
- draw_layer(screen.machine(), bitmap, cliprect, 2, (m_layer_enable >> 2) & 0x1);
+ draw_layer(machine(), bitmap, cliprect, 2, (m_layer_enable >> 2) & 0x1);
if( !(m_debug_layer_disable & 0x10) )
{
@@ -387,17 +387,17 @@ UINT32 model3_state::screen_update_model3(screen_device &screen, bitmap_ind16 &b
if(m_real3d_display_list) {
m_zbuffer.fill(0, cliprect);
m_bitmap3d.fill(0x8000, cliprect);
- real3d_traverse_display_list(screen.machine());
+ real3d_traverse_display_list(machine());
}
#endif
copybitmap_trans(bitmap, m_bitmap3d, 0, 0, 0, 0, cliprect, 0x8000);
}
if (!(m_debug_layer_disable & 0x2))
- draw_layer(screen.machine(), bitmap, cliprect, 1, (m_layer_enable >> 1) & 0x1);
+ draw_layer(machine(), bitmap, cliprect, 1, (m_layer_enable >> 1) & 0x1);
if (!(m_debug_layer_disable & 0x1))
- draw_layer(screen.machine(), bitmap, cliprect, 0, (m_layer_enable >> 0) & 0x1);
+ draw_layer(machine(), bitmap, cliprect, 0, (m_layer_enable >> 0) & 0x1);
//copy_screen(bitmap, cliprect);
diff --git a/src/mame/video/momoko.c b/src/mame/video/momoko.c
index ac32d6d3f4f..88d39254564 100644
--- a/src/mame/video/momoko.c
+++ b/src/mame/video/momoko.c
@@ -106,13 +106,13 @@ UINT32 momoko_state::screen_update_momoko(screen_device &screen, bitmap_ind16 &b
int x, y, dx, dy, rx, ry, radr, chr, sy, fx, fy, px, py, offs, col, pri, flip ;
UINT8 *spriteram = m_spriteram;
- UINT8 *BG_MAP = screen.machine().root_device().memregion("user1")->base();
- UINT8 *BG_COL_MAP = screen.machine().root_device().memregion("user2")->base();
- UINT8 *FG_MAP = screen.machine().root_device().memregion("user3")->base();
+ UINT8 *BG_MAP = machine().root_device().memregion("user1")->base();
+ UINT8 *BG_COL_MAP = machine().root_device().memregion("user2")->base();
+ UINT8 *FG_MAP = machine().root_device().memregion("user3")->base();
UINT8 *TEXT_COLOR = memregion("proms")->base();
- flip = m_flipscreen ^ (screen.machine().root_device().ioport("FAKE")->read() & 0x01);
+ flip = m_flipscreen ^ (machine().root_device().ioport("FAKE")->read() & 0x01);
/* draw BG layer */
dx = (7 - m_bg_scrollx[0]) & 7;
@@ -142,7 +142,7 @@ UINT32 momoko_state::screen_update_momoko(screen_device &screen, bitmap_ind16 &b
py = 248 - (8 * y + dy + 9);
}
- drawgfx_opaque(bitmap,cliprect,screen.machine().gfx[1],
+ drawgfx_opaque(bitmap,cliprect,machine().gfx[1],
chr,
col,
flip,flip,
@@ -176,7 +176,7 @@ UINT32 momoko_state::screen_update_momoko(screen_device &screen, bitmap_ind16 &b
py = y + 1;
}
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[3],
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[3],
chr,
col,
!fx,fy,
@@ -210,7 +210,7 @@ UINT32 momoko_state::screen_update_momoko(screen_device &screen, bitmap_ind16 &b
{
col = col & 0x0f;
chr = chr + m_bg_select * 512;
- momoko_draw_bg_pri(screen.machine(), bitmap, chr, col, flip, flip, px, py, pri);
+ momoko_draw_bg_pri(machine(), bitmap, chr, col, flip, flip, px, py, pri);
}
}
}
@@ -238,7 +238,7 @@ UINT32 momoko_state::screen_update_momoko(screen_device &screen, bitmap_ind16 &b
px = 248 - x;
py = y + 1;
}
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[3],
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[3],
chr,
col,
!fx,fy,
@@ -271,7 +271,7 @@ UINT32 momoko_state::screen_update_momoko(screen_device &screen, bitmap_ind16 &b
px = 248 - x * 8;
py = 255 - y;
}
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[0],
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[0],
m_videoram[(sy >> 3) * 32 + x] * 8 + dy,
col,
flip,0,
@@ -304,7 +304,7 @@ UINT32 momoko_state::screen_update_momoko(screen_device &screen, bitmap_ind16 &b
px = 248 - (8 * x + dx - 8);
py = 248 - (8 * y + dy + 9);
}
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[2],
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[2],
chr,
0, /* color */
flip,flip, /* flip */
diff --git a/src/mame/video/moo.c b/src/mame/video/moo.c
index 28e5a9e4f1a..66fdf88fbd3 100644
--- a/src/mame/video/moo.c
+++ b/src/mame/video/moo.c
@@ -110,7 +110,7 @@ UINT32 moo_state::screen_update_moo(screen_device &screen, bitmap_rgb32 &bitmap,
k054338_update_all_shadows(m_k054338, 0);
k054338_fill_backcolor(m_k054338, bitmap, 0);
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
if (m_layerpri[0] < k053251_get_priority(m_k053251, K053251_CI1)) /* bucky hides back layer behind background */
k056832_tilemap_draw(m_k056832, bitmap, cliprect, layers[0], 0, 1);
diff --git a/src/mame/video/mouser.c b/src/mame/video/mouser.c
index 3f922930f27..6bce29d6e38 100644
--- a/src/mame/video/mouser.c
+++ b/src/mame/video/mouser.c
@@ -90,7 +90,7 @@ UINT32 mouser_state::screen_update_mouser(screen_device &screen, bitmap_ind16 &b
/* Note: this is _not_ dependant on flipping */
color_offs = offs % 32 + ((256 + 8 * (offs / 32) - spriteram[offs % 32] )% 256) / 8 * 32;
- drawgfx_opaque(bitmap,cliprect,screen.machine().gfx[0],
+ drawgfx_opaque(bitmap,cliprect,machine().gfx[0],
m_videoram[offs] | (m_colorram[color_offs] >> 5) * 256 | ((m_colorram[color_offs] >> 4) & 1) * 512,
m_colorram[color_offs]%16,
flip_screen_x(),flip_screen_y(),
@@ -121,7 +121,7 @@ UINT32 mouser_state::screen_update_mouser(screen_device &screen, bitmap_ind16 &b
}
if (BIT(spriteram[offs + 1], 4))
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[1+((spriteram[offs+1]&0x20)>>5)],
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[1+((spriteram[offs+1]&0x20)>>5)],
spriteram[offs]&0x3f,
spriteram[offs+1]%16,
flipx,flipy,
@@ -150,7 +150,7 @@ UINT32 mouser_state::screen_update_mouser(screen_device &screen, bitmap_ind16 &b
}
if (BIT(spriteram[offs + 1], 4))
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[1+((spriteram[offs+1]&0x20)>>5)],
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[1+((spriteram[offs+1]&0x20)>>5)],
spriteram[offs]&0x3f,
spriteram[offs+1]%16,
flipx,flipy,
diff --git a/src/mame/video/mrdo.c b/src/mame/video/mrdo.c
index 5d92c287089..fca036d6556 100644
--- a/src/mame/video/mrdo.c
+++ b/src/mame/video/mrdo.c
@@ -260,6 +260,6 @@ UINT32 mrdo_state::screen_update_mrdo(screen_device &screen, bitmap_ind16 &bitma
bitmap.fill(0, cliprect);
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);
return 0;
}
diff --git a/src/mame/video/mrflea.c b/src/mame/video/mrflea.c
index 25ee3be4de6..f4c271b9f90 100644
--- a/src/mame/video/mrflea.c
+++ b/src/mame/video/mrflea.c
@@ -103,7 +103,7 @@ static void draw_background( running_machine &machine, bitmap_ind16 &bitmap, con
UINT32 mrflea_state::screen_update_mrflea(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- draw_background(screen.machine(), bitmap, cliprect);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_background(machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/video/mrjong.c b/src/mame/video/mrjong.c
index 93ac9d37f94..e8c0540d224 100644
--- a/src/mame/video/mrjong.c
+++ b/src/mame/video/mrjong.c
@@ -145,6 +145,6 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
UINT32 mrjong_state::screen_update_mrjong(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/video/ms32.c b/src/mame/video/ms32.c
index 02f65da6332..23abac2130d 100644
--- a/src/mame/video/ms32.c
+++ b/src/mame/video/ms32.c
@@ -366,7 +366,7 @@ UINT32 ms32_state::screen_update_ms32(screen_device &screen, bitmap_rgb32 &bitma
int i;
for (i = 0;i < 0x10000;i++) // colors 0x3000-0x3fff are not used
- update_color(screen.machine(), i);
+ update_color(machine(), i);
scrollx = m_tx_scroll[0x00/4] + m_tx_scroll[0x08/4] + 0x18;
scrolly = m_tx_scroll[0x0c/4] + m_tx_scroll[0x14/4];
@@ -381,7 +381,7 @@ UINT32 ms32_state::screen_update_ms32(screen_device &screen, bitmap_rgb32 &bitma
m_bg_tilemap_alt->set_scrolly(0, scrolly);
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
@@ -393,7 +393,7 @@ UINT32 ms32_state::screen_update_ms32(screen_device &screen, bitmap_rgb32 &bitma
m_temp_bitmap_sprites.fill(0, cliprect);
m_temp_bitmap_sprites_pri.fill(0, cliprect);
- draw_sprites(screen.machine(), m_temp_bitmap_sprites, m_temp_bitmap_sprites_pri, cliprect, m_sprram_16, 0x20000, 0, m_reverse_sprite_order);
+ draw_sprites(machine(), m_temp_bitmap_sprites, m_temp_bitmap_sprites_pri, cliprect, m_sprram_16, 0x20000, 0, m_reverse_sprite_order);
@@ -416,7 +416,7 @@ UINT32 ms32_state::screen_update_ms32(screen_device &screen, bitmap_rgb32 &bitma
rot_pri++;
if (rot_pri == 0)
- draw_roz(screen.machine(), m_temp_bitmap_tilemaps, cliprect, 1 << 1);
+ draw_roz(machine(), m_temp_bitmap_tilemaps, cliprect, 1 << 1);
else if (scr_pri == 0)
if (m_tilemaplayoutcontrol&1)
{
@@ -430,7 +430,7 @@ UINT32 ms32_state::screen_update_ms32(screen_device &screen, bitmap_rgb32 &bitma
m_tx_tilemap->draw(m_temp_bitmap_tilemaps, cliprect, 0, 1 << 2);
if (rot_pri == 1)
- draw_roz(screen.machine(), m_temp_bitmap_tilemaps, cliprect, 1 << 1);
+ draw_roz(machine(), m_temp_bitmap_tilemaps, cliprect, 1 << 1);
else if (scr_pri == 1)
if (m_tilemaplayoutcontrol&1)
{
@@ -444,7 +444,7 @@ UINT32 ms32_state::screen_update_ms32(screen_device &screen, bitmap_rgb32 &bitma
m_tx_tilemap->draw(m_temp_bitmap_tilemaps, cliprect, 0, 1 << 2);
if (rot_pri == 2)
- draw_roz(screen.machine(), m_temp_bitmap_tilemaps, cliprect, 1 << 1);
+ draw_roz(machine(), m_temp_bitmap_tilemaps, cliprect, 1 << 1);
else if (scr_pri == 2)
if (m_tilemaplayoutcontrol&1)
{
@@ -465,7 +465,7 @@ UINT32 ms32_state::screen_update_ms32(screen_device &screen, bitmap_rgb32 &bitma
int xx, yy;
int width = screen.width();
int height = screen.height();
- const pen_t *paldata = screen.machine().pens;
+ const pen_t *paldata = machine().pens;
UINT16* srcptr_tile;
UINT8* srcptr_tilepri;
@@ -479,7 +479,7 @@ UINT32 ms32_state::screen_update_ms32(screen_device &screen, bitmap_rgb32 &bitma
for (yy=0;yy<height;yy++)
{
srcptr_tile = &m_temp_bitmap_tilemaps.pix16(yy);
- srcptr_tilepri = &screen.machine().priority_bitmap.pix8(yy);
+ srcptr_tilepri = &machine().priority_bitmap.pix8(yy);
srcptr_spri = &m_temp_bitmap_sprites.pix16(yy);
//srcptr_spripri = &m_temp_bitmap_sprites_pri.pix8(yy);
dstptr_bitmap = &bitmap.pix32(yy);
@@ -568,7 +568,7 @@ UINT32 ms32_state::screen_update_ms32(screen_device &screen, bitmap_rgb32 &bitma
}
else if (primask == 0xc0)
{
- dstptr_bitmap[xx] = paldata[screen.machine().rand()&0xfff];
+ dstptr_bitmap[xx] = paldata[machine().rand()&0xfff];
}
else if (primask == 0xf0)
{
@@ -652,12 +652,12 @@ UINT32 ms32_state::screen_update_ms32(screen_device &screen, bitmap_rgb32 &bitma
}
else if (src_tilepri==0x06)
{
- //dstptr_bitmap[xx] = paldata[screen.machine().rand()&0xfff];
+ //dstptr_bitmap[xx] = paldata[machine().rand()&0xfff];
dstptr_bitmap[xx] = paldata[src_tile]; // assumed
}
else if (src_tilepri==0x07)
{
- //dstptr_bitmap[xx] = paldata[screen.machine().rand()&0xfff];
+ //dstptr_bitmap[xx] = paldata[machine().rand()&0xfff];
dstptr_bitmap[xx] = paldata[src_tile]; // assumed
}
}
diff --git a/src/mame/video/msisaac.c b/src/mame/video/msisaac.c
index 961f97b202e..f16c125fcb2 100644
--- a/src/mame/video/msisaac.c
+++ b/src/mame/video/msisaac.c
@@ -234,7 +234,7 @@ UINT32 msisaac_state::screen_update_msisaac(screen_device &screen, bitmap_ind16
{
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
m_bg2_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/video/mugsmash.c b/src/mame/video/mugsmash.c
index c7d9afd0bb1..14997777475 100644
--- a/src/mame/video/mugsmash.c
+++ b/src/mame/video/mugsmash.c
@@ -150,6 +150,6 @@ UINT32 mugsmash_state::screen_update_mugsmash(screen_device &screen, bitmap_ind1
m_tilemap2->draw(bitmap, cliprect, 0, 0);
m_tilemap1->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/video/munchmo.c b/src/mame/video/munchmo.c
index 86f3ad211a3..a4ec945123d 100644
--- a/src/mame/video/munchmo.c
+++ b/src/mame/video/munchmo.c
@@ -150,8 +150,8 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
UINT32 munchmo_state::screen_update_mnchmobl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- draw_background(screen.machine(), bitmap, cliprect);
- draw_sprites(screen.machine(), bitmap, cliprect);
- draw_status(screen.machine(), bitmap, cliprect);
+ draw_background(machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
+ draw_status(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/video/mustache.c b/src/mame/video/mustache.c
index 3a22690799a..595cdbe3fe7 100644
--- a/src/mame/video/mustache.c
+++ b/src/mame/video/mustache.c
@@ -142,6 +142,6 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
UINT32 mustache_state::screen_update_mustache(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/video/mystston.c b/src/mame/video/mystston.c
index 1c0a4cdc1e8..f767f8ffaa0 100644
--- a/src/mame/video/mystston.c
+++ b/src/mame/video/mystston.c
@@ -252,16 +252,16 @@ VIDEO_RESET_MEMBER(mystston_state,mystston)
UINT32 mystston_state::screen_update_mystston(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- int flip = (*m_video_control & 0x80) ^ ((screen.machine().root_device().ioport("DSW1")->read() & 0x20) << 2);
+ int flip = (*m_video_control & 0x80) ^ ((machine().root_device().ioport("DSW1")->read() & 0x20) << 2);
- set_palette(screen.machine(), this);
+ set_palette(machine(), this);
- screen.machine().tilemap().mark_all_dirty();
+ machine().tilemap().mark_all_dirty();
m_bg_tilemap->set_scrolly(0, *m_scroll);
- screen.machine().tilemap().set_flip_all(flip ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
+ machine().tilemap().set_flip_all(flip ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(bitmap, cliprect, screen.machine().gfx[2], flip);
+ draw_sprites(bitmap, cliprect, machine().gfx[2], flip);
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
diff --git a/src/mame/video/mystwarr.c b/src/mame/video/mystwarr.c
index 57d9294dc20..8f2b20f45c9 100644
--- a/src/mame/video/mystwarr.c
+++ b/src/mame/video/mystwarr.c
@@ -336,7 +336,7 @@ UINT32 mystwarr_state::screen_update_mystwarr(screen_device &screen, bitmap_rgb3
m_sprite_colorbase = K055555_get_palette_index(4)<<5;
- konamigx_mixer(screen.machine(), bitmap, cliprect, 0, 0, 0, 0, blendmode, 0, 0);
+ konamigx_mixer(machine(), bitmap, cliprect, 0, 0, 0, 0, blendmode, 0, 0);
return 0;
}
@@ -353,7 +353,7 @@ UINT32 mystwarr_state::screen_update_metamrph(screen_device &screen, bitmap_rgb3
m_sprite_colorbase = K055555_get_palette_index(4)<<4;
- konamigx_mixer(screen.machine(), bitmap, cliprect, 0, GXSUB_K053250 | GXSUB_4BPP, 0, 0, 0, 0, 0);
+ konamigx_mixer(machine(), bitmap, cliprect, 0, GXSUB_K053250 | GXSUB_4BPP, 0, 0, 0, 0, 0);
return 0;
}
@@ -376,7 +376,7 @@ UINT32 mystwarr_state::screen_update_martchmp(screen_device &screen, bitmap_rgb3
// not quite right
blendmode = (m_oinprion==0xef && K054338_read_register(K338_REG_PBLEND)) ? ((1<<16|GXMIX_BLEND_FORCE)<<2) : 0;
- konamigx_mixer(screen.machine(), bitmap, cliprect, 0, 0, 0, 0, blendmode, 0, 0);
+ konamigx_mixer(machine(), bitmap, cliprect, 0, 0, 0, 0, blendmode, 0, 0);
return 0;
}
@@ -537,6 +537,6 @@ UINT32 mystwarr_state::screen_update_dadandrn(screen_device &screen, bitmap_rgb3
popmessage("K053936: PSAC colorbase changed");
}
- konamigx_mixer(screen.machine(), bitmap, cliprect, (m_roz_enable) ? m_ult_936_tilemap : 0, rozmode, 0, 0, 0, 0, 0);
+ konamigx_mixer(machine(), bitmap, cliprect, (m_roz_enable) ? m_ult_936_tilemap : 0, rozmode, 0, 0, 0, 0, 0);
return 0;
}
diff --git a/src/mame/video/n64.c b/src/mame/video/n64.c
index 6ad01389eb8..daf5eb755fc 100644
--- a/src/mame/video/n64.c
+++ b/src/mame/video/n64.c
@@ -3849,7 +3849,7 @@ void n64_state::video_start()
UINT32 n64_state::screen_update_n64(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- n64_periphs *n64 = screen.machine().device<n64_periphs>("rcp");
+ n64_periphs *n64 = machine().device<n64_periphs>("rcp");
m_rdp->visarea = screen.visible_area();
//UINT16 *frame_buffer = (UINT16*)&rdram[(n64->vi_origin & 0xffffff) >> 2];
diff --git a/src/mame/video/n8080.c b/src/mame/video/n8080.c
index dfbbe93f875..4d68e6ec47a 100644
--- a/src/mame/video/n8080.c
+++ b/src/mame/video/n8080.c
@@ -248,8 +248,8 @@ UINT32 n8080_state::screen_update_sheriff(screen_device &screen, bitmap_ind16 &b
UINT32 n8080_state::screen_update_helifire(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- int SUN_BRIGHTNESS = screen.machine().root_device().ioport("POT0")->read();
- int SEA_BRIGHTNESS = screen.machine().root_device().ioport("POT1")->read();
+ int SUN_BRIGHTNESS = machine().root_device().ioport("POT0")->read();
+ int SEA_BRIGHTNESS = machine().root_device().ioport("POT1")->read();
static const int wave[8] = { 0, 1, 2, 2, 2, 1, 0, 0 };
@@ -336,7 +336,7 @@ UINT32 n8080_state::screen_update_helifire(screen_device &screen, bitmap_ind16 &
/* next line */
- helifire_next_line(screen.machine());
+ helifire_next_line(machine());
}
m_helifire_mv = saved_mv;
@@ -350,7 +350,7 @@ void n8080_state::screen_eof_helifire(screen_device &screen, bool state)
// falling edge
if (!state)
{
- int n = (screen.machine().primary_screen->frame_number() >> 1) % sizeof m_helifire_LSFR;
+ int n = (machine().primary_screen->frame_number() >> 1) % sizeof m_helifire_LSFR;
int i;
@@ -367,13 +367,13 @@ void n8080_state::screen_eof_helifire(screen_device &screen, bool state)
G |= B;
}
- if (screen.machine().primary_screen->frame_number() & 0x04)
+ if (machine().primary_screen->frame_number() & 0x04)
{
R |= G;
}
}
- palette_set_color_rgb(screen.machine(),i,
+ palette_set_color_rgb(machine(),i,
R ? 255 : 0,
G ? 255 : 0,
B ? 255 : 0);
@@ -381,7 +381,7 @@ void n8080_state::screen_eof_helifire(screen_device &screen, bool state)
for (i = 0; i < 256; i++)
{
- helifire_next_line(screen.machine());
+ helifire_next_line(machine());
}
}
}
diff --git a/src/mame/video/namcofl.c b/src/mame/video/namcofl.c
index cd9280f35a7..84b1f34d4f7 100644
--- a/src/mame/video/namcofl.c
+++ b/src/mame/video/namcofl.c
@@ -84,9 +84,9 @@ UINT32 namcofl_state::screen_update_namcofl(screen_device &screen, bitmap_ind16
{
int pri;
- namcofl_install_palette(screen.machine());
+ namcofl_install_palette(machine());
- bitmap.fill(get_black_pen(screen.machine()), cliprect );
+ bitmap.fill(get_black_pen(machine()), cliprect );
for( pri=0; pri<16; pri++ )
{
diff --git a/src/mame/video/namcona1.c b/src/mame/video/namcona1.c
index 93e8ec48135..87e37dac055 100644
--- a/src/mame/video/namcona1.c
+++ b/src/mame/video/namcona1.c
@@ -644,11 +644,11 @@ UINT32 namcona1_state::screen_update_namcona1(screen_device &screen, bitmap_ind1
/* palette updates are delayed when graphics are disabled */
for( which=0; which<0x1000; which++ )
{
- UpdatePalette(screen.machine(), which );
+ UpdatePalette(machine(), which );
}
m_palette_is_dirty = 0;
}
- UpdateGfx(screen.machine());
+ UpdateGfx(machine());
for( which=0; which<NAMCONA1_NUM_TILEMAPS; which++ )
{
int tilemap_color = m_vreg[0xb0/2+(which&3)]&0xf;
@@ -668,7 +668,7 @@ UINT32 namcona1_state::screen_update_namcona1(screen_device &screen, bitmap_ind1
}
}
- screen.machine().priority_bitmap.fill(0, cliprect );
+ machine().priority_bitmap.fill(0, cliprect );
bitmap.fill(0xff, cliprect ); /* background color? */
@@ -687,12 +687,12 @@ UINT32 namcona1_state::screen_update_namcona1(screen_device &screen, bitmap_ind1
}
if( pri == priority )
{
- draw_background(screen.machine(),bitmap,cliprect,which,priority);
+ draw_background(machine(),bitmap,cliprect,which,priority);
}
} /* next tilemap */
} /* next priority level */
- draw_sprites(screen.machine(),bitmap,cliprect);
+ draw_sprites(machine(),bitmap,cliprect);
} /* gfx enabled */
return 0;
}
diff --git a/src/mame/video/namconb1.c b/src/mame/video/namconb1.c
index db0463d0c48..fd72da508c0 100644
--- a/src/mame/video/namconb1.c
+++ b/src/mame/video/namconb1.c
@@ -146,9 +146,9 @@ UINT32 namconb1_state::screen_update_namconb1(screen_device &screen, bitmap_ind1
/* intersect with master clip rectangle */
clip &= cliprect;
- bitmap.fill(get_black_pen(screen.machine()), cliprect );
+ bitmap.fill(get_black_pen(machine()), cliprect );
- video_update_common( screen.machine(), bitmap, clip, 0 );
+ video_update_common( machine(), bitmap, clip, 0 );
return 0;
}
@@ -183,14 +183,14 @@ UINT32 namconb1_state::screen_update_namconb2(screen_device &screen, bitmap_ind1
/* intersect with master clip rectangle */
clip &= cliprect;
- bitmap.fill(get_black_pen(screen.machine()), cliprect );
+ bitmap.fill(get_black_pen(machine()), cliprect );
if( memcmp(m_tilemap_tile_bank,m_tilebank32,sizeof(m_tilemap_tile_bank))!=0 )
{
namco_tilemap_invalidate();
memcpy(m_tilemap_tile_bank,m_tilebank32,sizeof(m_tilemap_tile_bank));
}
- video_update_common( screen.machine(), bitmap, clip, 1 );
+ video_update_common( machine(), bitmap, clip, 1 );
return 0;
}
diff --git a/src/mame/video/namcos1.c b/src/mame/video/namcos1.c
index dd3d3eb5016..f1bea34316d 100644
--- a/src/mame/video/namcos1.c
+++ b/src/mame/video/namcos1.c
@@ -371,11 +371,11 @@ UINT32 namcos1_state::screen_update_namcos1(screen_device &screen, bitmap_ind16
/* flip screen is embedded in the sprite control registers */
/* can't use flip_screen_set() because the visible area is asymmetrical */
flip_screen_set_no_update(m_spriteram[0x0ff6] & 1);
- screen.machine().tilemap().set_flip_all(flip_screen() ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
+ machine().tilemap().set_flip_all(flip_screen() ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
/* background color */
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
/* berabohm uses asymmetrical visibility windows to iris on the character */
i = ((m_cus116[0] << 8) | m_cus116[1]) - 1; // min x
@@ -414,7 +414,7 @@ UINT32 namcos1_state::screen_update_namcos1(screen_device &screen, bitmap_ind16
}
- screen.machine().priority_bitmap.fill(0, new_clip);
+ machine().priority_bitmap.fill(0, new_clip);
/* bit 0-2 priority */
/* bit 3 disable */
@@ -427,7 +427,7 @@ UINT32 namcos1_state::screen_update_namcos1(screen_device &screen, bitmap_ind16
}
}
- draw_sprites(screen.machine(), bitmap, new_clip);
+ draw_sprites(machine(), bitmap, new_clip);
return 0;
}
diff --git a/src/mame/video/namcos21.c b/src/mame/video/namcos21.c
index b101c39dd5d..e285e3ee6fb 100644
--- a/src/mame/video/namcos21.c
+++ b/src/mame/video/namcos21.c
@@ -170,7 +170,7 @@ UINT32 namcos21_state::screen_update_namcos21(screen_device &screen, bitmap_ind1
UINT8 *videoram = m_videoram;
int pivot = 3;
int pri;
- update_palette(screen.machine());
+ update_palette(machine());
bitmap.fill(0xff, cliprect );
if( m_gametype != NAMCOS21_WINRUN91 )
@@ -179,7 +179,7 @@ UINT32 namcos21_state::screen_update_namcos21(screen_device &screen, bitmap_ind1
c355_obj_draw(bitmap, cliprect, 14 ); //driver's eyes
}
- CopyVisiblePolyFrameBuffer( screen.machine(), bitmap, cliprect, 0x7fc0, 0x7ffe );
+ CopyVisiblePolyFrameBuffer( machine(), bitmap, cliprect, 0x7fc0, 0x7ffe );
if( m_gametype != NAMCOS21_WINRUN91 )
{ /* draw low priority 2d sprites */
@@ -187,7 +187,7 @@ UINT32 namcos21_state::screen_update_namcos21(screen_device &screen, bitmap_ind1
c355_obj_draw(bitmap, cliprect, 1 );
}
- CopyVisiblePolyFrameBuffer( screen.machine(), bitmap, cliprect, 0, 0x7fbf );
+ CopyVisiblePolyFrameBuffer( machine(), bitmap, cliprect, 0, 0x7fbf );
if( m_gametype != NAMCOS21_WINRUN91 )
diff --git a/src/mame/video/namcos22.c b/src/mame/video/namcos22.c
index 446addd95fd..b71de2215c9 100644
--- a/src/mame/video/namcos22.c
+++ b/src/mame/video/namcos22.c
@@ -2781,10 +2781,10 @@ VIDEO_START_MEMBER(namcos22_state,namcos22s)
UINT32 namcos22_state::screen_update_namcos22s(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- UpdateVideoMixer(screen.machine());
- UpdatePalette(screen.machine());
- namcos22s_recalc_czram(screen.machine());
- screen.machine().priority_bitmap.fill(0, cliprect);
+ UpdateVideoMixer(machine());
+ UpdatePalette(machine());
+ namcos22s_recalc_czram(machine());
+ machine().priority_bitmap.fill(0, cliprect);
// background color
rgbint bg_color;
@@ -2799,16 +2799,16 @@ UINT32 namcos22_state::screen_update_namcos22s(screen_device &screen, bitmap_rgb
// layers
UINT8 layer = nthbyte(m_gamma,0x1f);
- if (layer&4) DrawCharacterLayer(screen.machine(), bitmap, cliprect);
- if (layer&2) DrawSprites(screen.machine(), bitmap, cliprect);
- if (layer&1) DrawPolygons(screen.machine(), bitmap);
- RenderScene(screen.machine(), bitmap );
- if (layer&4) namcos22s_mix_textlayer(screen.machine(), bitmap, cliprect, 6);
- ApplyGamma(screen.machine(), bitmap);
+ if (layer&4) DrawCharacterLayer(machine(), bitmap, cliprect);
+ if (layer&2) DrawSprites(machine(), bitmap, cliprect);
+ if (layer&1) DrawPolygons(machine(), bitmap);
+ RenderScene(machine(), bitmap );
+ if (layer&4) namcos22s_mix_textlayer(machine(), bitmap, cliprect, 6);
+ ApplyGamma(machine(), bitmap);
// debug stuff
#if ALLOW_MEMDUMP
- if( screen.machine().input().code_pressed(KEYCODE_D) )
+ if( machine().input().code_pressed(KEYCODE_D) )
{
FILE *f = fopen( "dump.txt", "wb" );
if( f )
@@ -2852,7 +2852,7 @@ UINT32 namcos22_state::screen_update_namcos22s(screen_device &screen, bitmap_rgb
//Dump(space, f,0xc00000, 0xc1ffff, "polygonram");
fclose( f );
}
- while( screen.machine().input().code_pressed(KEYCODE_D) ){}
+ while( machine().input().code_pressed(KEYCODE_D) ){}
}
#endif
@@ -2863,17 +2863,17 @@ UINT32 namcos22_state::screen_update_namcos22s(screen_device &screen, bitmap_rgb
UINT32 namcos22_state::screen_update_namcos22(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- UpdateVideoMixer(screen.machine());
- UpdatePalette(screen.machine());
- screen.machine().priority_bitmap.fill(0, cliprect);
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
- DrawPolygons(screen.machine(), bitmap);
- RenderScene(screen.machine(), bitmap);
- DrawCharacterLayer(screen.machine(), bitmap, cliprect);
- ApplyGamma(screen.machine(), bitmap);
+ UpdateVideoMixer(machine());
+ UpdatePalette(machine());
+ machine().priority_bitmap.fill(0, cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
+ DrawPolygons(machine(), bitmap);
+ RenderScene(machine(), bitmap);
+ DrawCharacterLayer(machine(), bitmap, cliprect);
+ ApplyGamma(machine(), bitmap);
#if ALLOW_MEMDUMP
- if( screen.machine().input().code_pressed(KEYCODE_D) )
+ if( machine().input().code_pressed(KEYCODE_D) )
{
FILE *f = fopen( "dump.txt", "wb" );
if( f )
@@ -2887,7 +2887,7 @@ UINT32 namcos22_state::screen_update_namcos22(screen_device &screen, bitmap_rgb3
//Dump(space, f,0x70000000, 0x7001ffff, "polygonram");
fclose( f );
}
- while( screen.machine().input().code_pressed(KEYCODE_D) ){}
+ while( machine().input().code_pressed(KEYCODE_D) ){}
}
#endif
diff --git a/src/mame/video/namcos86.c b/src/mame/video/namcos86.c
index 96a7a523c53..a30423500fe 100644
--- a/src/mame/video/namcos86.c
+++ b/src/mame/video/namcos86.c
@@ -356,15 +356,15 @@ UINT32 namcos86_state::screen_update_namcos86(screen_device &screen, bitmap_ind1
/* flip screen is embedded in the sprite control registers */
/* can't use flip_screen_set() because the visible area is asymmetrical */
flip_screen_set_no_update(m_spriteram[0x07f6] & 1);
- screen.machine().tilemap().set_flip_all(flip_screen() ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
- set_scroll(screen.machine(), 0);
- set_scroll(screen.machine(), 1);
- set_scroll(screen.machine(), 2);
- set_scroll(screen.machine(), 3);
+ machine().tilemap().set_flip_all(flip_screen() ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
+ set_scroll(machine(), 0);
+ set_scroll(machine(), 1);
+ set_scroll(machine(), 2);
+ set_scroll(machine(), 3);
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
- bitmap.fill(screen.machine().gfx[0]->colorbase() + 8*m_backcolor+7, cliprect);
+ bitmap.fill(machine().gfx[0]->colorbase() + 8*m_backcolor+7, cliprect);
for (layer = 0;layer < 8;layer++)
{
@@ -377,7 +377,7 @@ UINT32 namcos86_state::screen_update_namcos86(screen_device &screen, bitmap_ind1
}
}
- draw_sprites(screen.machine(),bitmap,cliprect);
+ draw_sprites(machine(),bitmap,cliprect);
return 0;
}
diff --git a/src/mame/video/naughtyb.c b/src/mame/video/naughtyb.c
index d30928deb66..1a8c0f1fddc 100644
--- a/src/mame/video/naughtyb.c
+++ b/src/mame/video/naughtyb.c
@@ -223,13 +223,13 @@ UINT32 naughtyb_state::screen_update_naughtyb(screen_device &screen, bitmap_ind1
}
}
- drawgfx_opaque(tmpbitmap,tmpbitmap.cliprect(),screen.machine().gfx[0],
+ drawgfx_opaque(tmpbitmap,tmpbitmap.cliprect(),machine().gfx[0],
m_videoram2[offs] + 256 * m_bankreg,
(m_videoram2[offs] >> 5) + 8 * m_palreg,
m_cocktail,m_cocktail,
8*sx,8*sy);
- drawgfx_transpen(tmpbitmap,tmpbitmap.cliprect(),screen.machine().gfx[1],
+ drawgfx_transpen(tmpbitmap,tmpbitmap.cliprect(),machine().gfx[1],
videoram[offs] + 256*m_bankreg,
(videoram[offs] >> 5) + 8 * m_palreg,
m_cocktail,m_cocktail,
diff --git a/src/mame/video/nbmj8891.c b/src/mame/video/nbmj8891.c
index 1ebf7ccd069..f0cbf931516 100644
--- a/src/mame/video/nbmj8891.c
+++ b/src/mame/video/nbmj8891.c
@@ -519,12 +519,12 @@ UINT32 nbmj8891_state::screen_update_nbmj8891(screen_device &screen, bitmap_ind1
m_screen_refresh = 0;
for (y = 0; y < height; y++)
for (x = 0; x < width; x++)
- update_pixel0(screen.machine(), x, y);
+ update_pixel0(machine(), x, y);
if (m_gfxdraw_mode)
for (y = 0; y < height; y++)
for (x = 0; x < width; x++)
- update_pixel1(screen.machine(), x, y);
+ update_pixel1(machine(), x, y);
}
if (m_dispflag)
diff --git a/src/mame/video/nbmj8900.c b/src/mame/video/nbmj8900.c
index 0d4358d9592..faa6547b76c 100644
--- a/src/mame/video/nbmj8900.c
+++ b/src/mame/video/nbmj8900.c
@@ -396,7 +396,7 @@ UINT32 nbmj8900_state::screen_update_nbmj8900(screen_device &screen, bitmap_ind1
{
for (x = 0; x < m_screen_width; x++)
{
- update_pixel0(screen.machine(), x, y);
+ update_pixel0(machine(), x, y);
}
}
if (m_gfxdraw_mode)
@@ -405,7 +405,7 @@ UINT32 nbmj8900_state::screen_update_nbmj8900(screen_device &screen, bitmap_ind1
{
for (x = 0; x < m_screen_width; x++)
{
- update_pixel1(screen.machine(), x, y);
+ update_pixel1(machine(), x, y);
}
}
}
diff --git a/src/mame/video/nbmj8991.c b/src/mame/video/nbmj8991.c
index f0993254781..ea4287036bc 100644
--- a/src/mame/video/nbmj8991.c
+++ b/src/mame/video/nbmj8991.c
@@ -304,14 +304,14 @@ UINT32 nbmj8991_state::screen_update_nbmj8991_type1(screen_device &screen, bitma
if (m_screen_refresh)
{
- int width = screen.machine().primary_screen->width();
- int height = screen.machine().primary_screen->height();
+ int width = machine().primary_screen->width();
+ int height = machine().primary_screen->height();
m_screen_refresh = 0;
for (y = 0; y < height; y++)
for (x = 0; x < width; x++)
- update_pixel(screen.machine(), x, y);
+ update_pixel(machine(), x, y);
}
if (m_dispflag)
@@ -350,7 +350,7 @@ UINT32 nbmj8991_state::screen_update_nbmj8991_type2(screen_device &screen, bitma
for (y = 0; y < height; y++)
for (x = 0; x < width; x++)
- update_pixel(screen.machine(), x, y);
+ update_pixel(machine(), x, y);
}
if (nb1413m3_inputport & 0x20)
diff --git a/src/mame/video/nbmj9195.c b/src/mame/video/nbmj9195.c
index 23358e54232..cf564dff869 100644
--- a/src/mame/video/nbmj9195.c
+++ b/src/mame/video/nbmj9195.c
@@ -454,10 +454,10 @@ UINT32 nbmj9195_state::screen_update_nbmj9195(screen_device &screen, bitmap_ind1
for (y = 0; y < height; y++)
for (x = 0; x < width; x++)
{
- update_pixel(screen.machine(), 0, x, y);
+ update_pixel(machine(), 0, x, y);
if (m_gfxdraw_mode)
- update_pixel(screen.machine(), 1, x, y);
+ update_pixel(machine(), 1, x, y);
}
}
diff --git a/src/mame/video/nemesis.c b/src/mame/video/nemesis.c
index db59b055c06..7b279f341b9 100644
--- a/src/mame/video/nemesis.c
+++ b/src/mame/video/nemesis.c
@@ -417,7 +417,7 @@ UINT32 nemesis_state::screen_update_nemesis(screen_device &screen, bitmap_ind16
int offs;
rectangle clip;
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
bitmap.fill(0, cliprect);
clip.min_x = 0;
@@ -462,7 +462,7 @@ UINT32 nemesis_state::screen_update_nemesis(screen_device &screen, bitmap_ind16
}
}
- draw_sprites(screen.machine(),bitmap,cliprect);
+ draw_sprites(machine(),bitmap,cliprect);
return 0;
}
diff --git a/src/mame/video/neogeo.c b/src/mame/video/neogeo.c
index 7f0346bb44d..331bbca6873 100644
--- a/src/mame/video/neogeo.c
+++ b/src/mame/video/neogeo.c
@@ -923,9 +923,9 @@ UINT32 neogeo_state::screen_update_neogeo(screen_device &screen, bitmap_rgb32 &b
/* fill with background color first */
bitmap.fill(m_pens[0x0fff], cliprect);
- draw_sprites(screen.machine(), bitmap, cliprect.min_y);
+ draw_sprites(machine(), bitmap, cliprect.min_y);
- draw_fixed_layer(screen.machine(), bitmap, cliprect.min_y);
+ draw_fixed_layer(machine(), bitmap, cliprect.min_y);
return 0;
}
diff --git a/src/mame/video/ninjakd2.c b/src/mame/video/ninjakd2.c
index ff0989fe18c..c188609a649 100644
--- a/src/mame/video/ninjakd2.c
+++ b/src/mame/video/ninjakd2.c
@@ -461,7 +461,7 @@ UINT32 ninjakd2_state::screen_update_ninjakd2(screen_device &screen, bitmap_ind1
{
// updating sprites here instead than in screen_eof avoids a palette glitch
// at the end of the "rainbow sky" screens.
- update_sprites(screen.machine());
+ update_sprites(machine());
m_sprites_updated = 1;
bitmap.fill(0, cliprect);
@@ -477,7 +477,7 @@ UINT32 ninjakd2_state::screen_update_ninjakd2(screen_device &screen, bitmap_ind1
UINT32 ninjakd2_state::screen_update_robokid(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- update_sprites(screen.machine());
+ update_sprites(machine());
m_sprites_updated = 1;
bitmap.fill(0, cliprect);
@@ -497,7 +497,7 @@ UINT32 ninjakd2_state::screen_update_robokid(screen_device &screen, bitmap_ind16
UINT32 ninjakd2_state::screen_update_omegaf(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- update_sprites(screen.machine());
+ update_sprites(machine());
m_sprites_updated = 1;
bitmap.fill(0, cliprect);
@@ -522,7 +522,7 @@ void ninjakd2_state::screen_eof_ninjakd2(screen_device &screen, bool state)
if (state)
{
if (!m_sprites_updated)
- update_sprites(screen.machine());
+ update_sprites(machine());
m_sprites_updated = 0;
}
diff --git a/src/mame/video/ninjaw.c b/src/mame/video/ninjaw.c
index 6aeb0eebce6..6780e891399 100644
--- a/src/mame/video/ninjaw.c
+++ b/src/mame/video/ninjaw.c
@@ -127,6 +127,6 @@ static UINT32 update_screen(screen_device &screen, bitmap_ind16 &bitmap, const r
return 0;
}
-UINT32 ninjaw_state::screen_update_ninjaw_left(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect){ return update_screen(screen, bitmap, cliprect, 36 * 8 * 0, screen.machine().driver_data<ninjaw_state>()->m_tc0100scn_1); }
-UINT32 ninjaw_state::screen_update_ninjaw_middle(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect){ return update_screen(screen, bitmap, cliprect, 36 * 8 * 1, screen.machine().driver_data<ninjaw_state>()->m_tc0100scn_2); }
-UINT32 ninjaw_state::screen_update_ninjaw_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect){ return update_screen(screen, bitmap, cliprect, 36 * 8 * 2, screen.machine().driver_data<ninjaw_state>()->m_tc0100scn_3); }
+UINT32 ninjaw_state::screen_update_ninjaw_left(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect){ return update_screen(screen, bitmap, cliprect, 36 * 8 * 0, machine().driver_data<ninjaw_state>()->m_tc0100scn_1); }
+UINT32 ninjaw_state::screen_update_ninjaw_middle(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect){ return update_screen(screen, bitmap, cliprect, 36 * 8 * 1, machine().driver_data<ninjaw_state>()->m_tc0100scn_2); }
+UINT32 ninjaw_state::screen_update_ninjaw_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect){ return update_screen(screen, bitmap, cliprect, 36 * 8 * 2, machine().driver_data<ninjaw_state>()->m_tc0100scn_3); }
diff --git a/src/mame/video/nitedrvr.c b/src/mame/video/nitedrvr.c
index b5aa33b0a48..e022624186e 100644
--- a/src/mame/video/nitedrvr.c
+++ b/src/mame/video/nitedrvr.c
@@ -73,6 +73,6 @@ UINT32 nitedrvr_state::screen_update_nitedrvr(screen_device &screen, bitmap_ind1
{
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_roadway(screen.machine(), bitmap);
+ draw_roadway(machine(), bitmap);
return 0;
}
diff --git a/src/mame/video/niyanpai.c b/src/mame/video/niyanpai.c
index 08ae48f963f..038e9922113 100644
--- a/src/mame/video/niyanpai.c
+++ b/src/mame/video/niyanpai.c
@@ -398,9 +398,9 @@ UINT32 niyanpai_state::screen_update_niyanpai(screen_device &screen, bitmap_ind1
for (y = 0; y < height; y++)
for (x = 0; x < width; x++)
{
- update_pixel(screen.machine(), 0, x, y);
- update_pixel(screen.machine(), 1, x, y);
- update_pixel(screen.machine(), 2, x, y);
+ update_pixel(machine(), 0, x, y);
+ update_pixel(machine(), 1, x, y);
+ update_pixel(machine(), 2, x, y);
}
}
diff --git a/src/mame/video/nmk16.c b/src/mame/video/nmk16.c
index 15088105d4c..6d84ea83cc9 100644
--- a/src/mame/video/nmk16.c
+++ b/src/mame/video/nmk16.c
@@ -990,10 +990,10 @@ static void redhawki_video_update(running_machine &machine, bitmap_ind16 &bitmap
nmk16_draw_sprites_flipsupported(machine, bitmap,cliprect,0);
}
-UINT32 nmk16_state::screen_update_afega(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect){ video_update(screen.machine(),bitmap,cliprect, 1, -0x100,+0x000, 0x0001); return 0; }
-UINT32 nmk16_state::screen_update_bubl2000(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect){ video_update(screen.machine(),bitmap,cliprect, 0, -0x100,+0x000, 0x0001); return 0; } // no flipscreen support, I really would confirmation from the schematics
-UINT32 nmk16_state::screen_update_redhawkb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect){ video_update(screen.machine(),bitmap,cliprect, 0, +0x000,+0x100, 0x0001); return 0; }
-UINT32 nmk16_state::screen_update_redhawki(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect){ redhawki_video_update(screen.machine(),bitmap,cliprect); return 0;} // strange scroll regs
+UINT32 nmk16_state::screen_update_afega(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect){ video_update(machine(),bitmap,cliprect, 1, -0x100,+0x000, 0x0001); return 0; }
+UINT32 nmk16_state::screen_update_bubl2000(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect){ video_update(machine(),bitmap,cliprect, 0, -0x100,+0x000, 0x0001); return 0; } // no flipscreen support, I really would confirmation from the schematics
+UINT32 nmk16_state::screen_update_redhawkb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect){ video_update(machine(),bitmap,cliprect, 0, +0x000,+0x100, 0x0001); return 0; }
+UINT32 nmk16_state::screen_update_redhawki(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect){ redhawki_video_update(machine(),bitmap,cliprect); return 0;} // strange scroll regs
UINT32 nmk16_state::screen_update_firehawk(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
@@ -1002,10 +1002,10 @@ UINT32 nmk16_state::screen_update_firehawk(screen_device &screen, bitmap_ind16 &
m_bg_tilemap0->draw(bitmap, cliprect, 0,0);
- nmk16_draw_sprites_flipsupported(screen.machine(), bitmap,cliprect,3);
- nmk16_draw_sprites_flipsupported(screen.machine(), bitmap,cliprect,2);
- nmk16_draw_sprites_flipsupported(screen.machine(), bitmap,cliprect,1);
- nmk16_draw_sprites_flipsupported(screen.machine(), bitmap,cliprect,0);
+ nmk16_draw_sprites_flipsupported(machine(), bitmap,cliprect,3);
+ nmk16_draw_sprites_flipsupported(machine(), bitmap,cliprect,2);
+ nmk16_draw_sprites_flipsupported(machine(), bitmap,cliprect,1);
+ nmk16_draw_sprites_flipsupported(machine(), bitmap,cliprect,0);
m_tx_tilemap->draw(bitmap, cliprect, 0,0);
return 0;
diff --git a/src/mame/video/nova2001.c b/src/mame/video/nova2001.c
index bbd6eee64c6..03e3461a2b1 100644
--- a/src/mame/video/nova2001.c
+++ b/src/mame/video/nova2001.c
@@ -343,7 +343,7 @@ UINT32 nova2001_state::screen_update_nova2001(screen_device &screen, bitmap_ind1
{
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- nova2001_draw_sprites(screen.machine(), bitmap, cliprect);
+ nova2001_draw_sprites(machine(), bitmap, cliprect);
// according to the schematics, fg category 0 should be drawn behind sprites,
// but it doesn't look right that way
@@ -357,7 +357,7 @@ UINT32 nova2001_state::screen_update_pkunwar(screen_device &screen, bitmap_ind16
{
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE | TILEMAP_DRAW_ALL_CATEGORIES, 0);
- pkunwar_draw_sprites(screen.machine(), bitmap, cliprect);
+ pkunwar_draw_sprites(machine(), bitmap, cliprect);
m_bg_tilemap->draw(bitmap, cliprect, 1, 0);
@@ -370,7 +370,7 @@ UINT32 nova2001_state::screen_update_ninjakun(screen_device &screen, bitmap_ind1
m_fg_tilemap->draw(bitmap, cliprect, 1, 0);
- nova2001_draw_sprites(screen.machine(), bitmap, cliprect);
+ nova2001_draw_sprites(machine(), bitmap, cliprect);
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
@@ -381,7 +381,7 @@ UINT32 nova2001_state::screen_update_raiders5(screen_device &screen, bitmap_ind1
{
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- pkunwar_draw_sprites(screen.machine(), bitmap, cliprect);
+ pkunwar_draw_sprites(machine(), bitmap, cliprect);
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
diff --git a/src/mame/video/nycaptor.c b/src/mame/video/nycaptor.c
index c7d1825a175..d3c7a4c98ca 100644
--- a/src/mame/video/nycaptor.c
+++ b/src/mame/video/nycaptor.c
@@ -241,7 +241,7 @@ UINT32 nycaptor_state::screen_update_nycaptor(screen_device &screen, bitmap_ind1
{
#if NYCAPTOR_DEBUG
- nycaptor_setmask(screen.machine());
+ nycaptor_setmask(machine());
if (m_mask & 0x1000)
{
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 3, 0);
@@ -252,46 +252,46 @@ UINT32 nycaptor_state::screen_update_nycaptor(screen_device &screen, bitmap_ind1
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 1, 0);
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 0, 0);
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 1);
- draw_sprites(screen.machine(), bitmap, cliprect, 2);
- draw_sprites(screen.machine(), bitmap, cliprect, 3);
- draw_sprites(screen.machine(), bitmap, cliprect, 4);
- draw_sprites(screen.machine(), bitmap, cliprect, 5);
- draw_sprites(screen.machine(), bitmap, cliprect, 6);
- draw_sprites(screen.machine(), bitmap, cliprect, 7);
+ draw_sprites(machine(), bitmap, cliprect, 0);
+ draw_sprites(machine(), bitmap, cliprect, 1);
+ draw_sprites(machine(), bitmap, cliprect, 2);
+ draw_sprites(machine(), bitmap, cliprect, 3);
+ draw_sprites(machine(), bitmap, cliprect, 4);
+ draw_sprites(machine(), bitmap, cliprect, 5);
+ draw_sprites(machine(), bitmap, cliprect, 6);
+ draw_sprites(machine(), bitmap, cliprect, 7);
}
else
#endif
- switch (nycaptor_spot(screen.machine()) & 3)
+ switch (nycaptor_spot(machine()) & 3)
{
case 0:
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 3, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 6);
+ draw_sprites(machine(), bitmap, cliprect, 6);
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 3, 0);
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 2, 0);
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 2, 0);
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 1, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 3);
+ draw_sprites(machine(), bitmap, cliprect, 3);
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 1, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 2);
+ draw_sprites(machine(), bitmap, cliprect, 0);
+ draw_sprites(machine(), bitmap, cliprect, 2);
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 1);
+ draw_sprites(machine(), bitmap, cliprect, 1);
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 0, 0);
break;
case 1:
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 3, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 3);
+ draw_sprites(machine(), bitmap, cliprect, 3);
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 3, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 2);
+ draw_sprites(machine(), bitmap, cliprect, 2);
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 2, 0);
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 1, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 1);
+ draw_sprites(machine(), bitmap, cliprect, 1);
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 1, 0);
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 2, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 0);
+ draw_sprites(machine(), bitmap, cliprect, 0);
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 0, 0);
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 0, 0);
break;
@@ -300,20 +300,20 @@ UINT32 nycaptor_state::screen_update_nycaptor(screen_device &screen, bitmap_ind1
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 3, 0);
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 3, 0);
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 1, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 1);
+ draw_sprites(machine(), bitmap, cliprect, 1);
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 1, 0);
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 2, 0);
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 2, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 0);
+ draw_sprites(machine(), bitmap, cliprect, 0);
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 0, 0);
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 0, 0);
break;
case 3:
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 1, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 1);
+ draw_sprites(machine(), bitmap, cliprect, 1);
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 1, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 0);
+ draw_sprites(machine(), bitmap, cliprect, 0);
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 0, 0);
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 0, 0);
break;
diff --git a/src/mame/video/ohmygod.c b/src/mame/video/ohmygod.c
index 487c55ac23c..aa5686913d0 100644
--- a/src/mame/video/ohmygod.c
+++ b/src/mame/video/ohmygod.c
@@ -103,6 +103,6 @@ UINT32 ohmygod_state::screen_update_ohmygod(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/video/ojankohs.c b/src/mame/video/ojankohs.c
index f435932af20..5ccf0b94554 100644
--- a/src/mame/video/ojankohs.c
+++ b/src/mame/video/ojankohs.c
@@ -307,7 +307,7 @@ UINT32 ojankohs_state::screen_update_ojankoc(screen_device &screen, bitmap_ind16
if (m_screen_refresh)
{
- address_space &space = *screen.machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
/* redraw bitmap */
for (offs = 0; offs < 0x8000; offs++)
diff --git a/src/mame/video/oneshot.c b/src/mame/video/oneshot.c
index 12f01f05c86..74302a7bb4f 100644
--- a/src/mame/video/oneshot.c
+++ b/src/mame/video/oneshot.c
@@ -152,30 +152,30 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
UINT32 oneshot_state::screen_update_oneshot(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_mid_tilemap->set_scrollx(0, m_scroll[0] - 0x1f5);
m_mid_tilemap->set_scrolly(0, m_scroll[1]);
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
m_mid_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);
- draw_crosshairs(screen.machine(), bitmap, cliprect);
+ draw_crosshairs(machine(), bitmap, cliprect);
return 0;
}
UINT32 oneshot_state::screen_update_maddonna(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_mid_tilemap->set_scrolly(0, m_scroll[1]); // other registers aren't used so we don't know which layers they relate to
m_mid_tilemap->draw(bitmap, cliprect, 0, 0);
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
// popmessage ("%04x %04x %04x %04x %04x %04x %04x %04x", m_scroll[0], m_scroll[1], m_scroll[2], m_scroll[3], m_scroll[4], m_scroll[5], m_scroll[6], m_scroll[7]);
return 0;
diff --git a/src/mame/video/opwolf.c b/src/mame/video/opwolf.c
index e94b0891138..9c6315599b4 100644
--- a/src/mame/video/opwolf.c
+++ b/src/mame/video/opwolf.c
@@ -44,7 +44,7 @@ UINT32 opwolf_state::screen_update_opwolf(screen_device &screen, bitmap_ind16 &b
layer[0] = 0;
layer[1] = 1;
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
pc080sn_tilemap_draw(m_pc080sn, bitmap, cliprect, layer[0], TILEMAP_DRAW_OPAQUE, 1);
pc080sn_tilemap_draw(m_pc080sn, bitmap, cliprect, layer[1], 0, 2);
diff --git a/src/mame/video/orbit.c b/src/mame/video/orbit.c
index 016d2d4362a..3aa89fa357d 100644
--- a/src/mame/video/orbit.c
+++ b/src/mame/video/orbit.c
@@ -79,10 +79,10 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
UINT32 orbit_state::screen_update_orbit(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- m_flip_screen = screen.machine().root_device().ioport("DSW2")->read() & 8;
+ m_flip_screen = machine().root_device().ioport("DSW2")->read() & 8;
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/video/othldrby.c b/src/mame/video/othldrby.c
index d34f861594b..a0ec82431d9 100644
--- a/src/mame/video/othldrby.c
+++ b/src/mame/video/othldrby.c
@@ -194,25 +194,25 @@ UINT32 othldrby_state::screen_update_othldrby(screen_device &screen, bitmap_ind1
}
}
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
bitmap.fill(0, cliprect);
for (layer = 0; layer < 3; layer++)
m_bg_tilemap[layer]->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 0);
+ draw_sprites(machine(), bitmap, cliprect, 0);
for (layer = 0; layer < 3; layer++)
m_bg_tilemap[layer]->draw(bitmap, cliprect, 1, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 1);
+ draw_sprites(machine(), bitmap, cliprect, 1);
for (layer = 0; layer < 3; layer++)
m_bg_tilemap[layer]->draw(bitmap, cliprect, 2, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 2);
+ draw_sprites(machine(), bitmap, cliprect, 2);
for (layer = 0; layer < 3; layer++)
m_bg_tilemap[layer]->draw(bitmap, cliprect, 3, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 3);
+ draw_sprites(machine(), bitmap, cliprect, 3);
return 0;
}
diff --git a/src/mame/video/othunder.c b/src/mame/video/othunder.c
index 19fa65b1765..efe673b4e26 100644
--- a/src/mame/video/othunder.c
+++ b/src/mame/video/othunder.c
@@ -209,7 +209,7 @@ UINT32 othunder_state::screen_update_othunder(screen_device &screen, bitmap_ind1
layer[1] = layer[0] ^ 1;
layer[2] = 2;
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
/* Ensure screen blanked even when bottom layer not drawn due to disable bit */
bitmap.fill(0, cliprect);
@@ -221,7 +221,7 @@ UINT32 othunder_state::screen_update_othunder(screen_device &screen, bitmap_ind1
/* Sprites can be under/over the layer below text layer */
{
static const int primasks[2] = {0xf0, 0xfc};
- draw_sprites(screen.machine(), bitmap, cliprect, primasks, 3);
+ draw_sprites(machine(), bitmap, cliprect, primasks, 3);
}
return 0;
diff --git a/src/mame/video/overdriv.c b/src/mame/video/overdriv.c
index 6319b8c3180..9e267337bc2 100644
--- a/src/mame/video/overdriv.c
+++ b/src/mame/video/overdriv.c
@@ -59,7 +59,7 @@ UINT32 overdriv_state::screen_update_overdriv(screen_device &screen, bitmap_ind1
m_zoom_colorbase[1] = k053251_get_palette_index(m_k053251, K053251_CI3);
m_zoom_colorbase[0] = k053251_get_palette_index(m_k053251, K053251_CI4);
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
k051316_zoom_draw(m_k051316_1, bitmap, cliprect, 0, 0);
k051316_zoom_draw(m_k051316_2, bitmap, cliprect, 0, 1);
diff --git a/src/mame/video/pacland.c b/src/mame/video/pacland.c
index e9d5631ee1a..b77e44f6bee 100644
--- a/src/mame/video/pacland.c
+++ b/src/mame/video/pacland.c
@@ -376,22 +376,22 @@ UINT32 pacland_state::screen_update_pacland(screen_device &screen, bitmap_ind16
/* draw high priority sprite pixels, setting priority bitmap to non-zero
wherever there is a high-priority pixel; note that we draw to the bitmap
which is safe because the bg_tilemap draw will overwrite everything */
- screen.machine().priority_bitmap.fill(0x00, cliprect);
- draw_sprites(screen.machine(), bitmap, cliprect, 0);
+ machine().priority_bitmap.fill(0x00, cliprect);
+ draw_sprites(machine(), bitmap, cliprect, 0);
/* draw background */
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
/* draw low priority fg tiles */
- draw_fg(screen.machine(), bitmap, cliprect, 0);
+ draw_fg(machine(), bitmap, cliprect, 0);
/* draw sprites with regular transparency */
- draw_sprites(screen.machine(), bitmap, cliprect, 1);
+ draw_sprites(machine(), bitmap, cliprect, 1);
/* draw high priority fg tiles */
- draw_fg(screen.machine(), bitmap, cliprect, 1);
+ draw_fg(machine(), bitmap, cliprect, 1);
/* draw sprite pixels with colortable values >= 0xf0, which have priority over everything */
- draw_sprites(screen.machine(), bitmap, cliprect, 2);
+ draw_sprites(machine(), bitmap, cliprect, 2);
return 0;
}
diff --git a/src/mame/video/pacman.c b/src/mame/video/pacman.c
index 8600806a655..7928286a7fc 100644
--- a/src/mame/video/pacman.c
+++ b/src/mame/video/pacman.c
@@ -248,20 +248,20 @@ UINT32 pacman_state::screen_update_pacman(screen_device &screen, bitmap_ind16 &b
color = ( spriteram[offs + 1] & 0x1f ) | (m_colortablebank << 5) | (m_palettebank << 6 );
- drawgfx_transmask(bitmap,spriteclip,screen.machine().gfx[1],
+ drawgfx_transmask(bitmap,spriteclip,machine().gfx[1],
( spriteram[offs] >> 2 ) | (m_spritebank << 6),
color,
fx,fy,
sx,sy,
- colortable_get_transpen_mask(screen.machine().colortable, screen.machine().gfx[1], color & 0x3f, 0));
+ colortable_get_transpen_mask(machine().colortable, machine().gfx[1], color & 0x3f, 0));
/* also plot the sprite with wraparound (tunnel in Crush Roller) */
- drawgfx_transmask(bitmap,spriteclip,screen.machine().gfx[1],
+ drawgfx_transmask(bitmap,spriteclip,machine().gfx[1],
( spriteram[offs] >> 2 ) | (m_spritebank << 6),
color,
fx,fy,
sx - 256,sy,
- colortable_get_transpen_mask(screen.machine().colortable, screen.machine().gfx[1], color & 0x3f, 0));
+ colortable_get_transpen_mask(machine().colortable, machine().gfx[1], color & 0x3f, 0));
}
/* In the Pac Man based games (NOT Pengo) the first two sprites must be offset */
/* one pixel to the left to get a more correct placement */
@@ -286,20 +286,20 @@ UINT32 pacman_state::screen_update_pacman(screen_device &screen, bitmap_ind16 &b
fx = (spriteram[offs] & 1) ^ m_inv_spr;
fy = (spriteram[offs] & 2) ^ ((m_inv_spr) << 1);
- drawgfx_transmask(bitmap,spriteclip,screen.machine().gfx[1],
+ drawgfx_transmask(bitmap,spriteclip,machine().gfx[1],
( spriteram[offs] >> 2 ) | (m_spritebank << 6),
color,
fx,fy,
sx,sy + m_xoffsethack,
- colortable_get_transpen_mask(screen.machine().colortable, screen.machine().gfx[1], color & 0x3f, 0));
+ colortable_get_transpen_mask(machine().colortable, machine().gfx[1], color & 0x3f, 0));
/* also plot the sprite with wraparound (tunnel in Crush Roller) */
- drawgfx_transmask(bitmap,spriteclip,screen.machine().gfx[1],
+ drawgfx_transmask(bitmap,spriteclip,machine().gfx[1],
( spriteram[offs] >> 2 ) | (m_spritebank << 6),
color,
fy,fx, //FIXME: flipping bits are really supposed to be inverted here?
sx - 256,sy + m_xoffsethack,
- colortable_get_transpen_mask(screen.machine().colortable, screen.machine().gfx[1], color & 0x3f, 0));
+ colortable_get_transpen_mask(machine().colortable, machine().gfx[1], color & 0x3f, 0));
}
}
@@ -418,12 +418,12 @@ UINT32 pacman_state::screen_update_s2650games(screen_device &screen, bitmap_ind1
color = spriteram[offs + 1] & 0x1f;
/* TODO: ?? */
- drawgfx_transmask(bitmap,cliprect,screen.machine().gfx[1],
+ drawgfx_transmask(bitmap,cliprect,machine().gfx[1],
(spriteram[offs] >> 2) | ((m_s2650_spriteram[offs] & 3) << 6),
color,
spriteram[offs] & 1,spriteram[offs] & 2,
sx,sy,
- colortable_get_transpen_mask(screen.machine().colortable, screen.machine().gfx[1], color & 0x3f, 0));
+ colortable_get_transpen_mask(machine().colortable, machine().gfx[1], color & 0x3f, 0));
}
/* In the Pac Man based games (NOT Pengo) the first two sprites must be offset */
/* one pixel to the left to get a more correct placement */
@@ -438,12 +438,12 @@ UINT32 pacman_state::screen_update_s2650games(screen_device &screen, bitmap_ind1
color = spriteram[offs + 1] & 0x1f;
/* TODO: ?? */
- drawgfx_transmask(bitmap,cliprect,screen.machine().gfx[1],
+ drawgfx_transmask(bitmap,cliprect,machine().gfx[1],
(spriteram[offs] >> 2) | ((m_s2650_spriteram[offs] & 3)<<6),
color,
spriteram[offs] & 1,spriteram[offs] & 2,
sx,sy + m_xoffsethack,
- colortable_get_transpen_mask(screen.machine().colortable, screen.machine().gfx[1], color & 0x3f, 0));
+ colortable_get_transpen_mask(machine().colortable, machine().gfx[1], color & 0x3f, 0));
}
return 0;
}
diff --git a/src/mame/video/pandoras.c b/src/mame/video/pandoras.c
index 38ce5ea66ef..79c67459126 100644
--- a/src/mame/video/pandoras.c
+++ b/src/mame/video/pandoras.c
@@ -175,7 +175,7 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
UINT32 pandoras_state::screen_update_pandoras(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
m_layer0->draw(bitmap, cliprect, 1 ,0);
- draw_sprites(screen.machine(), bitmap, cliprect, &m_spriteram[0x800] );
+ draw_sprites(machine(), bitmap, cliprect, &m_spriteram[0x800] );
m_layer0->draw(bitmap, cliprect, 0 ,0);
return 0;
}
diff --git a/src/mame/video/paradise.c b/src/mame/video/paradise.c
index 9ff14d902c8..b999eb77583 100644
--- a/src/mame/video/paradise.c
+++ b/src/mame/video/paradise.c
@@ -235,19 +235,19 @@ UINT32 paradise_state::screen_update_paradise(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 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 (screen.machine().input().code_pressed(KEYCODE_A)) mask |= 16;
+ 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;
+ if (machine().input().code_pressed(KEYCODE_A)) mask |= 16;
if (mask != 0) layers_ctrl &= mask;
}
#endif
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
if (!(m_priority & 4)) /* Screen blanking */
return 0;
@@ -283,20 +283,20 @@ if (screen.machine().input().code_pressed(KEYCODE_Z))
UINT32 paradise_state::screen_update_torus(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 (!(m_priority & 2)) /* Screen blanking */
return 0;
if (m_priority & 1)
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
m_tilemap_1->draw(bitmap, cliprect, 0,0);
if (m_priority & 4)
{
if (!(m_priority & 1))
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
m_tilemap_2->draw(bitmap, cliprect, 0, 0);
}
@@ -305,7 +305,7 @@ UINT32 paradise_state::screen_update_torus(screen_device &screen, bitmap_ind16 &
m_tilemap_2->draw(bitmap, cliprect, 0, 0);
if (!(m_priority & 1))
- draw_sprites(screen.machine(), bitmap,cliprect);
+ draw_sprites(machine(), bitmap,cliprect);
}
return 0;
}
@@ -314,10 +314,10 @@ UINT32 paradise_state::screen_update_torus(screen_device &screen, bitmap_ind16 &
UINT32 paradise_state::screen_update_madball(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_tilemap_0->draw(bitmap, cliprect, 0, 0);
m_tilemap_1->draw(bitmap, cliprect, 0, 0);
m_tilemap_2->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/video/parodius.c b/src/mame/video/parodius.c
index dddcb0b49b1..b0f1e109130 100644
--- a/src/mame/video/parodius.c
+++ b/src/mame/video/parodius.c
@@ -66,7 +66,7 @@ UINT32 parodius_state::screen_update_parodius(screen_device &screen, bitmap_ind1
konami_sortlayers3(layer, m_layerpri);
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
bitmap.fill(16 * bg_colorbase, cliprect);
k052109_tilemap_draw(m_k052109, bitmap, cliprect, layer[0], 0,1);
k052109_tilemap_draw(m_k052109, bitmap, cliprect, layer[1], 0,2);
diff --git a/src/mame/video/pbaction.c b/src/mame/video/pbaction.c
index 6ece827729b..ad1cab8737d 100644
--- a/src/mame/video/pbaction.c
+++ b/src/mame/video/pbaction.c
@@ -128,7 +128,7 @@ UINT32 pbaction_state::screen_update_pbaction(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/video/pcktgal.c b/src/mame/video/pcktgal.c
index 29b598939b1..935a018fa76 100644
--- a/src/mame/video/pcktgal.c
+++ b/src/mame/video/pcktgal.c
@@ -67,15 +67,15 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
UINT32 pcktgal_state::screen_update_pcktgal(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
-// flip_screen_set(screen.machine().device<deco_bac06_device>("tilegen1")->get_flip_state());
- screen.machine().device<deco_bac06_device>("tilegen1")->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0x00, 0x00, 0x00, 0x00);
- draw_sprites(screen.machine(), bitmap, cliprect);
+// flip_screen_set(machine().device<deco_bac06_device>("tilegen1")->get_flip_state());
+ machine().device<deco_bac06_device>("tilegen1")->deco_bac06_pf_draw(machine(),bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0x00, 0x00, 0x00, 0x00);
+ draw_sprites(machine(), bitmap, cliprect);
return 0;
}
UINT32 pcktgal_state::screen_update_pcktgalb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
// the bootleg doesn't properly set the tilemap registers, because it's on non-original hardware, which probably doesn't have the flexible tilemaps.
- screen.machine().device<deco_bac06_device>("tilegen1")->deco_bac06_pf_draw_bootleg(screen.machine(),bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0, 2);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ machine().device<deco_bac06_device>("tilegen1")->deco_bac06_pf_draw_bootleg(machine(),bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0, 2);
+ draw_sprites(machine(), bitmap, cliprect);
return 0;}
diff --git a/src/mame/video/pgm.c b/src/mame/video/pgm.c
index 79090e3b509..ee6e4c65d22 100644
--- a/src/mame/video/pgm.c
+++ b/src/mame/video/pgm.c
@@ -643,7 +643,7 @@ UINT32 pgm_state::screen_update_pgm(screen_device &screen, bitmap_ind16 &bitmap,
bitmap.fill(0x3ff, cliprect); // ddp2 igs logo needs 0x3ff
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
m_bg_tilemap->set_scrolly(0, m_videoregs[0x2000/2]);
@@ -653,7 +653,7 @@ UINT32 pgm_state::screen_update_pgm(screen_device &screen, bitmap_ind16 &bitmap,
m_bg_tilemap->draw(bitmap, cliprect, 0, 2);
- draw_sprites(this, screen.machine(), bitmap, m_spritebufferram, screen.machine().priority_bitmap);
+ draw_sprites(this, machine(), bitmap, m_spritebufferram, machine().priority_bitmap);
m_tx_tilemap->set_scrolly(0, m_videoregs[0x5000/2]);
m_tx_tilemap->set_scrollx(0, m_videoregs[0x6000/2]); // Check
diff --git a/src/mame/video/pingpong.c b/src/mame/video/pingpong.c
index 54c474f0cf6..e3767b3b6a6 100644
--- a/src/mame/video/pingpong.c
+++ b/src/mame/video/pingpong.c
@@ -146,6 +146,6 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
UINT32 pingpong_state::screen_update_pingpong(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/video/pirates.c b/src/mame/video/pirates.c
index ffc4dcd562e..238c6d6c004 100644
--- a/src/mame/video/pirates.c
+++ b/src/mame/video/pirates.c
@@ -106,7 +106,7 @@ UINT32 pirates_state::screen_update_pirates(screen_device &screen, bitmap_ind16
m_fg_tilemap->set_scrollx(0,m_scroll[0]);
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/video/pitnrun.c b/src/mame/video/pitnrun.c
index 6f343c84f5e..9edaff564bd 100644
--- a/src/mame/video/pitnrun.c
+++ b/src/mame/video/pitnrun.c
@@ -213,21 +213,21 @@ UINT32 pitnrun_state::screen_update_pitnrun(screen_device &screen, bitmap_ind16
rectangle myclip=cliprect;
#ifdef MAME_DEBUG
- if (screen.machine().input().code_pressed_once(KEYCODE_Q))
+ if (machine().input().code_pressed_once(KEYCODE_Q))
{
UINT8 *ROM = memregion("maincpu")->base();
ROM[0x84f6]=0; /* lap 0 - normal */
}
- if (screen.machine().input().code_pressed_once(KEYCODE_W))
+ if (machine().input().code_pressed_once(KEYCODE_W))
{
- UINT8 *ROM = screen.machine().root_device().memregion("maincpu")->base();
+ UINT8 *ROM = machine().root_device().memregion("maincpu")->base();
ROM[0x84f6]=6; /* lap 6 = spotlight */
}
- if (screen.machine().input().code_pressed_once(KEYCODE_E))
+ if (machine().input().code_pressed_once(KEYCODE_E))
{
- UINT8 *ROM = screen.machine().root_device().memregion("maincpu")->base();
+ UINT8 *ROM = machine().root_device().memregion("maincpu")->base();
ROM[0x84f6]=2; /* lap 3 (trial 2)= lightnings */
ROM[0x8102]=1;
}
@@ -254,7 +254,7 @@ UINT32 pitnrun_state::screen_update_pitnrun(screen_device &screen, bitmap_ind16
m_bg->draw(bitmap, myclip, 0,0);
}
- draw_sprites(screen.machine(),bitmap,myclip);
+ draw_sprites(machine(),bitmap,myclip);
if(m_ha&4)
copybitmap_trans(bitmap,*m_tmp_bitmap[m_ha&3],flip_screen_x(),flip_screen_y(),dx,dy,myclip, 1);
diff --git a/src/mame/video/pktgaldx.c b/src/mame/video/pktgaldx.c
index d71a0e5eb6e..4a55d2708b9 100644
--- a/src/mame/video/pktgaldx.c
+++ b/src/mame/video/pktgaldx.c
@@ -7,17 +7,17 @@
UINT32 pktgaldx_state::screen_update_pktgaldx(screen_device &screen, bitmap_ind16 &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));
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, 0);
- screen.machine().device<decospr_device>("spritegen")->draw_sprites(bitmap, cliprect, m_spriteram, 0x400, true);
+ machine().device<decospr_device>("spritegen")->draw_sprites(bitmap, cliprect, m_spriteram, 0x400, true);
deco16ic_tilemap_1_draw(m_deco_tilegen1, bitmap, cliprect, 0, 0);
return 0;
}
@@ -31,7 +31,7 @@ UINT32 pktgaldx_state::screen_update_pktgaldb(screen_device &screen, bitmap_ind1
int tileno;
int colour;
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
/* the bootleg seems to treat the tilemaps as sprites */
for (offset = 0; offset < 0x1600 / 2; offset += 8)
@@ -45,7 +45,7 @@ UINT32 pktgaldx_state::screen_update_pktgaldb(screen_device &screen, bitmap_ind1
y &= 0x1ff;
y -= 8;
- drawgfx_transpen(bitmap, cliprect, screen.machine().gfx[0], tileno ^ 0x1000, colour, 0, 0, x, y, 0);
+ drawgfx_transpen(bitmap, cliprect, machine().gfx[0], tileno ^ 0x1000, colour, 0, 0, x, y, 0);
}
for (offset = 0x1600/2; offset < 0x2000 / 2; offset += 8)
@@ -59,7 +59,7 @@ UINT32 pktgaldx_state::screen_update_pktgaldb(screen_device &screen, bitmap_ind1
y &= 0x1ff;
y -= 8;
- drawgfx_transpen(bitmap, cliprect, screen.machine().gfx[0], tileno ^ 0x4000, colour, 0, 0, x, y, 0);
+ drawgfx_transpen(bitmap, cliprect, machine().gfx[0], tileno ^ 0x4000, colour, 0, 0, x, y, 0);
}
for (offset = 0x2000/2; offset < 0x4000 / 2; offset += 8)
@@ -73,7 +73,7 @@ UINT32 pktgaldx_state::screen_update_pktgaldb(screen_device &screen, bitmap_ind1
y &= 0x1ff;
y -= 8;
- drawgfx_transpen(bitmap, cliprect, screen.machine().gfx[0], tileno ^ 0x3000, colour, 0, 0, x, y, 0);
+ drawgfx_transpen(bitmap, cliprect, machine().gfx[0], tileno ^ 0x3000, colour, 0, 0, x, y, 0);
}
return 0;
diff --git a/src/mame/video/playch10.c b/src/mame/video/playch10.c
index 41c380fe08f..d242c4b39c1 100644
--- a/src/mame/video/playch10.c
+++ b/src/mame/video/playch10.c
@@ -115,7 +115,7 @@ VIDEO_START_MEMBER(playch10_state,playch10_hboard)
UINT32 playch10_state::screen_update_playch10_single(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- ppu2c0x_device *ppu = screen.machine().device<ppu2c0x_device>("ppu");
+ ppu2c0x_device *ppu = machine().device<ppu2c0x_device>("ppu");
rectangle top_monitor = screen.visible_area();
@@ -143,7 +143,7 @@ UINT32 playch10_state::screen_update_playch10_single(screen_device &screen, bitm
UINT32 playch10_state::screen_update_playch10_top(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- ppu2c0x_device *ppu = screen.machine().device<ppu2c0x_device>("ppu");
+ ppu2c0x_device *ppu = machine().device<ppu2c0x_device>("ppu");
/* Single Monitor version */
if (m_pc10_bios != 1)
diff --git a/src/mame/video/playmark.c b/src/mame/video/playmark.c
index 5f41eb551d8..bf1f14eb6ba 100644
--- a/src/mame/video/playmark.c
+++ b/src/mame/video/playmark.c
@@ -496,12 +496,12 @@ static void draw_bitmap( running_machine &machine, bitmap_ind16 &bitmap, const r
UINT32 playmark_state::screen_update_bigtwin(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
if (m_bg_enable)
- draw_bitmap(screen.machine(), bitmap, cliprect);
- draw_sprites(screen.machine(), bitmap, cliprect, 4);
+ draw_bitmap(machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect, 4);
m_tx_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
}
@@ -515,24 +515,24 @@ UINT32 playmark_state::screen_update_bigtwinb(screen_device &screen, bitmap_ind1
{
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
- bigtwinb_draw_sprites(screen.machine(), bitmap, cliprect, 4);
+ bigtwinb_draw_sprites(machine(), bitmap, cliprect, 4);
m_tx_tilemap->draw(bitmap, cliprect, 0, 0);
}
else
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
return 0;
}
UINT32 playmark_state::screen_update_excelsr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
m_fg_tilemap->draw(bitmap, cliprect, 0, 1);
if (m_bg_enable)
- draw_bitmap(screen.machine(), bitmap, cliprect);
+ draw_bitmap(machine(), bitmap, cliprect);
m_tx_tilemap->draw(bitmap, cliprect, 0, 4);
- draw_sprites(screen.machine(), bitmap, cliprect, 2);
+ draw_sprites(machine(), bitmap, cliprect, 2);
return 0;
}
@@ -553,11 +553,11 @@ UINT32 playmark_state::screen_update_wbeachvl(screen_device &screen, bitmap_ind1
m_fg_tilemap->set_scrollx(0, m_fgscrollx);
}
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
m_bg_tilemap->draw(bitmap, cliprect, 0, 1);
m_fg_tilemap->draw(bitmap, cliprect, 0, 2);
- draw_sprites(screen.machine(), bitmap, cliprect, 0);
+ draw_sprites(machine(), bitmap, cliprect, 0);
m_tx_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
}
@@ -565,17 +565,17 @@ UINT32 playmark_state::screen_update_wbeachvl(screen_device &screen, bitmap_ind1
UINT32 playmark_state::screen_update_hrdtimes(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
// video enabled
if (m_scroll[6] & 1)
{
m_bg_tilemap->draw(bitmap, cliprect, 0, 1);
m_fg_tilemap->draw(bitmap, cliprect, 0, 2);
- draw_sprites(screen.machine(), bitmap, cliprect, 2);
+ draw_sprites(machine(), bitmap, cliprect, 2);
m_tx_tilemap->draw(bitmap, cliprect, 0, 0);
}
else
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
return 0;
}
diff --git a/src/mame/video/plygonet.c b/src/mame/video/plygonet.c
index 72d222b0938..a748a792987 100644
--- a/src/mame/video/plygonet.c
+++ b/src/mame/video/plygonet.c
@@ -118,9 +118,9 @@ void polygonet_state::video_start()
UINT32 polygonet_state::screen_update_polygonet(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- device_t *k053936 = screen.machine().device("k053936");
- screen.machine().priority_bitmap.fill(0);
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ device_t *k053936 = machine().device("k053936");
+ machine().priority_bitmap.fill(0);
+ bitmap.fill(get_black_pen(machine()), cliprect);
k053936_zoom_draw(k053936, bitmap, cliprect, m_roz_tilemap, 0, 0, 0);
diff --git a/src/mame/video/pokechmp.c b/src/mame/video/pokechmp.c
index c2a0ae00754..be2a847d20a 100644
--- a/src/mame/video/pokechmp.c
+++ b/src/mame/video/pokechmp.c
@@ -75,6 +75,6 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
UINT32 pokechmp_state::screen_update_pokechmp(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/video/polepos.c b/src/mame/video/polepos.c
index 11159d5ade6..01dec1fa774 100644
--- a/src/mame/video/polepos.c
+++ b/src/mame/video/polepos.c
@@ -503,8 +503,8 @@ UINT32 polepos_state::screen_update_polepos(screen_device &screen, bitmap_ind16
rectangle clip = cliprect;
clip.max_y = 127;
m_bg_tilemap->draw(bitmap, clip, 0,0);
- draw_road(screen.machine(), bitmap);
- draw_sprites(screen.machine(), bitmap,cliprect);
+ draw_road(machine(), bitmap);
+ draw_sprites(machine(), bitmap,cliprect);
m_tx_tilemap->draw(bitmap, cliprect, 0,0);
return 0;
}
diff --git a/src/mame/video/polyplay.c b/src/mame/video/polyplay.c
index 5e01d144057..c88bb499d76 100644
--- a/src/mame/video/polyplay.c
+++ b/src/mame/video/polyplay.c
@@ -57,7 +57,7 @@ UINT32 polyplay_state::screen_update_polyplay(screen_device &screen, bitmap_ind1
int sy = offs >> 6 << 3;
UINT8 code = videoram[offs];
- drawgfx_opaque(bitmap,cliprect, screen.machine().gfx[(code >> 7) & 0x01],
+ drawgfx_opaque(bitmap,cliprect, machine().gfx[(code >> 7) & 0x01],
code, 0, 0, 0, sx, sy);
}
diff --git a/src/mame/video/poolshrk.c b/src/mame/video/poolshrk.c
index 0c2574a9101..7fc9db7bea1 100644
--- a/src/mame/video/poolshrk.c
+++ b/src/mame/video/poolshrk.c
@@ -40,7 +40,7 @@ UINT32 poolshrk_state::screen_update_poolshrk(screen_device &screen, bitmap_ind1
int hpos = m_hpos_ram[i];
int vpos = m_vpos_ram[i];
- drawgfx_transpen(bitmap, cliprect, screen.machine().gfx[0], i, (i == 0) ? 0 : 1, 0, 0,
+ drawgfx_transpen(bitmap, cliprect, machine().gfx[0], i, (i == 0) ? 0 : 1, 0, 0,
248 - hpos, vpos - 15, 0);
}
diff --git a/src/mame/video/pooyan.c b/src/mame/video/pooyan.c
index 74714daae6e..eaef72f93c4 100644
--- a/src/mame/video/pooyan.c
+++ b/src/mame/video/pooyan.c
@@ -193,6 +193,6 @@ UINT32 pooyan_state::screen_update_pooyan(screen_device &screen, bitmap_ind16 &b
{
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/video/popeye.c b/src/mame/video/popeye.c
index 01b4ec53a7d..904e9f85dbb 100644
--- a/src/mame/video/popeye.c
+++ b/src/mame/video/popeye.c
@@ -367,8 +367,8 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
UINT32 popeye_state::screen_update_popeye(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- draw_background(screen.machine(), bitmap, cliprect);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_background(machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
}
diff --git a/src/mame/video/popper.c b/src/mame/video/popper.c
index 2c378bdf0ea..6c8538aca83 100644
--- a/src/mame/video/popper.c
+++ b/src/mame/video/popper.c
@@ -251,7 +251,7 @@ UINT32 popper_state::screen_update_popper(screen_device &screen, bitmap_ind16 &b
m_ol_p123_tilemap->draw(bitmap, finalclip, TILEMAP_DRAW_LAYER1, 0);
m_ol_p0_tilemap->draw(bitmap, finalclip, TILEMAP_DRAW_LAYER1, 0);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
m_p123_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0);
m_p0_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0);
diff --git a/src/mame/video/portrait.c b/src/mame/video/portrait.c
index 4eac99b2009..cf01e7c3e59 100644
--- a/src/mame/video/portrait.c
+++ b/src/mame/video/portrait.c
@@ -203,6 +203,6 @@ UINT32 portrait_state::screen_update_portrait(screen_device &screen, bitmap_ind1
m_background->draw(bitmap, cliprect_scroll, 0, 0);
m_foreground->draw(bitmap, cliprect_scroll, 0, 0);
- draw_sprites(screen.machine(), bitmap,cliprect);
+ draw_sprites(machine(), bitmap,cliprect);
return 0;
}
diff --git a/src/mame/video/powerins.c b/src/mame/video/powerins.c
index b99c6bde14f..87a87f79f9d 100644
--- a/src/mame/video/powerins.c
+++ b/src/mame/video/powerins.c
@@ -339,21 +339,21 @@ UINT32 powerins_state::screen_update_powerins(screen_device &screen, bitmap_ind1
m_tilemap_1->set_scrolly(0, 0x00);
#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_A)) 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_A)) msk |= 8;
if (msk != 0) layers_ctrl &= msk;
}
#endif
if (layers_ctrl&1) m_tilemap_0->draw(bitmap, cliprect, 0, 0);
else bitmap.fill(0, cliprect);
- if (layers_ctrl&8) draw_sprites(screen.machine(),bitmap,cliprect);
+ if (layers_ctrl&8) draw_sprites(machine(),bitmap,cliprect);
if (layers_ctrl&2) m_tilemap_1->draw(bitmap, cliprect, 0, 0);
return 0;
}
diff --git a/src/mame/video/prehisle.c b/src/mame/video/prehisle.c
index c3aee1d58e6..207d8cb39e0 100644
--- a/src/mame/video/prehisle.c
+++ b/src/mame/video/prehisle.c
@@ -161,9 +161,9 @@ UINT32 prehisle_state::screen_update_prehisle(screen_device &screen, bitmap_ind1
{
m_bg2_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 0);
+ draw_sprites(machine(), bitmap, cliprect, 0);
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 1);
+ draw_sprites(machine(), bitmap, cliprect, 1);
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
}
diff --git a/src/mame/video/psikyo.c b/src/mame/video/psikyo.c
index b66dc304d83..d71fc3879e1 100644
--- a/src/mame/video/psikyo.c
+++ b/src/mame/video/psikyo.c
@@ -529,7 +529,7 @@ UINT32 psikyo_state::screen_update_psikyo(screen_device &screen, bitmap_ind16 &b
tilemap_t *tmptilemap0, *tmptilemap1;
- flip_screen_set(~screen.machine().root_device().ioport("DSW")->read() & 0x00010000); // hardwired to a DSW bit
+ flip_screen_set(~machine().root_device().ioport("DSW")->read() & 0x00010000); // hardwired to a DSW bit
/* Layers enable (not quite right) */
@@ -564,8 +564,8 @@ UINT32 psikyo_state::screen_update_psikyo(screen_device &screen, bitmap_ind16 &b
/* For gfx banking for s1945jn/gunbird/btlkroad */
if (m_ka302c_banking)
{
- psikyo_switch_banks(screen.machine(), 0, (layer0_ctrl & 0x400) >> 10);
- psikyo_switch_banks(screen.machine(), 1, (layer1_ctrl & 0x400) >> 10);
+ psikyo_switch_banks(machine(), 0, (layer0_ctrl & 0x400) >> 10);
+ psikyo_switch_banks(machine(), 1, (layer1_ctrl & 0x400) >> 10);
}
switch ((layer0_ctrl & 0x00c0) >> 6)
@@ -664,9 +664,9 @@ UINT32 psikyo_state::screen_update_psikyo(screen_device &screen, bitmap_ind16 &b
m_tilemap_1_size2->set_transparent_pen((layer1_ctrl & 8 ? 0 : 15));
m_tilemap_1_size3->set_transparent_pen((layer1_ctrl & 8 ? 0 : 15));
- 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);
if (layers_ctrl & 1)
tmptilemap0->draw(bitmap, cliprect, layer0_ctrl & 2 ? TILEMAP_DRAW_OPAQUE : 0, 1);
@@ -675,7 +675,7 @@ UINT32 psikyo_state::screen_update_psikyo(screen_device &screen, bitmap_ind16 &b
tmptilemap1->draw(bitmap, cliprect, layer1_ctrl & 2 ? TILEMAP_DRAW_OPAQUE : 0, 2);
if (layers_ctrl & 4)
- draw_sprites(screen.machine(), bitmap, cliprect, (spr_ctrl & 4 ? 0 : 15));
+ draw_sprites(machine(), bitmap, cliprect, (spr_ctrl & 4 ? 0 : 15));
return 0;
}
@@ -702,7 +702,7 @@ UINT32 psikyo_state::screen_update_psikyo_bootleg(screen_device &screen, bitmap_
tilemap_t *tmptilemap0, *tmptilemap1;
- flip_screen_set(~screen.machine().root_device().ioport("DSW")->read() & 0x00010000); // hardwired to a DSW bit
+ flip_screen_set(~machine().root_device().ioport("DSW")->read() & 0x00010000); // hardwired to a DSW bit
/* Layers enable (not quite right) */
@@ -737,8 +737,8 @@ UINT32 psikyo_state::screen_update_psikyo_bootleg(screen_device &screen, bitmap_
/* For gfx banking for s1945jn/gunbird/btlkroad */
if (m_ka302c_banking)
{
- psikyo_switch_banks(screen.machine(), 0, (layer0_ctrl & 0x400) >> 10);
- psikyo_switch_banks(screen.machine(), 1, (layer1_ctrl & 0x400) >> 10);
+ psikyo_switch_banks(machine(), 0, (layer0_ctrl & 0x400) >> 10);
+ psikyo_switch_banks(machine(), 1, (layer1_ctrl & 0x400) >> 10);
}
switch ((layer0_ctrl & 0x00c0) >> 6)
@@ -837,9 +837,9 @@ UINT32 psikyo_state::screen_update_psikyo_bootleg(screen_device &screen, bitmap_
m_tilemap_1_size2->set_transparent_pen((layer1_ctrl & 8 ? 0 : 15));
m_tilemap_1_size3->set_transparent_pen((layer1_ctrl & 8 ? 0 : 15));
- 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);
if (layers_ctrl & 1)
tmptilemap0->draw(bitmap, cliprect, layer0_ctrl & 2 ? TILEMAP_DRAW_OPAQUE : 0, 1);
@@ -848,7 +848,7 @@ UINT32 psikyo_state::screen_update_psikyo_bootleg(screen_device &screen, bitmap_
tmptilemap1->draw(bitmap, cliprect, layer1_ctrl & 2 ? TILEMAP_DRAW_OPAQUE : 0, 2);
if (layers_ctrl & 4)
- draw_sprites_bootleg(screen.machine(), bitmap, cliprect, (spr_ctrl & 4 ? 0 : 15));
+ draw_sprites_bootleg(machine(), bitmap, cliprect, (spr_ctrl & 4 ? 0 : 15));
return 0;
}
diff --git a/src/mame/video/psikyo4.c b/src/mame/video/psikyo4.c
index a341b75770f..c5d6e1a66df 100644
--- a/src/mame/video/psikyo4.c
+++ b/src/mame/video/psikyo4.c
@@ -130,14 +130,14 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
UINT32 psikyo4_state::screen_update_psikyo4_left(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
bitmap.fill(0x1000, cliprect);
- draw_sprites(screen.machine(), bitmap, cliprect, 0x0000);
+ draw_sprites(machine(), bitmap, cliprect, 0x0000);
return 0;
}
UINT32 psikyo4_state::screen_update_psikyo4_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
bitmap.fill(0x1001, cliprect);
- draw_sprites(screen.machine(), bitmap, cliprect, 0x2000);
+ draw_sprites(machine(), bitmap, cliprect, 0x2000);
return 0;
}
diff --git a/src/mame/video/psikyosh.c b/src/mame/video/psikyosh.c
index dda41603c07..59e23d49d9f 100644
--- a/src/mame/video/psikyosh.c
+++ b/src/mame/video/psikyosh.c
@@ -1266,14 +1266,14 @@ UINT32 psikyosh_state::screen_update_psikyosh(screen_device &screen, bitmap_rgb3
#ifdef DEBUG_KEYS
for (i = 0; i <= 7; i++)
{
- if(screen.machine().input().code_pressed(pri_keys[i])) {
+ if(machine().input().code_pressed(pri_keys[i])) {
pri_debug = true;
}
}
- if(screen.machine().input().code_pressed(KEYCODE_G)) {
+ if(machine().input().code_pressed(KEYCODE_G)) {
sprites = false;
}
- if(screen.machine().input().code_pressed(KEYCODE_H)) {
+ if(machine().input().code_pressed(KEYCODE_H)) {
backgrounds = false;
}
#endif
@@ -1288,18 +1288,18 @@ popmessage ("%08x %08x %08x %08x\n%08x %08x %08x %08x",
m_z_bitmap.fill(0, cliprect); /* z-buffer */
- psikyosh_prelineblend(screen.machine(), bitmap, cliprect); // fills screen
+ psikyosh_prelineblend(machine(), bitmap, cliprect); // fills screen
for (i = 0; i <= 7; i++)
{
- if(!pri_debug || screen.machine().input().code_pressed(pri_keys[i]))
+ if(!pri_debug || machine().input().code_pressed(pri_keys[i]))
{
if(sprites) {
- draw_sprites(screen.machine(), bitmap, cliprect, i); // When same priority bg's have higher pri
+ draw_sprites(machine(), bitmap, cliprect, i); // When same priority bg's have higher pri
}
if(backgrounds) {
- draw_background(screen.machine(), bitmap, cliprect, i);
+ draw_background(machine(), bitmap, cliprect, i);
}
- psikyosh_postlineblend(screen.machine(), bitmap, cliprect, i); // assume this has highest priority at same priority level
+ psikyosh_postlineblend(machine(), bitmap, cliprect, i); // assume this has highest priority at same priority level
}
}
return 0;
diff --git a/src/mame/video/psychic5.c b/src/mame/video/psychic5.c
index d4406235c58..4c2886de1cd 100644
--- a/src/mame/video/psychic5.c
+++ b/src/mame/video/psychic5.c
@@ -411,11 +411,11 @@ static void draw_background(running_machine &machine, bitmap_rgb32 &bitmap, cons
UINT32 psychic5_state::screen_update_psychic5(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
if (m_bg_status & 1) /* Backgound enable */
- draw_background(screen.machine(), bitmap, cliprect);
+ draw_background(machine(), bitmap, cliprect);
if (!(m_title_screen & 1))
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
}
@@ -425,8 +425,8 @@ UINT32 psychic5_state::screen_update_bombsa(screen_device &screen, bitmap_rgb32
if (m_bg_status & 1) /* Backgound enable */
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
else
- bitmap.fill(screen.machine().pens[0x0ff], cliprect);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ bitmap.fill(machine().pens[0x0ff], cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
}
diff --git a/src/mame/video/punchout.c b/src/mame/video/punchout.c
index 4a7da7c3939..1660cb28fd2 100644
--- a/src/mame/video/punchout.c
+++ b/src/mame/video/punchout.c
@@ -354,12 +354,12 @@ static void punchout_copy_bot_palette(running_machine &machine, int bank)
UINT32 punchout_state::screen_update_punchout_top(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- punchout_copy_top_palette(screen.machine(), BIT(*m_palettebank,1));
+ punchout_copy_top_palette(machine(), BIT(*m_palettebank,1));
m_bg_top_tilemap->draw(bitmap, cliprect, 0, 0);
if (m_spr1_ctrlram[7] & 1) /* display in top monitor */
- draw_big_sprite(screen.machine(), bitmap, cliprect, 0);
+ draw_big_sprite(machine(), bitmap, cliprect, 0);
return 0;
}
@@ -368,7 +368,7 @@ UINT32 punchout_state::screen_update_punchout_bottom(screen_device &screen, bitm
{
int offs;
- punchout_copy_bot_palette(screen.machine(), BIT(*m_palettebank,0));
+ punchout_copy_bot_palette(machine(), BIT(*m_palettebank,0));
/* copy the character mapped graphics */
for (offs = 0;offs < 32;offs++)
@@ -377,8 +377,8 @@ UINT32 punchout_state::screen_update_punchout_bottom(screen_device &screen, bitm
m_bg_bot_tilemap->draw(bitmap, cliprect, 0, 0);
if (m_spr1_ctrlram[7] & 2) /* display in bottom monitor */
- draw_big_sprite(screen.machine(), bitmap, cliprect, 1);
- drawbs2(screen.machine(), bitmap, cliprect);
+ draw_big_sprite(machine(), bitmap, cliprect, 1);
+ drawbs2(machine(), bitmap, cliprect);
return 0;
}
@@ -387,12 +387,12 @@ UINT32 punchout_state::screen_update_punchout_bottom(screen_device &screen, bitm
UINT32 punchout_state::screen_update_armwrest_top(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- punchout_copy_top_palette(screen.machine(), BIT(*m_palettebank,1));
+ punchout_copy_top_palette(machine(), BIT(*m_palettebank,1));
m_bg_top_tilemap->draw(bitmap, cliprect, 0, 0);
if (m_spr1_ctrlram[7] & 1) /* display in top monitor */
- armwrest_draw_big_sprite(screen.machine(), bitmap, cliprect, 0);
+ armwrest_draw_big_sprite(machine(), bitmap, cliprect, 0);
return 0;
}
@@ -400,13 +400,13 @@ UINT32 punchout_state::screen_update_armwrest_top(screen_device &screen, bitmap_
UINT32 punchout_state::screen_update_armwrest_bottom(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- punchout_copy_bot_palette(screen.machine(), BIT(*m_palettebank,0));
+ punchout_copy_bot_palette(machine(), BIT(*m_palettebank,0));
m_bg_bot_tilemap->draw(bitmap, cliprect, 0, 0);
if (m_spr1_ctrlram[7] & 2) /* display in bottom monitor */
- armwrest_draw_big_sprite(screen.machine(), bitmap, cliprect, 1);
- drawbs2(screen.machine(), bitmap, cliprect);
+ armwrest_draw_big_sprite(machine(), bitmap, cliprect, 1);
+ drawbs2(machine(), bitmap, cliprect);
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
diff --git a/src/mame/video/pushman.c b/src/mame/video/pushman.c
index 7713bb42a18..22726b77bf7 100644
--- a/src/mame/video/pushman.c
+++ b/src/mame/video/pushman.c
@@ -124,7 +124,7 @@ UINT32 pushman_state::screen_update_pushman(screen_device &screen, bitmap_ind16
m_bg_tilemap->set_scrolly(0, 0xf00 - m_control[1]);
m_bg_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/video/qdrmfgp.c b/src/mame/video/qdrmfgp.c
index f83d7dd202a..f5b0262fc58 100644
--- a/src/mame/video/qdrmfgp.c
+++ b/src/mame/video/qdrmfgp.c
@@ -59,8 +59,8 @@ VIDEO_START_MEMBER(qdrmfgp_state,qdrmfgp2)
UINT32 qdrmfgp_state::screen_update_qdrmfgp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- device_t *k056832 = screen.machine().device("k056832");
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ device_t *k056832 = machine().device("k056832");
+ bitmap.fill(get_black_pen(machine()), cliprect);
k056832_tilemap_draw(k056832, bitmap, cliprect, 3, 0, 1);
k056832_tilemap_draw(k056832, bitmap, cliprect, 2, 0, 2);
diff --git a/src/mame/video/quasar.c b/src/mame/video/quasar.c
index 4870d609deb..f2ff8367bc7 100644
--- a/src/mame/video/quasar.c
+++ b/src/mame/video/quasar.c
@@ -125,7 +125,7 @@ UINT32 quasar_state::screen_update_quasar(screen_device &screen, bitmap_ind16 &b
bitmap.pix16(y + oy, x + ox) = forecolor;
/* Main Screen */
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[0],
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[0],
code,
m_color_ram[offs] & 0x3f,
0,0,
@@ -135,7 +135,7 @@ UINT32 quasar_state::screen_update_quasar(screen_device &screen, bitmap_ind16 &b
/* background for Collision Detection (it can only hit certain items) */
if((m_color_ram[offs] & 7) == 0)
{
- drawgfx_opaque(m_collision_background,cliprect,screen.machine().gfx[0],
+ drawgfx_opaque(m_collision_background,cliprect,machine().gfx[0],
code,
64,
0,0,
@@ -189,7 +189,7 @@ UINT32 quasar_state::screen_update_quasar(screen_device &screen, bitmap_ind16 &b
bitmap.pix16(y, x) = S2636_PIXEL_COLOR(pixel);
/* S2636 vs. background collision detection */
- if (colortable_entry_get_value(screen.machine().colortable, m_collision_background.pix16(y, x)))
+ if (colortable_entry_get_value(machine().colortable, m_collision_background.pix16(y, x)))
{
if (S2636_IS_PIXEL_DRAWN(pixel0)) m_collision_register |= 0x01;
if (S2636_IS_PIXEL_DRAWN(pixel2)) m_collision_register |= 0x02;
diff --git a/src/mame/video/quizdna.c b/src/mame/video/quizdna.c
index 4c6f80f828f..b81ea6d0ded 100644
--- a/src/mame/video/quizdna.c
+++ b/src/mame/video/quizdna.c
@@ -189,10 +189,10 @@ UINT32 quizdna_state::screen_update_quizdna(screen_device &screen, bitmap_ind16
if (m_video_enable)
{
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);
}
else
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
return 0;
}
diff --git a/src/mame/video/raiden.c b/src/mame/video/raiden.c
index bf7a9360ffe..2a5b250050b 100644
--- a/src/mame/video/raiden.c
+++ b/src/mame/video/raiden.c
@@ -162,11 +162,11 @@ UINT32 raiden_state::screen_update_raiden(screen_device &screen, bitmap_ind16 &b
m_bg_layer->draw(bitmap, cliprect, 0,0);
/* Draw sprites underneath foreground */
- draw_sprites(screen.machine(),bitmap,cliprect,0x40);
+ draw_sprites(machine(),bitmap,cliprect,0x40);
m_fg_layer->draw(bitmap, cliprect, 0,0);
/* Rest of sprites */
- draw_sprites(screen.machine(),bitmap,cliprect,0x80);
+ draw_sprites(machine(),bitmap,cliprect,0x80);
/* Text layer */
m_tx_layer->draw(bitmap, cliprect, 0,0);
diff --git a/src/mame/video/rainbow.c b/src/mame/video/rainbow.c
index 6f9ea464237..2e7c2a01729 100644
--- a/src/mame/video/rainbow.c
+++ b/src/mame/video/rainbow.c
@@ -49,7 +49,7 @@ UINT32 rbisland_state::screen_update_rainbow(screen_device &screen, bitmap_ind16
layer[0] = 0;
layer[1] = 1;
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
pc080sn_tilemap_draw(m_pc080sn, bitmap, cliprect, layer[0], TILEMAP_DRAW_OPAQUE, 1);
pc080sn_tilemap_draw(m_pc080sn, bitmap, cliprect, layer[1], 0, 2);
@@ -97,7 +97,7 @@ UINT32 rbisland_state::screen_update_jumping(screen_device &screen, bitmap_ind16
layer[0] = 0;
layer[1] = 1;
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
pc080sn_tilemap_draw(m_pc080sn, bitmap, cliprect, layer[0], TILEMAP_DRAW_OPAQUE, 0);
@@ -105,7 +105,7 @@ UINT32 rbisland_state::screen_update_jumping(screen_device &screen, bitmap_ind16
for (offs = m_spriteram.bytes() / 2 - 8; offs >= 0; offs -= 8)
{
int tile = spriteram[offs];
- if (tile < screen.machine().gfx[1]->elements())
+ if (tile < machine().gfx[1]->elements())
{
int sx,sy,color,data1;
@@ -117,7 +117,7 @@ UINT32 rbisland_state::screen_update_jumping(screen_device &screen, bitmap_ind16
data1 = spriteram[offs + 3];
color = (spriteram[offs + 4] & 0x0f) | sprite_colbank;
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[0],
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[0],
tile,
color,
data1 & 0x40, data1 & 0x80,
diff --git a/src/mame/video/rallyx.c b/src/mame/video/rallyx.c
index 7fda080ed35..7da4c2ffde6 100644
--- a/src/mame/video/rallyx.c
+++ b/src/mame/video/rallyx.c
@@ -639,16 +639,16 @@ UINT32 rallyx_state::screen_update_rallyx(screen_device &screen, bitmap_ind16 &b
fg_clip.min_x = 28 * 8;
}
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
m_bg_tilemap->draw(bitmap, bg_clip, 0, 0);
m_fg_tilemap->draw(bitmap, fg_clip, 0, 0);
m_bg_tilemap->draw(bitmap, bg_clip, 1, 1);
m_fg_tilemap->draw(bitmap, fg_clip, 1, 1);
- rallyx_draw_bullets(screen.machine(), bitmap, cliprect, TRUE);
- rallyx_draw_sprites(screen.machine(), bitmap, cliprect, 1);
- rallyx_draw_bullets(screen.machine(), bitmap, cliprect, FALSE);
+ rallyx_draw_bullets(machine(), bitmap, cliprect, TRUE);
+ rallyx_draw_sprites(machine(), bitmap, cliprect, 1);
+ rallyx_draw_bullets(machine(), bitmap, cliprect, FALSE);
return 0;
}
@@ -672,7 +672,7 @@ UINT32 rallyx_state::screen_update_jungler(screen_device &screen, bitmap_ind16 &
fg_clip.min_x = 28 * 8;
}
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
/* tile priority doesn't seem to be supported in Jungler */
m_bg_tilemap->draw(bitmap, bg_clip, 0, 0);
@@ -680,12 +680,12 @@ UINT32 rallyx_state::screen_update_jungler(screen_device &screen, bitmap_ind16 &
m_bg_tilemap->draw(bitmap, bg_clip, 1, 0);
m_fg_tilemap->draw(bitmap, fg_clip, 1, 0);
- jungler_draw_bullets(screen.machine(), bitmap, cliprect, TRUE);
- rallyx_draw_sprites(screen.machine(), bitmap, cliprect, 0);
- jungler_draw_bullets(screen.machine(), bitmap, cliprect, FALSE);
+ jungler_draw_bullets(machine(), bitmap, cliprect, TRUE);
+ rallyx_draw_sprites(machine(), bitmap, cliprect, 0);
+ jungler_draw_bullets(machine(), bitmap, cliprect, FALSE);
if (m_stars_enable)
- draw_stars(screen.machine(), bitmap, cliprect);
+ draw_stars(machine(), bitmap, cliprect);
return 0;
}
@@ -718,19 +718,19 @@ UINT32 rallyx_state::screen_update_locomotn(screen_device &screen, bitmap_ind16
fg_clip.min_x = 28 * 8;
}
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
m_bg_tilemap->draw(bitmap, bg_clip, 0, 0);
m_fg_tilemap->draw(bitmap, fg_clip, 0, 0);
m_bg_tilemap->draw(bitmap, bg_clip, 1, 1);
m_fg_tilemap->draw(bitmap, fg_clip, 1, 1);
- locomotn_draw_bullets(screen.machine(), bitmap, cliprect, TRUE);
- locomotn_draw_sprites(screen.machine(), bitmap, cliprect, 0);
- locomotn_draw_bullets(screen.machine(), bitmap, cliprect, FALSE);
+ locomotn_draw_bullets(machine(), bitmap, cliprect, TRUE);
+ locomotn_draw_sprites(machine(), bitmap, cliprect, 0);
+ locomotn_draw_bullets(machine(), bitmap, cliprect, FALSE);
if (m_stars_enable)
- draw_stars(screen.machine(), bitmap, cliprect);
+ draw_stars(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/video/rampart.c b/src/mame/video/rampart.c
index e5923de45d0..b41497a8c69 100644
--- a/src/mame/video/rampart.c
+++ b/src/mame/video/rampart.c
@@ -79,7 +79,7 @@ UINT32 rampart_state::screen_update_rampart(screen_device &screen, bitmap_ind16
int x, y, r;
/* draw the playfield */
- rampart_bitmap_render(screen.machine(), bitmap, cliprect);
+ rampart_bitmap_render(machine(), bitmap, cliprect);
/* draw and merge the MO */
mobitmap = atarimo_render(0, cliprect, &rectlist);
diff --git a/src/mame/video/rastan.c b/src/mame/video/rastan.c
index eee7d4f27d8..75f0cf06398 100644
--- a/src/mame/video/rastan.c
+++ b/src/mame/video/rastan.c
@@ -39,7 +39,7 @@ UINT32 rastan_state::screen_update_rastan(screen_device &screen, bitmap_ind16 &b
layer[0] = 0;
layer[1] = 1;
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
pc080sn_tilemap_draw(m_pc080sn, bitmap, cliprect, layer[0], TILEMAP_DRAW_OPAQUE, 1);
pc080sn_tilemap_draw(m_pc080sn, bitmap, cliprect, layer[1], 0, 2);
diff --git a/src/mame/video/realbrk.c b/src/mame/video/realbrk.c
index d2ae857f251..4a3961255c5 100644
--- a/src/mame/video/realbrk.c
+++ b/src/mame/video/realbrk.c
@@ -494,20 +494,20 @@ UINT32 realbrk_state::screen_update_realbrk(screen_device &screen, bitmap_ind16
m_tilemap_1->set_scrollx(0, m_vregs[0x6/2]);
#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_A)) 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_A)) msk |= 8;
if (msk != 0) layers_ctrl &= msk;
}
#endif
if (m_disable_video)
{
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
return 0;
}
else
@@ -516,7 +516,7 @@ if ( screen.machine().input().code_pressed(KEYCODE_Z) )
if (layers_ctrl & 2) m_tilemap_1->draw(bitmap, cliprect, 0,0);
if (layers_ctrl & 1) m_tilemap_0->draw(bitmap, cliprect, 0,0);
- if (layers_ctrl & 8) draw_sprites(screen.machine(),bitmap,cliprect);
+ if (layers_ctrl & 8) draw_sprites(machine(),bitmap,cliprect);
if (layers_ctrl & 4) m_tilemap_2->draw(bitmap, cliprect, 0,0);
@@ -564,20 +564,20 @@ UINT32 realbrk_state::screen_update_dai2kaku(screen_device &screen, bitmap_ind16
m_tilemap_1->set_scrolly(0, bgy1 );
#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_A)) 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_A)) msk |= 8;
if (msk != 0) layers_ctrl &= msk;
}
#endif
if (m_disable_video)
{
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
return 0;
}
else
@@ -586,7 +586,7 @@ if ( screen.machine().input().code_pressed(KEYCODE_Z) )
// spr 0
- if (layers_ctrl & 8) dai2kaku_draw_sprites(screen.machine(),bitmap,cliprect,2);
+ if (layers_ctrl & 8) dai2kaku_draw_sprites(machine(),bitmap,cliprect,2);
// bglow
if( m_vregs[8/2] & (0x8000)){
@@ -596,7 +596,7 @@ if ( screen.machine().input().code_pressed(KEYCODE_Z) )
}
// spr 1
- if (layers_ctrl & 8) dai2kaku_draw_sprites(screen.machine(),bitmap,cliprect,1);
+ if (layers_ctrl & 8) dai2kaku_draw_sprites(machine(),bitmap,cliprect,1);
// bghigh
if( m_vregs[8/2] & (0x8000)){
@@ -606,7 +606,7 @@ if ( screen.machine().input().code_pressed(KEYCODE_Z) )
}
// spr 2
- if (layers_ctrl & 8) dai2kaku_draw_sprites(screen.machine(),bitmap,cliprect,0);
+ if (layers_ctrl & 8) dai2kaku_draw_sprites(machine(),bitmap,cliprect,0);
// fix
if (layers_ctrl & 4) m_tilemap_2->draw(bitmap, cliprect, 0,0);
diff --git a/src/mame/video/redalert.c b/src/mame/video/redalert.c
index 5eec7f5a7ff..8f0afc6a782 100644
--- a/src/mame/video/redalert.c
+++ b/src/mame/video/redalert.c
@@ -188,7 +188,7 @@ UINT32 redalert_state::screen_update_redalert(screen_device &screen, bitmap_rgb3
pen_t pens[NUM_CHARMAP_PENS + NUM_BITMAP_PENS + 1];
offs_t offs;
- get_pens(screen.machine(), pens);
+ get_pens(machine(), pens);
for (offs = 0; offs < 0x2000; offs++)
{
@@ -260,7 +260,7 @@ UINT32 redalert_state::screen_update_demoneye(screen_device &screen, bitmap_rgb3
pen_t pens[NUM_CHARMAP_PENS + NUM_BITMAP_PENS + 1];
offs_t offs;
- get_pens(screen.machine(), pens);
+ get_pens(machine(), pens);
for (offs = 0; offs < 0x2000; offs++)
{
@@ -334,7 +334,7 @@ UINT32 redalert_state::screen_update_panther(screen_device &screen, bitmap_rgb32
pen_t pens[NUM_CHARMAP_PENS + NUM_BITMAP_PENS + 1];
offs_t offs;
- get_panther_pens(screen.machine(), pens);
+ get_panther_pens(machine(), pens);
for (offs = 0; offs < 0x2000; offs++)
{
diff --git a/src/mame/video/redclash.c b/src/mame/video/redclash.c
index b977fa755f2..c3a1041a908 100644
--- a/src/mame/video/redclash.c
+++ b/src/mame/video/redclash.c
@@ -421,16 +421,16 @@ void ladybug_state::screen_eof_redclash(screen_device &screen, bool state)
{
// falling edge
if (!state)
- redclash_update_stars_state(screen.machine());
+ redclash_update_stars_state(machine());
}
UINT32 ladybug_state::screen_update_redclash(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
- redclash_draw_stars(screen.machine(), bitmap, cliprect, 0x60, 0, 0x00, 0xff);
- draw_sprites(screen.machine(), bitmap, cliprect);
- draw_bullets(screen.machine(), bitmap, cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
+ redclash_draw_stars(machine(), bitmap, cliprect, 0x60, 0, 0x00, 0xff);
+ draw_sprites(machine(), bitmap, cliprect);
+ draw_bullets(machine(), bitmap, cliprect);
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
}
diff --git a/src/mame/video/relief.c b/src/mame/video/relief.c
index 26a8affd20e..a2c0b599877 100644
--- a/src/mame/video/relief.c
+++ b/src/mame/video/relief.c
@@ -107,7 +107,7 @@ VIDEO_START_MEMBER(relief_state,relief)
UINT32 relief_state::screen_update_relief(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- bitmap_ind8 &priority_bitmap = screen.machine().priority_bitmap;
+ bitmap_ind8 &priority_bitmap = machine().priority_bitmap;
atarimo_rect_list rectlist;
bitmap_ind16 *mobitmap;
int x, y, r;
diff --git a/src/mame/video/renegade.c b/src/mame/video/renegade.c
index 1b9521b48eb..38fb616809d 100644
--- a/src/mame/video/renegade.c
+++ b/src/mame/video/renegade.c
@@ -128,7 +128,7 @@ UINT32 renegade_state::screen_update_renegade(screen_device &screen, bitmap_ind1
{
m_bg_tilemap->set_scrollx(0, m_scrollx);
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/video/retofinv.c b/src/mame/video/retofinv.c
index 9fb63fc9b83..b0c26abe946 100644
--- a/src/mame/video/retofinv.c
+++ b/src/mame/video/retofinv.c
@@ -223,7 +223,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap)
UINT32 retofinv_state::screen_update_retofinv(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
m_bg_tilemap->draw(bitmap, cliprect, 0,0);
- draw_sprites(screen.machine(), bitmap);
+ draw_sprites(machine(), bitmap);
m_fg_tilemap->draw(bitmap, cliprect, 0,0);
return 0;
}
diff --git a/src/mame/video/rockrage.c b/src/mame/video/rockrage.c
index 87237740135..17348b15c3d 100644
--- a/src/mame/video/rockrage.c
+++ b/src/mame/video/rockrage.c
@@ -99,12 +99,12 @@ WRITE8_MEMBER(rockrage_state::rockrage_vreg_w)
UINT32 rockrage_state::screen_update_rockrage(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- set_pens(screen.machine());
+ set_pens(machine());
k007342_tilemap_update(m_k007342);
k007342_tilemap_draw(m_k007342, bitmap, cliprect, 0, TILEMAP_DRAW_OPAQUE, 0);
- k007420_sprites_draw(m_k007420, bitmap, cliprect, screen.machine().gfx[1]);
+ k007420_sprites_draw(m_k007420, bitmap, cliprect, machine().gfx[1]);
k007342_tilemap_draw(m_k007342, bitmap, cliprect, 0, 1 | TILEMAP_DRAW_OPAQUE, 0);
k007342_tilemap_draw(m_k007342, bitmap, cliprect, 1, 0, 0);
k007342_tilemap_draw(m_k007342, bitmap, cliprect, 1, 1, 0);
diff --git a/src/mame/video/rocnrope.c b/src/mame/video/rocnrope.c
index 113e876e9d8..8dd45f23530 100644
--- a/src/mame/video/rocnrope.c
+++ b/src/mame/video/rocnrope.c
@@ -142,6 +142,6 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
UINT32 rocnrope_state::screen_update_rocnrope(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/video/rohga.c b/src/mame/video/rohga.c
index b6bc4ae2ebb..ae5d66f221f 100644
--- a/src/mame/video/rohga.c
+++ b/src/mame/video/rohga.c
@@ -63,7 +63,7 @@ UINT16 rohga_col_callback(UINT16 x)
UINT32 rohga_state::screen_update_rohga(screen_device &screen, bitmap_ind16 &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);
UINT16 priority = decocomn_priority_r(m_decocomn, space, 0, 0xffff);
@@ -73,8 +73,8 @@ UINT32 rohga_state::screen_update_rohga(screen_device &screen, bitmap_ind16 &bit
deco16ic_pf_update(m_deco_tilegen2, m_pf3_rowscroll, m_pf4_rowscroll);
/* Draw playfields */
- screen.machine().priority_bitmap.fill(0, cliprect);
- bitmap.fill(screen.machine().pens[768], cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
+ bitmap.fill(machine().pens[768], cliprect);
switch (priority & 3)
{
@@ -104,7 +104,7 @@ UINT32 rohga_state::screen_update_rohga(screen_device &screen, bitmap_ind16 &bit
break;
}
- screen.machine().device<decospr_device>("spritegen1")->draw_sprites(bitmap, cliprect, m_spriteram->buffer(), 0x400, true);
+ machine().device<decospr_device>("spritegen1")->draw_sprites(bitmap, cliprect, m_spriteram->buffer(), 0x400, true);
deco16ic_tilemap_1_draw(m_deco_tilegen1, bitmap, cliprect, 0, 0);
return 0;
@@ -166,13 +166,13 @@ static void mixwizdfirelayer(running_machine &machine, bitmap_rgb32 &bitmap, con
UINT32 rohga_state::screen_update_wizdfire(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);
UINT16 priority = decocomn_priority_r(m_decocomn, space, 0, 0xffff);
/* draw sprite gfx to temp bitmaps */
- screen.machine().device<decospr_device>("spritegen2")->draw_sprites(bitmap, cliprect, m_spriteram2->buffer(), 0x400, true);
- screen.machine().device<decospr_device>("spritegen1")->draw_sprites(bitmap, cliprect, m_spriteram->buffer(), 0x400, true);
+ machine().device<decospr_device>("spritegen2")->draw_sprites(bitmap, cliprect, m_spriteram2->buffer(), 0x400, true);
+ machine().device<decospr_device>("spritegen1")->draw_sprites(bitmap, cliprect, m_spriteram->buffer(), 0x400, true);
/* Update playfields */
flip_screen_set(BIT(flip, 7));
@@ -180,21 +180,21 @@ UINT32 rohga_state::screen_update_wizdfire(screen_device &screen, bitmap_rgb32 &
deco16ic_pf_update(m_deco_tilegen2, m_pf3_rowscroll, m_pf4_rowscroll);
/* Draw playfields - Palette of 2nd playfield chip visible if playfields turned off */
- bitmap.fill(screen.machine().pens[512], cliprect);
+ bitmap.fill(machine().pens[512], cliprect);
deco16ic_tilemap_2_draw(m_deco_tilegen2, bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0);
- screen.machine().device<decospr_device>("spritegen1")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0600, 0x0600, 0x400, 0x1ff);
+ machine().device<decospr_device>("spritegen1")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0600, 0x0600, 0x400, 0x1ff);
deco16ic_tilemap_2_draw(m_deco_tilegen1, bitmap, cliprect, 0, 0);
- screen.machine().device<decospr_device>("spritegen1")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0400, 0x0600, 0x400, 0x1ff);
+ machine().device<decospr_device>("spritegen1")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0400, 0x0600, 0x400, 0x1ff);
if ((priority & 0x1f) == 0x1f) /* Wizdfire has bit 0x40 always set, Dark Seal 2 doesn't?! */
deco16ic_tilemap_1_draw(m_deco_tilegen2, bitmap, cliprect, TILEMAP_DRAW_ALPHA(0x80), 0);
else
deco16ic_tilemap_1_draw(m_deco_tilegen2, bitmap, cliprect, 0, 0);
- screen.machine().device<decospr_device>("spritegen1")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0000, 0x0400, 0x400, 0x1ff); // 0x000 and 0x200 of 0x600
+ machine().device<decospr_device>("spritegen1")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0000, 0x0400, 0x400, 0x1ff); // 0x000 and 0x200 of 0x600
- mixwizdfirelayer(screen.machine(), bitmap, cliprect, 4, 0x000, 0x000);
+ mixwizdfirelayer(machine(), bitmap, cliprect, 4, 0x000, 0x000);
deco16ic_tilemap_1_draw(m_deco_tilegen1, bitmap, cliprect, 0, 0);
return 0;
@@ -202,14 +202,14 @@ UINT32 rohga_state::screen_update_wizdfire(screen_device &screen, bitmap_rgb32 &
UINT32 rohga_state::screen_update_nitrobal(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);
/* draw sprite gfx to temp bitmaps */
- screen.machine().device<decospr_device>("spritegen1")->set_alt_format(true);
- screen.machine().device<decospr_device>("spritegen2")->set_alt_format(true);
- screen.machine().device<decospr_device>("spritegen2")->draw_sprites(bitmap, cliprect, m_spriteram2->buffer(), 0x400, false);
- screen.machine().device<decospr_device>("spritegen1")->draw_sprites(bitmap, cliprect, m_spriteram->buffer(), 0x400, false);
+ machine().device<decospr_device>("spritegen1")->set_alt_format(true);
+ machine().device<decospr_device>("spritegen2")->set_alt_format(true);
+ machine().device<decospr_device>("spritegen2")->draw_sprites(bitmap, cliprect, m_spriteram2->buffer(), 0x400, false);
+ machine().device<decospr_device>("spritegen1")->draw_sprites(bitmap, cliprect, m_spriteram->buffer(), 0x400, false);
/* Update playfields */
flip_screen_set(BIT(flip, 7));
@@ -217,8 +217,8 @@ UINT32 rohga_state::screen_update_nitrobal(screen_device &screen, bitmap_rgb32 &
deco16ic_pf_update(m_deco_tilegen2, m_pf3_rowscroll, m_pf4_rowscroll);
/* Draw playfields - Palette of 2nd playfield chip visible if playfields turned off */
- bitmap.fill(screen.machine().pens[512], cliprect);
- screen.machine().priority_bitmap.fill(0);
+ bitmap.fill(machine().pens[512], cliprect);
+ machine().priority_bitmap.fill(0);
/* pf3 and pf4 are combined into a single 8bpp bitmap */
deco16ic_tilemap_12_combine_draw(m_deco_tilegen2, bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0);
@@ -226,8 +226,8 @@ UINT32 rohga_state::screen_update_nitrobal(screen_device &screen, bitmap_rgb32 &
deco16ic_tilemap_2_draw(m_deco_tilegen1, bitmap, cliprect, 0, 16);
/* ToDo reimplement priorities + mixing / alpha, it was busted worse than this before anyway, so no big loss that we don't do it for now ;-) */
- screen.machine().device<decospr_device>("spritegen2")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0000, 0x0000, 0x600, 0xff);
- screen.machine().device<decospr_device>("spritegen1")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0000, 0x0000, 0x400, 0x1ff);
+ machine().device<decospr_device>("spritegen2")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0000, 0x0000, 0x600, 0xff);
+ machine().device<decospr_device>("spritegen1")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0000, 0x0000, 0x400, 0x1ff);
deco16ic_tilemap_1_draw(m_deco_tilegen1, bitmap, cliprect, 0, 0);
diff --git a/src/mame/video/rollerg.c b/src/mame/video/rollerg.c
index e27d603780d..5ee0a1d0ce1 100644
--- a/src/mame/video/rollerg.c
+++ b/src/mame/video/rollerg.c
@@ -62,7 +62,7 @@ UINT32 rollerg_state::screen_update_rollerg(screen_device &screen, bitmap_ind16
{
int bg_colorbase = 16;
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
bitmap.fill(16 * bg_colorbase, cliprect);
k051316_zoom_draw(m_k051316, bitmap, cliprect, 0, 1);
k053245_sprites_draw(m_k053244, bitmap, cliprect);
diff --git a/src/mame/video/rollrace.c b/src/mame/video/rollrace.c
index 9fc14f29a3b..89e0675790e 100644
--- a/src/mame/video/rollrace.c
+++ b/src/mame/video/rollrace.c
@@ -126,7 +126,7 @@ UINT32 rollrace_state::screen_update_rollrace(screen_device &screen, bitmap_ind1
sy = 31-sy ;
drawgfx_transpen(bitmap,
- cliprect,screen.machine().gfx[RA_BGCHAR_BASE],
+ cliprect,machine().gfx[RA_BGCHAR_BASE],
mem[offs + ( m_ra_bkgpage * 1024 )]
+ ((( mem[offs + 0x4000 + ( m_ra_bkgpage * 1024 )] & 0xc0 ) >> 6 ) * 256 ) ,
m_ra_bkgcol,
@@ -164,7 +164,7 @@ UINT32 rollrace_state::screen_update_rollrace(screen_device &screen, bitmap_ind1
if(bank)
bank += m_ra_spritebank;
- drawgfx_transpen(bitmap, cliprect,screen.machine().gfx[ RA_SP_BASE + bank ],
+ drawgfx_transpen(bitmap, cliprect,machine().gfx[ RA_SP_BASE + bank ],
spriteram[offs+1] & 0x3f ,
spriteram[offs+2] & 0x1f,
m_ra_flipx,!(s_flipy^m_ra_flipy),
@@ -192,7 +192,7 @@ UINT32 rollrace_state::screen_update_rollrace(screen_device &screen, bitmap_ind1
if (m_ra_flipx) sx = 31 - sx;
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[RA_FGCHAR_BASE + m_ra_chrbank] ,
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[RA_FGCHAR_BASE + m_ra_chrbank] ,
m_videoram[ offs ] ,
col,
m_ra_flipx,m_ra_flipy,
diff --git a/src/mame/video/route16.c b/src/mame/video/route16.c
index 420dbd7df57..b9a0a6699fa 100644
--- a/src/mame/video/route16.c
+++ b/src/mame/video/route16.c
@@ -72,7 +72,7 @@ UINT32 route16_state::screen_update_route16(screen_device &screen, bitmap_rgb32
{
offs_t offs;
- UINT8 *color_prom1 = &screen.machine().root_device().memregion("proms")->base()[0x000];
+ UINT8 *color_prom1 = &machine().root_device().memregion("proms")->base()[0x000];
UINT8 *color_prom2 = &memregion("proms")->base()[0x100];
for (offs = 0; offs < m_videoram1.bytes(); offs++)
@@ -176,11 +176,11 @@ static int video_update_stratvox_ttmahjng(running_machine &machine, bitmap_rgb32
UINT32 route16_state::screen_update_stratvox(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- return video_update_stratvox_ttmahjng(screen.machine(), bitmap, cliprect, route16_make_pen);
+ return video_update_stratvox_ttmahjng(machine(), bitmap, cliprect, route16_make_pen);
}
UINT32 route16_state::screen_update_ttmahjng(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- return video_update_stratvox_ttmahjng(screen.machine(), bitmap, cliprect, ttmajng_make_pen);
+ return video_update_stratvox_ttmahjng(machine(), bitmap, cliprect, ttmajng_make_pen);
}
diff --git a/src/mame/video/rpunch.c b/src/mame/video/rpunch.c
index 98d94933b1e..f75a72a326a 100644
--- a/src/mame/video/rpunch.c
+++ b/src/mame/video/rpunch.c
@@ -271,10 +271,10 @@ UINT32 rpunch_state::screen_update_rpunch(screen_device &screen, bitmap_ind16 &b
effbins = (m_bins > m_gins) ? m_gins : m_bins;
m_background[0]->draw(bitmap, cliprect, 0,0);
- draw_sprites(screen.machine(), bitmap, cliprect, 0, effbins);
+ draw_sprites(machine(), bitmap, cliprect, 0, effbins);
m_background[1]->draw(bitmap, cliprect, 0,0);
- draw_sprites(screen.machine(), bitmap, cliprect, effbins, m_gins);
+ draw_sprites(machine(), bitmap, cliprect, effbins, m_gins);
if (m_bitmapram)
- draw_bitmap(screen.machine(), bitmap, cliprect);
+ draw_bitmap(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/video/runaway.c b/src/mame/video/runaway.c
index e57f064b386..a53069a4a98 100644
--- a/src/mame/video/runaway.c
+++ b/src/mame/video/runaway.c
@@ -101,13 +101,13 @@ UINT32 runaway_state::screen_update_runaway(screen_device &screen, bitmap_ind16
code |= (m_sprite_ram[i + 0x30] << 2) & 0x1c0;
- drawgfx_transpen(bitmap, cliprect, screen.machine().gfx[1],
+ drawgfx_transpen(bitmap, cliprect, machine().gfx[1],
code,
0,
flipx, flipy,
x, 240 - y, 0);
- drawgfx_transpen(bitmap, cliprect, screen.machine().gfx[1],
+ drawgfx_transpen(bitmap, cliprect, machine().gfx[1],
code,
0,
flipx, flipy,
@@ -135,13 +135,13 @@ UINT32 runaway_state::screen_update_qwak(screen_device &screen, bitmap_ind16 &bi
code |= (m_sprite_ram[i + 0x30] << 2) & 0x1c0;
- drawgfx_transpen(bitmap, cliprect, screen.machine().gfx[1],
+ drawgfx_transpen(bitmap, cliprect, machine().gfx[1],
code,
0,
flipx, flipy,
x, 240 - y, 0);
- drawgfx_transpen(bitmap, cliprect, screen.machine().gfx[1],
+ drawgfx_transpen(bitmap, cliprect, machine().gfx[1],
code,
0,
flipx, flipy,
diff --git a/src/mame/video/rungun.c b/src/mame/video/rungun.c
index e5787446441..a8f31daa643 100644
--- a/src/mame/video/rungun.c
+++ b/src/mame/video/rungun.c
@@ -100,8 +100,8 @@ void rungun_state::video_start()
UINT32 rungun_state::screen_update_rng(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);
k053936_zoom_draw(m_k053936, bitmap, cliprect, m_936_tilemap, 0, 0, 1);
diff --git a/src/mame/video/sauro.c b/src/mame/video/sauro.c
index 0ae3f29d30a..003bc538138 100644
--- a/src/mame/video/sauro.c
+++ b/src/mame/video/sauro.c
@@ -149,7 +149,7 @@ UINT32 sauro_state::screen_update_sauro(screen_device &screen, bitmap_ind16 &bit
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
- sauro_draw_sprites(screen.machine(), bitmap, cliprect);
+ sauro_draw_sprites(machine(), bitmap, cliprect);
return 0;
}
@@ -221,6 +221,6 @@ static void trckydoc_draw_sprites(running_machine &machine, bitmap_ind16 &bitmap
UINT32 sauro_state::screen_update_trckydoc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- trckydoc_draw_sprites(screen.machine(), bitmap, cliprect);
+ trckydoc_draw_sprites(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/video/sbasketb.c b/src/mame/video/sbasketb.c
index 609c6b41142..746c5d6b01a 100644
--- a/src/mame/video/sbasketb.c
+++ b/src/mame/video/sbasketb.c
@@ -176,6 +176,6 @@ UINT32 sbasketb_state::screen_update_sbasketb(screen_device &screen, bitmap_ind1
m_bg_tilemap->set_scrolly(col, *m_scroll);
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/video/scotrsht.c b/src/mame/video/scotrsht.c
index 9c3fd5866fc..55cd90c7f61 100644
--- a/src/mame/video/scotrsht.c
+++ b/src/mame/video/scotrsht.c
@@ -141,6 +141,6 @@ UINT32 scotrsht_state::screen_update_scotrsht(screen_device &screen, bitmap_ind1
m_bg_tilemap->set_scrolly(col, m_scroll[col]);
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/video/sderby.c b/src/mame/video/sderby.c
index 05b84c36546..59df0f6e7a3 100644
--- a/src/mame/video/sderby.c
+++ b/src/mame/video/sderby.c
@@ -105,7 +105,7 @@ UINT32 sderby_state::screen_update_sderby(screen_device &screen, bitmap_ind16 &b
{
m_tilemap->draw(bitmap, cliprect, 0,0);
- draw_sprites(screen.machine(), bitmap,cliprect,0);
+ draw_sprites(machine(), bitmap,cliprect,0);
m_md_tilemap->draw(bitmap, cliprect, 0,0);
m_fg_tilemap->draw(bitmap, cliprect, 0,0);
return 0;
@@ -116,7 +116,7 @@ UINT32 sderby_state::screen_update_pmroulet(screen_device &screen, bitmap_ind16
m_tilemap->draw(bitmap, cliprect, 0,0);
m_md_tilemap->draw(bitmap, cliprect, 0,0);
- draw_sprites(screen.machine(), bitmap,cliprect,0);
+ draw_sprites(machine(), bitmap,cliprect,0);
m_fg_tilemap->draw(bitmap, cliprect, 0,0);
return 0;
}
diff --git a/src/mame/video/segag80r.c b/src/mame/video/segag80r.c
index 79bc4a8bae3..2fc7229446a 100644
--- a/src/mame/video/segag80r.c
+++ b/src/mame/video/segag80r.c
@@ -802,7 +802,7 @@ UINT32 segag80r_state::screen_update_segag80r(screen_device &screen, bitmap_ind1
/* background: none */
case G80_BACKGROUND_NONE:
memset(transparent_pens, 0, 16);
- draw_videoram(screen.machine(), bitmap, cliprect, transparent_pens);
+ draw_videoram(machine(), bitmap, cliprect, transparent_pens);
break;
/* foreground: visible except where black */
@@ -810,32 +810,32 @@ UINT32 segag80r_state::screen_update_segag80r(screen_device &screen, bitmap_ind1
/* we draw the foreground first, then the background to do collision detection */
case G80_BACKGROUND_SPACEOD:
memset(transparent_pens, 0, 16);
- draw_videoram(screen.machine(), bitmap, cliprect, transparent_pens);
- draw_background_spaceod(screen.machine(), bitmap, cliprect);
+ draw_videoram(machine(), bitmap, cliprect, transparent_pens);
+ draw_background_spaceod(machine(), bitmap, cliprect);
break;
/* foreground: visible except for pen 0 (this disagrees with schematics) */
/* background: page-granular scrolling */
case G80_BACKGROUND_MONSTERB:
memset(transparent_pens, 1, 16);
- draw_background_page_scroll(screen.machine(), bitmap, cliprect);
- draw_videoram(screen.machine(), bitmap, cliprect, transparent_pens);
+ draw_background_page_scroll(machine(), bitmap, cliprect);
+ draw_videoram(machine(), bitmap, cliprect, transparent_pens);
break;
/* foreground: visible except for pen 0 */
/* background: full scrolling */
case G80_BACKGROUND_PIGNEWT:
memset(transparent_pens, 1, 16);
- draw_background_full_scroll(screen.machine(), bitmap, cliprect);
- draw_videoram(screen.machine(), bitmap, cliprect, transparent_pens);
+ draw_background_full_scroll(machine(), bitmap, cliprect);
+ draw_videoram(machine(), bitmap, cliprect, transparent_pens);
break;
/* foreground: visible except for pen 0 */
/* background: page-granular scrolling */
case G80_BACKGROUND_SINDBADM:
memset(transparent_pens, 1, 16);
- draw_background_page_scroll(screen.machine(), bitmap, cliprect);
- draw_videoram(screen.machine(), bitmap, cliprect, transparent_pens);
+ draw_background_page_scroll(machine(), bitmap, cliprect);
+ draw_videoram(machine(), bitmap, cliprect, transparent_pens);
break;
}
return 0;
diff --git a/src/mame/video/segag80v.c b/src/mame/video/segag80v.c
index a3feaaf657e..39595493bd1 100644
--- a/src/mame/video/segag80v.c
+++ b/src/mame/video/segag80v.c
@@ -336,7 +336,7 @@ void segag80v_state::video_start()
UINT32 segag80v_state::screen_update_segag80v(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- sega_generate_vector_list(screen.machine());
+ sega_generate_vector_list(machine());
SCREEN_UPDATE32_CALL(vector);
return 0;
}
diff --git a/src/mame/video/segas18.c b/src/mame/video/segas18.c
index 6ae5c308dca..ab5f03e0ed2 100644
--- a/src/mame/video/segas18.c
+++ b/src/mame/video/segas18.c
@@ -127,7 +127,7 @@ void segas18_state::set_vdp_mixing(UINT8 mixing)
void segas18_state::draw_vdp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int priority)
{
- bitmap_ind8 &priority_bitmap = screen.machine().priority_bitmap;
+ bitmap_ind8 &priority_bitmap = machine().priority_bitmap;
for (int y = cliprect.min_y; y <= cliprect.max_y; y++)
{
// UINT16 *src = vdp->m_render_line; // can't use this because we're not in RGB32, which we'll need to be if there are palette effects
diff --git a/src/mame/video/segas24.c b/src/mame/video/segas24.c
index 2dfcb06ee85..13e05f5f326 100644
--- a/src/mame/video/segas24.c
+++ b/src/mame/video/segas24.c
@@ -27,11 +27,11 @@ UINT32 segas24_state::screen_update_system24(screen_device &screen, bitmap_ind16
{
if(vmixer->get_reg(13) & 1) {
- bitmap.fill(get_black_pen(screen.machine()));
+ bitmap.fill(get_black_pen(machine()));
return 0;
}
- screen.machine().priority_bitmap.fill(0);
+ machine().priority_bitmap.fill(0);
bitmap.fill(0, cliprect);
std::vector<int> order;
diff --git a/src/mame/video/segas32.c b/src/mame/video/segas32.c
index 24e97096866..1b7ed4585cb 100644
--- a/src/mame/video/segas32.c
+++ b/src/mame/video/segas32.c
@@ -2417,7 +2417,7 @@ UINT32 segas32_state::screen_update_system32(screen_device &screen, bitmap_rgb32
/* if the display is off, punt */
if (!m_system32_displayenable[0])
{
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
return 0;
}
@@ -2428,12 +2428,12 @@ UINT32 segas32_state::screen_update_system32(screen_device &screen, bitmap_rgb32
/* debugging */
#if QWERTY_LAYER_ENABLE
- if (screen.machine().input().code_pressed(KEYCODE_Q)) enablemask = 0x01;
- if (screen.machine().input().code_pressed(KEYCODE_W)) enablemask = 0x02;
- if (screen.machine().input().code_pressed(KEYCODE_E)) enablemask = 0x04;
- if (screen.machine().input().code_pressed(KEYCODE_R)) enablemask = 0x08;
- if (screen.machine().input().code_pressed(KEYCODE_T)) enablemask = 0x10;
- if (screen.machine().input().code_pressed(KEYCODE_Y)) enablemask = 0x20;
+ if (machine().input().code_pressed(KEYCODE_Q)) enablemask = 0x01;
+ if (machine().input().code_pressed(KEYCODE_W)) enablemask = 0x02;
+ if (machine().input().code_pressed(KEYCODE_E)) enablemask = 0x04;
+ if (machine().input().code_pressed(KEYCODE_R)) enablemask = 0x08;
+ if (machine().input().code_pressed(KEYCODE_T)) enablemask = 0x10;
+ if (machine().input().code_pressed(KEYCODE_Y)) enablemask = 0x20;
#endif
/* do the mixing */
@@ -2441,7 +2441,7 @@ UINT32 segas32_state::screen_update_system32(screen_device &screen, bitmap_rgb32
mix_all_layers(this, 0, 0, bitmap, cliprect, enablemask);
g_profiler.stop();
- if (LOG_SPRITES && screen.machine().input().code_pressed(KEYCODE_L))
+ if (LOG_SPRITES && machine().input().code_pressed(KEYCODE_L))
{
const rectangle &visarea = screen.visible_area();
FILE *f = fopen("sprite.txt", "w");
diff --git a/src/mame/video/seibuspi.c b/src/mame/video/seibuspi.c
index 823362bde76..295eea5d50d 100644
--- a/src/mame/video/seibuspi.c
+++ b/src/mame/video/seibuspi.c
@@ -608,29 +608,29 @@ UINT32 seibuspi_state::screen_update_spi(screen_device &screen, bitmap_rgb32 &bi
bitmap.fill(0, cliprect);
if (!(m_layer_enable & 0x1))
- combine_tilemap(screen.machine(), bitmap, cliprect, m_back_layer, m_spi_scrollram[0] & 0xffff, (m_spi_scrollram[0] >> 16) & 0xffff, 1, back_rowscroll);
+ combine_tilemap(machine(), bitmap, cliprect, m_back_layer, m_spi_scrollram[0] & 0xffff, (m_spi_scrollram[0] >> 16) & 0xffff, 1, back_rowscroll);
- draw_sprites(screen.machine(), bitmap, cliprect, 0);
+ draw_sprites(machine(), bitmap, cliprect, 0);
// if fore layer is enabled, draw priority 1 sprites behind mid layer
if (!(m_layer_enable & 0x4))
- draw_sprites(screen.machine(), bitmap, cliprect, 1);
+ draw_sprites(machine(), bitmap, cliprect, 1);
if (!(m_layer_enable & 0x2))
- combine_tilemap(screen.machine(), bitmap, cliprect, m_mid_layer, m_spi_scrollram[1] & 0xffff, (m_spi_scrollram[1] >> 16) & 0xffff, 0, mid_rowscroll);
+ combine_tilemap(machine(), bitmap, cliprect, m_mid_layer, m_spi_scrollram[1] & 0xffff, (m_spi_scrollram[1] >> 16) & 0xffff, 0, mid_rowscroll);
// if fore layer is disabled, draw priority 1 sprites above mid layer
if ((m_layer_enable & 0x4))
- draw_sprites(screen.machine(), bitmap, cliprect, 1);
+ draw_sprites(machine(), bitmap, cliprect, 1);
- draw_sprites(screen.machine(), bitmap, cliprect, 2);
+ draw_sprites(machine(), bitmap, cliprect, 2);
if (!(m_layer_enable & 0x4))
- combine_tilemap(screen.machine(), bitmap, cliprect, m_fore_layer, m_spi_scrollram[2] & 0xffff, (m_spi_scrollram[2] >> 16) & 0xffff, 0, fore_rowscroll);
+ combine_tilemap(machine(), bitmap, cliprect, m_fore_layer, m_spi_scrollram[2] & 0xffff, (m_spi_scrollram[2] >> 16) & 0xffff, 0, fore_rowscroll);
- draw_sprites(screen.machine(), bitmap, cliprect, 3);
+ draw_sprites(machine(), bitmap, cliprect, 3);
- combine_tilemap(screen.machine(), bitmap, cliprect, m_text_layer, 0, 0, 0, NULL);
+ combine_tilemap(machine(), bitmap, cliprect, m_text_layer, 0, 0, 0, NULL);
return 0;
}
@@ -655,9 +655,9 @@ VIDEO_START_MEMBER(seibuspi_state,sys386f2)
UINT32 seibuspi_state::screen_update_sys386f2(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
bitmap.fill(0, cliprect);
- draw_sprites(screen.machine(), bitmap, cliprect, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 1);
- draw_sprites(screen.machine(), bitmap, cliprect, 2);
- draw_sprites(screen.machine(), bitmap, cliprect, 3);
+ draw_sprites(machine(), bitmap, cliprect, 0);
+ draw_sprites(machine(), bitmap, cliprect, 1);
+ draw_sprites(machine(), bitmap, cliprect, 2);
+ draw_sprites(machine(), bitmap, cliprect, 3);
return 0;
}
diff --git a/src/mame/video/seicross.c b/src/mame/video/seicross.c
index e0c9086c0d1..b0bd510fa07 100644
--- a/src/mame/video/seicross.c
+++ b/src/mame/video/seicross.c
@@ -142,6 +142,6 @@ UINT32 seicross_state::screen_update_seicross(screen_device &screen, bitmap_ind1
m_bg_tilemap->set_scrolly(col, m_row_scroll[col]);
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/video/senjyo.c b/src/mame/video/senjyo.c
index 3cc728d9df1..96ec4a4dd75 100644
--- a/src/mame/video/senjyo.c
+++ b/src/mame/video/senjyo.c
@@ -282,8 +282,8 @@ UINT32 senjyo_state::screen_update_senjyo(screen_device &screen, bitmap_ind16 &b
/* two colors for the radar dots (verified on the real board) */
- palette_set_color(screen.machine(),512,MAKE_RGB(0xff,0x00,0x00)); /* red for enemies */
- palette_set_color(screen.machine(),513,MAKE_RGB(0xff,0xff,0x00)); /* yellow for player */
+ palette_set_color(machine(),512,MAKE_RGB(0xff,0x00,0x00)); /* red for enemies */
+ palette_set_color(machine(),513,MAKE_RGB(0xff,0xff,0x00)); /* yellow for player */
{
int flip = flip_screen();
@@ -319,16 +319,16 @@ UINT32 senjyo_state::screen_update_senjyo(screen_device &screen, bitmap_ind16 &b
m_bg3_tilemap->set_scrolly(0, scrolly);
}
- draw_bgbitmap(screen.machine(), bitmap, cliprect);
- draw_sprites(screen.machine(), bitmap, cliprect, 0);
+ draw_bgbitmap(machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect, 0);
m_bg3_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 1);
+ draw_sprites(machine(), bitmap, cliprect, 1);
m_bg2_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 2);
+ draw_sprites(machine(), bitmap, cliprect, 2);
m_bg1_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 3);
+ draw_sprites(machine(), bitmap, cliprect, 3);
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_radar(screen.machine(), bitmap, cliprect);
+ draw_radar(machine(), bitmap, cliprect);
#if 0
{
diff --git a/src/mame/video/seta.c b/src/mame/video/seta.c
index ead2316c464..b83405f5b1f 100644
--- a/src/mame/video/seta.c
+++ b/src/mame/video/seta.c
@@ -826,10 +826,10 @@ static void draw_tilemap_palette_effect(running_machine &machine, bitmap_ind16 &
/* For games without tilemaps */
UINT32 seta_state::screen_update_seta_no_layers(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- set_pens(screen.machine());
+ set_pens(machine());
bitmap.fill(0x1f0, cliprect);
- screen.machine().device<seta001_device>("spritegen")->seta001_draw_sprites(screen.machine(),bitmap,cliprect,0x1000, 1);
+ machine().device<seta001_device>("spritegen")->seta001_draw_sprites(machine(),bitmap,cliprect,0x1000, 1);
return 0;
}
@@ -1053,8 +1053,8 @@ UINT32 seta_state::screen_update_setaroul(screen_device &screen, bitmap_ind16 &b
{
bitmap.fill(0x0, 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 );
seta_layers_update(screen, bitmap, cliprect, 0x800, 1 );
@@ -1065,21 +1065,21 @@ void seta_state::screen_eof_setaroul(screen_device &screen, bool state)
{
// rising edge
if (state)
- screen.machine().device<seta001_device>("spritegen")->tnzs_eof();
+ machine().device<seta001_device>("spritegen")->tnzs_eof();
}
UINT32 seta_state::screen_update_seta(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- set_pens(screen.machine());
+ set_pens(machine());
return SCREEN_UPDATE16_CALL_MEMBER(seta_layers);
}
UINT32 seta_state::screen_update_usclssic(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- usclssic_set_pens(screen.machine());
+ usclssic_set_pens(machine());
return SCREEN_UPDATE16_CALL_MEMBER(seta_layers);
}
diff --git a/src/mame/video/seta2.c b/src/mame/video/seta2.c
index 0716f819494..232a4568bba 100644
--- a/src/mame/video/seta2.c
+++ b/src/mame/video/seta2.c
@@ -479,10 +479,10 @@ UINT32 seta2_state::screen_update_seta2(screen_device &screen, bitmap_ind16 &bit
{
// Black or pen 0?
- bitmap.fill(screen.machine().pens[0], cliprect);
+ bitmap.fill(machine().pens[0], cliprect);
if ( (m_vregs[0x30/2] & 1) == 0 ) // 1 = BLANK SCREEN
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/video/sf.c b/src/mame/video/sf.c
index 588b46dd34d..ff3fbf48a2f 100644
--- a/src/mame/video/sf.c
+++ b/src/mame/video/sf.c
@@ -223,7 +223,7 @@ UINT32 sf_state::screen_update_sf(screen_device &screen, bitmap_ind16 &bitmap, c
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
if (m_sf_active & 0x80)
- 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/video/shadfrce.c b/src/mame/video/shadfrce.c
index 88330761c01..5d7c0c0bb42 100644
--- a/src/mame/video/shadfrce.c
+++ b/src/mame/video/shadfrce.c
@@ -153,18 +153,18 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
UINT32 shadfrce_state::screen_update_shadfrce(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
if (m_video_enable)
{
m_bg1tilemap->draw(bitmap, cliprect, 0,0);
m_bg0tilemap->draw(bitmap, cliprect, 0,1);
- draw_sprites(screen.machine(), bitmap,cliprect);
+ draw_sprites(machine(), bitmap,cliprect);
m_fgtilemap->draw(bitmap, cliprect, 0,0);
}
else
{
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
}
return 0;
diff --git a/src/mame/video/shangkid.c b/src/mame/video/shangkid.c
index 51d16b3e298..1b872bcff6d 100644
--- a/src/mame/video/shangkid.c
+++ b/src/mame/video/shangkid.c
@@ -190,7 +190,7 @@ UINT32 shangkid_state::screen_update_shangkid(screen_device &screen, bitmap_ind1
m_background->set_scrolly(0,m_videoreg[2]+0x10 );
m_background->draw(bitmap, cliprect, 0,0 );
- shangkid_draw_sprites(screen.machine(), bitmap,cliprect );
+ shangkid_draw_sprites(machine(), bitmap,cliprect );
m_background->draw(bitmap, cliprect, 1,0 ); /* high priority tiles */
return 0;
}
@@ -320,8 +320,8 @@ static void dynamski_draw_sprites(running_machine &machine, bitmap_ind16 &bitmap
UINT32 shangkid_state::screen_update_dynamski(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- dynamski_draw_background(screen.machine(), bitmap,cliprect, 0 );
- dynamski_draw_sprites(screen.machine(), bitmap,cliprect );
- dynamski_draw_background(screen.machine(), bitmap,cliprect, 1 );
+ dynamski_draw_background(machine(), bitmap,cliprect, 0 );
+ dynamski_draw_sprites(machine(), bitmap,cliprect );
+ dynamski_draw_background(machine(), bitmap,cliprect, 1 );
return 0;
}
diff --git a/src/mame/video/shaolins.c b/src/mame/video/shaolins.c
index 2686e676066..cd1f5639c3e 100644
--- a/src/mame/video/shaolins.c
+++ b/src/mame/video/shaolins.c
@@ -190,6 +190,6 @@ UINT32 shaolins_state::screen_update_shaolins(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/video/shisen.c b/src/mame/video/shisen.c
index a20be13ac29..fc08c27bc4f 100644
--- a/src/mame/video/shisen.c
+++ b/src/mame/video/shisen.c
@@ -63,7 +63,7 @@ UINT32 shisen_state::screen_update_sichuan2(screen_device &screen, bitmap_ind16
// on Irem boards, screen flip is handled in both hardware and software.
// this game doesn't have cocktail mode so if there's software control we don't
// know where it is mapped.
- flip_screen_set(~screen.machine().root_device().ioport("DSW2")->read() & 1);
+ flip_screen_set(~machine().root_device().ioport("DSW2")->read() & 1);
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
diff --git a/src/mame/video/shootout.c b/src/mame/video/shootout.c
index 8e95d11eccc..0dfa7e70d6a 100644
--- a/src/mame/video/shootout.c
+++ b/src/mame/video/shootout.c
@@ -170,21 +170,21 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
UINT32 shootout_state::screen_update_shootout(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
m_background->draw(bitmap, cliprect, 0,0);
m_foreground->draw(bitmap, cliprect, 0,1);
- draw_sprites(screen.machine(), bitmap,cliprect,3/*bank bits */);
+ draw_sprites(machine(), bitmap,cliprect,3/*bank bits */);
return 0;
}
UINT32 shootout_state::screen_update_shootouj(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
m_background->draw(bitmap, cliprect, 0,0);
m_foreground->draw(bitmap, cliprect, 0,1);
- draw_sprites(screen.machine(), bitmap,cliprect,2/*bank bits*/);
+ draw_sprites(machine(), bitmap,cliprect,2/*bank bits*/);
return 0;
}
diff --git a/src/mame/video/sidearms.c b/src/mame/video/sidearms.c
index df07d702483..facb853c49c 100644
--- a/src/mame/video/sidearms.c
+++ b/src/mame/video/sidearms.c
@@ -339,7 +339,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
UINT32 sidearms_state::screen_update_sidearms(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- sidearms_draw_starfield(screen.machine(), bitmap);
+ sidearms_draw_starfield(machine(), bitmap);
m_bg_tilemap->set_scrollx(0, m_bg_scrollx[0] + (m_bg_scrollx[1] << 8 & 0xf00));
m_bg_tilemap->set_scrolly(0, m_bg_scrolly[0] + (m_bg_scrolly[1] << 8 & 0xf00));
@@ -348,7 +348,7 @@ UINT32 sidearms_state::screen_update_sidearms(screen_device &screen, bitmap_ind1
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
if (m_objon)
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
if (m_charon)
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
diff --git a/src/mame/video/sidepckt.c b/src/mame/video/sidepckt.c
index cee7119b1fe..682c00f2097 100644
--- a/src/mame/video/sidepckt.c
+++ b/src/mame/video/sidepckt.c
@@ -141,7 +141,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,const re
UINT32 sidepckt_state::screen_update_sidepckt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1,0);
- draw_sprites(screen.machine(), bitmap,cliprect);
+ draw_sprites(machine(), bitmap,cliprect);
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0,0);
return 0;
}
diff --git a/src/mame/video/silkroad.c b/src/mame/video/silkroad.c
index f3e5db723d0..e960dc8a3f8 100644
--- a/src/mame/video/silkroad.c
+++ b/src/mame/video/silkroad.c
@@ -136,7 +136,7 @@ void silkroad_state::video_start()
UINT32 silkroad_state::screen_update_silkroad(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
bitmap.fill(0x7c0, cliprect);
m_fg_tilemap->set_scrollx(0, ((m_regs[0] & 0xffff0000) >> 16) );
@@ -151,7 +151,7 @@ UINT32 silkroad_state::screen_update_silkroad(screen_device &screen, bitmap_ind1
m_fg_tilemap->draw(bitmap, cliprect, 0,0);
m_fg2_tilemap->draw(bitmap, cliprect, 0,1);
m_fg3_tilemap->draw(bitmap, cliprect, 0,2);
- draw_sprites(screen.machine(),bitmap,cliprect);
+ draw_sprites(machine(),bitmap,cliprect);
if (0)
{
diff --git a/src/mame/video/simpl156.c b/src/mame/video/simpl156.c
index 847a428c6f0..803d0e578cf 100644
--- a/src/mame/video/simpl156.c
+++ b/src/mame/video/simpl156.c
@@ -28,7 +28,7 @@ void simpl156_state::video_start()
UINT32 simpl156_state::screen_update_simpl156(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- screen.machine().priority_bitmap.fill(0);
+ machine().priority_bitmap.fill(0);
deco16ic_pf_update(m_deco_tilegen1, m_pf1_rowscroll, m_pf2_rowscroll);
@@ -40,6 +40,6 @@ UINT32 simpl156_state::screen_update_simpl156(screen_device &screen, bitmap_ind1
//FIXME: flip_screen_x should not be written!
flip_screen_set_no_update(1);
- screen.machine().device<decospr_device>("spritegen")->draw_sprites(bitmap, cliprect, m_spriteram, 0x1400/4); // 0x1400/4 seems right for charlien (doesn't initialize any more RAM, so will draw a garbage 0 with more)
+ machine().device<decospr_device>("spritegen")->draw_sprites(bitmap, cliprect, m_spriteram, 0x1400/4); // 0x1400/4 seems right for charlien (doesn't initialize any more RAM, so will draw a garbage 0 with more)
return 0;
}
diff --git a/src/mame/video/simpsons.c b/src/mame/video/simpsons.c
index 54db49adf4a..f04ff545e27 100644
--- a/src/mame/video/simpsons.c
+++ b/src/mame/video/simpsons.c
@@ -139,7 +139,7 @@ UINT32 simpsons_state::screen_update_simpsons(screen_device &screen, bitmap_ind1
konami_sortlayers3(layer, m_layerpri);
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
bitmap.fill(16 * bg_colorbase, cliprect);
k052109_tilemap_draw(m_k052109, bitmap, cliprect, layer[0], 0, 1);
k052109_tilemap_draw(m_k052109, bitmap, cliprect, layer[1], 0, 2);
diff --git a/src/mame/video/skydiver.c b/src/mame/video/skydiver.c
index 5953081eae0..2581e8d3213 100644
--- a/src/mame/video/skydiver.c
+++ b/src/mame/video/skydiver.c
@@ -204,6 +204,6 @@ UINT32 skydiver_state::screen_update_skydiver(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/video/skyfox.c b/src/mame/video/skyfox.c
index 357c518fa29..10c5c5261b9 100644
--- a/src/mame/video/skyfox.c
+++ b/src/mame/video/skyfox.c
@@ -283,7 +283,7 @@ static void draw_background(running_machine &machine, bitmap_ind16 &bitmap, cons
UINT32 skyfox_state::screen_update_skyfox(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
bitmap.fill(255, cliprect); // the bg is black
- draw_background(screen.machine(), bitmap, cliprect);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_background(machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/video/skykid.c b/src/mame/video/skykid.c
index e9bf27a50ea..73e1df56485 100644
--- a/src/mame/video/skykid.c
+++ b/src/mame/video/skykid.c
@@ -252,7 +252,7 @@ UINT32 skykid_state::screen_update_skykid(screen_device &screen, bitmap_ind16 &b
// draw low priority tiles
m_tx_tilemap->draw(bitmap, cliprect, pri, 0);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
// draw the other tiles
for (cat = 0; cat < 0xf; cat++)
@@ -260,7 +260,7 @@ UINT32 skykid_state::screen_update_skykid(screen_device &screen, bitmap_ind16 &b
}
else
{
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
m_tx_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_ALL_CATEGORIES, 0);
}
diff --git a/src/mame/video/skyraid.c b/src/mame/video/skyraid.c
index 45d0a91b07e..7c19f370adb 100644
--- a/src/mame/video/skyraid.c
+++ b/src/mame/video/skyraid.c
@@ -140,10 +140,10 @@ UINT32 skyraid_state::screen_update_skyraid(screen_device &screen, bitmap_ind16
rectangle helper_clip = cliprect;
helper_clip &= m_helper.cliprect();
- draw_terrain(screen.machine(), m_helper, helper_clip);
- draw_sprites(screen.machine(), m_helper, helper_clip);
- draw_missiles(screen.machine(), m_helper, helper_clip);
- draw_trapezoid(screen.machine(), bitmap, m_helper);
- draw_text(screen.machine(), bitmap, cliprect);
+ draw_terrain(machine(), m_helper, helper_clip);
+ draw_sprites(machine(), m_helper, helper_clip);
+ draw_missiles(machine(), m_helper, helper_clip);
+ draw_trapezoid(machine(), bitmap, m_helper);
+ draw_text(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/video/slapfght.c b/src/mame/video/slapfght.c
index c3909a3fd5b..58a8baf42fc 100644
--- a/src/mame/video/slapfght.c
+++ b/src/mame/video/slapfght.c
@@ -188,11 +188,11 @@ UINT32 slapfght_state::screen_update_perfrman(screen_device &screen, bitmap_ind1
}
m_pf1_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE,0);
- draw_sprites(screen.machine(), bitmap,cliprect,0);
+ draw_sprites(machine(), bitmap,cliprect,0);
m_pf1_tilemap->draw(bitmap, cliprect, 0,0);
- draw_sprites(screen.machine(), bitmap,cliprect,0x80);
+ draw_sprites(machine(), bitmap,cliprect,0x80);
- slapfght_log_vram(screen.machine());
+ slapfght_log_vram(machine());
return 0;
}
@@ -202,7 +202,7 @@ UINT32 slapfght_state::screen_update_slapfight(screen_device &screen, bitmap_ind
UINT8 *buffered_spriteram = m_spriteram->buffer();
int offs;
- screen.machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
+ machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
if (m_flipscreen) {
m_fix_tilemap->set_scrollx(0,296);
m_pf1_tilemap->set_scrollx(0,(*m_slapfight_scrollx_lo + 256 * *m_slapfight_scrollx_hi)+296 );
@@ -222,13 +222,13 @@ UINT32 slapfght_state::screen_update_slapfight(screen_device &screen, bitmap_ind
for (offs = 0;offs < m_spriteram->bytes();offs += 4)
{
if (m_flipscreen)
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[2],
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[2],
buffered_spriteram[offs] + ((buffered_spriteram[offs+2] & 0xc0) << 2),
(buffered_spriteram[offs+2] & 0x1e) >> 1,
1,1,
288-(buffered_spriteram[offs+1] + ((buffered_spriteram[offs+2] & 0x01) << 8)) +18,240-buffered_spriteram[offs+3],0);
else
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[2],
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[2],
buffered_spriteram[offs] + ((buffered_spriteram[offs+2] & 0xc0) << 2),
(buffered_spriteram[offs+2] & 0x1e) >> 1,
0,0,
@@ -237,6 +237,6 @@ UINT32 slapfght_state::screen_update_slapfight(screen_device &screen, bitmap_ind
m_fix_tilemap->draw(bitmap, cliprect, 0,0);
- slapfght_log_vram(screen.machine());
+ slapfght_log_vram(machine());
return 0;
}
diff --git a/src/mame/video/slapshot.c b/src/mame/video/slapshot.c
index ebd0ca1a721..41a6436e39b 100644
--- a/src/mame/video/slapshot.c
+++ b/src/mame/video/slapshot.c
@@ -433,7 +433,7 @@ void slapshot_state::screen_eof_taito_no_buffer(screen_device &screen, bool stat
if (state)
{
- taito_update_sprites_active_area(screen.machine());
+ taito_update_sprites_active_area(machine());
m_prepare_sprites = 1;
}
@@ -458,45 +458,45 @@ a bg layer given priority over some sprites.
UINT32 slapshot_state::screen_update_slapshot(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- address_space &space = screen.machine().driver_data()->generic_space();
+ address_space &space = machine().driver_data()->generic_space();
UINT8 layer[5];
UINT8 tilepri[5];
UINT8 spritepri[4];
UINT16 priority;
#ifdef MAME_DEBUG
- if (screen.machine().input().code_pressed_once (KEYCODE_Z))
+ if (machine().input().code_pressed_once (KEYCODE_Z))
{
m_dislayer[0] ^= 1;
popmessage("bg0: %01x",m_dislayer[0]);
}
- if (screen.machine().input().code_pressed_once (KEYCODE_X))
+ if (machine().input().code_pressed_once (KEYCODE_X))
{
m_dislayer[1] ^= 1;
popmessage("bg1: %01x",m_dislayer[1]);
}
- if (screen.machine().input().code_pressed_once (KEYCODE_C))
+ if (machine().input().code_pressed_once (KEYCODE_C))
{
m_dislayer[2] ^= 1;
popmessage("bg2: %01x",m_dislayer[2]);
}
- if (screen.machine().input().code_pressed_once (KEYCODE_V))
+ if (machine().input().code_pressed_once (KEYCODE_V))
{
m_dislayer[3] ^= 1;
popmessage("bg3: %01x",m_dislayer[3]);
}
- if (screen.machine().input().code_pressed_once (KEYCODE_B))
+ if (machine().input().code_pressed_once (KEYCODE_B))
{
m_dislayer[4] ^= 1;
popmessage("text: %01x",m_dislayer[4]);
}
#endif
- taito_handle_sprite_buffering(screen.machine());
+ taito_handle_sprite_buffering(machine());
tc0480scp_tilemap_update(m_tc0480scp);
@@ -521,7 +521,7 @@ UINT32 slapshot_state::screen_update_slapshot(screen_device &screen, bitmap_ind1
spritepri[2] = tc0360pri_r(m_tc0360pri, space, 7) & 0x0f;
spritepri[3] = tc0360pri_r(m_tc0360pri, space, 7) >> 4;
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
bitmap.fill(0, cliprect);
#ifdef MAME_DEBUG
@@ -556,7 +556,7 @@ UINT32 slapshot_state::screen_update_slapshot(screen_device &screen, bitmap_ind1
if (spritepri[i] < tilepri[(layer[3])]) primasks[i] |= 0xff00;
}
- draw_sprites(screen.machine(),bitmap,cliprect,primasks,0);
+ draw_sprites(machine(),bitmap,cliprect,primasks,0);
}
/*
diff --git a/src/mame/video/snes.c b/src/mame/video/snes.c
index 74795b7205a..933d61ac6f0 100644
--- a/src/mame/video/snes.c
+++ b/src/mame/video/snes.c
@@ -1792,7 +1792,7 @@ UINT32 snes_state::snes_screen_update( screen_device &screen, bitmap_rgb32 &bitm
/*NTSC SNES draw range is 1-225. */
for (y = cliprect.min_y; y <= cliprect.max_y; y++)
{
- snes_refresh_scanline(screen.machine(), bitmap, y + 1);
+ snes_refresh_scanline(machine(), bitmap, y + 1);
}
return 0;
}
diff --git a/src/mame/video/snk.c b/src/mame/video/snk.c
index e145c06595e..fdf2f65a7b5 100644
--- a/src/mame/video/snk.c
+++ b/src/mame/video/snk.c
@@ -949,9 +949,9 @@ UINT32 snk_state::screen_update_marvins(screen_device &screen, bitmap_ind16 &bit
m_fg_tilemap->set_scrolly(0, m_fg_scrolly);
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- marvins_draw_sprites(screen.machine(), bitmap, cliprect, m_sp16_scrollx, m_sp16_scrolly, 0, m_sprite_split_point>>2);
+ marvins_draw_sprites(machine(), bitmap, cliprect, m_sp16_scrollx, m_sp16_scrolly, 0, m_sprite_split_point>>2);
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
- marvins_draw_sprites(screen.machine(), bitmap, cliprect, m_sp16_scrollx, m_sp16_scrolly, m_sprite_split_point>>2, 25);
+ marvins_draw_sprites(machine(), bitmap, cliprect, m_sp16_scrollx, m_sp16_scrolly, m_sprite_split_point>>2, 25);
m_tx_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
@@ -965,7 +965,7 @@ UINT32 snk_state::screen_update_tnk3(screen_device &screen, bitmap_ind16 &bitmap
m_bg_tilemap->set_scrolly(0, m_bg_scrolly);
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- tnk3_draw_sprites(screen.machine(), bitmap, cliprect, m_sp16_scrollx, m_sp16_scrolly);
+ tnk3_draw_sprites(machine(), bitmap, cliprect, m_sp16_scrollx, m_sp16_scrolly);
m_tx_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
@@ -980,9 +980,9 @@ UINT32 snk_state::screen_update_ikari(screen_device &screen, bitmap_ind16 &bitma
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- ikari_draw_sprites(screen.machine(), bitmap, cliprect, 0, m_sp16_scrollx, m_sp16_scrolly, m_spriteram + 0x800, 2 );
- ikari_draw_sprites(screen.machine(), bitmap, cliprect, 0, m_sp32_scrollx, m_sp32_scrolly, m_spriteram, 3 );
- ikari_draw_sprites(screen.machine(), bitmap, cliprect, 25, m_sp16_scrollx, m_sp16_scrolly, m_spriteram + 0x800, 2 );
+ ikari_draw_sprites(machine(), bitmap, cliprect, 0, m_sp16_scrollx, m_sp16_scrolly, m_spriteram + 0x800, 2 );
+ ikari_draw_sprites(machine(), bitmap, cliprect, 0, m_sp32_scrollx, m_sp32_scrolly, m_spriteram, 3 );
+ ikari_draw_sprites(machine(), bitmap, cliprect, 25, m_sp16_scrollx, m_sp16_scrolly, m_spriteram + 0x800, 2 );
m_tx_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
@@ -997,9 +997,9 @@ UINT32 snk_state::screen_update_gwar(screen_device &screen, bitmap_ind16 &bitmap
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- tdfever_draw_sprites(screen.machine(), bitmap, cliprect, m_sp16_scrollx, m_sp16_scrolly, m_spriteram + 0x800, 2, 0, 0, m_sprite_split_point );
- tdfever_draw_sprites(screen.machine(), bitmap, cliprect, m_sp32_scrollx, m_sp32_scrolly, m_spriteram, 3, 0, 0, 32 );
- tdfever_draw_sprites(screen.machine(), bitmap, cliprect, m_sp16_scrollx, m_sp16_scrolly, m_spriteram + 0x800, 2, 0, m_sprite_split_point, 64 );
+ tdfever_draw_sprites(machine(), bitmap, cliprect, m_sp16_scrollx, m_sp16_scrolly, m_spriteram + 0x800, 2, 0, 0, m_sprite_split_point );
+ tdfever_draw_sprites(machine(), bitmap, cliprect, m_sp32_scrollx, m_sp32_scrolly, m_spriteram, 3, 0, 0, 32 );
+ tdfever_draw_sprites(machine(), bitmap, cliprect, m_sp16_scrollx, m_sp16_scrolly, m_spriteram + 0x800, 2, 0, m_sprite_split_point, 64 );
m_tx_tilemap->draw(bitmap, cliprect, 0, 0);
@@ -1015,7 +1015,7 @@ UINT32 snk_state::screen_update_tdfever(screen_device &screen, bitmap_ind16 &bit
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- tdfever_draw_sprites(screen.machine(), bitmap, cliprect, m_sp32_scrollx, m_sp32_scrolly, m_spriteram, 2, 1, 0, 32 );
+ tdfever_draw_sprites(machine(), bitmap, cliprect, m_sp32_scrollx, m_sp32_scrolly, m_spriteram, 2, 1, 0, 32 );
m_tx_tilemap->draw(bitmap, cliprect, 0, 0);
diff --git a/src/mame/video/snk68.c b/src/mame/video/snk68.c
index 971584301cc..d5e0f564eac 100644
--- a/src/mame/video/snk68.c
+++ b/src/mame/video/snk68.c
@@ -282,9 +282,9 @@ UINT32 snk68_state::screen_update_pow(screen_device &screen, bitmap_ind16 &bitma
bitmap.fill(0x7ff, cliprect);
/* This appears to be the correct priority order */
- draw_sprites(screen.machine(), bitmap, cliprect, 2);
- draw_sprites(screen.machine(), bitmap, cliprect, 3);
- draw_sprites(screen.machine(), bitmap, cliprect, 1);
+ draw_sprites(machine(), bitmap, cliprect, 2);
+ draw_sprites(machine(), bitmap, cliprect, 3);
+ draw_sprites(machine(), bitmap, cliprect, 1);
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
diff --git a/src/mame/video/solomon.c b/src/mame/video/solomon.c
index 5e973ea7470..c3d15efabaf 100644
--- a/src/mame/video/solomon.c
+++ b/src/mame/video/solomon.c
@@ -104,6 +104,6 @@ UINT32 solomon_state::screen_update_solomon(screen_device &screen, bitmap_ind16
{
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);
return 0;
}
diff --git a/src/mame/video/sonson.c b/src/mame/video/sonson.c
index faa6608cfc0..333f883848c 100644
--- a/src/mame/video/sonson.c
+++ b/src/mame/video/sonson.c
@@ -174,6 +174,6 @@ static void draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const
UINT32 sonson_state::screen_update_sonson(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/video/spacefb.c b/src/mame/video/spacefb.c
index c7d4cdc72c6..16defb38c10 100644
--- a/src/mame/video/spacefb.c
+++ b/src/mame/video/spacefb.c
@@ -396,7 +396,7 @@ static void draw_objects(running_machine &machine, bitmap_rgb32 &bitmap, const r
UINT32 spacefb_state::screen_update_spacefb(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- draw_objects(screen.machine(), bitmap, cliprect);
+ draw_objects(machine(), bitmap, cliprect);
draw_starfield(screen, bitmap, cliprect);
return 0;
diff --git a/src/mame/video/spbactn.c b/src/mame/video/spbactn.c
index 3790a7ce130..63e9febea14 100644
--- a/src/mame/video/spbactn.c
+++ b/src/mame/video/spbactn.c
@@ -130,9 +130,9 @@ UINT32 spbactn_state::screen_update_spbactn(screen_device &screen, bitmap_rgb32
color = ((attr & 0x00f0) >> 4) | 0x80;
- drawgfx_transpen_raw(m_tile_bitmap_bg, cliprect, screen.machine().gfx[1],
+ drawgfx_transpen_raw(m_tile_bitmap_bg, cliprect, machine().gfx[1],
code,
- screen.machine().gfx[1]->colorbase() + color * screen.machine().gfx[1]->granularity(),
+ machine().gfx[1]->colorbase() + color * machine().gfx[1]->granularity(),
0, 0,
16 * sx, 8 * sy,
(UINT32)-1);
@@ -145,7 +145,7 @@ UINT32 spbactn_state::screen_update_spbactn(screen_device &screen, bitmap_rgb32
}
}
- if (draw_sprites(screen.machine(), m_tile_bitmap_bg, cliprect, 0))
+ if (draw_sprites(machine(), m_tile_bitmap_bg, cliprect, 0))
{
/* kludge: draw table bg gfx again if priority 0 sprites are enabled */
for (sx = sy = offs = 0; offs < 0x4000 / 2; offs++)
@@ -157,9 +157,9 @@ UINT32 spbactn_state::screen_update_spbactn(screen_device &screen, bitmap_rgb32
color = ((attr & 0x00f0) >> 4) | 0x80;
- drawgfx_transpen_raw(m_tile_bitmap_bg, cliprect, screen.machine().gfx[1],
+ drawgfx_transpen_raw(m_tile_bitmap_bg, cliprect, machine().gfx[1],
code,
- screen.machine().gfx[1]->colorbase() + color * screen.machine().gfx[1]->granularity(),
+ machine().gfx[1]->colorbase() + color * machine().gfx[1]->granularity(),
0, 0,
16 * sx, 8 * sy,
0);
@@ -173,7 +173,7 @@ UINT32 spbactn_state::screen_update_spbactn(screen_device &screen, bitmap_rgb32
}
}
- draw_sprites(screen.machine(), m_tile_bitmap_bg, cliprect, 1);
+ draw_sprites(machine(), m_tile_bitmap_bg, cliprect, 1);
/* draw table fg gfx */
for (sx = sy = offs = 0; offs < 0x4000 / 2; offs++)
@@ -191,9 +191,9 @@ UINT32 spbactn_state::screen_update_spbactn(screen_device &screen, bitmap_rgb32
else
color |= 0x0080;
- drawgfx_transpen_raw(m_tile_bitmap_fg, cliprect, screen.machine().gfx[0],
+ drawgfx_transpen_raw(m_tile_bitmap_fg, cliprect, machine().gfx[0],
code,
- screen.machine().gfx[0]->colorbase() + color * screen.machine().gfx[0]->granularity(),
+ machine().gfx[0]->colorbase() + color * machine().gfx[0]->granularity(),
0, 0,
16 * sx, 8 * sy,
0);
@@ -206,10 +206,10 @@ UINT32 spbactn_state::screen_update_spbactn(screen_device &screen, bitmap_rgb32
}
}
- draw_sprites(screen.machine(), m_tile_bitmap_fg, cliprect, 2);
- draw_sprites(screen.machine(), m_tile_bitmap_fg, cliprect, 3);
+ draw_sprites(machine(), m_tile_bitmap_fg, cliprect, 2);
+ draw_sprites(machine(), m_tile_bitmap_fg, cliprect, 3);
/* mix & blend the tilemaps and sprites into a 32-bit bitmap */
- blendbitmaps(screen.machine(), bitmap, m_tile_bitmap_bg, m_tile_bitmap_fg, cliprect);
+ blendbitmaps(machine(), bitmap, m_tile_bitmap_bg, m_tile_bitmap_fg, cliprect);
return 0;
}
diff --git a/src/mame/video/spcforce.c b/src/mame/video/spcforce.c
index 4421ef81fb9..904694929ef 100644
--- a/src/mame/video/spcforce.c
+++ b/src/mame/video/spcforce.c
@@ -39,7 +39,7 @@ UINT32 spcforce_state::screen_update_spcforce(screen_device &screen, bitmap_ind1
sy = 248 - sy;
}
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[0],
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[0],
code, col,
flip, flip,
sx, sy,0);
diff --git a/src/mame/video/spdodgeb.c b/src/mame/video/spdodgeb.c
index baf5c44afa8..8f24702448e 100644
--- a/src/mame/video/spdodgeb.c
+++ b/src/mame/video/spdodgeb.c
@@ -208,6 +208,6 @@ UINT32 spdodgeb_state::screen_update_spdodgeb(screen_device &screen, bitmap_ind1
{
m_bg_tilemap->set_scrollx(0,m_lastscroll+5);
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/video/speedatk.c b/src/mame/video/speedatk.c
index af7b4ee1054..e9c14efec05 100644
--- a/src/mame/video/speedatk.c
+++ b/src/mame/video/speedatk.c
@@ -106,7 +106,7 @@ UINT32 speedatk_state::screen_update_speedatk(screen_device &screen, bitmap_ind1
color = m_colorram[count] & 0x1f;
region = (m_colorram[count] & 0x10) >> 4;
- drawgfx_opaque(bitmap,cliprect,screen.machine().gfx[region],tile,color,m_flip_scr,m_flip_scr,x*8,y*8);
+ drawgfx_opaque(bitmap,cliprect,machine().gfx[region],tile,color,m_flip_scr,m_flip_scr,x*8,y*8);
count = (m_flip_scr) ? count-1 : count+1;
count&=0x3ff;
diff --git a/src/mame/video/speedbal.c b/src/mame/video/speedbal.c
index 3335723a7c2..99bbc06d73b 100644
--- a/src/mame/video/speedbal.c
+++ b/src/mame/video/speedbal.c
@@ -126,7 +126,7 @@ UINT32 speedbal_state::screen_update_speedbal(screen_device &screen, bitmap_ind1
{
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0);
m_fg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0);
m_fg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0);
return 0;
diff --git a/src/mame/video/speedspn.c b/src/mame/video/speedspn.c
index 5f99475d895..3b1de6bbccf 100644
--- a/src/mame/video/speedspn.c
+++ b/src/mame/video/speedspn.c
@@ -90,7 +90,7 @@ UINT32 speedspn_state::screen_update_speedspn(screen_device &screen, bitmap_ind1
{
if (m_display_disable)
{
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
return 0;
}
@@ -104,6 +104,6 @@ UINT32 speedspn_state::screen_update_speedspn(screen_device &screen, bitmap_ind1
#endif
m_tilemap->set_scrollx(0, 0x100); // verify
m_tilemap->draw(bitmap, cliprect, 0,0);
- draw_sprites(screen.machine(), bitmap,cliprect);
+ draw_sprites(machine(), bitmap,cliprect);
return 0;
}
diff --git a/src/mame/video/splash.c b/src/mame/video/splash.c
index a1049be24e2..3d56d6a742a 100644
--- a/src/mame/video/splash.c
+++ b/src/mame/video/splash.c
@@ -261,10 +261,10 @@ UINT32 splash_state::screen_update_splash(screen_device &screen, bitmap_ind16 &b
m_bg_tilemap[0]->set_scrolly(0, m_vregs[0]);
m_bg_tilemap[1]->set_scrolly(0, m_vregs[1]);
- draw_bitmap(screen.machine(), bitmap, cliprect);
+ draw_bitmap(machine(), bitmap, cliprect);
m_bg_tilemap[1]->draw(bitmap, cliprect, 0, 0);
- splash_draw_sprites(screen.machine(), bitmap, cliprect);
+ splash_draw_sprites(machine(), bitmap, cliprect);
m_bg_tilemap[0]->draw(bitmap, cliprect, 0, 0);
return 0;
}
@@ -276,11 +276,11 @@ UINT32 splash_state::screen_update_funystrp(screen_device &screen, bitmap_ind16
m_bg_tilemap[0]->set_scrolly(0, m_vregs[0]);
m_bg_tilemap[1]->set_scrolly(0, m_vregs[1]);
- draw_bitmap(screen.machine(), bitmap, cliprect);
+ draw_bitmap(machine(), bitmap, cliprect);
m_bg_tilemap[1]->draw(bitmap, cliprect, 0, 0);
/*Sprite chip is similar but not the same*/
- funystrp_draw_sprites(screen.machine(), bitmap, cliprect);
+ funystrp_draw_sprites(machine(), bitmap, cliprect);
m_bg_tilemap[0]->draw(bitmap, cliprect, 0, 0);
return 0;
}
diff --git a/src/mame/video/sprcros2.c b/src/mame/video/sprcros2.c
index 5c3bda86a66..5837d30ab6e 100644
--- a/src/mame/video/sprcros2.c
+++ b/src/mame/video/sprcros2.c
@@ -192,7 +192,7 @@ UINT32 sprcros2_state::screen_update_sprcros2(screen_device &screen, bitmap_ind1
{
m_bgtilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
m_fgtilemap->draw(bitmap, cliprect, 0, 0);
return 0;
}
diff --git a/src/mame/video/sprint2.c b/src/mame/video/sprint2.c
index a26d5f67adf..2e2a03051f3 100644
--- a/src/mame/video/sprint2.c
+++ b/src/mame/video/sprint2.c
@@ -125,7 +125,7 @@ UINT32 sprint2_state::screen_update_sprint2(screen_device &screen, bitmap_ind16
for (i = 0; i < 4; i++)
{
- drawgfx_transpen(bitmap, cliprect, screen.machine().gfx[1],
+ drawgfx_transpen(bitmap, cliprect, machine().gfx[1],
get_sprite_code(video_ram, i),
i,
0, 0,
@@ -144,7 +144,7 @@ void sprint2_state::screen_eof_sprint2(screen_device &screen, bool state)
UINT8 *video_ram = m_video_ram;
int i;
int j;
- const rectangle &visarea = screen.machine().primary_screen->visible_area();
+ const rectangle &visarea = machine().primary_screen->visible_area();
/*
* Collisions are detected for both player cars:
@@ -160,8 +160,8 @@ void sprint2_state::screen_eof_sprint2(screen_device &screen, bool state)
rect.min_x = get_sprite_x(video_ram, i);
rect.min_y = get_sprite_y(video_ram, i);
- rect.max_x = get_sprite_x(video_ram, i) + screen.machine().gfx[1]->width() - 1;
- rect.max_y = get_sprite_y(video_ram, i) + screen.machine().gfx[1]->height() - 1;
+ rect.max_x = get_sprite_x(video_ram, i) + machine().gfx[1]->width() - 1;
+ rect.max_y = get_sprite_y(video_ram, i) + machine().gfx[1]->height() - 1;
rect &= visarea;
@@ -169,21 +169,21 @@ void sprint2_state::screen_eof_sprint2(screen_device &screen, bool state)
m_bg_tilemap->draw(m_helper, rect, 0, 0);
- drawgfx_transpen(m_helper, rect, screen.machine().gfx[1],
+ drawgfx_transpen(m_helper, rect, machine().gfx[1],
get_sprite_code(video_ram, i),
0,
0, 0,
get_sprite_x(video_ram, i),
get_sprite_y(video_ram, i), 1);
- m_collision[i] |= collision_check(this, screen.machine().colortable, rect);
+ m_collision[i] |= collision_check(this, machine().colortable, rect);
/* check for sprite-sprite collisions */
for (j = 0; j < 4; j++)
if (j != i)
{
- drawgfx_transpen(m_helper, rect, screen.machine().gfx[1],
+ drawgfx_transpen(m_helper, rect, machine().gfx[1],
get_sprite_code(video_ram, j),
1,
0, 0,
@@ -191,14 +191,14 @@ void sprint2_state::screen_eof_sprint2(screen_device &screen, bool state)
get_sprite_y(video_ram, j), 0);
}
- drawgfx_transpen(m_helper, rect, screen.machine().gfx[1],
+ drawgfx_transpen(m_helper, rect, machine().gfx[1],
get_sprite_code(video_ram, i),
0,
0, 0,
get_sprite_x(video_ram, i),
get_sprite_y(video_ram, i), 1);
- m_collision[i] |= collision_check(this, screen.machine().colortable, rect);
+ m_collision[i] |= collision_check(this, machine().colortable, rect);
}
}
}
diff --git a/src/mame/video/sprint4.c b/src/mame/video/sprint4.c
index 368f26cc670..d04ba58914e 100644
--- a/src/mame/video/sprint4.c
+++ b/src/mame/video/sprint4.c
@@ -74,7 +74,7 @@ UINT32 sprint4_state::screen_update_sprint4(screen_device &screen, bitmap_ind16
if (i & 1)
bank = 32;
- drawgfx_transpen(bitmap, cliprect, screen.machine().gfx[1],
+ drawgfx_transpen(bitmap, cliprect, machine().gfx[1],
(code >> 3) | bank,
(attr & 0x80) ? 4 : i,
0, 0,
@@ -95,7 +95,7 @@ void sprint4_state::screen_eof_sprint4(screen_device &screen, bool state)
/* check for sprite-playfield collisions */
- device_t *discrete = screen.machine().device("discrete");
+ device_t *discrete = machine().device("discrete");
for (i = 0; i < 4; i++)
{
@@ -112,17 +112,17 @@ void sprint4_state::screen_eof_sprint4(screen_device &screen, bool state)
rect.min_x = horz - 15;
rect.min_y = vert - 15;
- rect.max_x = horz - 15 + screen.machine().gfx[1]->width() - 1;
- rect.max_y = vert - 15 + screen.machine().gfx[1]->height() - 1;
+ rect.max_x = horz - 15 + machine().gfx[1]->width() - 1;
+ rect.max_y = vert - 15 + machine().gfx[1]->height() - 1;
- rect &= screen.machine().primary_screen->visible_area();
+ rect &= machine().primary_screen->visible_area();
m_playfield->draw(m_helper, rect, 0, 0);
if (i & 1)
bank = 32;
- drawgfx_transpen(m_helper, rect, screen.machine().gfx[1],
+ drawgfx_transpen(m_helper, rect, machine().gfx[1],
(code >> 3) | bank,
4,
0, 0,
@@ -131,13 +131,13 @@ void sprint4_state::screen_eof_sprint4(screen_device &screen, bool state)
for (y = rect.min_y; y <= rect.max_y; y++)
for (x = rect.min_x; x <= rect.max_x; x++)
- if (colortable_entry_get_value(screen.machine().colortable, m_helper.pix16(y, x)) != 0)
+ if (colortable_entry_get_value(machine().colortable, m_helper.pix16(y, x)) != 0)
m_collision[i] = 1;
}
/* update sound status */
- address_space &space = screen.machine().driver_data()->generic_space();
+ address_space &space = machine().driver_data()->generic_space();
discrete_sound_w(discrete, space, SPRINT4_MOTOR_DATA_1, videoram[0x391] & 15);
discrete_sound_w(discrete, space, SPRINT4_MOTOR_DATA_2, videoram[0x393] & 15);
discrete_sound_w(discrete, space, SPRINT4_MOTOR_DATA_3, videoram[0x395] & 15);
diff --git a/src/mame/video/sprint8.c b/src/mame/video/sprint8.c
index 7d826305695..5e06e1a3fbe 100644
--- a/src/mame/video/sprint8.c
+++ b/src/mame/video/sprint8.c
@@ -156,9 +156,9 @@ static TIMER_CALLBACK( sprint8_collision_callback )
UINT32 sprint8_state::screen_update_sprint8(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- set_pens(this, screen.machine().colortable);
+ set_pens(this, machine().colortable);
m_tilemap1->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
return 0;
}
@@ -170,13 +170,13 @@ void sprint8_state::screen_eof_sprint8(screen_device &screen, bool state)
{
int x;
int y;
- const rectangle &visarea = screen.machine().primary_screen->visible_area();
+ const rectangle &visarea = machine().primary_screen->visible_area();
m_tilemap2->draw(m_helper2, visarea, 0, 0);
m_helper1.fill(0x20, visarea);
- draw_sprites(screen.machine(), m_helper1, visarea);
+ draw_sprites(machine(), m_helper1, visarea);
for (y = visarea.min_y; y <= visarea.max_y; y++)
{
@@ -185,9 +185,9 @@ void sprint8_state::screen_eof_sprint8(screen_device &screen, bool state)
for (x = visarea.min_x; x <= visarea.max_x; x++)
if (p1[x] != 0x20 && p2[x] == 0x23)
- screen.machine().scheduler().timer_set(screen.machine().primary_screen->time_until_pos(y + 24, x),
+ machine().scheduler().timer_set(machine().primary_screen->time_until_pos(y + 24, x),
FUNC(sprint8_collision_callback),
- colortable_entry_get_value(screen.machine().colortable, p1[x]));
+ colortable_entry_get_value(machine().colortable, p1[x]));
}
}
}
diff --git a/src/mame/video/spy.c b/src/mame/video/spy.c
index d20931d27bf..d4ad84ec99a 100644
--- a/src/mame/video/spy.c
+++ b/src/mame/video/spy.c
@@ -66,7 +66,7 @@ UINT32 spy_state::screen_update_spy(screen_device &screen, bitmap_ind16 &bitmap,
k052109_tilemap_update(m_k052109);
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
if (!m_video_enable)
bitmap.fill(16 * m_layer_colorbase[0], cliprect);
diff --git a/src/mame/video/srmp2.c b/src/mame/video/srmp2.c
index d8edeee4681..dcaea0e3764 100644
--- a/src/mame/video/srmp2.c
+++ b/src/mame/video/srmp2.c
@@ -56,16 +56,16 @@ UINT32 srmp2_state::screen_update_srmp2(screen_device &screen, bitmap_ind16 &bit
{
bitmap.fill(0x1ff, cliprect);
- screen.machine().device<seta001_device>("spritegen")->set_transpen(15);
+ machine().device<seta001_device>("spritegen")->set_transpen(15);
- screen.machine().device<seta001_device>("spritegen")->set_colorbase((m_color_bank)?0x20:0x00);
+ machine().device<seta001_device>("spritegen")->set_colorbase((m_color_bank)?0x20:0x00);
- screen.machine().device<seta001_device>("spritegen")->set_fg_xoffsets( 0x10, 0x10 );
- screen.machine().device<seta001_device>("spritegen")->set_fg_yoffsets( 0x05, 0x07 );
- screen.machine().device<seta001_device>("spritegen")->set_bg_xoffsets( 0x00, 0x00 ); // bg not used?
- screen.machine().device<seta001_device>("spritegen")->set_bg_yoffsets( 0x00, 0x00 ); // bg not used?
+ machine().device<seta001_device>("spritegen")->set_fg_xoffsets( 0x10, 0x10 );
+ machine().device<seta001_device>("spritegen")->set_fg_yoffsets( 0x05, 0x07 );
+ machine().device<seta001_device>("spritegen")->set_bg_xoffsets( 0x00, 0x00 ); // bg not used?
+ machine().device<seta001_device>("spritegen")->set_bg_yoffsets( 0x00, 0x00 ); // bg not used?
- screen.machine().device<seta001_device>("spritegen")->seta001_draw_sprites(screen.machine(),bitmap,cliprect,0x1000, 1);
+ machine().device<seta001_device>("spritegen")->seta001_draw_sprites(machine(),bitmap,cliprect,0x1000, 1);
return 0;
}
@@ -73,14 +73,14 @@ UINT32 srmp2_state::screen_update_srmp3(screen_device &screen, bitmap_ind16 &bit
{
bitmap.fill(0x1f0, cliprect);
- screen.machine().device<seta001_device>("spritegen")->set_fg_xoffsets( 0x10, 0x10 );
- screen.machine().device<seta001_device>("spritegen")->set_fg_yoffsets( 0x06, 0x06 );
- screen.machine().device<seta001_device>("spritegen")->set_bg_xoffsets( -0x01, 0x10 );
- screen.machine().device<seta001_device>("spritegen")->set_bg_yoffsets( -0x06, 0x06 );
+ machine().device<seta001_device>("spritegen")->set_fg_xoffsets( 0x10, 0x10 );
+ machine().device<seta001_device>("spritegen")->set_fg_yoffsets( 0x06, 0x06 );
+ machine().device<seta001_device>("spritegen")->set_bg_xoffsets( -0x01, 0x10 );
+ machine().device<seta001_device>("spritegen")->set_bg_yoffsets( -0x06, 0x06 );
- screen.machine().device<seta001_device>("spritegen")->set_gfxbank_callback( srmp3_gfxbank_callback );
+ machine().device<seta001_device>("spritegen")->set_gfxbank_callback( srmp3_gfxbank_callback );
- screen.machine().device<seta001_device>("spritegen")->seta001_draw_sprites(screen.machine(),bitmap,cliprect,0x1000, 1);
+ machine().device<seta001_device>("spritegen")->seta001_draw_sprites(machine(),bitmap,cliprect,0x1000, 1);
return 0;
}
@@ -88,14 +88,14 @@ UINT32 srmp2_state::screen_update_mjyuugi(screen_device &screen, bitmap_ind16 &b
{
bitmap.fill(0x1f0, cliprect);
- screen.machine().device<seta001_device>("spritegen")->set_fg_xoffsets( 0x10, 0x10 );
- screen.machine().device<seta001_device>("spritegen")->set_fg_yoffsets( 0x06, 0x06 );
- screen.machine().device<seta001_device>("spritegen")->set_bg_yoffsets( 0x09, 0x07 );
+ machine().device<seta001_device>("spritegen")->set_fg_xoffsets( 0x10, 0x10 );
+ machine().device<seta001_device>("spritegen")->set_fg_yoffsets( 0x06, 0x06 );
+ machine().device<seta001_device>("spritegen")->set_bg_yoffsets( 0x09, 0x07 );
- screen.machine().device<seta001_device>("spritegen")->set_spritelimit( 0x1ff-6 );
+ machine().device<seta001_device>("spritegen")->set_spritelimit( 0x1ff-6 );
- screen.machine().device<seta001_device>("spritegen")->set_gfxbank_callback( srmp3_gfxbank_callback );
+ machine().device<seta001_device>("spritegen")->set_gfxbank_callback( srmp3_gfxbank_callback );
- screen.machine().device<seta001_device>("spritegen")->seta001_draw_sprites(screen.machine(),bitmap,cliprect,0x1000, 1);
+ machine().device<seta001_device>("spritegen")->seta001_draw_sprites(machine(),bitmap,cliprect,0x1000, 1);
return 0;
}
diff --git a/src/mame/video/srumbler.c b/src/mame/video/srumbler.c
index 5c49a6083ef..9807d90aa8e 100644
--- a/src/mame/video/srumbler.c
+++ b/src/mame/video/srumbler.c
@@ -158,7 +158,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
UINT32 srumbler_state::screen_update_srumbler(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1,0);
- draw_sprites(screen.machine(), bitmap,cliprect);
+ draw_sprites(machine(), bitmap,cliprect);
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0,0);
m_fg_tilemap->draw(bitmap, cliprect, 0,0);
return 0;
diff --git a/src/mame/video/sshangha.c b/src/mame/video/sshangha.c
index cac4abb913a..1cd037e73fb 100644
--- a/src/mame/video/sshangha.c
+++ b/src/mame/video/sshangha.c
@@ -31,33 +31,33 @@ void sshangha_state::video_start()
UINT32 sshangha_state::screen_update_sshangha(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- screen.machine().device<decospr_device>("spritegen1")->draw_sprites(bitmap, cliprect, m_spriteram, 0x800, true);
+ machine().device<decospr_device>("spritegen1")->draw_sprites(bitmap, cliprect, m_spriteram, 0x800, true);
// I'm pretty sure only the original has the 2nd spriteram, used for the Japanese text on the 2nd scene (non-scrolling text) in the intro of the quest (3rd in JPN) mode
if (m_spriteram2 != NULL)
- screen.machine().device<decospr_device>("spritegen2")->draw_sprites(bitmap, cliprect, m_spriteram2, 0x800, true);
+ machine().device<decospr_device>("spritegen2")->draw_sprites(bitmap, cliprect, m_spriteram2, 0x800, true);
- screen.machine().tilemap().set_flip_all(flip_screen_x() ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
+ machine().tilemap().set_flip_all(flip_screen_x() ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
deco16ic_pf_update(m_deco_tilegen1, m_pf1_rowscroll, m_pf2_rowscroll);
/* the tilemap 4bpp + 4bpp = 8bpp mixing actually seems external to the tilemap, note video_control is not part of the tilemap chip */
if ((m_video_control&4)==0) {
deco16ic_tilemap_12_combine_draw(m_deco_tilegen1, bitmap, cliprect, 0, 0, 1);
- screen.machine().device<decospr_device>("spritegen1")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0200, 0x0200, 0x100, 0x1ff);
+ machine().device<decospr_device>("spritegen1")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0200, 0x0200, 0x100, 0x1ff);
}
else {
deco16ic_tilemap_2_draw(m_deco_tilegen1, bitmap, cliprect, 0, 0);
- screen.machine().device<decospr_device>("spritegen1")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0200, 0x0200, 0x100, 0x1ff);
+ machine().device<decospr_device>("spritegen1")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0200, 0x0200, 0x100, 0x1ff);
deco16ic_tilemap_1_draw(m_deco_tilegen1, bitmap, cliprect, 0, 0);
}
if (m_spriteram2 != NULL)
- screen.machine().device<decospr_device>("spritegen2")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0000, 0x0000, 0, 0x1ff);
+ machine().device<decospr_device>("spritegen2")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0000, 0x0000, 0, 0x1ff);
- screen.machine().device<decospr_device>("spritegen1")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0000, 0x0200, 0, 0x1ff);
+ machine().device<decospr_device>("spritegen1")->inefficient_copy_sprite_bitmap(bitmap, cliprect, 0x0000, 0x0200, 0, 0x1ff);
return 0;
}
diff --git a/src/mame/video/sslam.c b/src/mame/video/sslam.c
index 2771bb372f3..104dc495d31 100644
--- a/src/mame/video/sslam.c
+++ b/src/mame/video/sslam.c
@@ -186,7 +186,7 @@ UINT32 sslam_state::screen_update_sslam(screen_device &screen, bitmap_ind16 &bit
if (!(m_regs[6] & 1))
{
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
return 0;
}
@@ -215,7 +215,7 @@ UINT32 sslam_state::screen_update_sslam(screen_device &screen, bitmap_ind16 &bit
m_md_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;
}
@@ -225,7 +225,7 @@ UINT32 sslam_state::screen_update_powerbls(screen_device &screen, bitmap_ind16 &
if (!(m_regs[6] & 1))
{
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
return 0;
}
@@ -233,6 +233,6 @@ UINT32 sslam_state::screen_update_powerbls(screen_device &screen, bitmap_ind16 &
m_bg_tilemap->set_scrolly(0, m_regs[1]-240);
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/video/ssozumo.c b/src/mame/video/ssozumo.c
index 22260c6e62f..f2056876101 100644
--- a/src/mame/video/ssozumo.c
+++ b/src/mame/video/ssozumo.c
@@ -181,6 +181,6 @@ UINT32 ssozumo_state::screen_update_ssozumo(screen_device &screen, bitmap_ind16
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);
return 0;
}
diff --git a/src/mame/video/sspeedr.c b/src/mame/video/sspeedr.c
index df9fdd4370c..16c6b3f835b 100644
--- a/src/mame/video/sspeedr.c
+++ b/src/mame/video/sspeedr.c
@@ -247,9 +247,9 @@ void sspeedr_state::video_start()
UINT32 sspeedr_state::screen_update_sspeedr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- draw_track(screen.machine(), bitmap);
- draw_drones(screen.machine(), bitmap, cliprect);
- draw_driver(screen.machine(), bitmap, cliprect);
+ draw_track(machine(), bitmap);
+ draw_drones(machine(), bitmap, cliprect);
+ draw_driver(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/video/ssrj.c b/src/mame/video/ssrj.c
index 040f1bb8652..9d7a5f9cd70 100644
--- a/src/mame/video/ssrj.c
+++ b/src/mame/video/ssrj.c
@@ -279,7 +279,7 @@ UINT32 ssrj_state::screen_update_ssrj(screen_device &screen, bitmap_ind16 &bitma
m_tilemap1->set_scrollx(0, 0xff-m_scrollram[2] );
m_tilemap1->set_scrolly(0, m_scrollram[0] );
m_tilemap1->draw(bitmap, cliprect, 0, 0);
- draw_objects(screen.machine(), bitmap, cliprect);
+ draw_objects(machine(), bitmap, cliprect);
m_tilemap2->draw(bitmap, cliprect, 0, 0);
if (m_scrollram[0x101] == 0xb) m_tilemap4->draw(bitmap, cliprect, 0, 0);/* hack to display 4th tilemap */
diff --git a/src/mame/video/ssv.c b/src/mame/video/ssv.c
index 2015c87e0a9..8b5ca49bba4 100644
--- a/src/mame/video/ssv.c
+++ b/src/mame/video/ssv.c
@@ -981,7 +981,7 @@ UINT32 ssv_state::screen_update_gdfs(screen_device &screen, bitmap_ind16 &bitmap
SCREEN_UPDATE16_CALL_MEMBER(ssv);
// draw zooming sprites
- m_gdfs_st0020->st0020_draw_all(screen.machine(), bitmap, cliprect);
+ m_gdfs_st0020->st0020_draw_all(machine(), bitmap, cliprect);
m_gdfs_tmap->set_scrollx(0, m_gdfs_tmapscroll[0x0c/2]);
m_gdfs_tmap->set_scrolly(0, m_gdfs_tmapscroll[0x10/2]);
@@ -1039,9 +1039,9 @@ UINT32 ssv_state::screen_update_ssv(screen_device &screen, bitmap_ind16 &bitmap,
if (!m_enable_video)
return 0;
- draw_layer(screen.machine(), bitmap, clip, 0); // "background layer"
+ draw_layer(machine(), bitmap, clip, 0); // "background layer"
- draw_sprites(screen.machine(), bitmap, clip); // sprites list
+ draw_sprites(machine(), bitmap, clip); // sprites list
return 0;
diff --git a/src/mame/video/st0016.c b/src/mame/video/st0016.c
index 3f6dcc0b895..129441e7cc4 100644
--- a/src/mame/video/st0016.c
+++ b/src/mame/video/st0016.c
@@ -586,16 +586,16 @@ static void draw_bgmap(running_machine &machine, bitmap_ind16 &bitmap,const rect
void st0016_state::st0016_draw_screen(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- draw_bgmap(screen.machine(), bitmap,cliprect,0);
- draw_sprites(screen.machine(), bitmap,cliprect);
- draw_bgmap(screen.machine(), bitmap,cliprect,1);
+ draw_bgmap(machine(), bitmap,cliprect,0);
+ draw_sprites(machine(), bitmap,cliprect);
+ draw_bgmap(machine(), bitmap,cliprect,1);
}
UINT32 st0016_state::screen_update_st0016(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
#ifdef MAME_DEBUG
- if(screen.machine().input().code_pressed_once(KEYCODE_Z))
+ if(machine().input().code_pressed_once(KEYCODE_Z))
{
int h,j;
FILE *p=fopen("vram.bin","wb");
diff --git a/src/mame/video/stactics.c b/src/mame/video/stactics.c
index 70a733298f7..bdc956952b9 100644
--- a/src/mame/video/stactics.c
+++ b/src/mame/video/stactics.c
@@ -386,7 +386,7 @@ UINT32 stactics_state::screen_update_stactics(screen_device &screen, bitmap_ind1
update_beam(this);
draw_background(this, bitmap, cliprect);
- update_artwork(screen.machine(), this);
+ update_artwork(machine(), this);
m_frame_count = (m_frame_count + 1) & 0x0f;
diff --git a/src/mame/video/stadhero.c b/src/mame/video/stadhero.c
index c06807795bc..72370a9e900 100644
--- a/src/mame/video/stadhero.c
+++ b/src/mame/video/stadhero.c
@@ -21,11 +21,11 @@
UINT32 stadhero_state::screen_update_stadhero(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
-// screen.machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
+// machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
- screen.machine().device<deco_bac06_device>("tilegen1")->set_bppmultmask(0x8, 0x7);
- screen.machine().device<deco_bac06_device>("tilegen1")->deco_bac06_pf_draw(screen.machine(),bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0x00, 0x00, 0x00, 0x00);
- screen.machine().device<deco_mxc06_device>("spritegen")->draw_sprites(screen.machine(), bitmap, cliprect, m_spriteram, 0x00, 0x00, 0x0f);
+ machine().device<deco_bac06_device>("tilegen1")->set_bppmultmask(0x8, 0x7);
+ machine().device<deco_bac06_device>("tilegen1")->deco_bac06_pf_draw(machine(),bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0x00, 0x00, 0x00, 0x00);
+ machine().device<deco_mxc06_device>("spritegen")->draw_sprites(machine(), bitmap, cliprect, m_spriteram, 0x00, 0x00, 0x0f);
m_pf1_tilemap->draw(bitmap, cliprect, 0,0);
return 0;
}
diff --git a/src/mame/video/starcrus.c b/src/mame/video/starcrus.c
index c3ad051bfbc..3d59cad9eef 100644
--- a/src/mame/video/starcrus.c
+++ b/src/mame/video/starcrus.c
@@ -408,7 +408,7 @@ UINT32 starcrus_state::screen_update_starcrus(screen_device &screen, bitmap_ind1
/* Draw ship 1 */
drawgfx_transpen(bitmap,
cliprect,
- screen.machine().gfx[8+((m_s1_sprite&0x04)>>2)],
+ machine().gfx[8+((m_s1_sprite&0x04)>>2)],
(m_s1_sprite&0x03)^0x03,
0,
(m_s1_sprite&0x08)>>3, (m_s1_sprite&0x10)>>4,
@@ -418,7 +418,7 @@ UINT32 starcrus_state::screen_update_starcrus(screen_device &screen, bitmap_ind1
/* Draw ship 2 */
drawgfx_transpen(bitmap,
cliprect,
- screen.machine().gfx[10+((m_s2_sprite&0x04)>>2)],
+ machine().gfx[10+((m_s2_sprite&0x04)>>2)],
(m_s2_sprite&0x03)^0x03,
0,
(m_s2_sprite&0x08)>>3, (m_s2_sprite&0x10)>>4,
@@ -428,7 +428,7 @@ UINT32 starcrus_state::screen_update_starcrus(screen_device &screen, bitmap_ind1
/* Draw score/projectile 1 */
drawgfx_transpen(bitmap,
cliprect,
- screen.machine().gfx[(m_p1_sprite&0x0c)>>2],
+ machine().gfx[(m_p1_sprite&0x0c)>>2],
(m_p1_sprite&0x03)^0x03,
0,
0,0,
@@ -438,7 +438,7 @@ UINT32 starcrus_state::screen_update_starcrus(screen_device &screen, bitmap_ind1
/* Draw score/projectile 2 */
drawgfx_transpen(bitmap,
cliprect,
- screen.machine().gfx[4+((m_p2_sprite&0x0c)>>2)],
+ machine().gfx[4+((m_p2_sprite&0x0c)>>2)],
(m_p2_sprite&0x03)^0x03,
0,
0,0,
@@ -451,23 +451,23 @@ UINT32 starcrus_state::screen_update_starcrus(screen_device &screen, bitmap_ind1
m_collision_reg = 0x00;
/* Check for collisions between ship1 and ship2 */
- if (collision_check_s1s2(screen.machine()))
+ if (collision_check_s1s2(machine()))
{
m_collision_reg |= 0x08;
}
/* Check for collisions between ship1 and projectiles */
- if (collision_check_s1p1p2(screen.machine()))
+ if (collision_check_s1p1p2(machine()))
{
m_collision_reg |= 0x02;
}
/* Check for collisions between ship1 and projectiles */
- if (collision_check_s2p1p2(screen.machine()))
+ if (collision_check_s2p1p2(machine()))
{
m_collision_reg |= 0x01;
}
/* Check for collisions between ship1 and projectiles */
/* Note: I don't think this is used by the game */
- if (collision_check_p1p2(screen.machine()))
+ if (collision_check_p1p2(machine()))
{
m_collision_reg |= 0x04;
}
diff --git a/src/mame/video/starshp1.c b/src/mame/video/starshp1.c
index fdb35ba1c69..3d11f15cbd3 100644
--- a/src/mame/video/starshp1.c
+++ b/src/mame/video/starshp1.c
@@ -352,23 +352,23 @@ static int circle_collision(starshp1_state *state, const rectangle &rect)
UINT32 starshp1_state::screen_update_starshp1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- set_pens(this, screen.machine().colortable);
+ set_pens(this, machine().colortable);
bitmap.fill(0, cliprect);
if (m_starfield_kill == 0)
draw_starfield(this, bitmap);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
if (m_circle_kill == 0 && m_circle_mod != 0)
- draw_circle(screen.machine(), bitmap);
+ draw_circle(machine(), bitmap);
if (m_attract == 0)
- draw_spaceship(screen.machine(), bitmap, cliprect);
+ draw_spaceship(machine(), bitmap, cliprect);
if (m_circle_kill == 0 && m_circle_mod == 0)
- draw_circle(screen.machine(), bitmap);
+ draw_circle(machine(), bitmap);
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
@@ -385,19 +385,19 @@ void starshp1_state::screen_eof_starshp1(screen_device &screen, bool state)
if (state)
{
rectangle rect;
- const rectangle &visarea = screen.machine().primary_screen->visible_area();
+ const rectangle &visarea = machine().primary_screen->visible_area();
rect.min_x = get_sprite_hpos(this, 13);
rect.min_y = get_sprite_vpos(this, 13);
- rect.max_x = rect.min_x + screen.machine().gfx[1]->width() - 1;
- rect.max_y = rect.min_y + screen.machine().gfx[1]->height() - 1;
+ rect.max_x = rect.min_x + machine().gfx[1]->width() - 1;
+ rect.max_y = rect.min_y + machine().gfx[1]->height() - 1;
rect &= m_helper.cliprect();
m_helper.fill(0, visarea);
if (m_attract == 0)
- draw_spaceship(screen.machine(), m_helper, visarea);
+ draw_spaceship(machine(), m_helper, visarea);
if (circle_collision(this, visarea))
m_collision_latch |= 1;
@@ -405,10 +405,10 @@ void starshp1_state::screen_eof_starshp1(screen_device &screen, bool state)
if (circle_collision(this, rect))
m_collision_latch |= 2;
- if (spaceship_collision(screen.machine(), m_helper, rect))
+ if (spaceship_collision(machine(), m_helper, rect))
m_collision_latch |= 4;
- if (spaceship_collision(screen.machine(), m_helper, visarea))
+ if (spaceship_collision(machine(), m_helper, visarea))
m_collision_latch |= 8;
}
}
diff --git a/src/mame/video/stfight.c b/src/mame/video/stfight.c
index 79b5d022258..dc7669af507 100644
--- a/src/mame/video/stfight.c
+++ b/src/mame/video/stfight.c
@@ -290,9 +290,9 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
UINT32 stfight_state::screen_update_stfight(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- set_pens(screen.machine());
+ set_pens(machine());
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
bitmap.fill(0, cliprect); /* in case m_bg_tilemap is disabled */
m_bg_tilemap->draw(bitmap, cliprect, 0,0);
@@ -300,7 +300,7 @@ UINT32 stfight_state::screen_update_stfight(screen_device &screen, bitmap_ind16
/* Draw sprites (may be obscured by foreground layer) */
if (m_vh_latch_ram[0x07] & 0x40)
- 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/video/stlforce.c b/src/mame/video/stlforce.c
index 6cfd6bc0605..1fbd7d5c366 100644
--- a/src/mame/video/stlforce.c
+++ b/src/mame/video/stlforce.c
@@ -170,7 +170,7 @@ UINT32 stlforce_state::screen_update_stlforce(screen_device &screen, bitmap_ind1
m_bg_tilemap->draw(bitmap, cliprect, 0,0);
m_mlow_tilemap->draw(bitmap, cliprect, 0,0);
m_mhigh_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/video/strnskil.c b/src/mame/video/strnskil.c
index 13fbf5d6b31..d9f49935514 100644
--- a/src/mame/video/strnskil.c
+++ b/src/mame/video/strnskil.c
@@ -142,6 +142,6 @@ UINT32 strnskil_state::screen_update_strnskil(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/video/stvvdp2.c b/src/mame/video/stvvdp2.c
index 33590f99fea..cbe1b27792b 100644
--- a/src/mame/video/stvvdp2.c
+++ b/src/mame/video/stvvdp2.c
@@ -6638,39 +6638,39 @@ static void draw_sprites(running_machine &machine, bitmap_rgb32 &bitmap, const r
UINT32 saturn_state::screen_update_stv_vdp2(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- saturn_state *state = screen.machine().driver_data<saturn_state>();
+ saturn_state *state = machine().driver_data<saturn_state>();
- stv_vdp2_fade_effects(screen.machine());
+ stv_vdp2_fade_effects(machine());
- stv_vdp2_draw_back(screen.machine(), m_tmpbitmap,cliprect);
+ stv_vdp2_draw_back(machine(), m_tmpbitmap,cliprect);
#if DEBUG_MODE
- if(screen.machine().input().code_pressed_once(KEYCODE_T))
+ if(machine().input().code_pressed_once(KEYCODE_T))
{
vdpdebug.l_en^=1;
popmessage("NBG3 %sabled",vdpdebug.l_en & 1 ? "en" : "dis");
}
- if(screen.machine().input().code_pressed_once(KEYCODE_Y))
+ if(machine().input().code_pressed_once(KEYCODE_Y))
{
vdpdebug.l_en^=2;
popmessage("NBG2 %sabled",vdpdebug.l_en & 2 ? "en" : "dis");
}
- if(screen.machine().input().code_pressed_once(KEYCODE_U))
+ if(machine().input().code_pressed_once(KEYCODE_U))
{
vdpdebug.l_en^=4;
popmessage("NBG1 %sabled",vdpdebug.l_en & 4 ? "en" : "dis");
}
- if(screen.machine().input().code_pressed_once(KEYCODE_I))
+ if(machine().input().code_pressed_once(KEYCODE_I))
{
vdpdebug.l_en^=8;
popmessage("NBG0 %sabled",vdpdebug.l_en & 8 ? "en" : "dis");
}
- if(screen.machine().input().code_pressed_once(KEYCODE_K))
+ if(machine().input().code_pressed_once(KEYCODE_K))
{
vdpdebug.l_en^=0x10;
popmessage("RBG0 %sabled",vdpdebug.l_en & 0x10 ? "en" : "dis");
}
- if(screen.machine().input().code_pressed_once(KEYCODE_O))
+ if(machine().input().code_pressed_once(KEYCODE_O))
{
vdpdebug.l_en^=0x20;
popmessage("SPRITE %sabled",vdpdebug.l_en & 0x20 ? "en" : "dis");
@@ -6688,12 +6688,12 @@ UINT32 saturn_state::screen_update_stv_vdp2(screen_device &screen, bitmap_rgb32
/*If a plane has a priority value of zero it isn't shown at all.*/
for(pri=1;pri<8;pri++)
{
- if (vdpdebug.l_en & 1) { if(pri==STV_VDP2_N3PRIN) stv_vdp2_draw_NBG3(screen.machine(), m_tmpbitmap,cliprect); }
- if (vdpdebug.l_en & 2) { if(pri==STV_VDP2_N2PRIN) stv_vdp2_draw_NBG2(screen.machine(), m_tmpbitmap,cliprect); }
- if (vdpdebug.l_en & 4) { if(pri==STV_VDP2_N1PRIN) stv_vdp2_draw_NBG1(screen.machine(), m_tmpbitmap,cliprect); }
- if (vdpdebug.l_en & 8) { if(pri==STV_VDP2_N0PRIN) stv_vdp2_draw_NBG0(screen.machine(), m_tmpbitmap,cliprect); }
- if (vdpdebug.l_en & 0x10) { if(pri==STV_VDP2_R0PRIN) stv_vdp2_draw_RBG0(screen.machine(), m_tmpbitmap,cliprect); }
- if (vdpdebug.l_en & 0x20) { draw_sprites(screen.machine(),m_tmpbitmap,cliprect,pri); }
+ if (vdpdebug.l_en & 1) { if(pri==STV_VDP2_N3PRIN) stv_vdp2_draw_NBG3(machine(), m_tmpbitmap,cliprect); }
+ if (vdpdebug.l_en & 2) { if(pri==STV_VDP2_N2PRIN) stv_vdp2_draw_NBG2(machine(), m_tmpbitmap,cliprect); }
+ if (vdpdebug.l_en & 4) { if(pri==STV_VDP2_N1PRIN) stv_vdp2_draw_NBG1(machine(), m_tmpbitmap,cliprect); }
+ if (vdpdebug.l_en & 8) { if(pri==STV_VDP2_N0PRIN) stv_vdp2_draw_NBG0(machine(), m_tmpbitmap,cliprect); }
+ if (vdpdebug.l_en & 0x10) { if(pri==STV_VDP2_R0PRIN) stv_vdp2_draw_RBG0(machine(), m_tmpbitmap,cliprect); }
+ if (vdpdebug.l_en & 0x20) { draw_sprites(machine(),m_tmpbitmap,cliprect,pri); }
}
}
@@ -6704,51 +6704,51 @@ UINT32 saturn_state::screen_update_stv_vdp2(screen_device &screen, bitmap_rgb32
,STV_VDP2_N1ZMXI,STV_VDP2_N1ZMXD
,STV_VDP2_N1ZMYI,STV_VDP2_N1ZMYD);*/
- if ( screen.machine().input().code_pressed_once(KEYCODE_W) )
+ if ( machine().input().code_pressed_once(KEYCODE_W) )
{
int tilecode;
for (tilecode = 0;tilecode<0x8000;tilecode++)
{
- screen.machine().gfx[0]->mark_dirty(tilecode);
+ machine().gfx[0]->mark_dirty(tilecode);
}
for (tilecode = 0;tilecode<0x2000;tilecode++)
{
- screen.machine().gfx[1]->mark_dirty(tilecode);
+ machine().gfx[1]->mark_dirty(tilecode);
}
for (tilecode = 0;tilecode<0x4000;tilecode++)
{
- screen.machine().gfx[2]->mark_dirty(tilecode);
+ machine().gfx[2]->mark_dirty(tilecode);
}
for (tilecode = 0;tilecode<0x1000;tilecode++)
{
- screen.machine().gfx[3]->mark_dirty(tilecode);
+ machine().gfx[3]->mark_dirty(tilecode);
}
/* vdp 1 ... doesn't have to be tile based */
for (tilecode = 0;tilecode<0x8000;tilecode++)
{
- screen.machine().gfx[4]->mark_dirty(tilecode);
+ machine().gfx[4]->mark_dirty(tilecode);
}
for (tilecode = 0;tilecode<0x2000;tilecode++)
{
- screen.machine().gfx[5]->mark_dirty(tilecode);
+ machine().gfx[5]->mark_dirty(tilecode);
}
for (tilecode = 0;tilecode<0x4000;tilecode++)
{
- screen.machine().gfx[6]->mark_dirty(tilecode);
+ machine().gfx[6]->mark_dirty(tilecode);
}
for (tilecode = 0;tilecode<0x1000;tilecode++)
{
- screen.machine().gfx[7]->mark_dirty(tilecode);
+ machine().gfx[7]->mark_dirty(tilecode);
}
}
- if ( screen.machine().input().code_pressed_once(KEYCODE_N) )
+ if ( machine().input().code_pressed_once(KEYCODE_N) )
{
FILE *fp;
@@ -6760,7 +6760,7 @@ UINT32 saturn_state::screen_update_stv_vdp2(screen_device &screen, bitmap_rgb32
}
}
- if ( screen.machine().input().code_pressed_once(KEYCODE_M) )
+ if ( machine().input().code_pressed_once(KEYCODE_M) )
{
FILE *fp;
@@ -7190,16 +7190,16 @@ static void vdp2_palette_entry(running_machine &machine, int *r, int *g, int *b,
UINT32 saturn_state::screen_update_saturn(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- saturn_state *state = screen.machine().driver_data<saturn_state>();
+ saturn_state *state = machine().driver_data<saturn_state>();
static UINT8 disclaimer;
- vdp2_draw_back(screen.machine(),bitmap,cliprect);
+ vdp2_draw_back(machine(),bitmap,cliprect);
if(STV_VDP2_DISP)
{
- copy_plane(screen.machine(),3);
+ copy_plane(machine(),3);
- draw_normal_screen(screen.machine(),bitmap,cliprect,3);
+ draw_normal_screen(machine(),bitmap,cliprect,3);
}
if(disclaimer == 0)
diff --git a/src/mame/video/subs.c b/src/mame/video/subs.c
index 9220b4e8ba2..dcc51919f69 100644
--- a/src/mame/video/subs.c
+++ b/src/mame/video/subs.c
@@ -43,7 +43,7 @@ UINT32 subs_state::screen_update_subs_left(screen_device &screen, bitmap_ind16 &
UINT8 *spriteram = m_spriteram;
int offs;
- device_t *discrete = screen.machine().device("discrete");
+ device_t *discrete = machine().device("discrete");
/* for every character in the Video RAM, check if it has been modified */
/* since last time and update it accordingly. */
@@ -76,11 +76,11 @@ UINT32 subs_state::screen_update_subs_left(screen_device &screen, bitmap_ind16 &
/* draw the left screen */
if ((left_enable || left_sonar_window) && (!right_sonar_window))
- drawgfx_opaque(bitmap,cliprect,screen.machine().gfx[0],
+ drawgfx_opaque(bitmap,cliprect,machine().gfx[0],
charcode, 1,
0,0,sx,sy);
else
- drawgfx_opaque(bitmap,cliprect,screen.machine().gfx[0],
+ drawgfx_opaque(bitmap,cliprect,machine().gfx[0],
0, 1,
0,0,sx,sy);
}
@@ -106,14 +106,14 @@ UINT32 subs_state::screen_update_subs_left(screen_device &screen, bitmap_ind16 &
/* left screen - special check for drawing right screen's sub */
if ((offs!=0) || (sub_enable))
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[1],
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[1],
charcode + 32 * prom_set,
0,
0,0,sx,sy,0);
}
/* Update sound */
- address_space &space = screen.machine().driver_data()->generic_space();
+ address_space &space = machine().driver_data()->generic_space();
discrete_sound_w(discrete, space, SUBS_LAUNCH_DATA, spriteram[5] & 0x0f); // Launch data
discrete_sound_w(discrete, space, SUBS_CRASH_DATA, spriteram[5] >> 4); // Crash/explode data
return 0;
@@ -156,11 +156,11 @@ UINT32 subs_state::screen_update_subs_right(screen_device &screen, bitmap_ind16
/* draw the right screen */
if ((right_enable || right_sonar_window) && (!left_sonar_window))
- drawgfx_opaque(bitmap,cliprect,screen.machine().gfx[0],
+ drawgfx_opaque(bitmap,cliprect,machine().gfx[0],
charcode, 0,
0,0,sx,sy);
else
- drawgfx_opaque(bitmap,cliprect,screen.machine().gfx[0],
+ drawgfx_opaque(bitmap,cliprect,machine().gfx[0],
0, 0,
0,0,sx,sy);
}
@@ -185,7 +185,7 @@ UINT32 subs_state::screen_update_subs_right(screen_device &screen, bitmap_ind16
charcode = (charcode >> 3) & 0x1F;
if ((offs!=1) || (sub_enable))
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[1],
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[1],
charcode + 32 * prom_set,
0,
0,0,sx,sy,0);
diff --git a/src/mame/video/suna16.c b/src/mame/video/suna16.c
index 26a44b87ab0..c8ef9c7b2ca 100644
--- a/src/mame/video/suna16.c
+++ b/src/mame/video/suna16.c
@@ -222,7 +222,7 @@ UINT32 suna16_state::screen_update_suna16(screen_device &screen, bitmap_ind16 &b
/* Suna Quiz indicates the background is the last pen */
bitmap.fill(0xff, cliprect);
- draw_sprites(screen.machine(), bitmap, cliprect, m_spriteram, 0);
+ draw_sprites(machine(), bitmap, cliprect, m_spriteram, 0);
return 0;
}
@@ -231,17 +231,17 @@ UINT32 suna16_state::screen_update_bestbest(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 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
/* Suna Quiz indicates the background is the last pen */
bitmap.fill(0xff, cliprect);
- if (layers_ctrl & 1) draw_sprites(screen.machine(), bitmap, cliprect, m_spriteram, 0);
- if (layers_ctrl & 2) draw_sprites(screen.machine(), bitmap, cliprect, m_spriteram2, 1);
+ if (layers_ctrl & 1) draw_sprites(machine(), bitmap, cliprect, m_spriteram, 0);
+ if (layers_ctrl & 2) draw_sprites(machine(), bitmap, cliprect, m_spriteram2, 1);
return 0;
}
diff --git a/src/mame/video/suna8.c b/src/mame/video/suna8.c
index c54c17a988a..f597fec3071 100644
--- a/src/mame/video/suna8.c
+++ b/src/mame/video/suna8.c
@@ -434,16 +434,16 @@ UINT32 suna8_state::screen_update_suna8(screen_device &screen, bitmap_ind16 &bit
#ifdef MAME_DEBUG
#if TILEMAPS
- if (screen.machine().input().code_pressed(KEYCODE_Z) || screen.machine().input().code_pressed(KEYCODE_X))
+ if (machine().input().code_pressed(KEYCODE_Z) || machine().input().code_pressed(KEYCODE_X))
{
int max_tiles = memregion("gfx1")->bytes() / (0x400 * 0x20);
- if (screen.machine().input().code_pressed_once(KEYCODE_Q)) { m_page--; screen.machine().tilemap().mark_all_dirty(); }
- if (screen.machine().input().code_pressed_once(KEYCODE_W)) { m_page++; screen.machine().tilemap().mark_all_dirty(); }
- if (screen.machine().input().code_pressed_once(KEYCODE_E)) { m_tiles--; screen.machine().tilemap().mark_all_dirty(); }
- if (screen.machine().input().code_pressed_once(KEYCODE_R)) { m_tiles++; screen.machine().tilemap().mark_all_dirty(); }
- if (screen.machine().input().code_pressed_once(KEYCODE_A)) { m_trombank--; screen.machine().tilemap().mark_all_dirty(); }
- if (screen.machine().input().code_pressed_once(KEYCODE_S)) { m_trombank++; screen.machine().tilemap().mark_all_dirty(); }
+ if (machine().input().code_pressed_once(KEYCODE_Q)) { m_page--; machine().tilemap().mark_all_dirty(); }
+ if (machine().input().code_pressed_once(KEYCODE_W)) { m_page++; machine().tilemap().mark_all_dirty(); }
+ if (machine().input().code_pressed_once(KEYCODE_E)) { m_tiles--; machine().tilemap().mark_all_dirty(); }
+ if (machine().input().code_pressed_once(KEYCODE_R)) { m_tiles++; machine().tilemap().mark_all_dirty(); }
+ if (machine().input().code_pressed_once(KEYCODE_A)) { m_trombank--; machine().tilemap().mark_all_dirty(); }
+ if (machine().input().code_pressed_once(KEYCODE_S)) { m_trombank++; machine().tilemap().mark_all_dirty(); }
m_rombank &= 0xf;
m_page &= (m_text_dim > 0)?3:7;
@@ -463,8 +463,8 @@ UINT32 suna8_state::screen_update_suna8(screen_device &screen, bitmap_ind16 &bit
#endif
#endif
{
- draw_normal_sprites(screen.machine() ,bitmap,cliprect);
- draw_text_sprites(screen.machine(), bitmap,cliprect);
+ draw_normal_sprites(machine() ,bitmap,cliprect);
+ draw_text_sprites(machine(), bitmap,cliprect);
}
return 0;
}
diff --git a/src/mame/video/supbtime.c b/src/mame/video/supbtime.c
index bca89067024..4722027a91b 100644
--- a/src/mame/video/supbtime.c
+++ b/src/mame/video/supbtime.c
@@ -23,7 +23,7 @@ End sequence uses rowscroll '98 c0' on pf1 (jmp to 1d61a on supbtimj)
UINT32 supbtime_state::screen_update_supbtime(screen_device &screen, bitmap_ind16 &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));
@@ -32,7 +32,7 @@ UINT32 supbtime_state::screen_update_supbtime(screen_device &screen, bitmap_ind1
bitmap.fill(768, cliprect);
deco16ic_tilemap_2_draw(m_deco_tilegen1, 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);
deco16ic_tilemap_1_draw(m_deco_tilegen1, bitmap, cliprect, 0, 0);
return 0;
}
diff --git a/src/mame/video/superchs.c b/src/mame/video/superchs.c
index 4824e4730bd..984ee673749 100644
--- a/src/mame/video/superchs.c
+++ b/src/mame/video/superchs.c
@@ -200,7 +200,7 @@ logerror("Sprite number %04x had %02x invalid chunks\n",tilenum,bad_chunks);
UINT32 superchs_state::screen_update_superchs(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- device_t *tc0480scp = screen.machine().device("tc0480scp");
+ device_t *tc0480scp = machine().device("tc0480scp");
UINT8 layer[5];
UINT16 priority;
static const int primasks[4] = {0xfffc, 0xfff0, 0xff00, 0x0};
@@ -214,25 +214,25 @@ UINT32 superchs_state::screen_update_superchs(screen_device &screen, bitmap_ind1
layer[3] = (priority & 0x000f) >> 0; /* tells us which is top */
layer[4] = 4; /* text layer always over bg layers */
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
/* We have to assume 2nd to bottom layer is always underneath
sprites as pdrawgfx cannot yet cope with more than 4 layers */
#ifdef MAME_DEBUG
- if (!screen.machine().input().code_pressed (KEYCODE_Z)) tc0480scp_tilemap_draw(tc0480scp, bitmap, cliprect, layer[0], TILEMAP_DRAW_OPAQUE, 0);
- if (!screen.machine().input().code_pressed (KEYCODE_X)) tc0480scp_tilemap_draw(tc0480scp, bitmap, cliprect, layer[1], 0, 1);
- if (!screen.machine().input().code_pressed (KEYCODE_C)) tc0480scp_tilemap_draw(tc0480scp, bitmap, cliprect, layer[2], 0, 2);
- if (!screen.machine().input().code_pressed (KEYCODE_V)) tc0480scp_tilemap_draw(tc0480scp, bitmap, cliprect, layer[3], 0, 4);
- if (!screen.machine().input().code_pressed (KEYCODE_B)) tc0480scp_tilemap_draw(tc0480scp, bitmap, cliprect, layer[4], 0, 8);
- if (!screen.machine().input().code_pressed (KEYCODE_N)) draw_sprites(screen.machine(), bitmap, cliprect, primasks, 48, -116);
+ if (!machine().input().code_pressed (KEYCODE_Z)) tc0480scp_tilemap_draw(tc0480scp, bitmap, cliprect, layer[0], TILEMAP_DRAW_OPAQUE, 0);
+ if (!machine().input().code_pressed (KEYCODE_X)) tc0480scp_tilemap_draw(tc0480scp, bitmap, cliprect, layer[1], 0, 1);
+ if (!machine().input().code_pressed (KEYCODE_C)) tc0480scp_tilemap_draw(tc0480scp, bitmap, cliprect, layer[2], 0, 2);
+ if (!machine().input().code_pressed (KEYCODE_V)) tc0480scp_tilemap_draw(tc0480scp, bitmap, cliprect, layer[3], 0, 4);
+ if (!machine().input().code_pressed (KEYCODE_B)) tc0480scp_tilemap_draw(tc0480scp, bitmap, cliprect, layer[4], 0, 8);
+ if (!machine().input().code_pressed (KEYCODE_N)) draw_sprites(machine(), bitmap, cliprect, primasks, 48, -116);
#else
tc0480scp_tilemap_draw(tc0480scp, bitmap, cliprect, layer[0], TILEMAP_DRAW_OPAQUE, 0);
tc0480scp_tilemap_draw(tc0480scp, bitmap, cliprect, layer[1], 0, 1);
tc0480scp_tilemap_draw(tc0480scp, bitmap, cliprect, layer[2], 0, 2);
tc0480scp_tilemap_draw(tc0480scp, bitmap, cliprect, layer[3], 0, 4);
tc0480scp_tilemap_draw(tc0480scp, bitmap, cliprect, layer[4], 0, 8); /* text layer */
- draw_sprites(screen.machine(), bitmap, cliprect, primasks, 48, -116);
+ draw_sprites(machine(), bitmap, cliprect, primasks, 48, -116);
#endif
return 0;
}
diff --git a/src/mame/video/superqix.c b/src/mame/video/superqix.c
index 9b83a89b10f..b3b80cee75b 100644
--- a/src/mame/video/superqix.c
+++ b/src/mame/video/superqix.c
@@ -219,7 +219,7 @@ static void superqix_draw_sprites(running_machine &machine, bitmap_ind16 &bitmap
UINT32 superqix_state::screen_update_pbillian(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- pbillian_draw_sprites(screen.machine(), bitmap,cliprect);
+ pbillian_draw_sprites(machine(), bitmap,cliprect);
return 0;
}
@@ -228,7 +228,7 @@ UINT32 superqix_state::screen_update_superqix(screen_device &screen, bitmap_ind1
{
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0);
copybitmap_trans(bitmap,*m_fg_bitmap[m_show_bitmap],flip_screen(),flip_screen(),0,0,cliprect,0);
- superqix_draw_sprites(screen.machine(), bitmap,cliprect);
+ superqix_draw_sprites(machine(), bitmap,cliprect);
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0);
return 0;
}
diff --git a/src/mame/video/suprloco.c b/src/mame/video/suprloco.c
index 85191895b87..117de20fda3 100644
--- a/src/mame/video/suprloco.c
+++ b/src/mame/video/suprloco.c
@@ -262,7 +262,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
UINT32 suprloco_state::screen_update_suprloco(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);
m_bg_tilemap->draw(bitmap, cliprect, 1,0);
return 0;
}
diff --git a/src/mame/video/suprnova.c b/src/mame/video/suprnova.c
index fb81c0d6cba..9c138c0b399 100644
--- a/src/mame/video/suprnova.c
+++ b/src/mame/video/suprnova.c
@@ -447,9 +447,9 @@ static void supernova_draw_b( running_machine &machine, bitmap_ind16 &bitmap, bi
UINT32 skns_state::screen_update_skns(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- palette_update(screen.machine());
+ palette_update(machine());
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
m_tilemap_bitmap_lower.fill(0);
m_tilemap_bitmapflags_lower.fill(0);
m_tilemap_bitmap_higher.fill(0);
@@ -466,8 +466,8 @@ UINT32 skns_state::screen_update_skns(screen_device &screen, bitmap_rgb32 &bitma
//popmessage("pri %d %d\n", supernova_pri_a, supernova_pri_b);
/*if (!supernova_pri_b) { */
- supernova_draw_b(screen.machine(), m_tilemap_bitmap_lower, m_tilemap_bitmapflags_lower, cliprect,tran);// tran = 1;
- supernova_draw_a(screen.machine(), m_tilemap_bitmap_higher,m_tilemap_bitmapflags_higher,cliprect,tran);// tran = 1;
+ supernova_draw_b(machine(), m_tilemap_bitmap_lower, m_tilemap_bitmapflags_lower, cliprect,tran);// tran = 1;
+ supernova_draw_a(machine(), m_tilemap_bitmap_higher,m_tilemap_bitmapflags_higher,cliprect,tran);// tran = 1;
{
int x,y;
@@ -476,7 +476,7 @@ UINT32 skns_state::screen_update_skns(screen_device &screen, bitmap_rgb32 &bitma
UINT32* dst;
UINT16 pri, pri2, pri3;
UINT16 bgpri;
- const pen_t *clut = &screen.machine().pens[0];
+ const pen_t *clut = &machine().pens[0];
// int drawpri;
@@ -621,7 +621,7 @@ UINT32 skns_state::screen_update_skns(screen_device &screen, bitmap_rgb32 &bitma
m_sprite_bitmap.fill(0x0000, cliprect);
if (m_alt_enable_sprites)
- m_spritegen->skns_draw_sprites(screen.machine(), m_sprite_bitmap, cliprect, m_spriteram, m_spriteram.bytes(), 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, cliprect, m_spriteram, m_spriteram.bytes(), machine().root_device().memregion("gfx1")->base(), machine().root_device().memregion ("gfx1")->bytes(), m_spc_regs );
return 0;
diff --git a/src/mame/video/suprridr.c b/src/mame/video/suprridr.c
index f400156657d..c2dea185f21 100644
--- a/src/mame/video/suprridr.c
+++ b/src/mame/video/suprridr.c
@@ -206,7 +206,7 @@ UINT32 suprridr_state::screen_update_suprridr(screen_device &screen, bitmap_ind1
fy = !fy;
y = 240 - y;
}
- drawgfx_transpen(bitmap, cliprect, screen.machine().gfx[2], code, color, fx, fy, x, y, 0);
+ drawgfx_transpen(bitmap, cliprect, machine().gfx[2], code, color, fx, fy, x, y, 0);
}
return 0;
}
diff --git a/src/mame/video/suprslam.c b/src/mame/video/suprslam.c
index 3f1d1a8c7cb..718f910ac9e 100644
--- a/src/mame/video/suprslam.c
+++ b/src/mame/video/suprslam.c
@@ -151,13 +151,13 @@ UINT32 suprslam_state::screen_update_suprslam(screen_device &screen, bitmap_ind1
{
m_screen_tilemap->set_scrollx(0, m_screen_vregs[0x04/2] );
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
k053936_zoom_draw(m_k053936, bitmap, cliprect, m_bg_tilemap, 0, 0, 1);
if(!(m_spr_ctrl[0] & 8))
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
m_screen_tilemap->draw(bitmap, cliprect, 0, 0);
if(m_spr_ctrl[0] & 8)
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/video/surpratk.c b/src/mame/video/surpratk.c
index 0f66510e9df..c838df669e8 100644
--- a/src/mame/video/surpratk.c
+++ b/src/mame/video/surpratk.c
@@ -67,7 +67,7 @@ UINT32 surpratk_state::screen_update_surpratk(screen_device &screen, bitmap_ind1
konami_sortlayers3(layer, m_layerpri);
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
bitmap.fill(16 * bg_colorbase, cliprect);
k052109_tilemap_draw(m_k052109, bitmap, cliprect, layer[0], 0, 1);
k052109_tilemap_draw(m_k052109, bitmap, cliprect, layer[1], 0, 2);
diff --git a/src/mame/video/system16.c b/src/mame/video/system16.c
index 46881fe9e4e..ee4da37841d 100644
--- a/src/mame/video/system16.c
+++ b/src/mame/video/system16.c
@@ -615,7 +615,7 @@ UINT32 segas1x_bootleg_state::screen_update_s16a_bootleg(screen_device &screen,
int offset_bg0x = 187;
int offset_bg0y = 0;
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
// start the sprites drawing
m_sprites->draw_async(cliprect);
@@ -664,7 +664,7 @@ UINT32 segas1x_bootleg_state::screen_update_s16a_bootleg(screen_device &screen,
{
UINT16 *dest = &bitmap.pix(y);
UINT16 *src = &sprites.pix(y);
-// UINT8 *pri = &screen.machine().priority_bitmap.pix(y);
+// UINT8 *pri = &machine().priority_bitmap.pix(y);
for (int x = rect->min_x; x <= rect->max_x; x++)
{
// only process written pixels
@@ -677,7 +677,7 @@ UINT32 segas1x_bootleg_state::screen_update_s16a_bootleg(screen_device &screen,
{
// if the color is set to maximum, shadow pixels underneath us
if ((pix & 0x03f0) == 0x03f0)
- dest[x] += (m_paletteram[dest[x]] & 0x8000) ? screen.machine().total_colors()*2 : screen.machine().total_colors();
+ dest[x] += (m_paletteram[dest[x]] & 0x8000) ? machine().total_colors()*2 : machine().total_colors();
// otherwise, just add in sprite palette base
else
@@ -703,7 +703,7 @@ UINT32 segas1x_bootleg_state::screen_update_s16a_bootleg_passht4b(screen_device
int offset_bg0x = 5;
int offset_bg0y = 32;
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
// start the sprites drawing
m_sprites->draw_async(cliprect);
@@ -735,7 +735,7 @@ UINT32 segas1x_bootleg_state::screen_update_s16a_bootleg_passht4b(screen_device
{
UINT16 *dest = &bitmap.pix(y);
UINT16 *src = &sprites.pix(y);
-// UINT8 *pri = &screen.machine().priority_bitmap.pix(y);
+// UINT8 *pri = &machine().priority_bitmap.pix(y);
for (int x = rect->min_x; x <= rect->max_x; x++)
{
// only process written pixels
@@ -748,7 +748,7 @@ UINT32 segas1x_bootleg_state::screen_update_s16a_bootleg_passht4b(screen_device
{
// if the color is set to maximum, shadow pixels underneath us
if ((pix & 0x03f0) == 0x03f0)
- dest[x] += (m_paletteram[dest[x]] & 0x8000) ? screen.machine().total_colors()*2 : screen.machine().total_colors();
+ dest[x] += (m_paletteram[dest[x]] & 0x8000) ? machine().total_colors()*2 : machine().total_colors();
// otherwise, just add in sprite palette base
else
@@ -777,9 +777,9 @@ UINT32 segas1x_bootleg_state::screen_update_system16(screen_device &screen, bitm
// start the sprites drawing
m_sprites->draw_async(cliprect);
- update_page(screen.machine());
+ update_page(machine());
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
m_background->set_scrollx(0, -320 - m_bg_scrollx);
m_background->set_scrolly(0, -256 + m_bg_scrolly + m_back_yscroll);
@@ -805,7 +805,7 @@ UINT32 segas1x_bootleg_state::screen_update_system16(screen_device &screen, bitm
m_text_layer->draw(bitmap, cliprect, 0, 0xf);
- //draw_sprites(screen.machine(), bitmap, cliprect,0);
+ //draw_sprites(machine(), bitmap, cliprect,0);
// mix in sprites
@@ -815,7 +815,7 @@ UINT32 segas1x_bootleg_state::screen_update_system16(screen_device &screen, bitm
{
UINT16 *dest = &bitmap.pix(y);
UINT16 *src = &sprites.pix(y);
-// UINT8 *pri = &screen.machine().priority_bitmap.pix(y);
+// UINT8 *pri = &machine().priority_bitmap.pix(y);
for (int x = rect->min_x; x <= rect->max_x; x++)
{
// only process written pixels
@@ -828,7 +828,7 @@ UINT32 segas1x_bootleg_state::screen_update_system16(screen_device &screen, bitm
{
// if the color is set to maximum, shadow pixels underneath us
if ((pix & 0x03f0) == 0x03f0)
- dest[x] += (m_paletteram[dest[x]] & 0x8000) ? screen.machine().total_colors()*2 : screen.machine().total_colors();
+ dest[x] += (m_paletteram[dest[x]] & 0x8000) ? machine().total_colors()*2 : machine().total_colors();
// otherwise, just add in sprite palette base
else
@@ -847,16 +847,16 @@ UINT32 segas1x_bootleg_state::screen_update_system18old(screen_device &screen, b
if (!m_refreshenable)
{
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
return 0;
}
// start the sprites drawing
m_sprites->draw_async(cliprect);
- update_page(screen.machine());
+ update_page(machine());
- screen.machine().priority_bitmap.fill(0);
+ machine().priority_bitmap.fill(0);
bitmap.fill(0, cliprect);
@@ -879,7 +879,7 @@ UINT32 segas1x_bootleg_state::screen_update_system18old(screen_device &screen, b
{
UINT16 *dest = &bitmap.pix(y);
UINT16 *src = &sprites.pix(y);
-// UINT8 *pri = &screen.machine().priority_bitmap.pix(y);
+// UINT8 *pri = &machine().priority_bitmap.pix(y);
for (int x = rect->min_x; x <= rect->max_x; x++)
{
// only process written pixels
@@ -892,7 +892,7 @@ UINT32 segas1x_bootleg_state::screen_update_system18old(screen_device &screen, b
{
// if the color is set to maximum, shadow pixels underneath us
if ((pix & 0x03f0) == 0x03f0)
- dest[x] += (m_paletteram[dest[x]] & 0x8000) ? screen.machine().total_colors()*2 : screen.machine().total_colors();
+ dest[x] += (m_paletteram[dest[x]] & 0x8000) ? machine().total_colors()*2 : machine().total_colors();
// otherwise, just add in sprite palette base
else
diff --git a/src/mame/video/tagteam.c b/src/mame/video/tagteam.c
index c45bec62206..ca0936569df 100644
--- a/src/mame/video/tagteam.c
+++ b/src/mame/video/tagteam.c
@@ -189,6 +189,6 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
UINT32 tagteam_state::screen_update_tagteam(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/video/tail2nos.c b/src/mame/video/tail2nos.c
index 54f70a284c4..10383ad5848 100644
--- a/src/mame/video/tail2nos.c
+++ b/src/mame/video/tail2nos.c
@@ -177,7 +177,7 @@ UINT32 tail2nos_state::screen_update_tail2nos(screen_device &screen, bitmap_ind1
if (m_video_enable)
{
k051316_zoom_draw(m_k051316, bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
}
else
diff --git a/src/mame/video/taito_b.c b/src/mame/video/taito_b.c
index eff867f2892..c85cc5d0a5c 100644
--- a/src/mame/video/taito_b.c
+++ b/src/mame/video/taito_b.c
@@ -367,7 +367,7 @@ g_profiler.stop();
UINT32 taitob_state::screen_update_taitob(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- address_space &space = screen.machine().driver_data()->generic_space();
+ address_space &space = machine().driver_data()->generic_space();
UINT8 video_control = tc0180vcu_get_videoctrl(m_tc0180vcu, space, 0);
if ((video_control & 0x20) == 0)
@@ -379,7 +379,7 @@ UINT32 taitob_state::screen_update_taitob(screen_device &screen, bitmap_ind16 &b
/* Draw playfields */
tc0180vcu_tilemap_draw(m_tc0180vcu, bitmap, cliprect, 0, 1);
- draw_framebuffer(screen.machine(), bitmap, cliprect, 1);
+ draw_framebuffer(machine(), bitmap, cliprect, 1);
tc0180vcu_tilemap_draw(m_tc0180vcu, bitmap, cliprect, 1, 0);
@@ -392,7 +392,7 @@ UINT32 taitob_state::screen_update_taitob(screen_device &screen, bitmap_ind16 &b
copyscrollbitmap_trans(bitmap, *m_pixel_bitmap, 1, &scrollx, 1, &scrolly, cliprect, m_b_fg_color_base * 16);
}
- draw_framebuffer(screen.machine(), bitmap, cliprect, 0);
+ draw_framebuffer(machine(), bitmap, cliprect, 0);
tc0180vcu_tilemap_draw(m_tc0180vcu, bitmap, cliprect, 2, 0);
@@ -403,8 +403,8 @@ UINT32 taitob_state::screen_update_taitob(screen_device &screen, bitmap_ind16 &b
UINT32 taitob_state::screen_update_realpunc(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- address_space &space = screen.machine().driver_data()->generic_space();
- const rgb_t *palette = palette_entry_list_adjusted(screen.machine().palette);
+ address_space &space = machine().driver_data()->generic_space();
+ const rgb_t *palette = palette_entry_list_adjusted(machine().palette);
UINT8 video_control = tc0180vcu_get_videoctrl(m_tc0180vcu, space, 0);
int x, y;
@@ -418,12 +418,12 @@ UINT32 taitob_state::screen_update_realpunc(screen_device &screen, bitmap_rgb32
/* Draw the palettized playfields to an indexed bitmap */
tc0180vcu_tilemap_draw(m_tc0180vcu, *m_realpunc_bitmap, cliprect, 0, 1);
- draw_framebuffer(screen.machine(), *m_realpunc_bitmap, cliprect, 1);
+ draw_framebuffer(machine(), *m_realpunc_bitmap, cliprect, 1);
tc0180vcu_tilemap_draw(m_tc0180vcu, *m_realpunc_bitmap, cliprect, 1, 0);
if (m_realpunc_video_ctrl & 0x0001)
- draw_framebuffer(screen.machine(), *m_realpunc_bitmap, cliprect, 0);
+ draw_framebuffer(machine(), *m_realpunc_bitmap, cliprect, 0);
/* Copy the intermediate bitmap to the output bitmap, applying the palette */
for (y = 0; y <= cliprect.max_y; y++)
@@ -433,7 +433,7 @@ UINT32 taitob_state::screen_update_realpunc(screen_device &screen, bitmap_rgb32
/* Draw the 15bpp raw CRTC frame buffer directly to the output bitmap */
if (m_realpunc_video_ctrl & 0x0002)
{
- device_t *hd63484 = screen.machine().device("hd63484");
+ device_t *hd63484 = machine().device("hd63484");
int base = (hd63484_regs_r(hd63484, space, 0xcc/2, 0xffff) << 16) + hd63484_regs_r(hd63484, space, 0xce/2, 0xffff);
int stride = hd63484_regs_r(hd63484, space, 0xca/2, 0xffff);
@@ -474,7 +474,7 @@ UINT32 taitob_state::screen_update_realpunc(screen_device &screen, bitmap_rgb32
m_realpunc_bitmap->fill(0, cliprect);
if (!(m_realpunc_video_ctrl & 0x0001))
- draw_framebuffer(screen.machine(), *m_realpunc_bitmap, cliprect, 0);
+ draw_framebuffer(machine(), *m_realpunc_bitmap, cliprect, 0);
tc0180vcu_tilemap_draw(m_tc0180vcu, *m_realpunc_bitmap, cliprect, 2, 0);
@@ -498,12 +498,12 @@ void taitob_state::screen_eof_taitob(screen_device &screen, bool state)
// rising edge
if (state)
{
- address_space &space = screen.machine().driver_data()->generic_space();
+ address_space &space = machine().driver_data()->generic_space();
UINT8 video_control = tc0180vcu_get_videoctrl(m_tc0180vcu, space, 0);
UINT8 framebuffer_page = tc0180vcu_get_fb_page(m_tc0180vcu, space, 0);
if (~video_control & 0x01)
- m_framebuffer[framebuffer_page]->fill(0, screen.machine().primary_screen->visible_area());
+ m_framebuffer[framebuffer_page]->fill(0, machine().primary_screen->visible_area());
if (~video_control & 0x80)
{
@@ -511,6 +511,6 @@ void taitob_state::screen_eof_taitob(screen_device &screen, bool state)
tc0180vcu_set_fb_page(m_tc0180vcu, space, 0, framebuffer_page);
}
- draw_sprites(screen.machine(), *m_framebuffer[framebuffer_page], screen.machine().primary_screen->visible_area());
+ draw_sprites(machine(), *m_framebuffer[framebuffer_page], machine().primary_screen->visible_area());
}
}
diff --git a/src/mame/video/taito_f2.c b/src/mame/video/taito_f2.c
index a31ea3beae2..fa96285ef31 100644
--- a/src/mame/video/taito_f2.c
+++ b/src/mame/video/taito_f2.c
@@ -888,7 +888,7 @@ void taitof2_state::screen_eof_taitof2_no_buffer(screen_device &screen, bool sta
if (state)
{
- taitof2_update_sprites_active_area(screen.machine());
+ taitof2_update_sprites_active_area(machine());
m_prepare_sprites = 1;
}
@@ -902,7 +902,7 @@ void taitof2_state::screen_eof_taitof2_full_buffer_delayed(screen_device &screen
UINT16 *spriteram = m_spriteram;
int i;
- taitof2_update_sprites_active_area(screen.machine());
+ taitof2_update_sprites_active_area(machine());
m_prepare_sprites = 0;
memcpy(m_spriteram_buffered, m_spriteram_delayed, m_spriteram.bytes());
@@ -920,7 +920,7 @@ void taitof2_state::screen_eof_taitof2_partial_buffer_delayed(screen_device &scr
UINT16 *spriteram = m_spriteram;
int i;
- taitof2_update_sprites_active_area(screen.machine());
+ taitof2_update_sprites_active_area(machine());
m_prepare_sprites = 0;
memcpy(m_spriteram_buffered, m_spriteram_delayed, m_spriteram.bytes());
@@ -938,7 +938,7 @@ void taitof2_state::screen_eof_taitof2_partial_buffer_delayed_thundfox(screen_de
UINT16 *spriteram = m_spriteram;
int i;
- taitof2_update_sprites_active_area(screen.machine());
+ taitof2_update_sprites_active_area(machine());
m_prepare_sprites = 0;
memcpy(m_spriteram_buffered, m_spriteram_delayed, m_spriteram.bytes());
@@ -963,7 +963,7 @@ void taitof2_state::screen_eof_taitof2_partial_buffer_delayed_qzchikyu(screen_de
UINT16 *spriteram = m_spriteram;
int i;
- taitof2_update_sprites_active_area(screen.machine());
+ taitof2_update_sprites_active_area(machine());
m_prepare_sprites = 0;
memcpy(m_spriteram_buffered, m_spriteram_delayed, m_spriteram.bytes());
@@ -984,13 +984,13 @@ void taitof2_state::screen_eof_taitof2_partial_buffer_delayed_qzchikyu(screen_de
/* SSI */
UINT32 taitof2_state::screen_update_taitof2_ssi(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- taitof2_handle_sprite_buffering(screen.machine());
+ taitof2_handle_sprite_buffering(machine());
/* SSI only uses sprites, the tilemap registers are not even initialized.
(they are in Majestic 12, but the tilemaps are not used anyway) */
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
bitmap.fill(0, cliprect);
- draw_sprites(screen.machine(), bitmap, cliprect, NULL, 0);
+ draw_sprites(machine(), bitmap, cliprect, NULL, 0);
return 0;
}
@@ -998,13 +998,13 @@ UINT32 taitof2_state::screen_update_taitof2_ssi(screen_device &screen, bitmap_in
UINT32 taitof2_state::screen_update_taitof2_yesnoj(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- taitof2_handle_sprite_buffering(screen.machine());
+ taitof2_handle_sprite_buffering(machine());
tc0100scn_tilemap_update(m_tc0100scn);
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
bitmap.fill(0, cliprect); /* wrong color? */
- draw_sprites(screen.machine(), bitmap, cliprect, NULL, 0);
+ draw_sprites(machine(), bitmap, cliprect, NULL, 0);
tc0100scn_tilemap_draw(m_tc0100scn, bitmap, cliprect, tc0100scn_bottomlayer(m_tc0100scn), 0, 0);
tc0100scn_tilemap_draw(m_tc0100scn, bitmap, cliprect, tc0100scn_bottomlayer(m_tc0100scn) ^ 1, 0, 0);
tc0100scn_tilemap_draw(m_tc0100scn, bitmap, cliprect, 2, 0, 0);
@@ -1015,15 +1015,15 @@ UINT32 taitof2_state::screen_update_taitof2_yesnoj(screen_device &screen, bitmap
UINT32 taitof2_state::screen_update_taitof2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- taitof2_handle_sprite_buffering(screen.machine());
+ taitof2_handle_sprite_buffering(machine());
tc0100scn_tilemap_update(m_tc0100scn);
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
bitmap.fill(0, cliprect); /* wrong color? */
tc0100scn_tilemap_draw(m_tc0100scn, bitmap, cliprect, tc0100scn_bottomlayer(m_tc0100scn), 0, 0);
tc0100scn_tilemap_draw(m_tc0100scn, bitmap, cliprect, tc0100scn_bottomlayer(m_tc0100scn) ^ 1, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, NULL, 0);
+ draw_sprites(machine(), bitmap, cliprect, NULL, 0);
tc0100scn_tilemap_draw(m_tc0100scn, bitmap, cliprect, 2, 0, 0);
return 0;
}
@@ -1031,10 +1031,10 @@ UINT32 taitof2_state::screen_update_taitof2(screen_device &screen, bitmap_ind16
UINT32 taitof2_state::screen_update_taitof2_pri(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- address_space &space = screen.machine().driver_data()->generic_space();
+ address_space &space = machine().driver_data()->generic_space();
int layer[3];
- taitof2_handle_sprite_buffering(screen.machine());
+ taitof2_handle_sprite_buffering(machine());
tc0100scn_tilemap_update(m_tc0100scn);
@@ -1052,14 +1052,14 @@ UINT32 taitof2_state::screen_update_taitof2_pri(screen_device &screen, bitmap_in
m_spriteblendmode = tc0360pri_r(m_tc0360pri, space, 0) & 0xc0;
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
bitmap.fill(0, cliprect); /* wrong color? */
tc0100scn_tilemap_draw(m_tc0100scn, bitmap, cliprect, layer[0], 0, 1);
tc0100scn_tilemap_draw(m_tc0100scn, bitmap, cliprect, layer[1], 0, 2);
tc0100scn_tilemap_draw(m_tc0100scn, bitmap, cliprect, layer[2], 0, 4);
- draw_sprites(screen.machine(), bitmap, cliprect, NULL, 1);
+ draw_sprites(machine(), bitmap, cliprect, NULL, 1);
return 0;
}
@@ -1078,7 +1078,7 @@ static void draw_roz_layer( running_machine &machine, bitmap_ind16 &bitmap, cons
UINT32 taitof2_state::screen_update_taitof2_pri_roz(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- address_space &space = screen.machine().driver_data()->generic_space();
+ address_space &space = machine().driver_data()->generic_space();
int tilepri[3];
int rozpri;
int layer[3];
@@ -1086,7 +1086,7 @@ UINT32 taitof2_state::screen_update_taitof2_pri_roz(screen_device &screen, bitma
int i,j;
int roz_base_color = (tc0360pri_r(m_tc0360pri, space, 1) & 0x3f) << 2;
- taitof2_handle_sprite_buffering(screen.machine());
+ taitof2_handle_sprite_buffering(machine());
if (m_tc0280grd != NULL)
tc0280grd_tilemap_update(m_tc0280grd, roz_base_color);
@@ -1114,7 +1114,7 @@ UINT32 taitof2_state::screen_update_taitof2_pri_roz(screen_device &screen, bitma
m_spriteblendmode = tc0360pri_r(m_tc0360pri, space, 0) & 0xc0;
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
bitmap.fill(0, cliprect); /* wrong color? */
drawn = 0;
@@ -1122,7 +1122,7 @@ UINT32 taitof2_state::screen_update_taitof2_pri_roz(screen_device &screen, bitma
{
if (rozpri == i)
{
- draw_roz_layer(screen.machine(), bitmap, cliprect, 1 << drawn);
+ draw_roz_layer(machine(), bitmap, cliprect, 1 << drawn);
m_tilepri[drawn] = i;
drawn++;
}
@@ -1138,7 +1138,7 @@ UINT32 taitof2_state::screen_update_taitof2_pri_roz(screen_device &screen, bitma
}
}
- draw_sprites(screen.machine(), bitmap, cliprect, NULL, 1);
+ draw_sprites(machine(), bitmap, cliprect, NULL, 1);
return 0;
}
@@ -1147,13 +1147,13 @@ UINT32 taitof2_state::screen_update_taitof2_pri_roz(screen_device &screen, bitma
/* Thunderfox */
UINT32 taitof2_state::screen_update_taitof2_thundfox(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- address_space &space = screen.machine().driver_data()->generic_space();
+ address_space &space = machine().driver_data()->generic_space();
int tilepri[2][3];
int spritepri[4];
int layer[2][3];
int drawn[2];
- taitof2_handle_sprite_buffering(screen.machine());
+ taitof2_handle_sprite_buffering(machine());
tc0100scn_tilemap_update(m_tc0100scn_1);
tc0100scn_tilemap_update(m_tc0100scn_2);
@@ -1177,7 +1177,7 @@ UINT32 taitof2_state::screen_update_taitof2_thundfox(screen_device &screen, bitm
spritepri[2] = tc0360pri_r(m_tc0360pri, space, 7) & 0x0f;
spritepri[3] = tc0360pri_r(m_tc0360pri, space, 7) >> 4;
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
bitmap.fill(0, cliprect); /* wrong color? */
/*
@@ -1229,7 +1229,7 @@ UINT32 taitof2_state::screen_update_taitof2_thundfox(screen_device &screen, bitm
if (spritepri[i] < tilepri[1][1]) primasks[i] |= 0xff00;
}
- draw_sprites(screen.machine(), bitmap,cliprect,primasks,0);
+ draw_sprites(machine(), bitmap,cliprect,primasks,0);
}
@@ -1284,11 +1284,11 @@ and it changes these (and the sprite pri settings) a lot.
UINT32 taitof2_state::screen_update_taitof2_metalb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- address_space &space = screen.machine().driver_data()->generic_space();
+ address_space &space = machine().driver_data()->generic_space();
UINT8 layer[5], invlayer[4];
UINT16 priority;
- taitof2_handle_sprite_buffering(screen.machine());
+ taitof2_handle_sprite_buffering(machine());
tc0480scp_tilemap_update(m_tc0480scp);
@@ -1318,7 +1318,7 @@ UINT32 taitof2_state::screen_update_taitof2_metalb(screen_device &screen, bitmap
m_spriteblendmode = tc0360pri_r(m_tc0360pri, space, 0) & 0xc0;
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
bitmap.fill(0, cliprect);
tc0480scp_tilemap_draw(m_tc0480scp, bitmap, cliprect, layer[0], 0 ,1);
@@ -1327,7 +1327,7 @@ UINT32 taitof2_state::screen_update_taitof2_metalb(screen_device &screen, bitmap
tc0480scp_tilemap_draw(m_tc0480scp, bitmap, cliprect, layer[3], 0, 8);
tc0480scp_tilemap_draw(m_tc0480scp, bitmap, cliprect, layer[4], 0, 16);
- draw_sprites(screen.machine(), bitmap, cliprect, NULL, 1);
+ draw_sprites(machine(), bitmap, cliprect, NULL, 1);
return 0;
}
@@ -1335,13 +1335,13 @@ UINT32 taitof2_state::screen_update_taitof2_metalb(screen_device &screen, bitmap
/* Deadconx, Footchmp */
UINT32 taitof2_state::screen_update_taitof2_deadconx(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- address_space &space = screen.machine().driver_data()->generic_space();
+ address_space &space = machine().driver_data()->generic_space();
UINT8 layer[5];
UINT8 tilepri[5];
UINT8 spritepri[4];
UINT16 priority;
- taitof2_handle_sprite_buffering(screen.machine());
+ taitof2_handle_sprite_buffering(machine());
tc0480scp_tilemap_update(m_tc0480scp);
@@ -1366,7 +1366,7 @@ UINT32 taitof2_state::screen_update_taitof2_deadconx(screen_device &screen, bitm
spritepri[2] = tc0360pri_r(m_tc0360pri, space, 7) & 0x0f;
spritepri[3] = tc0360pri_r(m_tc0360pri, space, 7) >> 4;
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
bitmap.fill(0, cliprect);
tc0480scp_tilemap_draw(m_tc0480scp, bitmap, cliprect, layer[0], 0 ,1);
@@ -1386,7 +1386,7 @@ UINT32 taitof2_state::screen_update_taitof2_deadconx(screen_device &screen, bitm
if (spritepri[i] < tilepri[(layer[3])]) primasks[i] |= 0xff00;
}
- draw_sprites(screen.machine(), bitmap, cliprect, primasks, 0);
+ draw_sprites(machine(), bitmap, cliprect, primasks, 0);
}
/*
diff --git a/src/mame/video/taito_f3.c b/src/mame/video/taito_f3.c
index 0c7c068e602..e1e2651e875 100644
--- a/src/mame/video/taito_f3.c
+++ b/src/mame/video/taito_f3.c
@@ -512,17 +512,17 @@ void taito_f3_state::screen_eof_f3(screen_device &screen, bool state)
{
if (m_sprite_lag==2)
{
- if (screen.machine().video().skip_this_frame() == 0)
+ if (machine().video().skip_this_frame() == 0)
{
- get_sprite_info(screen.machine(), m_spriteram16_buffered);
+ get_sprite_info(machine(), m_spriteram16_buffered);
}
memcpy(m_spriteram16_buffered,m_spriteram,0x10000);
}
else if (m_sprite_lag==1)
{
- if (screen.machine().video().skip_this_frame() == 0)
+ if (machine().video().skip_this_frame() == 0)
{
- get_sprite_info(screen.machine(), m_spriteram);
+ get_sprite_info(machine(), m_spriteram);
}
}
}
@@ -3153,7 +3153,7 @@ UINT32 taito_f3_state::screen_update_f3(screen_device &screen, bitmap_rgb32 &bit
UINT32 sy_fix[5],sx_fix[5];
m_f3_skip_this_frame=0;
- screen.machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
+ machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
/* Setup scroll */
sy_fix[0]=((m_f3_control_0[4]&0xffff)<< 9) + (1<<16);
@@ -3190,25 +3190,25 @@ UINT32 taito_f3_state::screen_update_f3(screen_device &screen, bitmap_rgb32 &bit
/* sprites */
if (m_sprite_lag==0)
- get_sprite_info(screen.machine(), m_spriteram);
+ get_sprite_info(machine(), m_spriteram);
/* Update sprite buffer */
- draw_sprites(screen.machine(), bitmap,cliprect);
+ draw_sprites(machine(), bitmap,cliprect);
/* Parse sprite, alpha & clipping parts of lineram */
get_spritealphaclip_info(this);
/* Parse playfield effects */
- get_line_ram_info(screen.machine(), m_pf1_tilemap,sx_fix[0],sy_fix[0],0,m_f3_pf_data_1);
- get_line_ram_info(screen.machine(), m_pf2_tilemap,sx_fix[1],sy_fix[1],1,m_f3_pf_data_2);
- get_line_ram_info(screen.machine(), m_pf3_tilemap,sx_fix[2],sy_fix[2],2,m_f3_pf_data_3);
- get_line_ram_info(screen.machine(), m_pf4_tilemap,sx_fix[3],sy_fix[3],3,m_f3_pf_data_4);
- get_vram_info(screen.machine(), m_vram_layer,m_pixel_layer,sx_fix[4],sy_fix[4]);
+ get_line_ram_info(machine(), m_pf1_tilemap,sx_fix[0],sy_fix[0],0,m_f3_pf_data_1);
+ get_line_ram_info(machine(), m_pf2_tilemap,sx_fix[1],sy_fix[1],1,m_f3_pf_data_2);
+ get_line_ram_info(machine(), m_pf3_tilemap,sx_fix[2],sy_fix[2],2,m_f3_pf_data_3);
+ get_line_ram_info(machine(), m_pf4_tilemap,sx_fix[3],sy_fix[3],3,m_f3_pf_data_4);
+ get_vram_info(machine(), m_vram_layer,m_pixel_layer,sx_fix[4],sy_fix[4]);
/* Draw final framebuffer */
- scanline_draw(screen.machine(), bitmap,cliprect);
+ scanline_draw(machine(), bitmap,cliprect);
if (VERBOSE)
- print_debug_info(screen.machine(), bitmap);
+ print_debug_info(machine(), bitmap);
return 0;
}
diff --git a/src/mame/video/taito_h.c b/src/mame/video/taito_h.c
index f2808eeaf91..31af0249dc2 100644
--- a/src/mame/video/taito_h.c
+++ b/src/mame/video/taito_h.c
@@ -399,13 +399,13 @@ UINT32 taitoh_state::screen_update_syvalion(screen_device &screen, bitmap_ind16
tc0080vco_tilemap_update(m_tc0080vco);
- taitoh_log_vram(screen.machine());
+ taitoh_log_vram(machine());
bitmap.fill(0, cliprect);
tc0080vco_tilemap_draw(m_tc0080vco, bitmap, cliprect, 0, TILEMAP_DRAW_OPAQUE, 0);
tc0080vco_tilemap_draw(m_tc0080vco, bitmap, cliprect, 1, 0, 0);
- syvalion_draw_sprites(screen.machine(), bitmap,cliprect);
+ syvalion_draw_sprites(machine(), bitmap,cliprect);
tc0080vco_tilemap_draw(m_tc0080vco, bitmap, cliprect, 2, 0, 0);
return 0;
@@ -417,24 +417,24 @@ UINT32 taitoh_state::screen_update_recordbr(screen_device &screen, bitmap_ind16
tc0080vco_tilemap_update(m_tc0080vco);
- taitoh_log_vram(screen.machine());
+ taitoh_log_vram(machine());
bitmap.fill(0, cliprect);
#ifdef MAME_DEBUG
- if (!screen.machine().input().code_pressed(KEYCODE_A))
+ if (!machine().input().code_pressed(KEYCODE_A))
tc0080vco_tilemap_draw(m_tc0080vco, bitmap, cliprect, 0, TILEMAP_DRAW_OPAQUE, 0);
- if (!screen.machine().input().code_pressed(KEYCODE_S))
- recordbr_draw_sprites(screen.machine(), bitmap, cliprect, 0);
- if (!screen.machine().input().code_pressed(KEYCODE_D))
+ if (!machine().input().code_pressed(KEYCODE_S))
+ recordbr_draw_sprites(machine(), bitmap, cliprect, 0);
+ if (!machine().input().code_pressed(KEYCODE_D))
tc0080vco_tilemap_draw(m_tc0080vco, bitmap, cliprect, 1, 0, 0);
- if (!screen.machine().input().code_pressed(KEYCODE_F))
- recordbr_draw_sprites(screen.machine(), bitmap, cliprect, 1);
+ if (!machine().input().code_pressed(KEYCODE_F))
+ recordbr_draw_sprites(machine(), bitmap, cliprect, 1);
#else
tc0080vco_tilemap_draw(m_tc0080vco, bitmap, cliprect, 0, TILEMAP_DRAW_OPAQUE, 0);
- recordbr_draw_sprites(screen.machine(), bitmap, cliprect, 0);
+ recordbr_draw_sprites(machine(), bitmap, cliprect, 0);
tc0080vco_tilemap_draw(m_tc0080vco, bitmap, cliprect, 1, 0, 0);
- recordbr_draw_sprites(screen.machine(), bitmap, cliprect, 1);
+ recordbr_draw_sprites(machine(), bitmap, cliprect, 1);
#endif
tc0080vco_tilemap_draw(m_tc0080vco, bitmap, cliprect, 2, 0, 0);
@@ -447,24 +447,24 @@ UINT32 taitoh_state::screen_update_dleague(screen_device &screen, bitmap_ind16 &
tc0080vco_tilemap_update(m_tc0080vco);
- taitoh_log_vram(screen.machine());
+ taitoh_log_vram(machine());
bitmap.fill(0, cliprect);
#ifdef MAME_DEBUG
- if (!screen.machine().input().code_pressed(KEYCODE_A))
+ if (!machine().input().code_pressed(KEYCODE_A))
tc0080vco_tilemap_draw(m_tc0080vco, bitmap, cliprect, 0, TILEMAP_DRAW_OPAQUE, 0);
- if (!screen.machine().input().code_pressed(KEYCODE_S))
- dleague_draw_sprites(screen.machine(), bitmap, cliprect, 0);
- if (!screen.machine().input().code_pressed(KEYCODE_D))
+ if (!machine().input().code_pressed(KEYCODE_S))
+ dleague_draw_sprites(machine(), bitmap, cliprect, 0);
+ if (!machine().input().code_pressed(KEYCODE_D))
tc0080vco_tilemap_draw(m_tc0080vco, bitmap, cliprect, 1, 0, 0);
- if (!screen.machine().input().code_pressed(KEYCODE_F))
- dleague_draw_sprites(screen.machine(), bitmap, cliprect, 1);
+ if (!machine().input().code_pressed(KEYCODE_F))
+ dleague_draw_sprites(machine(), bitmap, cliprect, 1);
#else
tc0080vco_tilemap_draw(m_tc0080vco, bitmap, cliprect, 0, TILEMAP_DRAW_OPAQUE, 0);
- dleague_draw_sprites (screen.machine(), bitmap, cliprect, 0);
+ dleague_draw_sprites (machine(), bitmap, cliprect, 0);
tc0080vco_tilemap_draw(m_tc0080vco, bitmap, cliprect, 1, 0, 0);
- dleague_draw_sprites (screen.machine(), bitmap, cliprect, 1);
+ dleague_draw_sprites (machine(), bitmap, cliprect, 1);
#endif
tc0080vco_tilemap_draw(m_tc0080vco, bitmap, cliprect, 2, 0, 0);
diff --git a/src/mame/video/taito_l.c b/src/mame/video/taito_l.c
index f398c73829f..ea4f7c8d5c0 100644
--- a/src/mame/video/taito_l.c
+++ b/src/mame/video/taito_l.c
@@ -297,7 +297,7 @@ UINT32 taitol_state::screen_update_taitol(screen_device &screen, bitmap_ind16 &b
if (m_cur_ctrl & 0x20) /* display enable */
{
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
m_bg19_tilemap->draw(bitmap, cliprect, 0, 0);
@@ -306,12 +306,12 @@ UINT32 taitol_state::screen_update_taitol(screen_device &screen, bitmap_ind16 &b
else /* split priority */
m_bg18_tilemap->draw(bitmap, cliprect, 0,1);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
m_ch1a_tilemap->draw(bitmap, cliprect, 0, 0);
}
else
- bitmap.fill(screen.machine().pens[0], cliprect);
+ bitmap.fill(machine().pens[0], cliprect);
return 0;
}
diff --git a/src/mame/video/taito_o.c b/src/mame/video/taito_o.c
index 47b4cba4898..2a32de3762d 100644
--- a/src/mame/video/taito_o.c
+++ b/src/mame/video/taito_o.c
@@ -148,8 +148,8 @@ UINT32 taitoo_state::screen_update_parentj(screen_device &screen, bitmap_ind16 &
tc0080vco_tilemap_draw(m_tc0080vco, bitmap, cliprect, 0, TILEMAP_DRAW_OPAQUE, 0);
- parentj_draw_sprites(screen.machine(), bitmap, cliprect, 0);
- parentj_draw_sprites(screen.machine(), bitmap, cliprect, 1);
+ parentj_draw_sprites(machine(), bitmap, cliprect, 0);
+ parentj_draw_sprites(machine(), bitmap, cliprect, 1);
tc0080vco_tilemap_draw(m_tc0080vco, bitmap, cliprect, 1, 0, 0);
tc0080vco_tilemap_draw(m_tc0080vco, bitmap, cliprect, 2, 0, 0);
diff --git a/src/mame/video/taito_z.c b/src/mame/video/taito_z.c
index 1a9c85d79dd..3bfd25441e5 100644
--- a/src/mame/video/taito_z.c
+++ b/src/mame/video/taito_z.c
@@ -847,7 +847,7 @@ UINT32 taitoz_state::screen_update_contcirc(screen_device &screen, bitmap_ind16
layer[1] = layer[0] ^ 1;
layer[2] = 2;
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
bitmap.fill(0, cliprect);
@@ -856,7 +856,7 @@ UINT32 taitoz_state::screen_update_contcirc(screen_device &screen, bitmap_ind16
tc0150rod_draw(m_tc0150rod, bitmap, cliprect, -3, m_road_palbank << 6, 1, 0, 1, 2); // -6
tc0100scn_tilemap_draw(m_tc0100scn, bitmap, cliprect, layer[2], 0, 4);
- contcirc_draw_sprites_16x8(screen.machine(), bitmap, cliprect, 5); // 7
+ contcirc_draw_sprites_16x8(machine(), bitmap, cliprect, 5); // 7
return 0;
}
@@ -873,7 +873,7 @@ UINT32 taitoz_state::screen_update_chasehq(screen_device &screen, bitmap_ind16 &
layer[1] = layer[0] ^ 1;
layer[2] = 2;
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
/* Ensure screen blanked even when bottom layer not drawn due to disable bit */
bitmap.fill(0, cliprect);
@@ -883,7 +883,7 @@ UINT32 taitoz_state::screen_update_chasehq(screen_device &screen, bitmap_ind16 &
tc0150rod_draw(m_tc0150rod, bitmap, cliprect, -1, 0xc0, 0, 0, 1, 2);
tc0100scn_tilemap_draw(m_tc0100scn, bitmap, cliprect, layer[2], 0, 4);
- chasehq_draw_sprites_16x16(screen.machine(), bitmap, cliprect, 7);
+ chasehq_draw_sprites_16x16(machine(), bitmap, cliprect, 7);
return 0;
}
@@ -898,7 +898,7 @@ UINT32 taitoz_state::screen_update_bshark(screen_device &screen, bitmap_ind16 &b
layer[1] = layer[0] ^ 1;
layer[2] = 2;
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
/* Ensure screen blanked even when bottom layer not drawn due to disable bit */
bitmap.fill(0, cliprect);
@@ -908,7 +908,7 @@ UINT32 taitoz_state::screen_update_bshark(screen_device &screen, bitmap_ind16 &b
tc0150rod_draw(m_tc0150rod, bitmap, cliprect, -1, 0xc0, 0, 1, 1, 2);
tc0100scn_tilemap_draw(m_tc0100scn, bitmap, cliprect, layer[2], 0, 4);
- bshark_draw_sprites_16x8(screen.machine(), bitmap, cliprect, 8);
+ bshark_draw_sprites_16x8(machine(), bitmap, cliprect, 8);
return 0;
}
@@ -923,7 +923,7 @@ UINT32 taitoz_state::screen_update_sci(screen_device &screen, bitmap_ind16 &bitm
layer[1] = layer[0] ^ 1;
layer[2] = 2;
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
/* Ensure screen blanked even when bottom layer not drawn due to disable bit */
bitmap.fill(0, cliprect);
@@ -933,7 +933,7 @@ UINT32 taitoz_state::screen_update_sci(screen_device &screen, bitmap_ind16 &bitm
tc0150rod_draw(m_tc0150rod, bitmap, cliprect, -1, 0xc0, 0, 0, 1, 2);
tc0100scn_tilemap_draw(m_tc0100scn, bitmap, cliprect, layer[2], 0, 4);
- sci_draw_sprites_16x8(screen.machine(), bitmap, cliprect, 6);
+ sci_draw_sprites_16x8(machine(), bitmap, cliprect, 6);
return 0;
}
@@ -948,7 +948,7 @@ UINT32 taitoz_state::screen_update_aquajack(screen_device &screen, bitmap_ind16
layer[1] = layer[0] ^ 1;
layer[2] = 2;
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
/* Ensure screen blanked even when bottom layer not drawn due to disable bit */
bitmap.fill(0, cliprect);
@@ -958,7 +958,7 @@ UINT32 taitoz_state::screen_update_aquajack(screen_device &screen, bitmap_ind16
tc0150rod_draw(m_tc0150rod, bitmap, cliprect, -1, 0, 2, 1, 1, 2);
tc0100scn_tilemap_draw(m_tc0100scn, bitmap, cliprect, layer[2], 0, 4);
- aquajack_draw_sprites_16x8(screen.machine(), bitmap, cliprect, 3);
+ aquajack_draw_sprites_16x8(machine(), bitmap, cliprect, 3);
return 0;
}
@@ -973,7 +973,7 @@ UINT32 taitoz_state::screen_update_spacegun(screen_device &screen, bitmap_ind16
layer[1] = layer[0] ^ 1;
layer[2] = 2;
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
/* Ensure screen blanked even when bottom layer not drawn due to disable bit */
bitmap.fill(0, cliprect);
@@ -982,7 +982,7 @@ UINT32 taitoz_state::screen_update_spacegun(screen_device &screen, bitmap_ind16
tc0100scn_tilemap_draw(m_tc0100scn, bitmap, cliprect, layer[1], 0, 2);
tc0100scn_tilemap_draw(m_tc0100scn, bitmap, cliprect, layer[2], 0, 4);
- spacegun_draw_sprites_16x8(screen.machine(), bitmap, cliprect, 4);
+ spacegun_draw_sprites_16x8(machine(), bitmap, cliprect, 4);
return 0;
}
@@ -1003,7 +1003,7 @@ UINT32 taitoz_state::screen_update_dblaxle(screen_device &screen, bitmap_ind16 &
layer[3] = (priority & 0x000f) >> 0; /* tells us which is top */
layer[4] = 4; /* text layer always over bg layers */
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
/* Ensure screen blanked - this shouldn't be necessary! */
bitmap.fill(0, cliprect);
@@ -1013,7 +1013,7 @@ UINT32 taitoz_state::screen_update_dblaxle(screen_device &screen, bitmap_ind16 &
tc0480scp_tilemap_draw(m_tc0480scp, bitmap, cliprect, layer[2], 0, 1);
tc0150rod_draw(m_tc0150rod, bitmap, cliprect, -1, 0xc0, 0, 0, 1, 2);
- bshark_draw_sprites_16x8(screen.machine(), bitmap, cliprect, 7);
+ bshark_draw_sprites_16x8(machine(), bitmap, cliprect, 7);
/* This layer used for the big numeric displays */
tc0480scp_tilemap_draw(m_tc0480scp, bitmap, cliprect, layer[3], 0, 4);
@@ -1038,7 +1038,7 @@ UINT32 taitoz_state::screen_update_racingb(screen_device &screen, bitmap_ind16 &
layer[3] = (priority & 0x000f) >> 0; /* tells us which is top */
layer[4] = 4; /* text layer always over bg layers */
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
/* Ensure screen blanked - this shouldn't be necessary! */
bitmap.fill(0, cliprect);
@@ -1049,7 +1049,7 @@ UINT32 taitoz_state::screen_update_racingb(screen_device &screen, bitmap_ind16 &
tc0480scp_tilemap_draw(m_tc0480scp, bitmap, cliprect, layer[3], 0, 2);
tc0150rod_draw(m_tc0150rod, bitmap, cliprect, -1, 0xc0, 0, 0, 1, 2);
- sci_draw_sprites_16x8(screen.machine(), bitmap, cliprect, 7);
+ sci_draw_sprites_16x8(machine(), bitmap, cliprect, 7);
tc0480scp_tilemap_draw(m_tc0480scp, bitmap, cliprect, layer[4], 0, 4);
return 0;
diff --git a/src/mame/video/taitoair.c b/src/mame/video/taitoair.c
index 76c453439a9..1f283adf4cc 100644
--- a/src/mame/video/taitoair.c
+++ b/src/mame/video/taitoair.c
@@ -601,13 +601,13 @@ UINT32 taitoair_state::screen_update_taitoair(screen_device &screen, bitmap_ind1
tc0080vco_tilemap_draw(m_tc0080vco, bitmap, cliprect, 0, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 0);
+ draw_sprites(machine(), bitmap, cliprect, 0);
copybitmap_trans(bitmap, *m_framebuffer[1], 0, 0, 0, 0, cliprect, 0);
tc0080vco_tilemap_draw(m_tc0080vco, bitmap, cliprect, 1, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 1);
+ draw_sprites(machine(), bitmap, cliprect, 1);
tc0080vco_tilemap_draw(m_tc0080vco, bitmap, cliprect, 2, 0, 0);
diff --git a/src/mame/video/taitojc.c b/src/mame/video/taitojc.c
index 1025c513ee4..f3ae2dbf671 100644
--- a/src/mame/video/taitojc.c
+++ b/src/mame/video/taitojc.c
@@ -335,17 +335,17 @@ UINT32 taitojc_state::screen_update_taitojc(screen_device &screen, bitmap_ind16
bitmap.fill(0, cliprect);
// low priority objects
- draw_object_bank(screen.machine(), bitmap, cliprect, 0, 0);
- draw_object_bank(screen.machine(), bitmap, cliprect, 1, 0);
- draw_object_bank(screen.machine(), bitmap, cliprect, 2, 0);
+ draw_object_bank(machine(), bitmap, cliprect, 0, 0);
+ draw_object_bank(machine(), bitmap, cliprect, 1, 0);
+ draw_object_bank(machine(), bitmap, cliprect, 2, 0);
// 3D layer
copybitmap_trans(bitmap, m_framebuffer, 0, 0, 0, 0, cliprect, 0);
// high priority objects
- draw_object_bank(screen.machine(), bitmap, cliprect, 0, 1);
- draw_object_bank(screen.machine(), bitmap, cliprect, 1, 1);
- draw_object_bank(screen.machine(), bitmap, cliprect, 2, 1);
+ draw_object_bank(machine(), bitmap, cliprect, 0, 1);
+ draw_object_bank(machine(), bitmap, cliprect, 1, 1);
+ draw_object_bank(machine(), bitmap, cliprect, 2, 1);
// text layer
if (m_objlist[0xfc4/4] & 0x10000)
diff --git a/src/mame/video/taitosj.c b/src/mame/video/taitosj.c
index 3616b52bf1c..10138b1cb0b 100644
--- a/src/mame/video/taitosj.c
+++ b/src/mame/video/taitosj.c
@@ -744,11 +744,11 @@ static int video_update_common(running_machine &machine, bitmap_ind16 &bitmap,
UINT32 taitosj_state::screen_update_taitosj(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- return video_update_common(screen.machine(), bitmap, cliprect, taitosj_copy_layer);
+ return video_update_common(machine(), bitmap, cliprect, taitosj_copy_layer);
}
UINT32 taitosj_state::screen_update_kikstart(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- return video_update_common(screen.machine(), bitmap, cliprect, kikstart_copy_layer);
+ return video_update_common(machine(), bitmap, cliprect, kikstart_copy_layer);
}
diff --git a/src/mame/video/tank8.c b/src/mame/video/tank8.c
index 86d85fdf57f..3c9d087e252 100644
--- a/src/mame/video/tank8.c
+++ b/src/mame/video/tank8.c
@@ -176,11 +176,11 @@ static TIMER_CALLBACK( tank8_collision_callback )
UINT32 tank8_state::screen_update_tank8(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- set_pens(this, screen.machine().colortable);
+ set_pens(this, machine().colortable);
m_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect);
- draw_bullets(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
+ draw_bullets(machine(), bitmap, cliprect);
return 0;
}
@@ -192,15 +192,15 @@ void tank8_state::screen_eof_tank8(screen_device &screen, bool state)
{
int x;
int y;
- const rectangle &visarea = screen.machine().primary_screen->visible_area();
+ const rectangle &visarea = machine().primary_screen->visible_area();
m_tilemap->draw(m_helper1, visarea, 0, 0);
m_helper2.fill(8, visarea);
m_helper3.fill(8, visarea);
- draw_sprites(screen.machine(), m_helper2, visarea);
- draw_bullets(screen.machine(), m_helper3, visarea);
+ draw_sprites(machine(), m_helper2, visarea);
+ draw_bullets(machine(), m_helper3, visarea);
for (y = visarea.min_y; y <= visarea.max_y; y++)
{
@@ -210,7 +210,7 @@ void tank8_state::screen_eof_tank8(screen_device &screen, bool state)
const UINT16* p2 = &m_helper2.pix16(y);
const UINT16* p3 = &m_helper3.pix16(y);
- if (y % 2 != screen.machine().primary_screen->frame_number() % 2)
+ if (y % 2 != machine().primary_screen->frame_number() % 2)
continue; /* video display is interlaced */
for (x = visarea.min_x; x <= visarea.max_x; x++)
@@ -269,7 +269,7 @@ void tank8_state::screen_eof_tank8(screen_device &screen, bool state)
index |= 0x80; /* collision on right side */
}
- screen.machine().scheduler().timer_set(screen.time_until_pos(y, x), FUNC(tank8_collision_callback), index);
+ machine().scheduler().timer_set(screen.time_until_pos(y, x), FUNC(tank8_collision_callback), index);
_state = 1;
}
diff --git a/src/mame/video/tankbatt.c b/src/mame/video/tankbatt.c
index ce9f720c835..d450d8936ee 100644
--- a/src/mame/video/tankbatt.c
+++ b/src/mame/video/tankbatt.c
@@ -102,6 +102,6 @@ static void draw_bullets(running_machine &machine, bitmap_ind16 &bitmap, const r
UINT32 tankbatt_state::screen_update_tankbatt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_bullets(screen.machine(), bitmap, cliprect);
+ draw_bullets(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/video/tankbust.c b/src/mame/video/tankbust.c
index 07cc2537c3f..37c4b47d3eb 100644
--- a/src/mame/video/tankbust.c
+++ b/src/mame/video/tankbust.c
@@ -238,7 +238,7 @@ UINT32 tankbust_state::screen_update_tankbust(screen_device &screen, bitmap_ind1
#endif
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
m_bg_tilemap->draw(bitmap, cliprect, 1, 0);
m_txt_tilemap->draw(bitmap, cliprect, 0,0);
diff --git a/src/mame/video/taotaido.c b/src/mame/video/taotaido.c
index c5cd48e683d..886bc7e6215 100644
--- a/src/mame/video/taotaido.c
+++ b/src/mame/video/taotaido.c
@@ -214,7 +214,7 @@ UINT32 taotaido_state::screen_update_taotaido(screen_device &screen, bitmap_ind1
m_bg_tilemap->draw(bitmap, clip, 0,0);
}
- draw_sprites(screen.machine(), bitmap,cliprect);
+ draw_sprites(machine(), bitmap,cliprect);
return 0;
}
diff --git a/src/mame/video/targeth.c b/src/mame/video/targeth.c
index e14f2a936d8..ccd9ec3d612 100644
--- a/src/mame/video/targeth.c
+++ b/src/mame/video/targeth.c
@@ -139,7 +139,7 @@ UINT32 targeth_state::screen_update_targeth(screen_device &screen, bitmap_ind16
m_pant[1]->draw(bitmap, cliprect, 0,0);
m_pant[0]->draw(bitmap, cliprect, 0,0);
- draw_sprites(screen.machine(), bitmap,cliprect);
+ draw_sprites(machine(), bitmap,cliprect);
return 0;
}
diff --git a/src/mame/video/tatsumi.c b/src/mame/video/tatsumi.c
index 88fb72c9ef4..93efa83b2a6 100644
--- a/src/mame/video/tatsumi.c
+++ b/src/mame/video/tatsumi.c
@@ -1064,14 +1064,14 @@ static void draw_ground(running_machine &machine, bitmap_rgb32 &dst, const recta
UINT32 tatsumi_state::screen_update_apache3(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- update_cluts(screen.machine(), 1024, 0, 2048);
+ update_cluts(machine(), 1024, 0, 2048);
m_tx_layer->set_scrollx(0,24);
- bitmap.fill(screen.machine().pens[0], cliprect);
- draw_sky(screen.machine(), bitmap, cliprect, 256, m_apache3_rotate_ctrl[1]);
-// draw_ground(screen.machine(), bitmap, cliprect);
- draw_sprites(screen.machine(), bitmap,cliprect,0, (m_sprite_control_ram[0x20]&0x1000) ? 0x1000 : 0);
+ bitmap.fill(machine().pens[0], cliprect);
+ draw_sky(machine(), bitmap, cliprect, 256, m_apache3_rotate_ctrl[1]);
+// draw_ground(machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap,cliprect,0, (m_sprite_control_ram[0x20]&0x1000) ? 0x1000 : 0);
m_tx_layer->draw(bitmap, cliprect, 0,0);
return 0;
}
@@ -1081,17 +1081,17 @@ UINT32 tatsumi_state::screen_update_roundup5(screen_device &screen, bitmap_rgb32
// UINT16 bg_x_scroll=m_roundup5_unknown1[0];
// UINT16 bg_y_scroll=m_roundup5_unknown2[0];
- update_cluts(screen.machine(), 1024, 512, 4096);
+ update_cluts(machine(), 1024, 512, 4096);
m_tx_layer->set_scrollx(0,24);
m_tx_layer->set_scrolly(0,0); //(((m_roundupt_crt_reg[0xe]<<8)|m_roundupt_crt_reg[0xf])>>5) + 96);
- bitmap.fill(screen.machine().pens[384], cliprect); // todo
- screen.machine().priority_bitmap.fill(0, cliprect);
+ bitmap.fill(machine().pens[384], cliprect); // todo
+ machine().priority_bitmap.fill(0, cliprect);
- draw_sprites(screen.machine(), screen.machine().priority_bitmap,cliprect,1,(m_sprite_control_ram[0xe0]&0x1000) ? 0x1000 : 0); // Alpha pass only
- draw_road(screen.machine(), bitmap,cliprect,screen.machine().priority_bitmap);
- draw_sprites(screen.machine(), bitmap,cliprect,0,(m_sprite_control_ram[0xe0]&0x1000) ? 0x1000 : 0); // Full pass
+ draw_sprites(machine(), machine().priority_bitmap,cliprect,1,(m_sprite_control_ram[0xe0]&0x1000) ? 0x1000 : 0); // Alpha pass only
+ draw_road(machine(), bitmap,cliprect,machine().priority_bitmap);
+ draw_sprites(machine(), bitmap,cliprect,0,(m_sprite_control_ram[0xe0]&0x1000) ? 0x1000 : 0); // Full pass
m_tx_layer->draw(bitmap, cliprect, 0,0);
return 0;
}
@@ -1108,14 +1108,14 @@ UINT32 tatsumi_state::screen_update_cyclwarr(screen_device &screen, bitmap_rgb32
m_bigfight_last_bank=m_bigfight_bank;
}
- bitmap.fill(screen.machine().pens[0], cliprect);
+ bitmap.fill(machine().pens[0], cliprect);
- draw_bg(screen.machine(), bitmap, m_layer3, &m_cyclwarr_videoram1[0x000], &m_cyclwarr_videoram1[0x100], m_cyclwarr_videoram1, m_bigfight_a40000[0], 8, -0x80, 512, 4096);
- draw_bg(screen.machine(), bitmap, m_layer2, &m_cyclwarr_videoram1[0x200], &m_cyclwarr_videoram1[0x300], m_cyclwarr_videoram1, m_bigfight_a40000[0], 8, -0x80, 512, 4096);
- draw_bg(screen.machine(), bitmap, m_layer1, &m_cyclwarr_videoram0[0x000], &m_cyclwarr_videoram0[0x100], m_cyclwarr_videoram0, m_bigfight_a40000[0], 8, -0x40, 1024, 2048);
- update_cluts(screen.machine(), 8192, 4096, 8192);
- draw_sprites(screen.machine(), bitmap,cliprect,0,(m_sprite_control_ram[0xe0]&0x1000) ? 0x1000 : 0);
- draw_bg(screen.machine(), bitmap, m_layer0, &m_cyclwarr_videoram0[0x200], &m_cyclwarr_videoram0[0x300], m_cyclwarr_videoram0, m_bigfight_a40000[0], 0x10, -0x80, 512, 4096);
+ draw_bg(machine(), bitmap, m_layer3, &m_cyclwarr_videoram1[0x000], &m_cyclwarr_videoram1[0x100], m_cyclwarr_videoram1, m_bigfight_a40000[0], 8, -0x80, 512, 4096);
+ draw_bg(machine(), bitmap, m_layer2, &m_cyclwarr_videoram1[0x200], &m_cyclwarr_videoram1[0x300], m_cyclwarr_videoram1, m_bigfight_a40000[0], 8, -0x80, 512, 4096);
+ draw_bg(machine(), bitmap, m_layer1, &m_cyclwarr_videoram0[0x000], &m_cyclwarr_videoram0[0x100], m_cyclwarr_videoram0, m_bigfight_a40000[0], 8, -0x40, 1024, 2048);
+ update_cluts(machine(), 8192, 4096, 8192);
+ draw_sprites(machine(), bitmap,cliprect,0,(m_sprite_control_ram[0xe0]&0x1000) ? 0x1000 : 0);
+ draw_bg(machine(), bitmap, m_layer0, &m_cyclwarr_videoram0[0x200], &m_cyclwarr_videoram0[0x300], m_cyclwarr_videoram0, m_bigfight_a40000[0], 0x10, -0x80, 512, 4096);
return 0;
}
@@ -1132,13 +1132,13 @@ UINT32 tatsumi_state::screen_update_bigfight(screen_device &screen, bitmap_rgb32
m_bigfight_last_bank=m_bigfight_bank;
}
- bitmap.fill(screen.machine().pens[0], cliprect);
- draw_bg(screen.machine(), bitmap, m_layer3, &m_cyclwarr_videoram1[0x000], &m_cyclwarr_videoram1[0x100], m_cyclwarr_videoram1, m_bigfight_a40000[0], 8, -0x40, 1024, 2048);
- draw_bg(screen.machine(), bitmap, m_layer2, &m_cyclwarr_videoram1[0x200], &m_cyclwarr_videoram1[0x300], m_cyclwarr_videoram1, m_bigfight_a40000[0], 8, -0x40, 1024, 2048);
- draw_bg(screen.machine(), bitmap, m_layer1, &m_cyclwarr_videoram0[0x000], &m_cyclwarr_videoram0[0x100], m_cyclwarr_videoram0, m_bigfight_a40000[0], 8, -0x40, 1024, 2048);
- update_cluts(screen.machine(), 8192, 4096, 8192);
- draw_sprites(screen.machine(), bitmap,cliprect,0,(m_sprite_control_ram[0xe0]&0x1000) ? 0x1000 : 0);
- draw_bg(screen.machine(), bitmap, m_layer0, &m_cyclwarr_videoram0[0x200], &m_cyclwarr_videoram0[0x300], m_cyclwarr_videoram0, m_bigfight_a40000[0], 0x10, -0x40, 1024, 2048);
+ bitmap.fill(machine().pens[0], cliprect);
+ draw_bg(machine(), bitmap, m_layer3, &m_cyclwarr_videoram1[0x000], &m_cyclwarr_videoram1[0x100], m_cyclwarr_videoram1, m_bigfight_a40000[0], 8, -0x40, 1024, 2048);
+ draw_bg(machine(), bitmap, m_layer2, &m_cyclwarr_videoram1[0x200], &m_cyclwarr_videoram1[0x300], m_cyclwarr_videoram1, m_bigfight_a40000[0], 8, -0x40, 1024, 2048);
+ draw_bg(machine(), bitmap, m_layer1, &m_cyclwarr_videoram0[0x000], &m_cyclwarr_videoram0[0x100], m_cyclwarr_videoram0, m_bigfight_a40000[0], 8, -0x40, 1024, 2048);
+ update_cluts(machine(), 8192, 4096, 8192);
+ draw_sprites(machine(), bitmap,cliprect,0,(m_sprite_control_ram[0xe0]&0x1000) ? 0x1000 : 0);
+ draw_bg(machine(), bitmap, m_layer0, &m_cyclwarr_videoram0[0x200], &m_cyclwarr_videoram0[0x300], m_cyclwarr_videoram0, m_bigfight_a40000[0], 0x10, -0x40, 1024, 2048);
return 0;
}
diff --git a/src/mame/video/taxidriv.c b/src/mame/video/taxidriv.c
index 75984260acd..b269ac8c42e 100644
--- a/src/mame/video/taxidriv.c
+++ b/src/mame/video/taxidriv.c
@@ -31,7 +31,7 @@ UINT32 taxidriv_state::screen_update_taxidriv(screen_device &screen, bitmap_ind1
sx = offs % 32;
sy = offs / 32;
- drawgfx_opaque(bitmap,cliprect,screen.machine().gfx[3],
+ drawgfx_opaque(bitmap,cliprect,machine().gfx[3],
m_vram3[offs],
0,
0,0,
@@ -43,7 +43,7 @@ UINT32 taxidriv_state::screen_update_taxidriv(screen_device &screen, bitmap_ind1
sx = offs % 32;
sy = offs / 32;
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[2],
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[2],
m_vram2[offs]+256*m_vram2[offs+0x400],
0,
0,0,
@@ -109,7 +109,7 @@ UINT32 taxidriv_state::screen_update_taxidriv(screen_device &screen, bitmap_ind1
sx = offs % 32;
sy = offs / 32;
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[1],
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[1],
m_vram1[offs],
0,
0,0,
@@ -136,7 +136,7 @@ UINT32 taxidriv_state::screen_update_taxidriv(screen_device &screen, bitmap_ind1
sx = offs % 32;
sy = offs / 32;
- drawgfx_transpen(bitmap,cliprect,screen.machine().gfx[0],
+ drawgfx_transpen(bitmap,cliprect,machine().gfx[0],
m_vram0[offs],
0,
0,0,
diff --git a/src/mame/video/tbowl.c b/src/mame/video/tbowl.c
index af5e0bec401..21479170b68 100644
--- a/src/mame/video/tbowl.c
+++ b/src/mame/video/tbowl.c
@@ -211,7 +211,7 @@ UINT32 tbowl_state::screen_update_tbowl_left(screen_device &screen, bitmap_ind16
bitmap.fill(0x100, cliprect); /* is there a register controling the colour? looks odd when screen is blank */
m_bg_tilemap->draw(bitmap, cliprect, 0,0);
- draw_sprites(screen.machine(), bitmap,cliprect, 0);
+ draw_sprites(machine(), bitmap,cliprect, 0);
m_bg2_tilemap->draw(bitmap, cliprect, 0,0);
m_tx_tilemap->draw(bitmap, cliprect, 0,0);
@@ -230,7 +230,7 @@ UINT32 tbowl_state::screen_update_tbowl_right(screen_device &screen, bitmap_ind1
bitmap.fill(0x100, cliprect); /* is there a register controling the colour? looks odd when screen is blank */
m_bg_tilemap->draw(bitmap, cliprect, 0,0);
- draw_sprites(screen.machine(), bitmap,cliprect, 32*8);
+ draw_sprites(machine(), bitmap,cliprect, 32*8);
m_bg2_tilemap->draw(bitmap, cliprect, 0,0);
m_tx_tilemap->draw(bitmap, cliprect, 0,0);
diff --git a/src/mame/video/tceptor.c b/src/mame/video/tceptor.c
index 10546de961f..bfcdc9d4f6e 100644
--- a/src/mame/video/tceptor.c
+++ b/src/mame/video/tceptor.c
@@ -534,7 +534,7 @@ UINT32 tceptor_state::screen_update_tceptor_2d(screen_device &screen, bitmap_ind
{
m_c45_road->draw(bitmap, cliprect, pri * 2);
m_c45_road->draw(bitmap, cliprect, pri * 2 + 1);
- draw_sprites(screen.machine(), bitmap, cliprect, pri);
+ draw_sprites(machine(), bitmap, cliprect, pri);
}
m_tx_tilemap->draw(bitmap, cliprect, 0, 0);
diff --git a/src/mame/video/tecmo.c b/src/mame/video/tecmo.c
index 09b4638c1cb..85df0d5709b 100644
--- a/src/mame/video/tecmo.c
+++ b/src/mame/video/tecmo.c
@@ -239,12 +239,12 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,const re
UINT32 tecmo_state::screen_update_tecmo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
bitmap.fill(0x100, cliprect);
m_bg_tilemap->draw(bitmap, cliprect, 0,1);
m_fg_tilemap->draw(bitmap, cliprect, 0,2);
m_tx_tilemap->draw(bitmap, cliprect, 0,4);
- draw_sprites(screen.machine(), bitmap,cliprect);
+ draw_sprites(machine(), bitmap,cliprect);
return 0;
}
diff --git a/src/mame/video/tecmo16.c b/src/mame/video/tecmo16.c
index ca3fa787b42..2bfc9475f5c 100644
--- a/src/mame/video/tecmo16.c
+++ b/src/mame/video/tecmo16.c
@@ -468,7 +468,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap_bg, bitm
UINT32 tecmo16_state::screen_update_tecmo16(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
m_tile_bitmap_bg.fill(0x300, cliprect);
m_tile_bitmap_fg.fill(0, cliprect);
@@ -483,9 +483,9 @@ UINT32 tecmo16_state::screen_update_tecmo16(screen_device &screen, bitmap_rgb32
m_tx_tilemap->draw(m_tile_bitmap_fg, cliprect, 0, 4);
/* draw sprites into a 16-bit bitmap */
- draw_sprites(screen.machine(), m_tile_bitmap_bg, m_tile_bitmap_fg, m_sprite_bitmap, cliprect);
+ draw_sprites(machine(), m_tile_bitmap_bg, m_tile_bitmap_fg, m_sprite_bitmap, cliprect);
/* mix & blend the tilemaps and sprites into a 32-bit bitmap */
- blendbitmaps(screen.machine(), bitmap, m_tile_bitmap_bg, m_tile_bitmap_fg, m_sprite_bitmap, 0, 0, cliprect);
+ blendbitmaps(machine(), bitmap, m_tile_bitmap_bg, m_tile_bitmap_fg, m_sprite_bitmap, 0, 0, cliprect);
return 0;
}
diff --git a/src/mame/video/tecmosys.c b/src/mame/video/tecmosys.c
index 58bdc97158d..5f75f9d2162 100644
--- a/src/mame/video/tecmosys.c
+++ b/src/mame/video/tecmosys.c
@@ -288,7 +288,7 @@ static void tecmosys_do_final_mix(running_machine &machine, bitmap_rgb32 &bitmap
UINT32 tecmosys_state::screen_update_tecmosys(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- bitmap.fill(screen.machine().pens[0x4000], cliprect);
+ bitmap.fill(machine().pens[0x4000], cliprect);
m_bg0tilemap->set_scrolly(0, m_c80000regs[1]+16);
@@ -319,10 +319,10 @@ UINT32 tecmosys_state::screen_update_tecmosys(screen_device &screen, bitmap_rgb3
tecmosys_tilemap_copy_to_compose(this, 0xc000);
- tecmosys_do_final_mix(screen.machine(), bitmap);
+ tecmosys_do_final_mix(machine(), bitmap);
// prepare sprites for NEXT frame - causes 1 frame palette errors, but prevents sprite lag in tkdensho, which is correct?
- tecmosys_render_sprites_to_bitmap(screen.machine(), bitmap, m_880000regs[0x0], m_880000regs[0x1]);
+ tecmosys_render_sprites_to_bitmap(machine(), bitmap, m_880000regs[0x0], m_880000regs[0x1]);
return 0;
}
diff --git a/src/mame/video/tehkanwc.c b/src/mame/video/tehkanwc.c
index 0821e304622..04a9889c80f 100644
--- a/src/mame/video/tehkanwc.c
+++ b/src/mame/video/tehkanwc.c
@@ -159,9 +159,9 @@ UINT32 tehkanwc_state::screen_update_tehkanwc(screen_device &screen, bitmap_ind1
m_bg_tilemap->set_scrollx(0, m_scroll_x[0] + 256 * m_scroll_x[1]);
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_fg_tilemap->draw(bitmap, cliprect, 1, 0);
- gridiron_draw_led(screen.machine(), bitmap, cliprect, m_led0, 0);
- gridiron_draw_led(screen.machine(), bitmap, cliprect, m_led1, 1);
+ gridiron_draw_led(machine(), bitmap, cliprect, m_led0, 0);
+ gridiron_draw_led(machine(), bitmap, cliprect, m_led1, 1);
return 0;
}
diff --git a/src/mame/video/terracre.c b/src/mame/video/terracre.c
index d50ddb1c9d4..bc3b8ce55d1 100644
--- a/src/mame/video/terracre.c
+++ b/src/mame/video/terracre.c
@@ -197,11 +197,11 @@ void terracre_state::video_start()
UINT32 terracre_state::screen_update_amazon(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
if( m_xscroll&0x2000 )
- bitmap.fill(get_black_pen(screen.machine()), cliprect );
+ bitmap.fill(get_black_pen(machine()), cliprect );
else
m_background->draw(bitmap, cliprect, 0, 0 );
- draw_sprites(screen.machine(), bitmap,cliprect );
+ draw_sprites(machine(), bitmap,cliprect );
m_foreground->draw(bitmap, cliprect, 0, 0 );
return 0;
}
diff --git a/src/mame/video/tetrisp2.c b/src/mame/video/tetrisp2.c
index a87cce00569..65222d0e71d 100644
--- a/src/mame/video/tetrisp2.c
+++ b/src/mame/video/tetrisp2.c
@@ -431,13 +431,13 @@ UINT32 tetrisp2_state::screen_update_tetrisp2(screen_device &screen, bitmap_ind1
/* Black background color */
bitmap.fill(0, cliprect);
- screen.machine().priority_bitmap.fill(0);
+ machine().priority_bitmap.fill(0);
/* Flip Screen */
if (flipscreen != m_flipscreen_old)
{
m_flipscreen_old = flipscreen;
- screen.machine().tilemap().set_flip_all(flipscreen ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0);
+ machine().tilemap().set_flip_all(flipscreen ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0);
}
/* Flip Screen */
@@ -499,7 +499,7 @@ UINT32 tetrisp2_state::screen_update_tetrisp2(screen_device &screen, bitmap_ind1
else if (asc_pri == 2)
m_tilemap_fg->draw(bitmap, cliprect, 0, 1 << 2);
- tetrisp2_draw_sprites( screen.machine(), bitmap, screen.machine().priority_bitmap, cliprect, m_priority,
+ tetrisp2_draw_sprites( machine(), bitmap, machine().priority_bitmap, cliprect, m_priority,
m_spriteram, m_spriteram.bytes(), 0, (m_systemregs[0x00] & 0x02) );
return 0;
}
@@ -516,13 +516,13 @@ UINT32 tetrisp2_state::screen_update_rockntread(screen_device &screen, bitmap_in
/* Black background color */
bitmap.fill(0, cliprect);
- screen.machine().priority_bitmap.fill(0);
+ machine().priority_bitmap.fill(0);
/* Flip Screen */
if (flipscreen != m_flipscreen_old)
{
m_flipscreen_old = flipscreen;
- screen.machine().tilemap().set_flip_all(flipscreen ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0);
+ machine().tilemap().set_flip_all(flipscreen ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0);
}
/* Flip Screen */
@@ -584,7 +584,7 @@ UINT32 tetrisp2_state::screen_update_rockntread(screen_device &screen, bitmap_in
else if (asc_pri == 2)
m_tilemap_fg->draw(bitmap, cliprect, 0, 1 << 2);
- tetrisp2_draw_sprites( screen.machine(), bitmap, screen.machine().priority_bitmap, cliprect, m_priority,
+ tetrisp2_draw_sprites( machine(), bitmap, machine().priority_bitmap, cliprect, m_priority,
m_spriteram, m_spriteram.bytes(), 0, (m_systemregs[0x00] & 0x02) );
return 0;
}
@@ -605,8 +605,8 @@ UINT32 tetrisp2_state::screen_update_rocknms_left(screen_device &screen, bitmap_
m_tilemap_sub_rot->set_scrollx(0, m_rocknms_sub_rotregs[ 0 ] + 0x400);
m_tilemap_sub_rot->set_scrolly(0, m_rocknms_sub_rotregs[ 2 ] + 0x400);
- bitmap.fill(screen.machine().pens[0x0000], cliprect);
- screen.machine().priority_bitmap.fill(0, cliprect);
+ bitmap.fill(machine().pens[0x0000], cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
asc_pri = scr_pri = rot_pri = 0;
@@ -646,7 +646,7 @@ UINT32 tetrisp2_state::screen_update_rocknms_left(screen_device &screen, bitmap_
else if (asc_pri == 2)
m_tilemap_sub_fg->draw(bitmap, cliprect, 0, 1 << 2);
- tetrisp2_draw_sprites( screen.machine(), bitmap, screen.machine().priority_bitmap, cliprect, m_priority,
+ tetrisp2_draw_sprites( machine(), bitmap, machine().priority_bitmap, cliprect, m_priority,
m_spriteram2, m_spriteram2.bytes(), 4, (m_systemregs[0x00] & 0x02) );
return 0;
@@ -666,8 +666,8 @@ UINT32 tetrisp2_state::screen_update_rocknms_right(screen_device &screen, bitmap
m_tilemap_rot->set_scrolly(0, m_rotregs[ 2 ] + 0x400);
/* Black background color */
- bitmap.fill(screen.machine().pens[0x0000], cliprect);
- screen.machine().priority_bitmap.fill(0, cliprect);
+ bitmap.fill(machine().pens[0x0000], cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
asc_pri = scr_pri = rot_pri = 0;
@@ -707,7 +707,7 @@ UINT32 tetrisp2_state::screen_update_rocknms_right(screen_device &screen, bitmap
else if (asc_pri == 2)
m_tilemap_fg->draw(bitmap, cliprect, 0, 1 << 2);
- tetrisp2_draw_sprites( screen.machine(), bitmap, screen.machine().priority_bitmap, cliprect, m_priority,
+ tetrisp2_draw_sprites( machine(), bitmap, machine().priority_bitmap, cliprect, m_priority,
m_spriteram, m_spriteram.bytes(), 0, (m_systemregs[0x00] & 0x02) );
return 0;
@@ -761,9 +761,9 @@ UINT32 stepstag_state::screen_update_stepstag_left(screen_device &screen, bitmap
{
bitmap.fill(0, cliprect);
- screen.machine().priority_bitmap.fill(0);
+ machine().priority_bitmap.fill(0);
- tetrisp2_draw_sprites( screen.machine(), bitmap, screen.machine().priority_bitmap, cliprect, m_priority,
+ tetrisp2_draw_sprites( machine(), bitmap, machine().priority_bitmap, cliprect, m_priority,
m_spriteram, m_spriteram.bytes(), 1, (m_systemregs[0x00] & 0x02) );
return 0;
}
@@ -771,9 +771,9 @@ UINT32 stepstag_state::screen_update_stepstag_right(screen_device &screen, bitma
{
bitmap.fill(0, cliprect);
- screen.machine().priority_bitmap.fill(0);
+ machine().priority_bitmap.fill(0);
- tetrisp2_draw_sprites( screen.machine(), bitmap, screen.machine().priority_bitmap, cliprect, m_priority,
+ tetrisp2_draw_sprites( machine(), bitmap, machine().priority_bitmap, cliprect, m_priority,
m_spriteram3, m_spriteram3.bytes(), 1, (m_systemregs[0x00] & 0x02) );
return 0;
}
@@ -782,9 +782,9 @@ UINT32 stepstag_state::screen_update_stepstag_mid(screen_device &screen, bitmap_
{
bitmap.fill(0, cliprect);
- screen.machine().priority_bitmap.fill(0);
+ machine().priority_bitmap.fill(0);
- tetrisp2_draw_sprites( screen.machine(), bitmap, screen.machine().priority_bitmap, cliprect, m_priority,
+ tetrisp2_draw_sprites( machine(), bitmap, machine().priority_bitmap, cliprect, m_priority,
m_spriteram2, m_spriteram2.bytes(), 0, (m_systemregs[0x00] & 0x02) );
m_tilemap_fg->draw(bitmap, cliprect, 0, 1 << 2);
diff --git a/src/mame/video/thedeep.c b/src/mame/video/thedeep.c
index 68b25bb87ad..9c7f400a0a1 100644
--- a/src/mame/video/thedeep.c
+++ b/src/mame/video/thedeep.c
@@ -219,10 +219,10 @@ UINT32 thedeep_state::screen_update_thedeep(screen_device &screen, bitmap_ind16
m_tilemap_0->set_scrolly(x, y + scrolly);
}
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
m_tilemap_0->draw(bitmap, cliprect, 0,0);
- draw_sprites(screen.machine(), bitmap,cliprect);
+ draw_sprites(machine(), bitmap,cliprect);
m_tilemap_1->draw(bitmap, cliprect, 0,0);
return 0;
}
diff --git a/src/mame/video/thepit.c b/src/mame/video/thepit.c
index 65ee47dd0a7..a32c7fbc96b 100644
--- a/src/mame/video/thepit.c
+++ b/src/mame/video/thepit.c
@@ -297,13 +297,13 @@ UINT32 thepit_state::screen_update_thepit(screen_device &screen, bitmap_ind16 &b
m_tilemap->draw(bitmap, cliprect, 0, 0);
/* low priority sprites */
- draw_sprites(screen.machine(), bitmap, cliprect, 0);
+ draw_sprites(machine(), bitmap, cliprect, 0);
/* high priority tiles */
m_solid_tilemap->draw(bitmap, cliprect, 1, 1);
/* high priority sprites */
- draw_sprites(screen.machine(), bitmap, cliprect, 1);
+ draw_sprites(machine(), bitmap, cliprect, 1);
return 0;
}
diff --git a/src/mame/video/thief.c b/src/mame/video/thief.c
index a9285979d6a..5fb72c0aa8a 100644
--- a/src/mame/video/thief.c
+++ b/src/mame/video/thief.c
@@ -105,9 +105,9 @@ UINT32 thief_state::screen_update_thief(screen_device &screen, bitmap_ind16 &bit
int flipscreen = m_video_control&1;
const UINT8 *source = videoram;
- if (tms9927_screen_reset(screen.machine().device("tms")))
+ if (tms9927_screen_reset(machine().device("tms")))
{
- bitmap.fill(get_black_pen(screen.machine()), cliprect);
+ bitmap.fill(get_black_pen(machine()), cliprect);
return 0;
}
diff --git a/src/mame/video/thoop2.c b/src/mame/video/thoop2.c
index b896d535550..54efa5a5e2a 100644
--- a/src/mame/video/thoop2.c
+++ b/src/mame/video/thoop2.c
@@ -203,34 +203,34 @@ UINT32 thoop2_state::screen_update_thoop2(screen_device &screen, bitmap_ind16 &b
m_pant[1]->set_scrolly(0, m_vregs[2]);
m_pant[1]->set_scrollx(0, m_vregs[3]);
- thoop2_sort_sprites(screen.machine());
+ thoop2_sort_sprites(machine());
bitmap.fill(0, cliprect );
m_pant[1]->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 3,0);
m_pant[0]->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 3,0);
- draw_sprites(screen.machine(), bitmap,cliprect,3);
+ draw_sprites(machine(), bitmap,cliprect,3);
m_pant[1]->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 3,0);
m_pant[0]->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 3,0);
m_pant[1]->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 2,0);
m_pant[0]->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 2,0);
- draw_sprites(screen.machine(), bitmap,cliprect,2);
+ draw_sprites(machine(), bitmap,cliprect,2);
m_pant[1]->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 2,0);
m_pant[0]->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 2,0);
m_pant[1]->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 1,0);
m_pant[0]->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 1,0);
- draw_sprites(screen.machine(), bitmap,cliprect,1);
+ draw_sprites(machine(), bitmap,cliprect,1);
m_pant[1]->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 1,0);
m_pant[0]->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 1,0);
m_pant[1]->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 0,0);
m_pant[0]->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1 | 0,0);
- draw_sprites(screen.machine(), bitmap,cliprect,0);
+ draw_sprites(machine(), bitmap,cliprect,0);
m_pant[1]->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 0,0);
m_pant[0]->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0 | 0,0);
- draw_sprites(screen.machine(), bitmap,cliprect,4);
+ draw_sprites(machine(), bitmap,cliprect,4);
return 0;
}
diff --git a/src/mame/video/thunderj.c b/src/mame/video/thunderj.c
index 3b62608ab9f..297b24d77c5 100644
--- a/src/mame/video/thunderj.c
+++ b/src/mame/video/thunderj.c
@@ -120,7 +120,7 @@ VIDEO_START_MEMBER(thunderj_state,thunderj)
UINT32 thunderj_state::screen_update_thunderj(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- bitmap_ind8 &priority_bitmap = screen.machine().priority_bitmap;
+ bitmap_ind8 &priority_bitmap = machine().priority_bitmap;
atarimo_rect_list rectlist;
bitmap_ind16 *mobitmap;
int x, y, r;
diff --git a/src/mame/video/thunderx.c b/src/mame/video/thunderx.c
index 33270ffd6da..d9c3f81a995 100644
--- a/src/mame/video/thunderx.c
+++ b/src/mame/video/thunderx.c
@@ -70,7 +70,7 @@ UINT32 thunderx_state::screen_update_scontra(screen_device &screen, bitmap_ind16
k052109_tilemap_update(m_k052109);
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
/* The background color is always from layer 1 - but it's always black anyway */
// bitmap.fill(16 * m_layer_colorbase[1], cliprect);
diff --git a/src/mame/video/tiamc1.c b/src/mame/video/tiamc1.c
index 412049b3020..e9514f9b2e0 100644
--- a/src/mame/video/tiamc1.c
+++ b/src/mame/video/tiamc1.c
@@ -200,7 +200,7 @@ UINT32 tiamc1_state::screen_update_tiamc1(screen_device &screen, bitmap_ind16 &b
m_bg_tilemap1->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/video/tigeroad.c b/src/mame/video/tigeroad.c
index a49c0cb35e1..e0ccd6b1a23 100644
--- a/src/mame/video/tigeroad.c
+++ b/src/mame/video/tigeroad.c
@@ -158,9 +158,9 @@ void tigeroad_state::video_start()
UINT32 tigeroad_state::screen_update_tigeroad(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, 0);
+ draw_sprites(machine(), bitmap, cliprect, 0);
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 1);
- //draw_sprites(screen.machine(), bitmap, cliprect, 1); draw priority sprites?
+ //draw_sprites(machine(), bitmap, cliprect, 1); draw priority sprites?
m_fg_tilemap->draw(bitmap, cliprect, 0, 2);
return 0;
}
diff --git a/src/mame/video/timelimt.c b/src/mame/video/timelimt.c
index 505c252d3ad..05174473934 100644
--- a/src/mame/video/timelimt.c
+++ b/src/mame/video/timelimt.c
@@ -142,7 +142,7 @@ UINT32 timelimt_state::screen_update_timelimt(screen_device &screen, bitmap_ind1
m_bg_tilemap->set_scrolly(0, m_scrolly);
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/video/timeplt.c b/src/mame/video/timeplt.c
index ee40fcc06d4..e4026d3508c 100644
--- a/src/mame/video/timeplt.c
+++ b/src/mame/video/timeplt.c
@@ -208,7 +208,7 @@ UINT32 timeplt_state::screen_update_timeplt(screen_device &screen, bitmap_ind16
{
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
m_bg_tilemap->draw(bitmap, cliprect, 1, 0);
return 0;
}
diff --git a/src/mame/video/tmnt.c b/src/mame/video/tmnt.c
index 809fb4e6557..c7a8bc0c4d2 100644
--- a/src/mame/video/tmnt.c
+++ b/src/mame/video/tmnt.c
@@ -605,7 +605,7 @@ UINT32 tmnt_state::screen_update_punkshot(screen_device &screen, bitmap_ind16 &b
konami_sortlayers3(m_sorted_layer, m_layerpri);
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
k052109_tilemap_draw(m_k052109, bitmap, cliprect, m_sorted_layer[0], TILEMAP_DRAW_OPAQUE, 1);
k052109_tilemap_draw(m_k052109, bitmap, cliprect, m_sorted_layer[1], 0, 2);
k052109_tilemap_draw(m_k052109, bitmap, cliprect, m_sorted_layer[2], 0, 4);
@@ -636,7 +636,7 @@ UINT32 tmnt_state::screen_update_lgtnfght(screen_device &screen, bitmap_ind16 &b
konami_sortlayers3(m_sorted_layer, m_layerpri);
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
bitmap.fill(16 * bg_colorbase, cliprect);
k052109_tilemap_draw(m_k052109, bitmap, cliprect, m_sorted_layer[0], 0, 1);
k052109_tilemap_draw(m_k052109, bitmap, cliprect, m_sorted_layer[1], 0, 2);
@@ -683,7 +683,7 @@ UINT32 tmnt_state::screen_update_glfgreat(screen_device &screen, bitmap_ind16 &b
/* not sure about the 053936 priority, but it seems to work */
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
bitmap.fill(16 * bg_colorbase, cliprect);
k052109_tilemap_draw(m_k052109, bitmap, cliprect, m_sorted_layer[0], 0, 1);
@@ -743,21 +743,21 @@ UINT32 tmnt_state::screen_update_tmnt2(screen_device &screen, bitmap_ind16 &bitm
// dim all colors before it
for (i = 0; i < cb; i++)
- palette_set_pen_contrast(screen.machine(), i, brt);
+ palette_set_pen_contrast(machine(), i, brt);
// reset all colors in range
for (i = cb; i < ce; i++)
- palette_set_pen_contrast(screen.machine(), i, 1.0);
+ palette_set_pen_contrast(machine(), i, 1.0);
// dim all colors after it
for (i = ce; i < 2048; i++)
- palette_set_pen_contrast(screen.machine(), i, brt);
+ palette_set_pen_contrast(machine(), i, brt);
// toggle shadow/highlight
if (~m_dim_c & 0x10)
- palette_set_shadow_mode(screen.machine(), 1);
+ palette_set_shadow_mode(machine(), 1);
else
- palette_set_shadow_mode(screen.machine(), 0);
+ palette_set_shadow_mode(machine(), 0);
}
SCREEN_UPDATE16_CALL_MEMBER(lgtnfght);
@@ -786,7 +786,7 @@ UINT32 tmnt_state::screen_update_thndrx2(screen_device &screen, bitmap_ind16 &bi
konami_sortlayers3(m_sorted_layer, m_layerpri);
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
bitmap.fill(16 * bg_colorbase, cliprect);
k052109_tilemap_draw(m_k052109, bitmap, cliprect, m_sorted_layer[0], 0, 1);
k052109_tilemap_draw(m_k052109, bitmap, cliprect, m_sorted_layer[1], 0, 2);
diff --git a/src/mame/video/tnzs.c b/src/mame/video/tnzs.c
index 5cf6d34f097..56eae38dcbc 100644
--- a/src/mame/video/tnzs.c
+++ b/src/mame/video/tnzs.c
@@ -50,7 +50,7 @@ UINT32 tnzs_state::screen_update_tnzs(screen_device &screen, bitmap_ind16 &bitma
machine().device<seta001_device>("spritegen")->set_fg_yoffsets( -0x12, 0x0e );
machine().device<seta001_device>("spritegen")->set_bg_yoffsets( 0x1, -0x1 );
- machine().device<seta001_device>("spritegen")->seta001_draw_sprites(screen.machine(), bitmap, cliprect, 0x800, 0 );
+ machine().device<seta001_device>("spritegen")->seta001_draw_sprites(machine(), bitmap, cliprect, 0x800, 0 );
return 0;
}
diff --git a/src/mame/video/toaplan1.c b/src/mame/video/toaplan1.c
index dbed7ac9429..7630f01980f 100644
--- a/src/mame/video/toaplan1.c
+++ b/src/mame/video/toaplan1.c
@@ -1134,7 +1134,7 @@ UINT32 toaplan1_state::screen_update_rallybik(screen_device &screen, bitmap_ind1
{
int priority;
- toaplan1_log_vram(screen.machine());
+ toaplan1_log_vram(machine());
bitmap.fill(0x120, cliprect);
@@ -1147,7 +1147,7 @@ UINT32 toaplan1_state::screen_update_rallybik(screen_device &screen, bitmap_ind1
m_pf3_tilemap->draw(bitmap, cliprect, priority, 0);
m_pf2_tilemap->draw(bitmap, cliprect, priority, 0);
m_pf1_tilemap->draw(bitmap, cliprect, priority, 0);
- rallybik_draw_sprites(screen.machine(), bitmap,cliprect,priority << 8);
+ rallybik_draw_sprites(machine(), bitmap,cliprect,priority << 8);
}
return 0;
@@ -1157,9 +1157,9 @@ UINT32 toaplan1_state::screen_update_toaplan1(screen_device &screen, bitmap_ind1
{
int priority;
- toaplan1_log_vram(screen.machine());
+ toaplan1_log_vram(machine());
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
bitmap.fill(0x120, cliprect);
// it's really correct?
@@ -1174,7 +1174,7 @@ UINT32 toaplan1_state::screen_update_toaplan1(screen_device &screen, bitmap_ind1
m_pf1_tilemap->draw(bitmap, cliprect, priority, priority, 0);
}
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
return 0;
}
@@ -1213,6 +1213,6 @@ void toaplan1_state::screen_eof_samesame(screen_device &screen, bool state)
memcpy(m_buffered_spriteram, m_spriteram, m_spriteram.bytes());
memcpy(m_buffered_spritesizeram16, m_spritesizeram16, TOAPLAN1_SPRITESIZERAM_SIZE);
- screen.machine().device("maincpu")->execute().set_input_line(M68K_IRQ_2, HOLD_LINE); /* Frame done */
+ machine().device("maincpu")->execute().set_input_line(M68K_IRQ_2, HOLD_LINE); /* Frame done */
}
}
diff --git a/src/mame/video/toaplan2.c b/src/mame/video/toaplan2.c
index e0c7db1aeca..46c52a8c51c 100644
--- a/src/mame/video/toaplan2.c
+++ b/src/mame/video/toaplan2.c
@@ -293,13 +293,13 @@ UINT32 toaplan2_state::screen_update_toaplan2_dual(screen_device &screen, bitmap
{
bitmap.fill(0, cliprect);
m_custom_priority_bitmap.fill(0, cliprect);
- m_vdp1->gp9001_render_vdp(screen.machine(), bitmap, cliprect);
+ m_vdp1->gp9001_render_vdp(machine(), bitmap, cliprect);
}
if (m_vdp0)
{
// bitmap.fill(0, cliprect);
m_custom_priority_bitmap.fill(0, cliprect);
- m_vdp0->gp9001_render_vdp(screen.machine(), bitmap, cliprect);
+ m_vdp0->gp9001_render_vdp(machine(), bitmap, cliprect);
}
@@ -318,13 +318,13 @@ UINT32 toaplan2_state::screen_update_toaplan2_mixed(screen_device &screen, bitma
{
bitmap.fill(0, cliprect);
m_custom_priority_bitmap.fill(0, cliprect);
- m_vdp0->gp9001_render_vdp(screen.machine(), bitmap, cliprect);
+ m_vdp0->gp9001_render_vdp(machine(), bitmap, cliprect);
}
if (m_vdp1)
{
m_secondary_render_bitmap.fill(0, cliprect);
m_custom_priority_bitmap.fill(0, cliprect);
- m_vdp1->gp9001_render_vdp(screen.machine(), m_secondary_render_bitmap, cliprect);
+ m_vdp1->gp9001_render_vdp(machine(), m_secondary_render_bitmap, cliprect);
}
@@ -414,7 +414,7 @@ UINT32 toaplan2_state::screen_update_toaplan2(screen_device &screen, bitmap_ind1
{
bitmap.fill(0, cliprect);
m_custom_priority_bitmap.fill(0, cliprect);
- m_vdp0->gp9001_render_vdp(screen.machine(), bitmap, cliprect);
+ m_vdp0->gp9001_render_vdp(machine(), bitmap, cliprect);
}
return 0;
diff --git a/src/mame/video/toki.c b/src/mame/video/toki.c
index 85769ceac65..1c94e403deb 100644
--- a/src/mame/video/toki.c
+++ b/src/mame/video/toki.c
@@ -280,7 +280,7 @@ UINT32 toki_state::screen_update_toki(screen_device &screen, bitmap_ind16 &bitma
m_foreground_layer->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE,0);
m_background_layer->draw(bitmap, cliprect, 0,0);
}
- toki_draw_sprites(screen.machine(), bitmap,cliprect);
+ toki_draw_sprites(machine(), bitmap,cliprect);
m_text_layer->draw(bitmap, cliprect, 0,0);
return 0;
}
@@ -302,7 +302,7 @@ UINT32 toki_state::screen_update_tokib(screen_device &screen, bitmap_ind16 &bitm
m_background_layer->draw(bitmap, cliprect, 0,0);
}
- tokib_draw_sprites(screen.machine(), bitmap,cliprect);
+ tokib_draw_sprites(machine(), bitmap,cliprect);
m_text_layer->draw(bitmap, cliprect, 0,0);
return 0;
}
diff --git a/src/mame/video/toobin.c b/src/mame/video/toobin.c
index 3dcc69ebc96..249b9ef2aa2 100644
--- a/src/mame/video/toobin.c
+++ b/src/mame/video/toobin.c
@@ -227,8 +227,8 @@ WRITE16_HANDLER( toobin_slip_w )
UINT32 toobin_state::screen_update_toobin(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- bitmap_ind8 &priority_bitmap = screen.machine().priority_bitmap;
- const rgb_t *palette = palette_entry_list_adjusted(screen.machine().palette);
+ bitmap_ind8 &priority_bitmap = machine().priority_bitmap;
+ const rgb_t *palette = palette_entry_list_adjusted(machine().palette);
atarimo_rect_list rectlist;
bitmap_ind16 *mobitmap;
int x, y;
diff --git a/src/mame/video/topspeed.c b/src/mame/video/topspeed.c
index 102ffebe2ba..a4d22615e1a 100644
--- a/src/mame/video/topspeed.c
+++ b/src/mame/video/topspeed.c
@@ -114,31 +114,31 @@ UINT32 topspeed_state::screen_update_topspeed(screen_device &screen, bitmap_ind1
UINT8 layer[4];
#ifdef MAME_DEBUG
- if (screen.machine().input().code_pressed_once (KEYCODE_V))
+ if (machine().input().code_pressed_once (KEYCODE_V))
{
m_dislayer[0] ^= 1;
popmessage("bg: %01x", m_dislayer[0]);
}
- if (screen.machine().input().code_pressed_once (KEYCODE_B))
+ if (machine().input().code_pressed_once (KEYCODE_B))
{
m_dislayer[1] ^= 1;
popmessage("fg: %01x", m_dislayer[1]);
}
- if (screen.machine().input().code_pressed_once (KEYCODE_N))
+ if (machine().input().code_pressed_once (KEYCODE_N))
{
m_dislayer[2] ^= 1;
popmessage("bg2: %01x", m_dislayer[2]);
}
- if (screen.machine().input().code_pressed_once (KEYCODE_M))
+ if (machine().input().code_pressed_once (KEYCODE_M))
{
m_dislayer[3] ^= 1;
popmessage("fg2: %01x", m_dislayer[3]);
}
- if (screen.machine().input().code_pressed_once (KEYCODE_C))
+ if (machine().input().code_pressed_once (KEYCODE_C))
{
m_dislayer[4] ^= 1;
popmessage("sprites: %01x", m_dislayer[4]);
@@ -154,7 +154,7 @@ UINT32 topspeed_state::screen_update_topspeed(screen_device &screen, bitmap_ind1
layer[2] = 1;
layer[3] = 0;
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
bitmap.fill(0, cliprect);
#ifdef MAME_DEBUG
@@ -181,6 +181,6 @@ UINT32 topspeed_state::screen_update_topspeed(screen_device &screen, bitmap_ind1
if (m_dislayer[4] == 0)
#endif
- draw_sprites(screen.machine(), bitmap,cliprect);
+ draw_sprites(machine(), bitmap,cliprect);
return 0;
}
diff --git a/src/mame/video/toypop.c b/src/mame/video/toypop.c
index 043563bdc85..033c08e399e 100644
--- a/src/mame/video/toypop.c
+++ b/src/mame/video/toypop.c
@@ -272,8 +272,8 @@ void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const rectangl
UINT32 toypop_state::screen_update_toypop(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- draw_background(screen.machine(), bitmap);
+ draw_background(machine(), bitmap);
m_bg_tilemap->draw(bitmap, cliprect, 0,0);
- draw_sprites(screen.machine(), bitmap, cliprect, m_spriteram);
+ draw_sprites(machine(), bitmap, cliprect, m_spriteram);
return 0;
}
diff --git a/src/mame/video/tp84.c b/src/mame/video/tp84.c
index f578556929a..34aba088a67 100644
--- a/src/mame/video/tp84.c
+++ b/src/mame/video/tp84.c
@@ -179,17 +179,17 @@ UINT32 tp84_state::screen_update_tp84(screen_device &screen, bitmap_ind16 &bitma
if (cliprect.min_y == screen.visible_area().min_y)
{
- screen.machine().tilemap().mark_all_dirty();
+ machine().tilemap().mark_all_dirty();
m_bg_tilemap->set_scrollx(0, *m_scroll_x);
m_bg_tilemap->set_scrolly(0, *m_scroll_y);
- screen.machine().tilemap().set_flip_all(((*m_flipscreen_x & 0x01) ? TILEMAP_FLIPX : 0) |
+ machine().tilemap().set_flip_all(((*m_flipscreen_x & 0x01) ? TILEMAP_FLIPX : 0) |
((*m_flipscreen_y & 0x01) ? TILEMAP_FLIPY : 0));
}
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
/* draw top status region */
clip.min_x = visarea.min_x;
diff --git a/src/mame/video/trackfld.c b/src/mame/video/trackfld.c
index 86139e284ad..1d25c1457c6 100644
--- a/src/mame/video/trackfld.c
+++ b/src/mame/video/trackfld.c
@@ -255,7 +255,7 @@ UINT32 trackfld_state::screen_update_trackfld(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/video/travrusa.c b/src/mame/video/travrusa.c
index a61456f6724..262584e1951 100644
--- a/src/mame/video/travrusa.c
+++ b/src/mame/video/travrusa.c
@@ -332,7 +332,7 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,const re
UINT32 travrusa_state::screen_update_travrusa(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0);
- draw_sprites(screen.machine(), bitmap,cliprect);
+ draw_sprites(machine(), bitmap,cliprect);
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_LAYER0, 0);
return 0;
}
diff --git a/src/mame/video/triplhnt.c b/src/mame/video/triplhnt.c
index caf469c8222..6de05a4aa51 100644
--- a/src/mame/video/triplhnt.c
+++ b/src/mame/video/triplhnt.c
@@ -105,15 +105,15 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
UINT32 triplhnt_state::screen_update_triplhnt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- device_t *discrete = screen.machine().device("discrete");
+ device_t *discrete = machine().device("discrete");
m_bg_tilemap->mark_all_dirty();
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
- address_space &space = screen.machine().driver_data()->generic_space();
+ address_space &space = machine().driver_data()->generic_space();
discrete_sound_w(discrete, space, TRIPLHNT_BEAR_ROAR_DATA, m_playfield_ram[0xfa] & 15);
discrete_sound_w(discrete, space, TRIPLHNT_SHOT_DATA, m_playfield_ram[0xfc] & 15);
return 0;
diff --git a/src/mame/video/tryout.c b/src/mame/video/tryout.c
index 77deba5855e..3acdca62436 100644
--- a/src/mame/video/tryout.c
+++ b/src/mame/video/tryout.c
@@ -247,13 +247,13 @@ UINT32 tryout_state::screen_update_tryout(screen_device &screen, bitmap_ind16 &b
if(!(m_gfx_control[0] & 0x8)) // screen disable
{
/* TODO: Color might be different, needs a video from an original pcb. */
- bitmap.fill(screen.machine().pens[0x10], cliprect);
+ bitmap.fill(machine().pens[0x10], cliprect);
}
else
{
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);
}
// popmessage("%02x %02x %02x %02x",m_gfx_control[0],m_gfx_control[1],m_gfx_control[2],scrollx);
diff --git a/src/mame/video/tsamurai.c b/src/mame/video/tsamurai.c
index 95bf43576b3..2dc51ce8563 100644
--- a/src/mame/video/tsamurai.c
+++ b/src/mame/video/tsamurai.c
@@ -208,7 +208,7 @@ UINT32 tsamurai_state::screen_update_tsamurai(screen_device &screen, bitmap_ind1
*/
bitmap.fill(m_bgcolor, cliprect);
m_background->draw(bitmap, cliprect, 0,0);
- draw_sprites(screen.machine(), bitmap,cliprect);
+ draw_sprites(machine(), bitmap,cliprect);
m_foreground->draw(bitmap, cliprect, 0,0);
return 0;
}
@@ -250,8 +250,8 @@ VIDEO_START_MEMBER(tsamurai_state,vsgongf)
UINT32 tsamurai_state::screen_update_vsgongf(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
#ifdef MAME_DEBUG
- if( screen.machine().input().code_pressed( KEYCODE_Q ) ){
- while( screen.machine().input().code_pressed( KEYCODE_Q ) ){
+ if( machine().input().code_pressed( KEYCODE_Q ) ){
+ while( machine().input().code_pressed( KEYCODE_Q ) ){
m_key_count++;
m_vsgongf_color = m_key_count;
m_foreground ->mark_all_dirty();
@@ -260,6 +260,6 @@ UINT32 tsamurai_state::screen_update_vsgongf(screen_device &screen, bitmap_ind16
#endif
m_foreground->draw(bitmap, cliprect, 0,0);
- draw_sprites(screen.machine(),bitmap,cliprect);
+ draw_sprites(machine(),bitmap,cliprect);
return 0;
}
diff --git a/src/mame/video/tubep.c b/src/mame/video/tubep.c
index fee2cfcbddc..6bb0fa996bf 100644
--- a/src/mame/video/tubep.c
+++ b/src/mame/video/tubep.c
@@ -584,7 +584,7 @@ UINT32 tubep_state::screen_update_tubep(screen_device &screen, bitmap_ind16 &bit
pen_t pen_base = 32; //change it later
UINT32 v;
- UINT8 *text_gfx_base = screen.machine().root_device().memregion("gfx1")->base();
+ UINT8 *text_gfx_base = machine().root_device().memregion("gfx1")->base();
UINT8 *romBxx = memregion("user1")->base() + 0x2000*m_background_romsel;
/* logerror(" update: from DISP=%i y_min=%3i y_max=%3i\n", DISP_, cliprect.min_y, cliprect.max_y+1); */
@@ -738,7 +738,7 @@ UINT32 tubep_state::screen_update_rjammer(screen_device &screen, bitmap_ind16 &b
int DISP_ = m_DISP^1;
UINT32 v;
- UINT8 *text_gfx_base = screen.machine().root_device().memregion("gfx1")->base();
+ UINT8 *text_gfx_base = machine().root_device().memregion("gfx1")->base();
UINT8 *rom13D = memregion("user1")->base();
UINT8 *rom11BD = rom13D+0x1000;
UINT8 *rom19C = rom13D+0x5000;
diff --git a/src/mame/video/tumbleb.c b/src/mame/video/tumbleb.c
index 4c194d8e8d5..ebd3dd0dc04 100644
--- a/src/mame/video/tumbleb.c
+++ b/src/mame/video/tumbleb.c
@@ -327,7 +327,7 @@ UINT32 tumbleb_state::screen_update_tumblepb(screen_device &screen, bitmap_ind16
int offs, offs2;
m_flipscreen = m_control_0[0] & 0x80;
- screen.machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
+ machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
if (m_flipscreen)
offs = 1;
@@ -339,7 +339,7 @@ UINT32 tumbleb_state::screen_update_tumblepb(screen_device &screen, bitmap_ind16
else
offs2 = -5;
- tumbleb_draw_common(screen.machine(),bitmap,cliprect, offs2, 0, offs, 0);
+ tumbleb_draw_common(machine(),bitmap,cliprect, offs2, 0, offs, 0);
return 0;
}
@@ -349,7 +349,7 @@ UINT32 tumbleb_state::screen_update_jumpkids(screen_device &screen, bitmap_ind16
int offs, offs2;
m_flipscreen = m_control_0[0] & 0x80;
- screen.machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
+ machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
if (m_flipscreen)
offs = 1;
@@ -361,7 +361,7 @@ UINT32 tumbleb_state::screen_update_jumpkids(screen_device &screen, bitmap_ind16
else
offs2 = -5;
- tumbleb_draw_common(screen.machine(),bitmap,cliprect, offs2, 0, offs, 0);
+ tumbleb_draw_common(machine(),bitmap,cliprect, offs2, 0, offs, 0);
return 0;
}
@@ -370,7 +370,7 @@ UINT32 tumbleb_state::screen_update_semicom(screen_device &screen, bitmap_ind16
int offs, offs2;
m_flipscreen = m_control_0[0] & 0x80;
- screen.machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
+ machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
if (m_flipscreen)
offs = 1;
@@ -382,7 +382,7 @@ UINT32 tumbleb_state::screen_update_semicom(screen_device &screen, bitmap_ind16
else
offs2 = -5;
- tumbleb_draw_common(screen.machine(),bitmap,cliprect, offs2, 0, offs, 0);
+ tumbleb_draw_common(machine(),bitmap,cliprect, offs2, 0, offs, 0);
return 0;
}
@@ -396,7 +396,7 @@ UINT32 tumbleb_state::screen_update_semicom_altoffsets(screen_device &screen, bi
offsy = 2;
offsx2 = -5;
- tumbleb_draw_common(screen.machine(),bitmap,cliprect, offsx2, 0, offsx, offsy);
+ tumbleb_draw_common(machine(),bitmap,cliprect, offsx2, 0, offsx, offsy);
return 0;
}
@@ -406,7 +406,7 @@ UINT32 tumbleb_state::screen_update_bcstory(screen_device &screen, bitmap_ind16
int offs, offs2;
m_flipscreen = m_control_0[0] & 0x80;
- screen.machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
+ machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
/* not sure of this */
if (m_flipscreen)
@@ -420,7 +420,7 @@ UINT32 tumbleb_state::screen_update_bcstory(screen_device &screen, bitmap_ind16
else
offs2 = 8;
- tumbleb_draw_common(screen.machine(),bitmap,cliprect, offs2, 0, offs, 0);
+ tumbleb_draw_common(machine(),bitmap,cliprect, offs2, 0, offs, 0);
return 0;
}
@@ -429,11 +429,11 @@ UINT32 tumbleb_state::screen_update_semibase(screen_device &screen, bitmap_ind16
int offs, offs2;
m_flipscreen = m_control_0[0] & 0x80;
- screen.machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
+ machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
offs = -1;
offs2 = -2;
- tumbleb_draw_common(screen.machine(),bitmap,cliprect, offs2, 0, offs, 0);
+ tumbleb_draw_common(machine(),bitmap,cliprect, offs2, 0, offs, 0);
return 0;
}
@@ -443,13 +443,13 @@ UINT32 tumbleb_state::screen_update_sdfight(screen_device &screen, bitmap_ind16
int offs, offs2;
m_flipscreen = m_control_0[0] & 0x80;
- screen.machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
+ machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
offs = -1;
offs2 = -5; // foreground scroll..
- tumbleb_draw_common(screen.machine(),bitmap,cliprect, offs2, -16, offs, 0);
+ tumbleb_draw_common(machine(),bitmap,cliprect, offs2, -16, offs, 0);
- screen.machine().device<decospr_device>("spritegen")->draw_sprites(bitmap, cliprect, m_spriteram, m_spriteram.bytes()/2);
+ machine().device<decospr_device>("spritegen")->draw_sprites(bitmap, cliprect, m_spriteram, m_spriteram.bytes()/2);
return 0;
}
@@ -458,7 +458,7 @@ UINT32 tumbleb_state::screen_update_fncywld(screen_device &screen, bitmap_ind16
int offs, offs2;
m_flipscreen = m_control_0[0] & 0x80;
- screen.machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
+ machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
if (m_flipscreen)
offs = 1;
@@ -470,7 +470,7 @@ UINT32 tumbleb_state::screen_update_fncywld(screen_device &screen, bitmap_ind16
else
offs2 = -5;
- tumbleb_draw_common(screen.machine(),bitmap,cliprect, offs2, 0, offs, 0);
+ tumbleb_draw_common(machine(),bitmap,cliprect, offs2, 0, offs, 0);
return 0;
}
@@ -480,7 +480,7 @@ UINT32 tumbleb_state::screen_update_pangpang(screen_device &screen, bitmap_ind16
int offs, offs2;
m_flipscreen = m_control_0[0] & 0x80;
- screen.machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
+ machine().tilemap().set_flip_all(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
if (m_flipscreen)
offs = 1;
@@ -492,7 +492,7 @@ UINT32 tumbleb_state::screen_update_pangpang(screen_device &screen, bitmap_ind16
else
offs2 = -5;
- tumbleb_draw_common(screen.machine(),bitmap,cliprect, offs2, 0, offs, 0);
+ tumbleb_draw_common(machine(),bitmap,cliprect, offs2, 0, offs, 0);
return 0;
}
@@ -509,7 +509,7 @@ UINT32 tumbleb_state::screen_update_suprtrio(screen_device &screen, bitmap_ind16
m_pf2_tilemap->draw(bitmap, cliprect, 0, 0);
m_pf1_alt_tilemap->draw(bitmap, cliprect, 0, 0);
- screen.machine().device<decospr_device>("spritegen")->draw_sprites(bitmap, cliprect, m_spriteram, m_spriteram.bytes()/2);
+ machine().device<decospr_device>("spritegen")->draw_sprites(bitmap, cliprect, m_spriteram, m_spriteram.bytes()/2);
return 0;
}
diff --git a/src/mame/video/tumblep.c b/src/mame/video/tumblep.c
index 189a35127a3..2070faaaa1d 100644
--- a/src/mame/video/tumblep.c
+++ b/src/mame/video/tumblep.c
@@ -21,7 +21,7 @@ to switch between 8*8 tiles and 16*16 tiles.
UINT32 tumblep_state::screen_update_tumblep(screen_device &screen, bitmap_ind16 &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));
@@ -32,6 +32,6 @@ UINT32 tumblep_state::screen_update_tumblep(screen_device &screen, bitmap_ind16
deco16ic_tilemap_2_draw(m_deco_tilegen1, bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0);
deco16ic_tilemap_1_draw(m_deco_tilegen1, 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/video/tunhunt.c b/src/mame/video/tunhunt.c
index 469f5d26055..bd8d1df8397 100644
--- a/src/mame/video/tunhunt.c
+++ b/src/mame/video/tunhunt.c
@@ -376,13 +376,13 @@ static void draw_shell(running_machine &machine,
UINT32 tunhunt_state::screen_update_tunhunt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- set_pens(screen.machine());
+ set_pens(machine());
- draw_box(screen.machine(), bitmap, cliprect);
+ draw_box(machine(), bitmap, cliprect);
- draw_motion_object(screen.machine(), bitmap, cliprect);
+ draw_motion_object(machine(), bitmap, cliprect);
- draw_shell(screen.machine(), bitmap, cliprect,
+ draw_shell(machine(), bitmap, cliprect,
m_workram[SHL0PC], /* picture code */
m_workram[SHEL0H], /* hposition */
m_workram[SHL0V], /* vstart */
@@ -390,7 +390,7 @@ UINT32 tunhunt_state::screen_update_tunhunt(screen_device &screen, bitmap_ind16
m_workram[SHL0ST], /* vstretch */
m_control&0x08 ); /* hstretch */
- draw_shell(screen.machine(), bitmap, cliprect,
+ draw_shell(machine(), bitmap, cliprect,
m_workram[SHL1PC], /* picture code */
m_workram[SHEL1H], /* hposition */
m_workram[SHL1V], /* vstart */
diff --git a/src/mame/video/turbo.c b/src/mame/video/turbo.c
index 059fe52e125..a06822c568f 100644
--- a/src/mame/video/turbo.c
+++ b/src/mame/video/turbo.c
@@ -400,7 +400,7 @@ static UINT32 turbo_get_sprite_bits(const UINT8 *sprite_gfxdata, UINT8 road, spr
UINT32 turbo_state::screen_update_turbo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
bitmap_ind16 &fgpixmap = m_fg_tilemap->pixmap();
- const UINT8 *road_gfxdata = screen.machine().root_device().memregion("gfx3")->base();
+ const UINT8 *road_gfxdata = machine().root_device().memregion("gfx3")->base();
const UINT8 *prom_base = memregion("proms")->base();
const UINT8 *pr1114 = prom_base + 0x000;
const UINT8 *pr1115 = prom_base + 0x020;
@@ -429,7 +429,7 @@ UINT32 turbo_state::screen_update_turbo(screen_device &screen, bitmap_ind16 &bit
/* compute the sprite information; we use y-1 since this info was computed during HBLANK */
/* on the previous scanline */
- turbo_prepare_sprites(screen.machine(), this, y, &sprinfo);
+ turbo_prepare_sprites(machine(), this, y, &sprinfo);
/* loop over columns */
for (x = 0; x <= cliprect.max_x; x += TURBO_X_SCALE)
@@ -769,7 +769,7 @@ UINT32 turbo_state::screen_update_subroc3d(screen_device &screen, bitmap_ind16 &
/* compute the sprite information; we use y-1 since this info was computed during HBLANK */
/* on the previous scanline */
- subroc3d_prepare_sprites(screen.machine(), this, y, &sprinfo);
+ subroc3d_prepare_sprites(machine(), this, y, &sprinfo);
/* loop over columns */
for (x = 0; x <= cliprect.max_x; x += TURBO_X_SCALE)
@@ -971,7 +971,7 @@ static UINT32 buckrog_get_sprite_bits(const UINT8 *sprite_gfxdata, sprite_info *
UINT32 turbo_state::screen_update_buckrog(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
bitmap_ind16 &fgpixmap = m_fg_tilemap->pixmap();
- const UINT8 *bgcolor = screen.machine().root_device().memregion("gfx3")->base();
+ const UINT8 *bgcolor = machine().root_device().memregion("gfx3")->base();
const UINT8 *prom_base = memregion("proms")->base();
const UINT8 *pr5194 = prom_base + 0x000;
const UINT8 *pr5198 = prom_base + 0x500;
@@ -987,7 +987,7 @@ UINT32 turbo_state::screen_update_buckrog(screen_device &screen, bitmap_ind16 &b
/* compute the sprite information; we use y-1 since this info was computed during HBLANK */
/* on the previous scanline */
- buckrog_prepare_sprites(screen.machine(), this, y, &sprinfo);
+ buckrog_prepare_sprites(machine(), this, y, &sprinfo);
/* loop over columns */
for (x = 0; x <= cliprect.max_x; x += TURBO_X_SCALE)
diff --git a/src/mame/video/tutankhm.c b/src/mame/video/tutankhm.c
index 34a632ff2c6..a731684e55c 100644
--- a/src/mame/video/tutankhm.c
+++ b/src/mame/video/tutankhm.c
@@ -64,7 +64,7 @@ UINT32 tutankhm_state::screen_update_tutankhm(screen_device &screen, bitmap_rgb3
pen_t pens[NUM_PENS];
int x, y;
- get_pens(screen.machine(), pens);
+ get_pens(machine(), pens);
for (y = cliprect.min_y; y <= cliprect.max_y; y++)
{
diff --git a/src/mame/video/twin16.c b/src/mame/video/twin16.c
index 6a649d95b2f..526bfbae360 100644
--- a/src/mame/video/twin16.c
+++ b/src/mame/video/twin16.c
@@ -520,10 +520,10 @@ UINT32 twin16_state::screen_update_twin16(screen_device &screen, bitmap_ind16 &b
if (m_video_register&TWIN16_SCREEN_FLIPX) text_flip|=TILEMAP_FLIPX;
if (m_video_register&TWIN16_SCREEN_FLIPY) text_flip|=TILEMAP_FLIPY;
- screen.machine().priority_bitmap.fill(0, cliprect);
- draw_layer( screen.machine(), bitmap, 1 );
- draw_layer( screen.machine(), bitmap, 0 );
- draw_sprites( screen.machine(), bitmap );
+ machine().priority_bitmap.fill(0, cliprect);
+ draw_layer( machine(), bitmap, 1 );
+ draw_layer( machine(), bitmap, 0 );
+ draw_sprites( machine(), bitmap );
if (text_flip) m_text_tilemap->set_flip(text_flip);
m_text_tilemap->draw(bitmap, cliprect, 0, 0);
@@ -535,10 +535,10 @@ void twin16_state::screen_eof_twin16(screen_device &screen, bool state)
// rising edge
if (state)
{
- twin16_set_sprite_timer(screen.machine());
+ twin16_set_sprite_timer(machine());
- if (twin16_spriteram_process_enable(screen.machine())) {
- if (m_need_process_spriteram) twin16_spriteram_process(screen.machine());
+ if (twin16_spriteram_process_enable(machine())) {
+ if (m_need_process_spriteram) twin16_spriteram_process(machine());
m_need_process_spriteram = 1;
/* if the sprite preprocessor is used, sprite ram is copied to an external buffer first,
diff --git a/src/mame/video/twincobr.c b/src/mame/video/twincobr.c
index 7882557f93e..697cfdc6069 100644
--- a/src/mame/video/twincobr.c
+++ b/src/mame/video/twincobr.c
@@ -495,18 +495,18 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
UINT32 twincobr_state::screen_update_toaplan0(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- twincobr_log_vram(screen.machine());
+ twincobr_log_vram(machine());
- if (m_wardner_sprite_hack) wardner_sprite_priority_hack(screen.machine());
+ if (m_wardner_sprite_hack) wardner_sprite_priority_hack(machine());
bitmap.fill(0, cliprect);
m_bg_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE,0);
- draw_sprites(screen.machine(), bitmap,cliprect,0x0400);
+ draw_sprites(machine(), bitmap,cliprect,0x0400);
m_fg_tilemap->draw(bitmap, cliprect, 0,0);
- draw_sprites(screen.machine(), bitmap,cliprect,0x0800);
+ draw_sprites(machine(), bitmap,cliprect,0x0800);
m_tx_tilemap->draw(bitmap, cliprect, 0,0);
- draw_sprites(screen.machine(), bitmap,cliprect,0x0c00);
+ draw_sprites(machine(), bitmap,cliprect,0x0c00);
return 0;
}
diff --git a/src/mame/video/tx1.c b/src/mame/video/tx1.c
index ba00c2f53d3..9aa06c0e868 100644
--- a/src/mame/video/tx1.c
+++ b/src/mame/video/tx1.c
@@ -1186,23 +1186,23 @@ UINT32 tx1_state::screen_update_tx1_left(screen_device &screen, bitmap_ind16 &bi
memset(m_obj_bmp, 0, 768*240);
- tx1_draw_char(screen.machine(), m_chr_bmp);
- tx1_draw_road(screen.machine(), m_rod_bmp);
- tx1_draw_objects(screen.machine(), m_obj_bmp);
+ tx1_draw_char(machine(), m_chr_bmp);
+ tx1_draw_road(machine(), m_rod_bmp);
+ tx1_draw_objects(machine(), m_obj_bmp);
- tx1_combine_layers(screen.machine(), bitmap, 0);
+ tx1_combine_layers(machine(), bitmap, 0);
return 0;
}
UINT32 tx1_state::screen_update_tx1_middle(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- tx1_combine_layers(screen.machine(), bitmap, 1);
+ tx1_combine_layers(machine(), bitmap, 1);
return 0;
}
UINT32 tx1_state::screen_update_tx1_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- tx1_combine_layers(screen.machine(), bitmap, 2);
+ tx1_combine_layers(machine(), bitmap, 2);
return 0;
}
@@ -3042,23 +3042,23 @@ UINT32 tx1_state::screen_update_buggyboy_left(screen_device &screen, bitmap_ind1
memset(m_obj_bmp, 0, 768*240);
memset(m_rod_bmp, 0, 768*240);
- buggyboy_draw_char(screen.machine(), m_chr_bmp, 1);
- buggyboy_draw_road(screen.machine(), m_rod_bmp);
- buggyboy_draw_objs(screen.machine(), m_obj_bmp, 1);
+ buggyboy_draw_char(machine(), m_chr_bmp, 1);
+ buggyboy_draw_road(machine(), m_rod_bmp);
+ buggyboy_draw_objs(machine(), m_obj_bmp, 1);
- bb_combine_layers(screen.machine(), bitmap, 0);
+ bb_combine_layers(machine(), bitmap, 0);
return 0;
}
UINT32 tx1_state::screen_update_buggyboy_middle(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- bb_combine_layers(screen.machine(), bitmap, 1);
+ bb_combine_layers(machine(), bitmap, 1);
return 0;
}
UINT32 tx1_state::screen_update_buggyboy_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- bb_combine_layers(screen.machine(), bitmap, 2);
+ bb_combine_layers(machine(), bitmap, 2);
return 0;
}
@@ -3066,10 +3066,10 @@ UINT32 tx1_state::screen_update_buggybjr(screen_device &screen, bitmap_ind16 &bi
{
memset(m_obj_bmp, 0, 256*240);
- buggyboy_draw_char(screen.machine(), m_chr_bmp, 0);
- buggybjr_draw_road(screen.machine(), m_rod_bmp, 0);
- buggyboy_draw_objs(screen.machine(), m_obj_bmp, 0);
+ buggyboy_draw_char(machine(), m_chr_bmp, 0);
+ buggybjr_draw_road(machine(), m_rod_bmp, 0);
+ buggyboy_draw_objs(machine(), m_obj_bmp, 0);
- bb_combine_layers(screen.machine(), bitmap, -1);
+ bb_combine_layers(machine(), bitmap, -1);
return 0;
}
diff --git a/src/mame/video/ultratnk.c b/src/mame/video/ultratnk.c
index 6476bab72c9..be45daa34e3 100644
--- a/src/mame/video/ultratnk.c
+++ b/src/mame/video/ultratnk.c
@@ -75,7 +75,7 @@ UINT32 ultratnk_state::screen_update_ultratnk(screen_device &screen, bitmap_ind1
if (!(attr & 0x80))
{
- drawgfx_transpen(bitmap, cliprect, screen.machine().gfx[1],
+ drawgfx_transpen(bitmap, cliprect, machine().gfx[1],
(code >> 3) | bank,
i,
0, 0,
@@ -94,8 +94,8 @@ void ultratnk_state::screen_eof_ultratnk(screen_device &screen, bool state)
if (state)
{
int i;
- UINT16 BG = colortable_entry_get_value(screen.machine().colortable, 0);
- device_t *discrete = screen.machine().device("discrete");
+ UINT16 BG = colortable_entry_get_value(machine().colortable, 0);
+ device_t *discrete = machine().device("discrete");
UINT8 *videoram = m_videoram;
/* check for sprite-playfield collisions */
@@ -115,17 +115,17 @@ void ultratnk_state::screen_eof_ultratnk(screen_device &screen, bool state)
rect.min_x = horz - 15;
rect.min_y = vert - 15;
- rect.max_x = horz - 15 + screen.machine().gfx[1]->width() - 1;
- rect.max_y = vert - 15 + screen.machine().gfx[1]->height() - 1;
+ rect.max_x = horz - 15 + machine().gfx[1]->width() - 1;
+ rect.max_y = vert - 15 + machine().gfx[1]->height() - 1;
- rect &= screen.machine().primary_screen->visible_area();
+ rect &= machine().primary_screen->visible_area();
m_playfield->draw(m_helper, rect, 0, 0);
if (code & 4)
bank = 32;
- drawgfx_transpen(m_helper, rect, screen.machine().gfx[1],
+ drawgfx_transpen(m_helper, rect, machine().gfx[1],
(code >> 3) | bank,
4,
0, 0,
@@ -134,13 +134,13 @@ void ultratnk_state::screen_eof_ultratnk(screen_device &screen, bool state)
for (y = rect.min_y; y <= rect.max_y; y++)
for (x = rect.min_x; x <= rect.max_x; x++)
- if (colortable_entry_get_value(screen.machine().colortable, m_helper.pix16(y, x)) != BG)
+ if (colortable_entry_get_value(machine().colortable, m_helper.pix16(y, x)) != BG)
m_collision[i] = 1;
}
/* update sound status */
- address_space &space = screen.machine().driver_data()->generic_space();
+ address_space &space = machine().driver_data()->generic_space();
discrete_sound_w(discrete, space, ULTRATNK_MOTOR_DATA_1, videoram[0x391] & 15);
discrete_sound_w(discrete, space, ULTRATNK_MOTOR_DATA_2, videoram[0x393] & 15);
}
diff --git a/src/mame/video/undrfire.c b/src/mame/video/undrfire.c
index 9103dfc86ab..8a09faba020 100644
--- a/src/mame/video/undrfire.c
+++ b/src/mame/video/undrfire.c
@@ -348,44 +348,44 @@ static void draw_sprites_cbombers(running_machine &machine, bitmap_ind16 &bitmap
UINT32 undrfire_state::screen_update_undrfire(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- device_t *tc0100scn = screen.machine().device("tc0100scn");
- device_t *tc0480scp = screen.machine().device("tc0480scp");
- address_space &space = screen.machine().driver_data()->generic_space();
+ device_t *tc0100scn = machine().device("tc0100scn");
+ device_t *tc0480scp = machine().device("tc0480scp");
+ address_space &space = machine().driver_data()->generic_space();
UINT8 layer[5];
UINT8 pivlayer[3];
UINT16 priority;
#ifdef MAME_DEBUG
- if (screen.machine().input().code_pressed_once (KEYCODE_X))
+ if (machine().input().code_pressed_once (KEYCODE_X))
{
m_dislayer[5] ^= 1;
popmessage("piv text: %01x",m_dislayer[5]);
}
- if (screen.machine().input().code_pressed_once (KEYCODE_C))
+ if (machine().input().code_pressed_once (KEYCODE_C))
{
m_dislayer[0] ^= 1;
popmessage("bg0: %01x",m_dislayer[0]);
}
- if (screen.machine().input().code_pressed_once (KEYCODE_V))
+ if (machine().input().code_pressed_once (KEYCODE_V))
{
m_dislayer[1] ^= 1;
popmessage("bg1: %01x",m_dislayer[1]);
}
- if (screen.machine().input().code_pressed_once (KEYCODE_B))
+ if (machine().input().code_pressed_once (KEYCODE_B))
{
m_dislayer[2] ^= 1;
popmessage("bg2: %01x",m_dislayer[2]);
}
- if (screen.machine().input().code_pressed_once (KEYCODE_N))
+ if (machine().input().code_pressed_once (KEYCODE_N))
{
m_dislayer[3] ^= 1;
popmessage("bg3: %01x",m_dislayer[3]);
}
- if (screen.machine().input().code_pressed_once (KEYCODE_M))
+ if (machine().input().code_pressed_once (KEYCODE_M))
{
m_dislayer[4] ^= 1;
popmessage("sprites: %01x",m_dislayer[4]);
@@ -407,7 +407,7 @@ UINT32 undrfire_state::screen_update_undrfire(screen_device &screen, bitmap_ind1
pivlayer[1] = pivlayer[0] ^ 1;
pivlayer[2] = 2;
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
bitmap.fill(0, cliprect); /* wrong color? */
@@ -448,12 +448,12 @@ UINT32 undrfire_state::screen_update_undrfire(screen_device &screen, bitmap_ind1
if ((tc0480scp_pri_reg_r(tc0480scp, space, 0) & 0x3) == 3) /* on road levels kludge sprites up 1 priority */
{
static const int primasks[4] = {0xfff0, 0xff00, 0x0, 0x0};
- draw_sprites(screen.machine(), bitmap, cliprect, primasks, 44, -574);
+ draw_sprites(machine(), bitmap, cliprect, primasks, 44, -574);
}
else
{
static const int primasks[4] = {0xfffc, 0xfff0, 0xff00, 0x0};
- draw_sprites(screen.machine(), bitmap, cliprect, primasks, 44, -574);
+ draw_sprites(machine(), bitmap, cliprect, primasks, 44, -574);
}
}
@@ -467,7 +467,7 @@ UINT32 undrfire_state::screen_update_undrfire(screen_device &screen, bitmap_ind1
/* See if we should draw artificial gun targets */
/* (not yet implemented...) */
- if (screen.machine().root_device().ioport("FAKE")->read() & 0x1) /* Fake DSW */
+ if (machine().root_device().ioport("FAKE")->read() & 0x1) /* Fake DSW */
{
popmessage("Gunsights on");
}
@@ -491,44 +491,44 @@ UINT32 undrfire_state::screen_update_undrfire(screen_device &screen, bitmap_ind1
UINT32 undrfire_state::screen_update_cbombers(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- device_t *tc0100scn = screen.machine().device("tc0100scn");
- device_t *tc0480scp = screen.machine().device("tc0480scp");
- address_space &space = screen.machine().driver_data()->generic_space();
+ device_t *tc0100scn = machine().device("tc0100scn");
+ device_t *tc0480scp = machine().device("tc0480scp");
+ address_space &space = machine().driver_data()->generic_space();
UINT8 layer[5];
UINT8 pivlayer[3];
UINT16 priority;
#ifdef MAME_DEBUG
- if (screen.machine().input().code_pressed_once (KEYCODE_X))
+ if (machine().input().code_pressed_once (KEYCODE_X))
{
m_dislayer[5] ^= 1;
popmessage("piv text: %01x",m_dislayer[5]);
}
- if (screen.machine().input().code_pressed_once (KEYCODE_C))
+ if (machine().input().code_pressed_once (KEYCODE_C))
{
m_dislayer[0] ^= 1;
popmessage("bg0: %01x",m_dislayer[0]);
}
- if (screen.machine().input().code_pressed_once (KEYCODE_V))
+ if (machine().input().code_pressed_once (KEYCODE_V))
{
m_dislayer[1] ^= 1;
popmessage("bg1: %01x",m_dislayer[1]);
}
- if (screen.machine().input().code_pressed_once (KEYCODE_B))
+ if (machine().input().code_pressed_once (KEYCODE_B))
{
m_dislayer[2] ^= 1;
popmessage("bg2: %01x",m_dislayer[2]);
}
- if (screen.machine().input().code_pressed_once (KEYCODE_N))
+ if (machine().input().code_pressed_once (KEYCODE_N))
{
m_dislayer[3] ^= 1;
popmessage("bg3: %01x",m_dislayer[3]);
}
- if (screen.machine().input().code_pressed_once (KEYCODE_M))
+ if (machine().input().code_pressed_once (KEYCODE_M))
{
m_dislayer[4] ^= 1;
popmessage("sprites: %01x",m_dislayer[4]);
@@ -550,7 +550,7 @@ UINT32 undrfire_state::screen_update_cbombers(screen_device &screen, bitmap_ind1
pivlayer[1] = pivlayer[0] ^ 1;
pivlayer[2] = 2;
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
bitmap.fill(0, cliprect); /* wrong color? */
@@ -591,12 +591,12 @@ UINT32 undrfire_state::screen_update_cbombers(screen_device &screen, bitmap_ind1
if ((tc0480scp_pri_reg_r(tc0480scp, space, 0) & 0x3) == 3) /* on road levels kludge sprites up 1 priority */
{
static const int primasks[4] = {0xfff0, 0xff00, 0x0, 0x0};
- draw_sprites_cbombers(screen.machine(), bitmap, cliprect, primasks, 80, -208);
+ draw_sprites_cbombers(machine(), bitmap, cliprect, primasks, 80, -208);
}
else
{
static const int primasks[4] = {0xfffc, 0xfff0, 0xff00, 0x0};
- draw_sprites_cbombers(screen.machine(), bitmap, cliprect, primasks, 80, -208);
+ draw_sprites_cbombers(machine(), bitmap, cliprect, primasks, 80, -208);
}
}
diff --git a/src/mame/video/unico.c b/src/mame/video/unico.c
index 9f1ec38c8f9..b4e548c293b 100644
--- a/src/mame/video/unico.c
+++ b/src/mame/video/unico.c
@@ -351,20 +351,20 @@ UINT32 unico_state::screen_update_unico(screen_device &screen, bitmap_ind16 &bit
m_tilemap[2]->set_scrolly(0, m_scroll[0x02]);
#ifdef MAME_DEBUG
-if ( screen.machine().input().code_pressed(KEYCODE_Z) || screen.machine().input().code_pressed(KEYCODE_X) )
+if ( machine().input().code_pressed(KEYCODE_Z) || machine().input().code_pressed(KEYCODE_X) )
{
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_A)) 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_A)) msk |= 8;
if (msk != 0) layers_ctrl &= msk;
}
#endif
/* The background color is the first of the last palette */
bitmap.fill(0x1f00, cliprect);
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
if (layers_ctrl & 1) m_tilemap[0]->draw(bitmap, cliprect, 0,1);
if (layers_ctrl & 2) m_tilemap[1]->draw(bitmap, cliprect, 0,2);
@@ -390,13 +390,13 @@ UINT32 unico_state::screen_update_zeropnt2(screen_device &screen, bitmap_ind16 &
m_tilemap[2]->set_scrolly(0, m_scroll32[1] >> 16);
#ifdef MAME_DEBUG
-if ( screen.machine().input().code_pressed(KEYCODE_Z) || screen.machine().input().code_pressed(KEYCODE_X) )
+if ( machine().input().code_pressed(KEYCODE_Z) || machine().input().code_pressed(KEYCODE_X) )
{
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_A)) 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_A)) msk |= 8;
if (msk != 0) layers_ctrl &= msk;
}
#endif
diff --git a/src/mame/video/vaportra.c b/src/mame/video/vaportra.c
index 21b58ac89ff..6ac633e40ac 100644
--- a/src/mame/video/vaportra.c
+++ b/src/mame/video/vaportra.c
@@ -52,7 +52,7 @@ WRITE16_MEMBER(vaportra_state::vaportra_palette_24bit_b_w)
UINT32 vaportra_state::screen_update_vaportra(screen_device &screen, bitmap_ind16 &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);
int pri = m_priority[0] & 0x03;
@@ -60,39 +60,39 @@ UINT32 vaportra_state::screen_update_vaportra(screen_device &screen, bitmap_ind1
deco16ic_pf_update(m_deco_tilegen1, 0, 0);
deco16ic_pf_update(m_deco_tilegen2, 0, 0);
- screen.machine().device<deco_mxc06_device>("spritegen")->set_pri_type(1); // force priorities to be handled in a different way for this driver for now
+ machine().device<deco_mxc06_device>("spritegen")->set_pri_type(1); // force priorities to be handled in a different way for this driver for now
/* Draw playfields */
if (pri == 0)
{
deco16ic_tilemap_2_draw(m_deco_tilegen2, bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0);
deco16ic_tilemap_1_draw(m_deco_tilegen2, bitmap, cliprect, 0, 0);
- screen.machine().device<deco_mxc06_device>("spritegen")->draw_sprites(screen.machine(), bitmap, cliprect, m_spriteram->buffer(), 0, m_priority[1], 0x0f);
+ machine().device<deco_mxc06_device>("spritegen")->draw_sprites(machine(), bitmap, cliprect, m_spriteram->buffer(), 0, m_priority[1], 0x0f);
deco16ic_tilemap_2_draw(m_deco_tilegen1, bitmap, cliprect, 0, 0);
}
else if (pri == 1)
{
deco16ic_tilemap_1_draw(m_deco_tilegen2, bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0);
deco16ic_tilemap_2_draw(m_deco_tilegen2, bitmap, cliprect, 0, 0);
- screen.machine().device<deco_mxc06_device>("spritegen")->draw_sprites(screen.machine(), bitmap, cliprect, m_spriteram->buffer(), 0, m_priority[1], 0x0f);
+ machine().device<deco_mxc06_device>("spritegen")->draw_sprites(machine(), bitmap, cliprect, m_spriteram->buffer(), 0, m_priority[1], 0x0f);
deco16ic_tilemap_2_draw(m_deco_tilegen1, bitmap, cliprect, 0, 0);
}
else if (pri == 2)
{
deco16ic_tilemap_2_draw(m_deco_tilegen2, bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0);
deco16ic_tilemap_2_draw(m_deco_tilegen1, bitmap, cliprect, 0, 0);
- screen.machine().device<deco_mxc06_device>("spritegen")->draw_sprites(screen.machine(), bitmap, cliprect, m_spriteram->buffer(), 0, m_priority[1], 0x0f);
+ machine().device<deco_mxc06_device>("spritegen")->draw_sprites(machine(), bitmap, cliprect, m_spriteram->buffer(), 0, m_priority[1], 0x0f);
deco16ic_tilemap_1_draw(m_deco_tilegen2, bitmap, cliprect, 0, 0);
}
else
{
deco16ic_tilemap_1_draw(m_deco_tilegen2, bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0);
deco16ic_tilemap_2_draw(m_deco_tilegen1, bitmap, cliprect, 0, 0);
- screen.machine().device<deco_mxc06_device>("spritegen")->draw_sprites(screen.machine(), bitmap, cliprect, m_spriteram->buffer(), 0, m_priority[1], 0x0f);
+ machine().device<deco_mxc06_device>("spritegen")->draw_sprites(machine(), bitmap, cliprect, m_spriteram->buffer(), 0, m_priority[1], 0x0f);
deco16ic_tilemap_2_draw(m_deco_tilegen2, bitmap, cliprect, 0, 0);
}
- screen.machine().device<deco_mxc06_device>("spritegen")->draw_sprites(screen.machine(), bitmap, cliprect, m_spriteram->buffer(), 1, m_priority[1], 0x0f);
+ machine().device<deco_mxc06_device>("spritegen")->draw_sprites(machine(), bitmap, cliprect, m_spriteram->buffer(), 1, m_priority[1], 0x0f);
deco16ic_tilemap_1_draw(m_deco_tilegen1, bitmap, cliprect, 0, 0);
return 0;
}
diff --git a/src/mame/video/vastar.c b/src/mame/video/vastar.c
index 3ade1f3c434..6a91cba135e 100644
--- a/src/mame/video/vastar.c
+++ b/src/mame/video/vastar.c
@@ -202,14 +202,14 @@ UINT32 vastar_state::screen_update_vastar(screen_device &screen, bitmap_ind16 &b
{
case 0:
m_bg1_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE,0);
- draw_sprites(screen.machine(), bitmap,cliprect);
+ draw_sprites(machine(), bitmap,cliprect);
m_bg2_tilemap->draw(bitmap, cliprect, 0,0);
m_fg_tilemap->draw(bitmap, cliprect, 0,0);
break;
case 2:
m_bg1_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE,0);
- draw_sprites(screen.machine(), bitmap,cliprect);
+ draw_sprites(machine(), bitmap,cliprect);
m_bg1_tilemap->draw(bitmap, cliprect, 0,0);
m_bg2_tilemap->draw(bitmap, cliprect, 0,0);
m_fg_tilemap->draw(bitmap, cliprect, 0,0);
@@ -219,7 +219,7 @@ UINT32 vastar_state::screen_update_vastar(screen_device &screen, bitmap_ind16 &b
m_bg1_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE,0);
m_bg2_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);
break;
default:
diff --git a/src/mame/video/vball.c b/src/mame/video/vball.c
index db6dcc3b9ba..8d70850e526 100644
--- a/src/mame/video/vball.c
+++ b/src/mame/video/vball.c
@@ -168,6 +168,6 @@ UINT32 vball_state::screen_update_vb(screen_device &screen, bitmap_ind16 &bitmap
//logerror("scrollx[%d] = %d\n",i,m_vb_scrollx[i]);
}
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/video/vectrex.c b/src/mame/video/vectrex.c
index aea4fc26316..1ff51a9224f 100644
--- a/src/mame/video/vectrex.c
+++ b/src/mame/video/vectrex.c
@@ -162,10 +162,10 @@ UINT32 vectrex_state::screen_update_vectrex(screen_device &screen, bitmap_rgb32
{
int i;
- vectrex_configuration(screen.machine());
+ vectrex_configuration(machine());
/* start black */
- vector_add_point(screen.machine(),
+ vector_add_point(machine(),
m_points[m_display_start].x,
m_points[m_display_start].y,
m_points[m_display_start].col,
@@ -173,7 +173,7 @@ UINT32 vectrex_state::screen_update_vectrex(screen_device &screen, bitmap_rgb32
for (i = m_display_start; i != m_display_end; i = (i + 1) % NVECT)
{
- vector_add_point(screen.machine(),
+ vector_add_point(machine(),
m_points[i].x,
m_points[i].y,
m_points[i].col,
diff --git a/src/mame/video/vendetta.c b/src/mame/video/vendetta.c
index 2aa8a4779a7..1fffb03fa7f 100644
--- a/src/mame/video/vendetta.c
+++ b/src/mame/video/vendetta.c
@@ -72,7 +72,7 @@ UINT32 vendetta_state::screen_update_vendetta(screen_device &screen, bitmap_ind1
konami_sortlayers3(layer, m_layerpri);
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
k052109_tilemap_draw(m_k052109, bitmap, cliprect, layer[0], TILEMAP_DRAW_OPAQUE, 1);
k052109_tilemap_draw(m_k052109, bitmap, cliprect, layer[1], 0, 2);
k052109_tilemap_draw(m_k052109, bitmap, cliprect, layer[2], 0, 4);
diff --git a/src/mame/video/vicdual.c b/src/mame/video/vicdual.c
index 627a2bfcc73..d03afc87f74 100644
--- a/src/mame/video/vicdual.c
+++ b/src/mame/video/vicdual.c
@@ -138,7 +138,7 @@ UINT32 vicdual_state::screen_update_vicdual_color(screen_device &screen, bitmap_
UINT32 vicdual_state::screen_update_vicdual_bw_or_color(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- if (vicdual_is_cabinet_color(screen.machine()))
+ if (vicdual_is_cabinet_color(machine()))
SCREEN_UPDATE32_CALL_MEMBER(vicdual_color);
else
SCREEN_UPDATE32_CALL_MEMBER(vicdual_bw);
diff --git a/src/mame/video/victory.c b/src/mame/video/victory.c
index 0ae20ee55c0..865ac9c8f65 100644
--- a/src/mame/video/victory.c
+++ b/src/mame/video/victory.c
@@ -1093,11 +1093,11 @@ UINT32 victory_state::screen_update_victory(screen_device &screen, bitmap_ind16
int x, y;
/* copy the palette from palette RAM */
- set_palette(screen.machine());
+ set_palette(machine());
/* update the foreground & background */
- update_foreground(screen.machine());
- update_background(screen.machine());
+ update_foreground(machine());
+ update_background(machine());
/* blend the bitmaps and do collision detection */
for (y = 0; y < 256; y++)
@@ -1114,7 +1114,7 @@ UINT32 victory_state::screen_update_victory(screen_device &screen, bitmap_ind16
int bpix = bg[(x + m_scrollx) & 255];
scanline[x] = bpix | (fpix << 3);
if (fpix && (bpix & bgcollmask) && count++ < 128)
- screen.machine().scheduler().timer_set(screen.time_until_pos(y, x), FUNC(bgcoll_irq_callback), x | (y << 8));
+ machine().scheduler().timer_set(screen.time_until_pos(y, x), FUNC(bgcoll_irq_callback), x | (y << 8));
}
}
diff --git a/src/mame/video/videopin.c b/src/mame/video/videopin.c
index 624b22b00f9..998166018b5 100644
--- a/src/mame/video/videopin.c
+++ b/src/mame/video/videopin.c
@@ -68,7 +68,7 @@ UINT32 videopin_state::screen_update_videopin(screen_device &screen, bitmap_ind1
{
for (j = 0; j < 2; j++)
{
- drawgfx_transpen(bitmap, rect, screen.machine().gfx[1],
+ drawgfx_transpen(bitmap, rect, machine().gfx[1],
0, 0,
0, 0,
x + 16 * i,
diff --git a/src/mame/video/vigilant.c b/src/mame/video/vigilant.c
index 141b69210d2..1e6cae3210c 100644
--- a/src/mame/video/vigilant.c
+++ b/src/mame/video/vigilant.c
@@ -274,14 +274,14 @@ UINT32 vigilant_state::screen_update_kikcubic(screen_device &screen, bitmap_ind1
int color = (attributes & 0xF0) >> 4;
int tile_number = videoram[offs] | ((attributes & 0x0F) << 8);
- drawgfx_opaque(bitmap,cliprect,screen.machine().gfx[0],
+ drawgfx_opaque(bitmap,cliprect,machine().gfx[0],
tile_number,
color,
0,0,
sx,sy);
}
- draw_sprites(screen.machine(),bitmap,cliprect);
+ draw_sprites(machine(),bitmap,cliprect);
return 0;
}
@@ -299,27 +299,27 @@ UINT32 vigilant_state::screen_update_vigilant(screen_device &screen, bitmap_ind1
g = (m_generic_paletteram_8[0x500 + 16 * m_rear_color + i] << 3) & 0xFF;
b = (m_generic_paletteram_8[0x600 + 16 * m_rear_color + i] << 3) & 0xFF;
- palette_set_color(screen.machine(),512 + i,MAKE_RGB(r,g,b));
+ palette_set_color(machine(),512 + i,MAKE_RGB(r,g,b));
r = (m_generic_paletteram_8[0x400 + 16 * m_rear_color + 32 + i] << 3) & 0xFF;
g = (m_generic_paletteram_8[0x500 + 16 * m_rear_color + 32 + i] << 3) & 0xFF;
b = (m_generic_paletteram_8[0x600 + 16 * m_rear_color + 32 + i] << 3) & 0xFF;
- palette_set_color(screen.machine(),512 + 16 + i,MAKE_RGB(r,g,b));
+ palette_set_color(machine(),512 + 16 + i,MAKE_RGB(r,g,b));
}
if (m_rear_disable) /* opaque foreground */
{
- draw_foreground(screen.machine(),bitmap,cliprect,0,1);
- draw_sprites(screen.machine(),bitmap,bottomvisiblearea);
- draw_foreground(screen.machine(),bitmap,cliprect,1,0);
+ draw_foreground(machine(),bitmap,cliprect,0,1);
+ draw_sprites(machine(),bitmap,bottomvisiblearea);
+ draw_foreground(machine(),bitmap,cliprect,1,0);
}
else
{
- draw_background(screen.machine(),bitmap,cliprect);
- draw_foreground(screen.machine(),bitmap,cliprect,0,0);
- draw_sprites(screen.machine(),bitmap,bottomvisiblearea);
- draw_foreground(screen.machine(),bitmap,cliprect,1,0); // priority tiles
+ draw_background(machine(),bitmap,cliprect);
+ draw_foreground(machine(),bitmap,cliprect,0,0);
+ draw_sprites(machine(),bitmap,bottomvisiblearea);
+ draw_foreground(machine(),bitmap,cliprect,1,0); // priority tiles
}
return 0;
}
diff --git a/src/mame/video/volfied.c b/src/mame/video/volfied.c
index b7851e5e261..c9e28678e07 100644
--- a/src/mame/video/volfied.c
+++ b/src/mame/video/volfied.c
@@ -125,8 +125,8 @@ static void refresh_pixel_layer( running_machine &machine, bitmap_ind16 &bitmap
UINT32 volfied_state::screen_update_volfied(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- screen.machine().priority_bitmap.fill(0, cliprect);
- refresh_pixel_layer(screen.machine(), bitmap);
+ machine().priority_bitmap.fill(0, cliprect);
+ refresh_pixel_layer(machine(), bitmap);
pc090oj_draw_sprites(m_pc090oj, bitmap, cliprect, 0);
return 0;
}
diff --git a/src/mame/video/vulgus.c b/src/mame/video/vulgus.c
index 493ebd273f1..fed1a949445 100644
--- a/src/mame/video/vulgus.c
+++ b/src/mame/video/vulgus.c
@@ -218,7 +218,7 @@ UINT32 vulgus_state::screen_update_vulgus(screen_device &screen, bitmap_ind16 &b
m_bg_tilemap->set_scrolly(0, m_scroll_low[0] + 256 * m_scroll_high[0]);
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/video/warpwarp.c b/src/mame/video/warpwarp.c
index fc9846e9c52..f75b8afc1db 100644
--- a/src/mame/video/warpwarp.c
+++ b/src/mame/video/warpwarp.c
@@ -239,6 +239,6 @@ UINT32 warpwarp_state::screen_update_geebee(screen_device &screen, bitmap_ind16
{
m_bg_tilemap->draw(bitmap, cliprect, 0,0);
- draw_ball(screen.machine(), bitmap, cliprect, m_ball_pen);
+ draw_ball(machine(), bitmap, cliprect, m_ball_pen);
return 0;
}
diff --git a/src/mame/video/warriorb.c b/src/mame/video/warriorb.c
index a8d0f28ac75..bfb59f88c18 100644
--- a/src/mame/video/warriorb.c
+++ b/src/mame/video/warriorb.c
@@ -115,5 +115,5 @@ static UINT32 update_screen(screen_device &screen, bitmap_ind16 &bitmap, const r
return 0;
}
-UINT32 warriorb_state::screen_update_warriorb_left(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect){ return update_screen(screen, bitmap, cliprect, 40 * 8 * 0, screen.machine().driver_data<warriorb_state>()->m_tc0100scn_1); }
-UINT32 warriorb_state::screen_update_warriorb_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect){ return update_screen(screen, bitmap, cliprect, 40 * 8 * 1, screen.machine().driver_data<warriorb_state>()->m_tc0100scn_2); }
+UINT32 warriorb_state::screen_update_warriorb_left(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect){ return update_screen(screen, bitmap, cliprect, 40 * 8 * 0, machine().driver_data<warriorb_state>()->m_tc0100scn_1); }
+UINT32 warriorb_state::screen_update_warriorb_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect){ return update_screen(screen, bitmap, cliprect, 40 * 8 * 1, machine().driver_data<warriorb_state>()->m_tc0100scn_2); }
diff --git a/src/mame/video/wc90.c b/src/mame/video/wc90.c
index fd5485376c9..a37768b6ee7 100644
--- a/src/mame/video/wc90.c
+++ b/src/mame/video/wc90.c
@@ -344,12 +344,12 @@ UINT32 wc90_state::screen_update_wc90(screen_device &screen, bitmap_ind16 &bitma
m_tx_tilemap->set_scrollx(0,m_scroll0xlo[0] + 256 * m_scroll0xhi[0]);
m_tx_tilemap->set_scrolly(0,m_scroll0ylo[0] + 256 * m_scroll0yhi[0]);
-// draw_sprites(screen.machine(), bitmap,cliprect, 3 );
+// draw_sprites(machine(), bitmap,cliprect, 3 );
m_bg_tilemap->draw(bitmap, cliprect, 0,0);
- draw_sprites(screen.machine(), bitmap,cliprect, 2 );
+ draw_sprites(machine(), bitmap,cliprect, 2 );
m_fg_tilemap->draw(bitmap, cliprect, 0,0);
- draw_sprites(screen.machine(), bitmap,cliprect, 1 );
+ draw_sprites(machine(), bitmap,cliprect, 1 );
m_tx_tilemap->draw(bitmap, cliprect, 0,0);
- draw_sprites(screen.machine(), bitmap,cliprect, 0 );
+ draw_sprites(machine(), bitmap,cliprect, 0 );
return 0;
}
diff --git a/src/mame/video/wc90b.c b/src/mame/video/wc90b.c
index 9456ea6d7a8..0ee7a2ec964 100644
--- a/src/mame/video/wc90b.c
+++ b/src/mame/video/wc90b.c
@@ -134,8 +134,8 @@ UINT32 wc90b_state::screen_update_wc90b(screen_device &screen, bitmap_ind16 &bit
m_bg_tilemap->draw(bitmap, cliprect, 0,0);
m_fg_tilemap->draw(bitmap, cliprect, 0,0);
- draw_sprites(screen.machine(), bitmap,cliprect, 1 );
+ draw_sprites(machine(), bitmap,cliprect, 1 );
m_tx_tilemap->draw(bitmap, cliprect, 0,0);
- draw_sprites(screen.machine(), bitmap,cliprect, 0 );
+ draw_sprites(machine(), bitmap,cliprect, 0 );
return 0;
}
diff --git a/src/mame/video/wecleman.c b/src/mame/video/wecleman.c
index 745277cd8d0..6218781559b 100644
--- a/src/mame/video/wecleman.c
+++ b/src/mame/video/wecleman.c
@@ -1022,11 +1022,11 @@ UINT32 wecleman_state::screen_update_wecleman(screen_device &screen, bitmap_rgb3
int cloud_sx, cloud_sy;
int i, j, k;
- mrct = screen.machine().pens;
+ mrct = machine().pens;
video_on = m_irqctrl & 0x40;
- set_led_status(screen.machine(), 0, m_selected_ip & 0x04); // Start lamp
+ set_led_status(machine(), 0, m_selected_ip & 0x04); // Start lamp
fg_y = (m_txtram[0x0f24>>1] & (TILEMAP_DIMY - 1));
bg_y = (m_txtram[0x0f26>>1] & (TILEMAP_DIMY - 1));
@@ -1054,12 +1054,12 @@ UINT32 wecleman_state::screen_update_wecleman(screen_device &screen, bitmap_rgb3
/* palette hacks! */
((pen_t *)mrct)[0x27] = mrct[0x24];
- get_sprite_info(screen.machine());
+ get_sprite_info(machine());
bitmap.fill(m_black_pen, cliprect);
/* Draw the road (lines which have priority 0x02) */
- if (video_on) wecleman_draw_road(screen.machine(), bitmap, cliprect, 0x02);
+ if (video_on) wecleman_draw_road(machine(), bitmap, cliprect, 0x02);
/* Draw the background */
if (video_on) m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
@@ -1073,7 +1073,7 @@ UINT32 wecleman_state::screen_update_wecleman(screen_device &screen, bitmap_rgb3
if (video_on)
draw_cloud(
bitmap,
- screen.machine().gfx[0],
+ machine().gfx[0],
m_pageram+0x1800,
BMP_PAD, BMP_PAD,
41, 20,
@@ -1093,10 +1093,10 @@ UINT32 wecleman_state::screen_update_wecleman(screen_device &screen, bitmap_rgb3
if (video_on) m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
/* Draw the road (lines which have priority 0x04) */
- if (video_on) wecleman_draw_road(screen.machine(), bitmap,cliprect, 0x04);
+ if (video_on) wecleman_draw_road(machine(), bitmap,cliprect, 0x04);
/* Draw the sprites */
- if (video_on) sprite_draw(screen.machine(), bitmap,cliprect);
+ if (video_on) sprite_draw(machine(), bitmap,cliprect);
/* Draw the text layer */
if (video_on) m_txt_tilemap->draw(bitmap, cliprect, 0, 0);
@@ -1109,15 +1109,15 @@ UINT32 wecleman_state::screen_update_wecleman(screen_device &screen, bitmap_rgb3
UINT32 wecleman_state::screen_update_hotchase(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- device_t *k051316_1 = screen.machine().device("k051316_1");
- device_t *k051316_2 = screen.machine().device("k051316_2");
+ device_t *k051316_1 = machine().device("k051316_1");
+ device_t *k051316_2 = machine().device("k051316_2");
int video_on;
video_on = m_irqctrl & 0x40;
- set_led_status(screen.machine(), 0, m_selected_ip & 0x04); // Start lamp
+ set_led_status(machine(), 0, m_selected_ip & 0x04); // Start lamp
- get_sprite_info(screen.machine());
+ get_sprite_info(machine());
bitmap.fill(m_black_pen, cliprect);
@@ -1127,11 +1127,11 @@ UINT32 wecleman_state::screen_update_hotchase(screen_device &screen, bitmap_ind1
/* Draw the road */
if (video_on)
- hotchase_draw_road(screen.machine(), bitmap, cliprect);
+ hotchase_draw_road(machine(), bitmap, cliprect);
/* Draw the sprites */
if (video_on)
- sprite_draw(screen.machine(), bitmap,cliprect);
+ sprite_draw(machine(), bitmap,cliprect);
/* Draw the foreground (text) */
if (video_on)
diff --git a/src/mame/video/welltris.c b/src/mame/video/welltris.c
index 548da8c5120..f903fd2ee28 100644
--- a/src/mame/video/welltris.c
+++ b/src/mame/video/welltris.c
@@ -238,8 +238,8 @@ UINT32 welltris_state::screen_update_welltris(screen_device &screen, bitmap_ind1
m_char_tilemap->set_scrollx(0, m_scrollx);
m_char_tilemap->set_scrolly(0, m_scrolly);
- draw_background(screen.machine(), bitmap, cliprect);
+ draw_background(machine(), bitmap, cliprect);
m_char_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/video/wgp.c b/src/mame/video/wgp.c
index 57019d7d448..64e35e82a29 100644
--- a/src/mame/video/wgp.c
+++ b/src/mame/video/wgp.c
@@ -645,25 +645,25 @@ UINT32 wgp_state::screen_update_wgp(screen_device &screen, bitmap_ind16 &bitmap,
UINT8 layer[3];
#ifdef MAME_DEBUG
- if (screen.machine().input().code_pressed_once (KEYCODE_V))
+ if (machine().input().code_pressed_once (KEYCODE_V))
{
m_dislayer[0] ^= 1;
popmessage("piv0: %01x",m_dislayer[0]);
}
- if (screen.machine().input().code_pressed_once (KEYCODE_B))
+ if (machine().input().code_pressed_once (KEYCODE_B))
{
m_dislayer[1] ^= 1;
popmessage("piv1: %01x",m_dislayer[1]);
}
- if (screen.machine().input().code_pressed_once (KEYCODE_N))
+ if (machine().input().code_pressed_once (KEYCODE_N))
{
m_dislayer[2] ^= 1;
popmessage("piv2: %01x",m_dislayer[2]);
}
- if (screen.machine().input().code_pressed_once (KEYCODE_M))
+ if (machine().input().code_pressed_once (KEYCODE_M))
{
m_dislayer[3] ^= 1;
popmessage("TC0100SCN top bg layer: %01x",m_dislayer[3]);
@@ -695,19 +695,19 @@ UINT32 wgp_state::screen_update_wgp(screen_device &screen, bitmap_ind16 &bitmap,
#ifdef MAME_DEBUG
if (m_dislayer[layer[0]] == 0)
#endif
- wgp_piv_layer_draw(screen.machine(), bitmap, cliprect, layer[0], TILEMAP_DRAW_OPAQUE, 1);
+ wgp_piv_layer_draw(machine(), bitmap, cliprect, layer[0], TILEMAP_DRAW_OPAQUE, 1);
#ifdef MAME_DEBUG
if (m_dislayer[layer[1]] == 0)
#endif
- wgp_piv_layer_draw(screen.machine(), bitmap, cliprect, layer[1], 0, 2);
+ wgp_piv_layer_draw(machine(), bitmap, cliprect, layer[1], 0, 2);
#ifdef MAME_DEBUG
if (m_dislayer[layer[2]] == 0)
#endif
- wgp_piv_layer_draw(screen.machine(), bitmap, cliprect, layer[2], 0, 4);
+ wgp_piv_layer_draw(machine(), bitmap, cliprect, layer[2], 0, 4);
- draw_sprites(screen.machine(), bitmap, cliprect, 16);
+ draw_sprites(machine(), bitmap, cliprect, 16);
/* ... then here we should apply rotation from wgp_sate_ctrl[] to the bitmap before we draw the TC0100SCN layers on it */
layer[0] = tc0100scn_bottomlayer(m_tc0100scn);
diff --git a/src/mame/video/williams.c b/src/mame/video/williams.c
index a782de07f8f..e1c6fed64c6 100644
--- a/src/mame/video/williams.c
+++ b/src/mame/video/williams.c
@@ -247,7 +247,7 @@ UINT32 williams_state::screen_update_williams2(screen_device &screen, bitmap_rgb
/* fetch the relevant pens */
for (x = 1; x < 16; x++)
- pens[x] = palette_get_color(screen.machine(), m_williams2_fg_color * 16 + x);
+ pens[x] = palette_get_color(machine(), m_williams2_fg_color * 16 + x);
/* loop over rows */
for (y = cliprect.min_y; y <= cliprect.max_y; y++)
diff --git a/src/mame/video/wiping.c b/src/mame/video/wiping.c
index c5d83d26998..48be9687bc2 100644
--- a/src/mame/video/wiping.c
+++ b/src/mame/video/wiping.c
@@ -120,7 +120,7 @@ UINT32 wiping_state::screen_update_wiping(screen_device &screen, bitmap_ind16 &b
sy = 27 - sy;
}
- drawgfx_opaque(bitmap,cliprect,screen.machine().gfx[0],
+ drawgfx_opaque(bitmap,cliprect,machine().gfx[0],
m_videoram[offs],
m_colorram[offs] & 0x3f,
m_flipscreen,m_flipscreen,
@@ -148,12 +148,12 @@ UINT32 wiping_state::screen_update_wiping(screen_device &screen, bitmap_ind16 &b
flipy = !flipy;
}
- drawgfx_transmask(bitmap,cliprect,screen.machine().gfx[1],
+ drawgfx_transmask(bitmap,cliprect,machine().gfx[1],
(spriteram[offs] & 0x3f) + 64 * otherbank,
color,
flipx,flipy,
sx,sy,
- colortable_get_transpen_mask(screen.machine().colortable, screen.machine().gfx[1], color, 0x1f));
+ colortable_get_transpen_mask(machine().colortable, machine().gfx[1], color, 0x1f));
}
/* redraw high priority chars */
@@ -188,7 +188,7 @@ UINT32 wiping_state::screen_update_wiping(screen_device &screen, bitmap_ind16 &b
sy = 27 - sy;
}
- drawgfx_opaque(bitmap,cliprect,screen.machine().gfx[0],
+ drawgfx_opaque(bitmap,cliprect,machine().gfx[0],
m_videoram[offs],
m_colorram[offs] & 0x3f,
m_flipscreen,m_flipscreen,
diff --git a/src/mame/video/wiz.c b/src/mame/video/wiz.c
index edd82a1473e..7ecca699980 100644
--- a/src/mame/video/wiz.c
+++ b/src/mame/video/wiz.c
@@ -204,10 +204,10 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap,
UINT32 wiz_state::screen_update_kungfut(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
bitmap.fill(m_bgpen, cliprect);
- draw_background(screen.machine(), bitmap, cliprect, 2 + m_char_bank[0] , 0);
- draw_foreground(screen.machine(), bitmap, cliprect, 0);
- draw_sprites(screen.machine(), bitmap, cliprect, m_spriteram2, 4);
- draw_sprites(screen.machine(), bitmap, cliprect, m_spriteram , 5);
+ draw_background(machine(), bitmap, cliprect, 2 + m_char_bank[0] , 0);
+ draw_foreground(machine(), bitmap, cliprect, 0);
+ draw_sprites(machine(), bitmap, cliprect, m_spriteram2, 4);
+ draw_sprites(machine(), bitmap, cliprect, m_spriteram , 5);
return 0;
}
@@ -216,8 +216,8 @@ UINT32 wiz_state::screen_update_wiz(screen_device &screen, bitmap_ind16 &bitmap,
int bank;
bitmap.fill(m_bgpen, cliprect);
- draw_background(screen.machine(), bitmap, cliprect, 2 + ((m_char_bank[0] << 1) | m_char_bank[1]), 0);
- draw_foreground(screen.machine(), bitmap, cliprect, 0);
+ draw_background(machine(), bitmap, cliprect, 2 + ((m_char_bank[0] << 1) | m_char_bank[1]), 0);
+ draw_foreground(machine(), bitmap, cliprect, 0);
const rectangle spritevisiblearea(2*8, 32*8-1, 2*8, 30*8-1);
const rectangle spritevisibleareaflipx(0*8, 30*8-1, 2*8, 30*8-1);
@@ -225,8 +225,8 @@ UINT32 wiz_state::screen_update_wiz(screen_device &screen, bitmap_ind16 &bitmap,
bank = 7 + *m_sprite_bank;
- draw_sprites(screen.machine(), bitmap, visible_area, m_spriteram2, 6);
- draw_sprites(screen.machine(), bitmap, visible_area, m_spriteram , bank);
+ draw_sprites(machine(), bitmap, visible_area, m_spriteram2, 6);
+ draw_sprites(machine(), bitmap, visible_area, m_spriteram , bank);
return 0;
}
@@ -234,9 +234,9 @@ UINT32 wiz_state::screen_update_wiz(screen_device &screen, bitmap_ind16 &bitmap,
UINT32 wiz_state::screen_update_stinger(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
bitmap.fill(m_bgpen, cliprect);
- draw_background(screen.machine(), bitmap, cliprect, 2 + m_char_bank[0], 1);
- draw_foreground(screen.machine(), bitmap, cliprect, 1);
- draw_sprites(screen.machine(), bitmap, cliprect, m_spriteram2, 4);
- draw_sprites(screen.machine(), bitmap, cliprect, m_spriteram , 5);
+ draw_background(machine(), bitmap, cliprect, 2 + m_char_bank[0], 1);
+ draw_foreground(machine(), bitmap, cliprect, 1);
+ draw_sprites(machine(), bitmap, cliprect, m_spriteram2, 4);
+ draw_sprites(machine(), bitmap, cliprect, m_spriteram , 5);
return 0;
}
diff --git a/src/mame/video/wolfpack.c b/src/mame/video/wolfpack.c
index 7784d99e956..32474f9f189 100644
--- a/src/mame/video/wolfpack.c
+++ b/src/mame/video/wolfpack.c
@@ -248,8 +248,8 @@ UINT32 wolfpack_state::screen_update_wolfpack(screen_device &screen, bitmap_ind1
if (m_ship_size & 0x40) color += 0x3a;
if (m_ship_size & 0x80) color += 0x48;
- colortable_palette_set_color(screen.machine().colortable, 3, MAKE_RGB(color,color,color));
- colortable_palette_set_color(screen.machine().colortable, 7, MAKE_RGB(color < 0xb8 ? color + 0x48 : 0xff,
+ colortable_palette_set_color(machine().colortable, 3, MAKE_RGB(color,color,color));
+ colortable_palette_set_color(machine().colortable, 7, MAKE_RGB(color < 0xb8 ? color + 0x48 : 0xff,
color < 0xb8 ? color + 0x48 : 0xff,
color < 0xb8 ? color + 0x48 : 0xff));
@@ -261,7 +261,7 @@ UINT32 wolfpack_state::screen_update_wolfpack(screen_device &screen, bitmap_ind1
int code = m_alpha_num_ram[32 * i + j];
drawgfx_opaque(bitmap, cliprect,
- screen.machine().gfx[0],
+ machine().gfx[0],
code,
m_video_invert,
0, 0,
@@ -269,10 +269,10 @@ UINT32 wolfpack_state::screen_update_wolfpack(screen_device &screen, bitmap_ind1
192 + 8 * i);
}
- draw_pt(screen.machine(), bitmap, cliprect);
- draw_ship(screen.machine(), bitmap, cliprect);
- draw_torpedo(screen.machine(), bitmap, cliprect);
- draw_water(screen.machine().colortable, bitmap, cliprect);
+ draw_pt(machine(), bitmap, cliprect);
+ draw_ship(machine(), bitmap, cliprect);
+ draw_torpedo(machine(), bitmap, cliprect);
+ draw_water(machine().colortable, bitmap, cliprect);
return 0;
}
@@ -288,7 +288,7 @@ void wolfpack_state::screen_eof_wolfpack(screen_device &screen, bool state)
m_helper.fill(0);
- draw_ship(screen.machine(), m_helper, m_helper.cliprect());
+ draw_ship(machine(), m_helper, m_helper.cliprect());
for (y = 128; y < 224 - m_torpedo_v; y++)
{
diff --git a/src/mame/video/wrally.c b/src/mame/video/wrally.c
index e6ed72a0dfb..8600b897a64 100644
--- a/src/mame/video/wrally.c
+++ b/src/mame/video/wrally.c
@@ -196,11 +196,11 @@ UINT32 wrally_state::screen_update_wrally(screen_device &screen, bitmap_ind16 &b
m_pant[1]->draw(bitmap, cliprect, TILEMAP_DRAW_CATEGORY(1),0);
m_pant[0]->draw(bitmap, cliprect, TILEMAP_DRAW_CATEGORY(1) | TILEMAP_DRAW_LAYER0,0);
- draw_sprites(screen.machine(),bitmap,cliprect,0);
+ draw_sprites(machine(),bitmap,cliprect,0);
m_pant[0]->draw(bitmap, cliprect, TILEMAP_DRAW_CATEGORY(1) | TILEMAP_DRAW_LAYER1,0);
- draw_sprites(screen.machine(),bitmap,cliprect,1);
+ draw_sprites(machine(),bitmap,cliprect,1);
return 0;
}
diff --git a/src/mame/video/wwfsstar.c b/src/mame/video/wwfsstar.c
index 5cc90721934..89ef7cb8417 100644
--- a/src/mame/video/wwfsstar.c
+++ b/src/mame/video/wwfsstar.c
@@ -222,7 +222,7 @@ UINT32 wwfsstar_state::screen_update_wwfsstar(screen_device &screen, bitmap_ind1
m_bg0_tilemap->set_scrollx(0, m_scrollx );
m_bg0_tilemap->draw(bitmap, cliprect, 0,0);
- draw_sprites(screen.machine(), bitmap,cliprect );
+ draw_sprites(machine(), bitmap,cliprect );
m_fg0_tilemap->draw(bitmap, cliprect, 0,0);
return 0;
diff --git a/src/mame/video/wwfwfest.c b/src/mame/video/wwfwfest.c
index 2d95b09836b..f94647e3a4f 100644
--- a/src/mame/video/wwfwfest.c
+++ b/src/mame/video/wwfwfest.c
@@ -266,13 +266,13 @@ UINT32 wwfwfest_state::screen_update_wwfwfest(screen_device &screen, bitmap_ind1
if (m_pri == 0x007b) {
m_bg0_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE,0);
m_bg1_tilemap->draw(bitmap, cliprect, 0,0);
- draw_sprites(screen.machine(), bitmap,cliprect);
+ draw_sprites(machine(), bitmap,cliprect);
m_fg0_tilemap->draw(bitmap, cliprect, 0,0);
}
if (m_pri == 0x007c) {
m_bg0_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE,0);
- draw_sprites(screen.machine(), bitmap,cliprect);
+ draw_sprites(machine(), bitmap,cliprect);
m_bg1_tilemap->draw(bitmap, cliprect, 0,0);
m_fg0_tilemap->draw(bitmap, cliprect, 0,0);
}
@@ -280,7 +280,7 @@ UINT32 wwfwfest_state::screen_update_wwfwfest(screen_device &screen, bitmap_ind1
if (m_pri == 0x0078) {
m_bg1_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE,0);
m_bg0_tilemap->draw(bitmap, cliprect, 0,0);
- draw_sprites(screen.machine(), bitmap,cliprect);
+ draw_sprites(machine(), bitmap,cliprect);
m_fg0_tilemap->draw(bitmap, cliprect, 0,0);
}
return 0;
diff --git a/src/mame/video/xain.c b/src/mame/video/xain.c
index 1f4c2ffc942..b8b783cc6e8 100644
--- a/src/mame/video/xain.c
+++ b/src/mame/video/xain.c
@@ -219,48 +219,48 @@ UINT32 xain_state::screen_update_xain(screen_device &screen, bitmap_ind16 &bitma
case 0:
m_bgram0_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE,0);
m_bgram1_tilemap->draw(bitmap, cliprect, 0,0);
- draw_sprites(screen.machine(), bitmap,cliprect);
+ draw_sprites(machine(), bitmap,cliprect);
m_char_tilemap->draw(bitmap, cliprect, 0,0);
break;
case 1:
m_bgram1_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE,0);
m_bgram0_tilemap->draw(bitmap, cliprect, 0,0);
- draw_sprites(screen.machine(), bitmap,cliprect);
+ draw_sprites(machine(), bitmap,cliprect);
m_char_tilemap->draw(bitmap, cliprect, 0,0);
break;
case 2:
m_char_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE,0);
m_bgram0_tilemap->draw(bitmap, cliprect, 0,0);
- draw_sprites(screen.machine(), bitmap,cliprect);
+ draw_sprites(machine(), bitmap,cliprect);
m_bgram1_tilemap->draw(bitmap, cliprect, 0,0);
break;
case 3:
m_char_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE,0);
m_bgram1_tilemap->draw(bitmap, cliprect, 0,0);
- draw_sprites(screen.machine(), bitmap,cliprect);
+ draw_sprites(machine(), bitmap,cliprect);
m_bgram0_tilemap->draw(bitmap, cliprect, 0,0);
break;
case 4:
m_bgram0_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE,0);
m_char_tilemap->draw(bitmap, cliprect, 0,0);
- draw_sprites(screen.machine(), bitmap,cliprect);
+ draw_sprites(machine(), bitmap,cliprect);
m_bgram1_tilemap->draw(bitmap, cliprect, 0,0);
break;
case 5:
m_bgram1_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE,0);
m_char_tilemap->draw(bitmap, cliprect, 0,0);
- draw_sprites(screen.machine(), bitmap,cliprect);
+ draw_sprites(machine(), bitmap,cliprect);
m_bgram0_tilemap->draw(bitmap, cliprect, 0,0);
break;
case 6:
m_bgram0_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE,0);
- draw_sprites(screen.machine(), bitmap,cliprect);
+ draw_sprites(machine(), bitmap,cliprect);
m_bgram1_tilemap->draw(bitmap, cliprect, 0,0);
m_char_tilemap->draw(bitmap, cliprect, 0,0);
break;
case 7:
m_bgram1_tilemap->draw(bitmap, cliprect, TILEMAP_DRAW_OPAQUE,0);
- draw_sprites(screen.machine(), bitmap,cliprect);
+ draw_sprites(machine(), bitmap,cliprect);
m_bgram0_tilemap->draw(bitmap, cliprect, 0,0);
m_char_tilemap->draw(bitmap, cliprect, 0,0);
break;
diff --git a/src/mame/video/xevious.c b/src/mame/video/xevious.c
index 197178c33fc..6e51ec9c4a3 100644
--- a/src/mame/video/xevious.c
+++ b/src/mame/video/xevious.c
@@ -499,7 +499,7 @@ UINT32 xevious_state::screen_update_xevious(screen_device &screen, bitmap_ind16
{
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/video/xexex.c b/src/mame/video/xexex.c
index 17bef519986..3fdc92745d2 100644
--- a/src/mame/video/xexex.c
+++ b/src/mame/video/xexex.c
@@ -79,7 +79,7 @@ UINT32 xexex_state::screen_update_xexex(screen_device &screen, bitmap_rgb32 &bit
k054338_update_all_shadows(m_k054338, 0);
k054338_fill_backcolor(m_k054338, bitmap, 0);
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
for (plane = 0; plane < 4; plane++)
{
diff --git a/src/mame/video/xmen.c b/src/mame/video/xmen.c
index c071ce5a7a9..868d2e8b8ac 100644
--- a/src/mame/video/xmen.c
+++ b/src/mame/video/xmen.c
@@ -91,7 +91,7 @@ UINT32 xmen_state::screen_update_xmen(screen_device &screen, bitmap_ind16 &bitma
konami_sortlayers3(layer, m_layerpri);
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
/* note the '+1' in the background color!!! */
bitmap.fill(16 * bg_colorbase + 1, cliprect);
k052109_tilemap_draw(m_k052109, bitmap, cliprect, layer[0], 0, 1);
@@ -148,14 +148,14 @@ void xmen_state::screen_eof_xmen6p(screen_device &screen, bool state)
rectangle cliprect;
int offset;
- // const rectangle *visarea = screen.machine().primary_screen->visible_area();
+ // const rectangle *visarea = machine().primary_screen->visible_area();
// cliprect = *visarea;
cliprect.set(0, 64 * 8 - 1, 2 * 8, 30 * 8 - 1);
- address_space &space = screen.machine().driver_data()->generic_space();
- if (screen.machine().primary_screen->frame_number() & 0x01)
+ address_space &space = machine().driver_data()->generic_space();
+ if (machine().primary_screen->frame_number() & 0x01)
{
/* copy the desired spritelist to the chip */
@@ -212,7 +212,7 @@ void xmen_state::screen_eof_xmen6p(screen_device &screen, bool state)
konami_sortlayers3(layer, m_layerpri);
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
/* note the '+1' in the background color!!! */
renderbitmap->fill(16 * bg_colorbase + 1, cliprect);
k052109_tilemap_draw(m_k052109, *renderbitmap, cliprect, layer[0], 0, 1);
diff --git a/src/mame/video/xorworld.c b/src/mame/video/xorworld.c
index d28596db00e..c0371488450 100644
--- a/src/mame/video/xorworld.c
+++ b/src/mame/video/xorworld.c
@@ -114,6 +114,6 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
UINT32 xorworld_state::screen_update_xorworld(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/video/xxmissio.c b/src/mame/video/xxmissio.c
index ac470deaa58..f66bbd49682 100644
--- a/src/mame/video/xxmissio.c
+++ b/src/mame/video/xxmissio.c
@@ -132,14 +132,14 @@ static void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, gfx_el
UINT32 xxmissio_state::screen_update_xxmissio(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- screen.machine().tilemap().mark_all_dirty();
- screen.machine().tilemap().set_flip_all(m_flipscreen ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0);
+ machine().tilemap().mark_all_dirty();
+ machine().tilemap().set_flip_all(m_flipscreen ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0);
m_bg_tilemap->set_scrollx(0, m_xscroll * 2);
m_bg_tilemap->set_scrolly(0, m_yscroll);
m_bg_tilemap->draw(bitmap, cliprect, 0, 0);
- draw_sprites(bitmap, cliprect, screen.machine().gfx[1]);
+ draw_sprites(bitmap, cliprect, machine().gfx[1]);
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
diff --git a/src/mame/video/yiear.c b/src/mame/video/yiear.c
index 6b06e6a4c91..2272aeaa047 100644
--- a/src/mame/video/yiear.c
+++ b/src/mame/video/yiear.c
@@ -142,6 +142,6 @@ UINT32 yiear_state::screen_update_yiear(screen_device &screen, bitmap_ind16 &bit
{
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/video/yunsun16.c b/src/mame/video/yunsun16.c
index 497bce486b2..77960bcbf9d 100644
--- a/src/mame/video/yunsun16.c
+++ b/src/mame/video/yunsun16.c
@@ -206,7 +206,7 @@ UINT32 yunsun16_state::screen_update_yunsun16(screen_device &screen, bitmap_ind1
//popmessage("%04X", *m_priorityram);
- screen.machine().priority_bitmap.fill(0, cliprect);
+ machine().priority_bitmap.fill(0, cliprect);
if ((*m_priorityram & 0x0c) == 4)
{
@@ -223,6 +223,6 @@ UINT32 yunsun16_state::screen_update_yunsun16(screen_device &screen, bitmap_ind1
m_tilemap_0->draw(bitmap, cliprect, 0, 2);
}
- draw_sprites(screen.machine(), bitmap, cliprect);
+ draw_sprites(machine(), bitmap, cliprect);
return 0;
}
diff --git a/src/mame/video/yunsung8.c b/src/mame/video/yunsung8.c
index 4670190c9e4..44f3f2f919a 100644
--- a/src/mame/video/yunsung8.c
+++ b/src/mame/video/yunsung8.c
@@ -193,11 +193,11 @@ UINT32 yunsung8_state::screen_update_yunsung8(screen_device &screen, bitmap_ind1
int layers_ctrl = (~m_layers_ctrl) >> 4;
#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
diff --git a/src/mame/video/zac2650.c b/src/mame/video/zac2650.c
index 907903e41e8..e65d2994027 100644
--- a/src/mame/video/zac2650.c
+++ b/src/mame/video/zac2650.c
@@ -204,6 +204,6 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
UINT32 zac2650_state::screen_update_tinvader(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/video/zaccaria.c b/src/mame/video/zaccaria.c
index 453566bc7da..49c525dd0e9 100644
--- a/src/mame/video/zaccaria.c
+++ b/src/mame/video/zaccaria.c
@@ -247,9 +247,9 @@ UINT32 zaccaria_state::screen_update_zaccaria(screen_device &screen, bitmap_ind1
// 3 layers of sprites, each with their own palette and priorities
// Not perfect yet, does spriteram(1) layer have a priority bit somewhere?
- draw_sprites(screen.machine(),bitmap,cliprect,m_spriteram2,2,1);
- draw_sprites(screen.machine(),bitmap,cliprect,m_spriteram,1,0);
- draw_sprites(screen.machine(),bitmap,cliprect,m_spriteram2+0x20,0,1);
+ draw_sprites(machine(),bitmap,cliprect,m_spriteram2,2,1);
+ draw_sprites(machine(),bitmap,cliprect,m_spriteram,1,0);
+ draw_sprites(machine(),bitmap,cliprect,m_spriteram2+0x20,0,1);
return 0;
}
diff --git a/src/mame/video/zaxxon.c b/src/mame/video/zaxxon.c
index e34a38c3711..431b31e5a90 100644
--- a/src/mame/video/zaxxon.c
+++ b/src/mame/video/zaxxon.c
@@ -463,8 +463,8 @@ static void draw_sprites(running_machine &machine, bitmap_ind16 &bitmap, const r
UINT32 zaxxon_state::screen_update_zaxxon(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- draw_background(screen.machine(), bitmap, cliprect, TRUE);
- draw_sprites(screen.machine(), bitmap, cliprect, 0x140, 0x180);
+ draw_background(machine(), bitmap, cliprect, TRUE);
+ draw_sprites(machine(), bitmap, cliprect, 0x140, 0x180);
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
}
@@ -473,8 +473,8 @@ UINT32 zaxxon_state::screen_update_zaxxon(screen_device &screen, bitmap_ind16 &b
UINT32 zaxxon_state::screen_update_futspy(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- draw_background(screen.machine(), bitmap, cliprect, TRUE);
- draw_sprites(screen.machine(), bitmap, cliprect, 0x180, 0x180);
+ draw_background(machine(), bitmap, cliprect, TRUE);
+ draw_sprites(machine(), bitmap, cliprect, 0x180, 0x180);
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
}
@@ -483,8 +483,8 @@ UINT32 zaxxon_state::screen_update_futspy(screen_device &screen, bitmap_ind16 &b
UINT32 zaxxon_state::screen_update_razmataz(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- draw_background(screen.machine(), bitmap, cliprect, FALSE);
- draw_sprites(screen.machine(), bitmap, cliprect, 0x140, 0x180);
+ draw_background(machine(), bitmap, cliprect, FALSE);
+ draw_sprites(machine(), bitmap, cliprect, 0x140, 0x180);
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
}
@@ -493,8 +493,8 @@ UINT32 zaxxon_state::screen_update_razmataz(screen_device &screen, bitmap_ind16
UINT32 zaxxon_state::screen_update_congo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- draw_background(screen.machine(), bitmap, cliprect, TRUE);
- draw_sprites(screen.machine(), bitmap, cliprect, 0x280, 0x180);
+ draw_background(machine(), bitmap, cliprect, TRUE);
+ draw_sprites(machine(), bitmap, cliprect, 0x280, 0x180);
m_fg_tilemap->draw(bitmap, cliprect, 0, 0);
return 0;
}