summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatarGravatar Miodrag Milanovic <mmicko@gmail.com>2012-09-18 08:43:04 +0000
committerGravatarGravatar Miodrag Milanovic <mmicko@gmail.com>2012-09-18 08:43:04 +0000
commit7e40ce54f21d854327fbe56a5c989014602462ff (patch)
tree310b268b8424a7eb6b8bffd5b87e808b8c7ccb5e
parent8196b6177882559f277b0688f4f210e352cce6be (diff)
changed most of screen.machine() to machine() (no whatsnew)
-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
-rw-r--r--src/mess/drivers/apexc.c12
-rw-r--r--src/mess/drivers/bml3.c4
-rw-r--r--src/mess/drivers/c65.c2
-rw-r--r--src/mess/drivers/cybiko.c2
-rw-r--r--src/mess/drivers/einstein.c2
-rw-r--r--src/mess/drivers/fp6000.c6
-rw-r--r--src/mess/drivers/interact.c2
-rw-r--r--src/mess/drivers/ipds.c2
-rw-r--r--src/mess/drivers/itt3030.c6
-rw-r--r--src/mess/drivers/jr200.c4
-rw-r--r--src/mess/drivers/m20.c4
-rw-r--r--src/mess/drivers/mbc200.c2
-rw-r--r--src/mess/drivers/multi16.c2
-rw-r--r--src/mess/drivers/multi8.c12
-rw-r--r--src/mess/drivers/myb3k.c2
-rw-r--r--src/mess/drivers/mz2000.c26
-rw-r--r--src/mess/drivers/mz2500.c8
-rw-r--r--src/mess/drivers/paso1600.c10
-rw-r--r--src/mess/drivers/pasogo.c2
-rw-r--r--src/mess/drivers/pasopia7.c8
-rw-r--r--src/mess/drivers/pc100.c2
-rw-r--r--src/mess/drivers/pc6001.c32
-rw-r--r--src/mess/drivers/pc8801.c4
-rw-r--r--src/mess/drivers/pc88va.c4
-rw-r--r--src/mess/drivers/pk8000.c2
-rw-r--r--src/mess/drivers/pv1000.c4
-rw-r--r--src/mess/drivers/rainbow.c2
-rw-r--r--src/mess/drivers/sm1800.c2
-rw-r--r--src/mess/drivers/smc777.c30
-rw-r--r--src/mess/drivers/ssem.c12
-rw-r--r--src/mess/drivers/supracan.c12
-rw-r--r--src/mess/drivers/svision.c6
-rw-r--r--src/mess/drivers/ti99_2.c2
-rw-r--r--src/mess/drivers/tk80bs.c2
-rw-r--r--src/mess/drivers/vboy.c6
-rw-r--r--src/mess/drivers/vii.c6
-rw-r--r--src/mess/drivers/vt100.c2
-rw-r--r--src/mess/drivers/x1.c6
-rw-r--r--src/mess/drivers/z100.c2
-rw-r--r--src/mess/machine/amstrad.c2
-rw-r--r--src/mess/machine/lisa.c2
-rw-r--r--src/mess/machine/sms.c6
-rw-r--r--src/mess/video/ac1.c8
-rw-r--r--src/mess/video/apple1.c4
-rw-r--r--src/mess/video/apple2.c2
-rw-r--r--src/mess/video/apple3.c12
-rw-r--r--src/mess/video/b2m.c2
-rw-r--r--src/mess/video/bbc.c8
-rw-r--r--src/mess/video/cgenie.c4
-rw-r--r--src/mess/video/dai.c2
-rw-r--r--src/mess/video/fmtowns.c20
-rw-r--r--src/mess/video/galeb.c2
-rw-r--r--src/mess/video/hec2video.c6
-rw-r--r--src/mess/video/hp48.c6
-rw-r--r--src/mess/video/intv.c4
-rw-r--r--src/mess/video/kramermc.c4
-rw-r--r--src/mess/video/mac.c6
-rw-r--r--src/mess/video/mz700.c6
-rw-r--r--src/mess/video/nascom1.c8
-rw-r--r--src/mess/video/nc.c2
-rw-r--r--src/mess/video/nes.c4
-rw-r--r--src/mess/video/ondra.c4
-rw-r--r--src/mess/video/oric.c10
-rw-r--r--src/mess/video/orion.c2
-rw-r--r--src/mess/video/p2000m.c2
-rw-r--r--src/mess/video/pcw.c4
-rw-r--r--src/mess/video/pcw16.c2
-rw-r--r--src/mess/video/pdp1.c2
-rw-r--r--src/mess/video/pet.c2
-rw-r--r--src/mess/video/pk8020.c2
-rw-r--r--src/mess/video/pp01.c2
-rw-r--r--src/mess/video/primo.c2
-rw-r--r--src/mess/video/radio86.c2
-rw-r--r--src/mess/video/spectrum.c12
-rw-r--r--src/mess/video/ssystem3.c4
-rw-r--r--src/mess/video/super80.c16
-rw-r--r--src/mess/video/timex.c20
-rw-r--r--src/mess/video/tx0.c2
-rw-r--r--src/mess/video/ut88.c2
-rw-r--r--src/mess/video/vector06.c2
-rw-r--r--src/mess/video/vtech2.c16
-rw-r--r--src/mess/video/x68k.c22
843 files changed, 3605 insertions, 3605 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 ecb8f21a