summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2008-12-04 10:17:17 +0000
committer Aaron Giles <aaron@aarongiles.com>2008-12-04 10:17:17 +0000
commit60bc02ae1bb9c2618901abf6b5f24c02561b4547 (patch)
tree2ab801a7daa5c9a5f947c24822d66a3d2b5c349c
parent2c3a713213844d1d99c840acf1e7882d6e83048d (diff)
Removed fillbitmap() macro in favor of direct calls to bitmap_fill().
Note that the parameters to the latter are in a different order (bitmap, clip, color). [Atari Ace]
-rw-r--r--src/emu/crsshair.c2
-rw-r--r--src/emu/drawgfx.h3
-rw-r--r--src/emu/rendfont.c2
-rw-r--r--src/emu/rendlay.c12
-rw-r--r--src/emu/uigfx.c4
-rw-r--r--src/emu/video/cdp1869.c2
-rw-r--r--src/emu/video/s2636.c4
-rw-r--r--src/emu/video/tms9928a.c18
-rw-r--r--src/emu/video/vector.c2
-rw-r--r--src/emu/video/voodoo.c2
-rw-r--r--src/mame/drivers/2mindril.c2
-rw-r--r--src/mame/drivers/ace.c2
-rw-r--r--src/mame/drivers/astrocorp.c4
-rw-r--r--src/mame/drivers/backfire.c8
-rw-r--r--src/mame/drivers/bigfghtr.c2
-rw-r--r--src/mame/drivers/bishjan.c2
-rw-r--r--src/mame/drivers/bmcbowl.c2
-rw-r--r--src/mame/drivers/bnstars.c6
-rw-r--r--src/mame/drivers/cardline.c2
-rw-r--r--src/mame/drivers/cowrace.c2
-rw-r--r--src/mame/drivers/cps3.c4
-rw-r--r--src/mame/drivers/cshooter.c2
-rw-r--r--src/mame/drivers/cubeqst.c2
-rw-r--r--src/mame/drivers/cultures.c2
-rw-r--r--src/mame/drivers/darkhors.c2
-rw-r--r--src/mame/drivers/dblewing.c4
-rw-r--r--src/mame/drivers/ddenlovr.c2
-rw-r--r--src/mame/drivers/deco156.c4
-rw-r--r--src/mame/drivers/discoboy.c2
-rw-r--r--src/mame/drivers/dmndrby.c2
-rw-r--r--src/mame/drivers/dunhuang.c2
-rw-r--r--src/mame/drivers/dwarfd.c2
-rw-r--r--src/mame/drivers/esh.c2
-rw-r--r--src/mame/drivers/fcrash.c8
-rw-r--r--src/mame/drivers/filetto.c2
-rw-r--r--src/mame/drivers/firebeat.c2
-rw-r--r--src/mame/drivers/firefox.c2
-rw-r--r--src/mame/drivers/galaxi.c2
-rw-r--r--src/mame/drivers/galpani3.c4
-rw-r--r--src/mame/drivers/gamecstl.c2
-rw-r--r--src/mame/drivers/gpworld.c2
-rw-r--r--src/mame/drivers/gticlub.c2
-rw-r--r--src/mame/drivers/guab.c2
-rw-r--r--src/mame/drivers/halleys.c4
-rw-r--r--src/mame/drivers/hanaroku.c2
-rw-r--r--src/mame/drivers/hotblock.c2
-rw-r--r--src/mame/drivers/igs009.c4
-rw-r--r--src/mame/drivers/igs_180.c4
-rw-r--r--src/mame/drivers/igs_m027.c2
-rw-r--r--src/mame/drivers/intrscti.c2
-rw-r--r--src/mame/drivers/istellar.c2
-rw-r--r--src/mame/drivers/jalmah.c4
-rw-r--r--src/mame/drivers/jchan.c6
-rw-r--r--src/mame/drivers/jollyjgr.c2
-rw-r--r--src/mame/drivers/konamim2.c2
-rw-r--r--src/mame/drivers/lastfght.c2
-rw-r--r--src/mame/drivers/lgp.c2
-rw-r--r--src/mame/drivers/limenko.c6
-rw-r--r--src/mame/drivers/littlerb.c2
-rw-r--r--src/mame/drivers/marinedt.c8
-rw-r--r--src/mame/drivers/mazerbla.c12
-rw-r--r--src/mame/drivers/mediagx.c2
-rw-r--r--src/mame/drivers/meritm.c2
-rw-r--r--src/mame/drivers/midas.c2
-rw-r--r--src/mame/drivers/mirage.c2
-rw-r--r--src/mame/drivers/missb2.c2
-rw-r--r--src/mame/drivers/mlanding.c2
-rw-r--r--src/mame/drivers/mpu4drvr.c2
-rw-r--r--src/mame/drivers/murogem.c2
-rw-r--r--src/mame/drivers/mwarr.c2
-rw-r--r--src/mame/drivers/namcoic.c6
-rw-r--r--src/mame/drivers/namcos23.c6
-rw-r--r--src/mame/drivers/nwk-tr.c4
-rw-r--r--src/mame/drivers/panicr.c2
-rw-r--r--src/mame/drivers/pturn.c2
-rw-r--r--src/mame/drivers/quizpun2.c4
-rw-r--r--src/mame/drivers/rabbit.c6
-rw-r--r--src/mame/drivers/raiden2.c2
-rw-r--r--src/mame/drivers/sbowling.c2
-rw-r--r--src/mame/drivers/segac2.c2
-rw-r--r--src/mame/drivers/segald.c2
-rw-r--r--src/mame/drivers/skylncr.c2
-rw-r--r--src/mame/drivers/sliver.c4
-rw-r--r--src/mame/drivers/snowbros.c2
-rw-r--r--src/mame/drivers/srmp5.c2
-rw-r--r--src/mame/drivers/srmp6.c2
-rw-r--r--src/mame/drivers/steaser.c2
-rw-r--r--src/mame/drivers/subsino.c2
-rw-r--r--src/mame/drivers/taitowlf.c2
-rw-r--r--src/mame/drivers/tecmosys.c20
-rw-r--r--src/mame/drivers/tmaster.c2
-rw-r--r--src/mame/drivers/trvmadns.c2
-rw-r--r--src/mame/drivers/ttchamp.c2
-rw-r--r--src/mame/drivers/twins.c4
-rw-r--r--src/mame/drivers/vamphalf.c2
-rw-r--r--src/mame/drivers/vmetal.c4
-rw-r--r--src/mame/drivers/wheelfir.c4
-rw-r--r--src/mame/drivers/zr107.c4
-rw-r--r--src/mame/video/1943.c2
-rw-r--r--src/mame/video/aeroboto.c4
-rw-r--r--src/mame/video/aerofgt.c16
-rw-r--r--src/mame/video/ajax.c4
-rw-r--r--src/mame/video/aliens.c4
-rw-r--r--src/mame/video/alpha68k.c12
-rw-r--r--src/mame/video/ambush.c2
-rw-r--r--src/mame/video/angelkds.c2
-rw-r--r--src/mame/video/argus.c4
-rw-r--r--src/mame/video/armedf.c4
-rw-r--r--src/mame/video/asterix.c4
-rw-r--r--src/mame/video/asuka.c8
-rw-r--r--src/mame/video/atarig42.c2
-rw-r--r--src/mame/video/atarigx2.c2
-rw-r--r--src/mame/video/atarimo.c2
-rw-r--r--src/mame/video/atarirle.c16
-rw-r--r--src/mame/video/atarisy2.c2
-rw-r--r--src/mame/video/batman.c2
-rw-r--r--src/mame/video/bigstrkb.c2
-rw-r--r--src/mame/video/bionicc.c2
-rw-r--r--src/mame/video/bishi.c2
-rw-r--r--src/mame/video/blktiger.c2
-rw-r--r--src/mame/video/blmbycar.c4
-rw-r--r--src/mame/video/blockhl.c2
-rw-r--r--src/mame/video/bloodbro.c6
-rw-r--r--src/mame/video/blueprnt.c2
-rw-r--r--src/mame/video/boogwing.c4
-rw-r--r--src/mame/video/bosco.c2
-rw-r--r--src/mame/video/bottom9.c2
-rw-r--r--src/mame/video/boxer.c2
-rw-r--r--src/mame/video/bublbobl.c2
-rw-r--r--src/mame/video/buggychl.c2
-rw-r--r--src/mame/video/bwing.c2
-rw-r--r--src/mame/video/canyon.c2
-rw-r--r--src/mame/video/capbowl.c2
-rw-r--r--src/mame/video/carpolo.c12
-rw-r--r--src/mame/video/cave.c6
-rw-r--r--src/mame/video/cbasebal.c2
-rw-r--r--src/mame/video/ccastles.c2
-rw-r--r--src/mame/video/cclimber.c14
-rw-r--r--src/mame/video/changela.c8
-rw-r--r--src/mame/video/cheekyms.c2
-rw-r--r--src/mame/video/chqflag.c2
-rw-r--r--src/mame/video/circusc.c2
-rw-r--r--src/mame/video/cischeat.c14
-rw-r--r--src/mame/video/cloud9.c2
-rw-r--r--src/mame/video/cninja.c22
-rw-r--r--src/mame/video/combatsc.c6
-rw-r--r--src/mame/video/cosmic.c12
-rw-r--r--src/mame/video/cps1.c6
-rw-r--r--src/mame/video/crshrace.c4
-rw-r--r--src/mame/video/darkmist.c2
-rw-r--r--src/mame/video/dassault.c4
-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/deadang.c4
-rw-r--r--src/mame/video/dec0.c2
-rw-r--r--src/mame/video/deco16ic.c2
-rw-r--r--src/mame/video/deco32.c24
-rw-r--r--src/mame/video/deco_mlc.c6
-rw-r--r--src/mame/video/decocass.c2
-rw-r--r--src/mame/video/deniam.c2
-rw-r--r--src/mame/video/destroyr.c2
-rw-r--r--src/mame/video/dietgo.c2
-rw-r--r--src/mame/video/diverboy.c2
-rw-r--r--src/mame/video/djmain.c2
-rw-r--r--src/mame/video/docastle.c2
-rw-r--r--src/mame/video/dooyong.c30
-rw-r--r--src/mame/video/dynax.c34
-rw-r--r--src/mame/video/dynduke.c2
-rw-r--r--src/mame/video/equites.c4
-rw-r--r--src/mame/video/esd16.c8
-rw-r--r--src/mame/video/exedexes.c2
-rw-r--r--src/mame/video/exidy.c6
-rw-r--r--src/mame/video/exzisus.c2
-rw-r--r--src/mame/video/f1gp.c6
-rw-r--r--src/mame/video/fantland.c2
-rw-r--r--src/mame/video/fastfred.c2
-rw-r--r--src/mame/video/firetrk.c16
-rw-r--r--src/mame/video/fitfight.c2
-rw-r--r--src/mame/video/foodf.c2
-rw-r--r--src/mame/video/funkyjet.c2
-rw-r--r--src/mame/video/funybubl.c2
-rw-r--r--src/mame/video/fuukifg2.c4
-rw-r--r--src/mame/video/fuukifg3.c4
-rw-r--r--src/mame/video/gaelco.c8
-rw-r--r--src/mame/video/gaelco2.c4
-rw-r--r--src/mame/video/gaiden.c14
-rw-r--r--src/mame/video/galaga.c2
-rw-r--r--src/mame/video/galastrm.c14
-rw-r--r--src/mame/video/galaxian.c18
-rw-r--r--src/mame/video/galaxold.c12
-rw-r--r--src/mame/video/galivan.c4
-rw-r--r--src/mame/video/galpani2.c4
-rw-r--r--src/mame/video/galpanic.c2
-rw-r--r--src/mame/video/gaplus.c2
-rw-r--r--src/mame/video/gcpinbal.c4
-rw-r--r--src/mame/video/genesis.c2
-rw-r--r--src/mame/video/gijoe.c4
-rw-r--r--src/mame/video/ginganin.c2
-rw-r--r--src/mame/video/gladiatr.c2
-rw-r--r--src/mame/video/glass.c4
-rw-r--r--src/mame/video/goal92.c2
-rw-r--r--src/mame/video/gomoku.c4
-rw-r--r--src/mame/video/gottlieb.c2
-rw-r--r--src/mame/video/gradius3.c2
-rw-r--r--src/mame/video/groundfx.c4
-rw-r--r--src/mame/video/gstriker.c2
-rw-r--r--src/mame/video/gticlub.c4
-rw-r--r--src/mame/video/gunbustr.c2
-rw-r--r--src/mame/video/gunsmoke.c2
-rw-r--r--src/mame/video/hng64.c2
-rw-r--r--src/mame/video/homedata.c8
-rw-r--r--src/mame/video/hyhoo.c2
-rw-r--r--src/mame/video/hyprduel.c6
-rw-r--r--src/mame/video/ikki.c2
-rw-r--r--src/mame/video/inufuku.c4
-rw-r--r--src/mame/video/itech8.c8
-rw-r--r--src/mame/video/jaguar.c2
-rw-r--r--src/mame/video/jedi.c2
-rw-r--r--src/mame/video/kan_panb.c8
-rw-r--r--src/mame/video/kan_pand.c2
-rw-r--r--src/mame/video/kaneko16.c8
-rw-r--r--src/mame/video/konamiic.c2
-rw-r--r--src/mame/video/ksayakyu.c2
-rw-r--r--src/mame/video/labyrunr.c4
-rw-r--r--src/mame/video/ladybug.c4
-rw-r--r--src/mame/video/lasso.c6
-rw-r--r--src/mame/video/legionna.c6
-rw-r--r--src/mame/video/lemmings.c4
-rw-r--r--src/mame/video/lethal.c4
-rw-r--r--src/mame/video/liberate.c8
-rw-r--r--src/mame/video/liberatr.c2
-rw-r--r--src/mame/video/lkage.c2
-rw-r--r--src/mame/video/lockon.c2
-rw-r--r--src/mame/video/lordgun.c4
-rw-r--r--src/mame/video/lsasquad.c4
-rw-r--r--src/mame/video/m10.c2
-rw-r--r--src/mame/video/m107.c2
-rw-r--r--src/mame/video/m52.c4
-rw-r--r--src/mame/video/m62.c4
-rw-r--r--src/mame/video/m72.c4
-rw-r--r--src/mame/video/m90.c14
-rw-r--r--src/mame/video/m92.c4
-rw-r--r--src/mame/video/macrossp.c2
-rw-r--r--src/mame/video/madalien.c2
-rw-r--r--src/mame/video/magmax.c4
-rw-r--r--src/mame/video/mainevt.c2
-rw-r--r--src/mame/video/malzak.c2
-rw-r--r--src/mame/video/mappy.c2
-rw-r--r--src/mame/video/mcatadv.c4
-rw-r--r--src/mame/video/mcr.c2
-rw-r--r--src/mame/video/mcr3.c2
-rw-r--r--src/mame/video/mcr68.c4
-rw-r--r--src/mame/video/megasys1.c4
-rw-r--r--src/mame/video/mermaid.c20
-rw-r--r--src/mame/video/metlclsh.c2
-rw-r--r--src/mame/video/metro.c6
-rw-r--r--src/mame/video/mexico86.c4
-rw-r--r--src/mame/video/mitchell.c2
-rw-r--r--src/mame/video/mjkjidai.c2
-rw-r--r--src/mame/video/mjsister.c2
-rw-r--r--src/mame/video/model1.c4
-rw-r--r--src/mame/video/model2.c6
-rw-r--r--src/mame/video/model3.c10
-rw-r--r--src/mame/video/momoko.c2
-rw-r--r--src/mame/video/moo.c2
-rw-r--r--src/mame/video/mrdo.c2
-rw-r--r--src/mame/video/ms32.c4
-rw-r--r--src/mame/video/namcofl.c2
-rw-r--r--src/mame/video/namcona1.c4
-rw-r--r--src/mame/video/namconb1.c4
-rw-r--r--src/mame/video/namcos1.c4
-rw-r--r--src/mame/video/namcos2.c10
-rw-r--r--src/mame/video/namcos21.c2
-rw-r--r--src/mame/video/namcos22.c6
-rw-r--r--src/mame/video/namcos86.c4
-rw-r--r--src/mame/video/nbmj8688.c2
-rw-r--r--src/mame/video/nbmj8891.c2
-rw-r--r--src/mame/video/nbmj8991.c4
-rw-r--r--src/mame/video/nbmj9195.c2
-rw-r--r--src/mame/video/nemesis.c8
-rw-r--r--src/mame/video/neogeo.c2
-rw-r--r--src/mame/video/ninjakd2.c8
-rw-r--r--src/mame/video/ninjaw.c2
-rw-r--r--src/mame/video/niyanpai.c2
-rw-r--r--src/mame/video/oneshot.c4
-rw-r--r--src/mame/video/othldrby.c4
-rw-r--r--src/mame/video/othunder.c4
-rw-r--r--src/mame/video/overdriv.c2
-rw-r--r--src/mame/video/pacland.c4
-rw-r--r--src/mame/video/pacman.c2
-rw-r--r--src/mame/video/paradise.c6
-rw-r--r--src/mame/video/parodius.c4
-rw-r--r--src/mame/video/pastelg.c2
-rw-r--r--src/mame/video/pgm.c2
-rw-r--r--src/mame/video/pitnrun.c2
-rw-r--r--src/mame/video/pktgaldx.c6
-rw-r--r--src/mame/video/playch10.c4
-rw-r--r--src/mame/video/playmark.c10
-rw-r--r--src/mame/video/plygonet.c4
-rw-r--r--src/mame/video/poolshrk.c2
-rw-r--r--src/mame/video/popeye.c2
-rw-r--r--src/mame/video/powerins.c2
-rw-r--r--src/mame/video/psikyo.c4
-rw-r--r--src/mame/video/psikyo4.c4
-rw-r--r--src/mame/video/psikyosh.c6
-rw-r--r--src/mame/video/psx.c4
-rw-r--r--src/mame/video/psychic5.c4
-rw-r--r--src/mame/video/qdrmfgp.c2
-rw-r--r--src/mame/video/quizdna.c2
-rw-r--r--src/mame/video/rallyx.c6
-rw-r--r--src/mame/video/rastan.c8
-rw-r--r--src/mame/video/realbrk.c12
-rw-r--r--src/mame/video/redclash.c2
-rw-r--r--src/mame/video/relief.c2
-rw-r--r--src/mame/video/rohga.c10
-rw-r--r--src/mame/video/rollerg.c4
-rw-r--r--src/mame/video/rollrace.c2
-rw-r--r--src/mame/video/rungun.c4
-rw-r--r--src/mame/video/segag80r.c4
-rw-r--r--src/mame/video/segahang.c4
-rw-r--r--src/mame/video/segaorun.c6
-rw-r--r--src/mame/video/segas16a.c4
-rw-r--r--src/mame/video/segas16b.c4
-rw-r--r--src/mame/video/segas18.c6
-rw-r--r--src/mame/video/segas24.c6
-rw-r--r--src/mame/video/segas32.c8
-rw-r--r--src/mame/video/segaxbd.c4
-rw-r--r--src/mame/video/segaybd.c2
-rw-r--r--src/mame/video/seibuspi.c2
-rw-r--r--src/mame/video/sengokmj.c2
-rw-r--r--src/mame/video/senjyo.c2
-rw-r--r--src/mame/video/seta.c4
-rw-r--r--src/mame/video/seta2.c2
-rw-r--r--src/mame/video/sf.c2
-rw-r--r--src/mame/video/shadfrce.c4
-rw-r--r--src/mame/video/shootout.c4
-rw-r--r--src/mame/video/silkroad.c2
-rw-r--r--src/mame/video/simpl156.c4
-rw-r--r--src/mame/video/simpsons.c4
-rw-r--r--src/mame/video/skyfox.c2
-rw-r--r--src/mame/video/skyraid.c4
-rw-r--r--src/mame/video/slapshot.c4
-rw-r--r--src/mame/video/snk68.c2
-rw-r--r--src/mame/video/spbactn.c2
-rw-r--r--src/mame/video/spcforce.c2
-rw-r--r--src/mame/video/speedspn.c2
-rw-r--r--src/mame/video/sprint8.c2
-rw-r--r--src/mame/video/spy.c4
-rw-r--r--src/mame/video/srmp2.c6
-rw-r--r--src/mame/video/sshangha.c2
-rw-r--r--src/mame/video/sslam.c4
-rw-r--r--src/mame/video/ssv.c2
-rw-r--r--src/mame/video/st0016.c4
-rw-r--r--src/mame/video/stactics.c2
-rw-r--r--src/mame/video/starcrus.c22
-rw-r--r--src/mame/video/starshp1.c4
-rw-r--r--src/mame/video/stfight.c4
-rw-r--r--src/mame/video/stvvdp2.c4
-rw-r--r--src/mame/video/suna16.c4
-rw-r--r--src/mame/video/suna8.c2
-rw-r--r--src/mame/video/supbtime.c2
-rw-r--r--src/mame/video/superchs.c2
-rw-r--r--src/mame/video/suprnova.c12
-rw-r--r--src/mame/video/suprslam.c2
-rw-r--r--src/mame/video/surpratk.c4
-rw-r--r--src/mame/video/system1.c10
-rw-r--r--src/mame/video/system16.c10
-rw-r--r--src/mame/video/tail2nos.c2
-rw-r--r--src/mame/video/taito_b.c4
-rw-r--r--src/mame/video/taito_f2.c32
-rw-r--r--src/mame/video/taito_f3.c2
-rw-r--r--src/mame/video/taito_h.c6
-rw-r--r--src/mame/video/taito_l.c4
-rw-r--r--src/mame/video/taito_z.c28
-rw-r--r--src/mame/video/taitoair.c2
-rw-r--r--src/mame/video/taitojc.c6
-rw-r--r--src/mame/video/taitosj.c14
-rw-r--r--src/mame/video/tank8.c6
-rw-r--r--src/mame/video/tatsumi.c12
-rw-r--r--src/mame/video/taxidrvr.c2
-rw-r--r--src/mame/video/tbowl.c4
-rw-r--r--src/mame/video/tecmo.c4
-rw-r--r--src/mame/video/tecmo16.c8
-rw-r--r--src/mame/video/terracre.c2
-rw-r--r--src/mame/video/tetrisp2.c16
-rw-r--r--src/mame/video/thedeep.c2
-rw-r--r--src/mame/video/thoop2.c2
-rw-r--r--src/mame/video/thunderj.c2
-rw-r--r--src/mame/video/thunderx.c4
-rw-r--r--src/mame/video/tmnt.c14
-rw-r--r--src/mame/video/tnzs.c2
-rw-r--r--src/mame/video/toaplan1.c10
-rw-r--r--src/mame/video/toaplan2.c10
-rw-r--r--src/mame/video/toobin.c2
-rw-r--r--src/mame/video/topspeed.c4
-rw-r--r--src/mame/video/tsamurai.c2
-rw-r--r--src/mame/video/tumbleb.c2
-rw-r--r--src/mame/video/tumblep.c2
-rw-r--r--src/mame/video/tunhunt.c2
-rw-r--r--src/mame/video/twin16.c2
-rw-r--r--src/mame/video/twincobr.c2
-rw-r--r--src/mame/video/undrfire.c8
-rw-r--r--src/mame/video/unico.c8
-rw-r--r--src/mame/video/vendetta.c2
-rw-r--r--src/mame/video/volfied.c2
-rw-r--r--src/mame/video/warriorb.c4
-rw-r--r--src/mame/video/wecleman.c4
-rw-r--r--src/mame/video/wgp.c2
-rw-r--r--src/mame/video/wiz.c6
-rw-r--r--src/mame/video/wolfpack.c4
-rw-r--r--src/mame/video/xexex.c2
-rw-r--r--src/mame/video/xmen.c8
-rw-r--r--src/mame/video/ygv608.c10
-rw-r--r--src/mame/video/yunsun16.c2
-rw-r--r--src/mame/video/yunsung8.c2
-rw-r--r--src/mame/video/zaxxon.c2
-rw-r--r--src/osd/windows/drawd3d.c2
418 files changed, 919 insertions, 932 deletions
diff --git a/src/emu/crsshair.c b/src/emu/crsshair.c
index 57497b8aa95..b56e04afdfb 100644
--- a/src/emu/crsshair.c
+++ b/src/emu/crsshair.c
@@ -152,7 +152,7 @@ static void create_bitmap(int player)
{
/* allocate a blank bitmap to start with */
global.bitmap[player] = bitmap_alloc(CROSSHAIR_RAW_SIZE, CROSSHAIR_RAW_SIZE, BITMAP_FORMAT_ARGB32);
- fillbitmap(global.bitmap[player], MAKE_ARGB(0x00,0xff,0xff,0xff), NULL);
+ bitmap_fill(global.bitmap[player], NULL, MAKE_ARGB(0x00,0xff,0xff,0xff));
/* extract the raw source data to it */
for (y = 0; y < CROSSHAIR_RAW_SIZE / 2; y++)
diff --git a/src/emu/drawgfx.h b/src/emu/drawgfx.h
index e9fa5fe9943..89ae33ecbe8 100644
--- a/src/emu/drawgfx.h
+++ b/src/emu/drawgfx.h
@@ -72,9 +72,6 @@ enum
MACROS
***************************************************************************/
-/* map old fillbitmap to new shared bitmap_fill code */
-#define fillbitmap(dest, pen, clip) bitmap_fill(dest, clip, pen)
-
/* these macros describe gfx_layouts in terms of fractions of a region */
/* they can be used for total, planeoffset, xoffset, yoffset */
#define RGN_FRAC(num,den) (0x80000000 | (((num) & 0x0f) << 27) | (((den) & 0x0f) << 23))
diff --git a/src/emu/rendfont.c b/src/emu/rendfont.c
index 9f52c9697a2..e43b08f010a 100644
--- a/src/emu/rendfont.c
+++ b/src/emu/rendfont.c
@@ -217,7 +217,7 @@ static void render_font_char_expand(render_font *font, render_font_char *ch)
/* allocate a new bitmap of the size we need */
ch->bitmap = bitmap_alloc(ch->bmwidth, font->height, BITMAP_FORMAT_ARGB32);
- fillbitmap(ch->bitmap, 0, NULL);
+ bitmap_fill(ch->bitmap, NULL, 0);
/* extract the data */
for (y = 0; y < ch->bmheight; y++)
diff --git a/src/emu/rendlay.c b/src/emu/rendlay.c
index caa4adac067..308019fef34 100644
--- a/src/emu/rendlay.c
+++ b/src/emu/rendlay.c
@@ -823,7 +823,7 @@ static void layout_element_draw_led7seg(bitmap_t *dest, const rectangle *bounds,
/* allocate a temporary bitmap for drawing */
tempbitmap = bitmap_alloc(bmwidth + skewwidth, bmheight, BITMAP_FORMAT_ARGB32);
- fillbitmap(tempbitmap, MAKE_ARGB(0xff,0x00,0x00,0x00), NULL);
+ bitmap_fill(tempbitmap, NULL, MAKE_ARGB(0xff,0x00,0x00,0x00));
/* top bar */
draw_segment_horizontal(tempbitmap, 0 + 2*segwidth/3, bmwidth - 2*segwidth/3, 0 + segwidth/2, segwidth, (pattern & (1 << 0)) ? onpen : offpen);
@@ -879,7 +879,7 @@ static void layout_element_draw_led14seg(bitmap_t *dest, const rectangle *bounds
/* allocate a temporary bitmap for drawing */
tempbitmap = bitmap_alloc(bmwidth + skewwidth, bmheight, BITMAP_FORMAT_ARGB32);
- fillbitmap(tempbitmap, MAKE_ARGB(0xff, 0x00, 0x00, 0x00), NULL);
+ bitmap_fill(tempbitmap, NULL, MAKE_ARGB(0xff, 0x00, 0x00, 0x00));
/* top bar */
draw_segment_horizontal(tempbitmap,
@@ -985,7 +985,7 @@ static void layout_element_draw_led14segsc(bitmap_t *dest, const rectangle *boun
/* allocate a temporary bitmap for drawing, adding some extra space for the tail */
tempbitmap = bitmap_alloc(bmwidth + skewwidth, bmheight + segwidth, BITMAP_FORMAT_ARGB32);
- fillbitmap(tempbitmap, MAKE_ARGB(0xff, 0x00, 0x00, 0x00), NULL);
+ bitmap_fill(tempbitmap, NULL, MAKE_ARGB(0xff, 0x00, 0x00, 0x00));
/* top bar */
draw_segment_horizontal(tempbitmap,
@@ -1100,7 +1100,7 @@ static void layout_element_draw_led16seg(bitmap_t *dest, const rectangle *bounds
/* allocate a temporary bitmap for drawing */
tempbitmap = bitmap_alloc(bmwidth + skewwidth, bmheight, BITMAP_FORMAT_ARGB32);
- fillbitmap(tempbitmap, MAKE_ARGB(0xff, 0x00, 0x00, 0x00), NULL);
+ bitmap_fill(tempbitmap, NULL, MAKE_ARGB(0xff, 0x00, 0x00, 0x00));
/* top-left bar */
draw_segment_horizontal_caps(tempbitmap,
@@ -1216,7 +1216,7 @@ static void layout_element_draw_led16segsc(bitmap_t *dest, const rectangle *boun
/* allocate a temporary bitmap for drawing */
tempbitmap = bitmap_alloc(bmwidth + skewwidth, bmheight + segwidth, BITMAP_FORMAT_ARGB32);
- fillbitmap(tempbitmap, MAKE_ARGB(0xff, 0x00, 0x00, 0x00), NULL);
+ bitmap_fill(tempbitmap, NULL, MAKE_ARGB(0xff, 0x00, 0x00, 0x00));
/* top-left bar */
draw_segment_horizontal_caps(tempbitmap,
@@ -1900,7 +1900,7 @@ static bitmap_t *load_component_bitmap(const char *dirname, const char *file, co
/* draw some stripes in the bitmap */
bitmap = bitmap_alloc(100, 100, BITMAP_FORMAT_ARGB32);
- fillbitmap(bitmap, 0, NULL);
+ bitmap_fill(bitmap, NULL, 0);
for (step = 0; step < 100; step += 25)
for (line = 0; line < 100; line++)
*BITMAP_ADDR32(bitmap, (step + line) % 100, line % 100) = MAKE_ARGB(0xff,0xff,0xff,0xff);
diff --git a/src/emu/uigfx.c b/src/emu/uigfx.c
index 8b2ffeee3cf..72ab6c4db55 100644
--- a/src/emu/uigfx.c
+++ b/src/emu/uigfx.c
@@ -740,13 +740,13 @@ static void gfxset_update_bitmap(running_machine *machine, ui_gfx_state *state,
/* otherwise, fill with transparency */
else
- fillbitmap(state->bitmap, 0, &cellbounds);
+ bitmap_fill(state->bitmap, &cellbounds, 0);
}
}
/* otherwise, fill with transparency */
else
- fillbitmap(state->bitmap, 0, &cellbounds);
+ bitmap_fill(state->bitmap, &cellbounds, 0);
}
/* reset the texture to force an update */
diff --git a/src/emu/video/cdp1869.c b/src/emu/video/cdp1869.c
index 82defaaa2ff..dae58c9f396 100644
--- a/src/emu/video/cdp1869.c
+++ b/src/emu/video/cdp1869.c
@@ -664,7 +664,7 @@ void cdp1869_update(const device_config *device, bitmap_t *bitmap, const rectang
}
sect_rect(&outer, cliprect);
- fillbitmap(bitmap, device->machine->pens[cdp1869->bkg], &outer);
+ bitmap_fill(bitmap, &outer, device->machine->pens[cdp1869->bkg]);
if (!cdp1869->dispoff)
{
diff --git a/src/emu/video/s2636.c b/src/emu/video/s2636.c
index 584caaeb1ca..893fe7a3394 100644
--- a/src/emu/video/s2636.c
+++ b/src/emu/video/s2636.c
@@ -206,7 +206,7 @@ static int check_collision(s2636_t *s2636, int spriteno1, int spriteno2, const r
/* TODO: does not check shadow sprites yet */
- fillbitmap(s2636->collision_bitmap, 0, cliprect);
+ bitmap_fill(s2636->collision_bitmap, cliprect, 0);
if ((attr1[0x0a] != 0xff) && (attr2[0x0a] != 0xff))
{
@@ -269,7 +269,7 @@ bitmap_t *s2636_update(s2636_t *s2636, const rectangle *cliprect)
UINT8 collision = 0;
int spriteno;
- fillbitmap(s2636->bitmap, 0, cliprect);
+ bitmap_fill(s2636->bitmap, cliprect, 0);
for (spriteno = 0; spriteno < 4; spriteno++)
{
diff --git a/src/emu/video/tms9928a.c b/src/emu/video/tms9928a.c
index 9c8a710baf5..d46091908a5 100644
--- a/src/emu/video/tms9928a.c
+++ b/src/emu/video/tms9928a.c
@@ -401,7 +401,7 @@ VIDEO_UPDATE( tms9928a )
palette_set_color(screen->machine, 0, (TMS9928A_palette[BackColour] & MAKE_ARGB(0,255,255,255)) | (oldcolor & MAKE_ARGB(255,0,0,0)));
if (! (tms.Regs[1] & 0x40))
- fillbitmap(bitmap, screen->machine->pens[BackColour], cliprect);
+ bitmap_fill(bitmap, cliprect, screen->machine->pens[BackColour]);
else
{
(*ModeHandlers[TMS_MODE])(screen->machine, tms.tmpbmp, cliprect);
@@ -413,15 +413,15 @@ VIDEO_UPDATE( tms9928a )
/* set borders */
rt.min_x = 0; rt.max_x = LEFT_BORDER+256+RIGHT_BORDER-1;
rt.min_y = 0; rt.max_y = TOP_BORDER-1;
- fillbitmap (bitmap, BackColour, &rt);
+ bitmap_fill (bitmap, &rt, BackColour);
rt.min_y = TOP_BORDER+192; rt.max_y = TOP_BORDER+192+BOTTOM_BORDER-1;
- fillbitmap (bitmap, BackColour, &rt);
+ bitmap_fill (bitmap, &rt, BackColour);
rt.min_y = TOP_BORDER; rt.max_y = TOP_BORDER+192-1;
rt.min_x = 0; rt.max_x = LEFT_BORDER-1;
- fillbitmap (bitmap, BackColour, &rt);
+ bitmap_fill (bitmap, &rt, BackColour);
rt.min_x = LEFT_BORDER+256; rt.max_x = LEFT_BORDER+256+RIGHT_BORDER-1;
- fillbitmap (bitmap, BackColour, &rt);
+ bitmap_fill (bitmap, &rt, BackColour);
}
if (TMS_SPRITES_ENABLED)
draw_sprites(screen->machine, bitmap, cliprect);
@@ -461,10 +461,10 @@ static void draw_mode1 (running_machine *machine, bitmap_t *bitmap, const rectan
/* colours at sides must be reset */
rt.min_y = 0; rt.max_y = 191;
rt.min_x = 0; rt.max_x = 7;
- fillbitmap (bitmap, bg, &rt);
+ bitmap_fill (bitmap, &rt, bg);
rt.min_y = 0; rt.max_y = 191;
rt.min_x = 248; rt.max_x = 255;
- fillbitmap (bitmap, bg, &rt);
+ bitmap_fill (bitmap, &rt, bg);
name = 0;
for (y=0;y<24;y++) {
@@ -494,10 +494,10 @@ static void draw_mode12 (running_machine *machine, bitmap_t *bitmap, const recta
/* colours at sides must be reset */
rt.min_y = 0; rt.max_y = 191;
rt.min_x = 0; rt.max_x = 7;
- fillbitmap (bitmap, bg, &rt);
+ bitmap_fill (bitmap, &rt, bg);
rt.min_y = 0; rt.max_y = 191;
rt.min_x = 248; rt.max_x = 255;
- fillbitmap (bitmap, bg, &rt);
+ bitmap_fill (bitmap, &rt, bg);
name = 0;
for (y=0;y<24;y++) {
diff --git a/src/emu/video/vector.c b/src/emu/video/vector.c
index 5f12e67efd1..efebae9b493 100644
--- a/src/emu/video/vector.c
+++ b/src/emu/video/vector.c
@@ -95,7 +95,7 @@ static render_texture *get_vector_texture(float dx, float dy, float intensity)
height = lbucket * VECTOR_WIDTH_DENOM / TEXTURE_LENGTH_BUCKETS;
tex->bitmap = bitmap_alloc(TEXTURE_WIDTH, height, BITMAP_FORMAT_ARGB32);
- fillbitmap(tex->bitmap, NULL, MAKE_ARGB(0xff,0xff,0xff,0xff));
+ bitmap_fill(tex->bitmap, NULL, MAKE_ARGB(0xff,0xff,0xff,0xff));
totalint = 1.0f;
for (x = TEXTURE_WIDTH / 2 - 1; x >= 0; x--)
diff --git a/src/emu/video/voodoo.c b/src/emu/video/voodoo.c
index 163d48f6252..36d1697a2d0 100644
--- a/src/emu/video/voodoo.c
+++ b/src/emu/video/voodoo.c
@@ -302,7 +302,7 @@ int voodoo_update(const device_config *device, bitmap_t *bitmap, const rectangle
/* if we are blank, just fill with black */
if (v->type <= VOODOO_2 && FBIINIT1_SOFTWARE_BLANK(v->reg[fbiInit1].u))
{
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
return changed;
}
diff --git a/src/mame/drivers/2mindril.c b/src/mame/drivers/2mindril.c
index ebacae8b6cd..604348cf5f2 100644
--- a/src/mame/drivers/2mindril.c
+++ b/src/mame/drivers/2mindril.c
@@ -81,7 +81,7 @@ static UINT16 *textram;
static VIDEO_UPDATE( drill )
{
int i;
- fillbitmap(bitmap,0,NULL);
+ bitmap_fill(bitmap,NULL,0);
for (i=0; i<256; i++)
{
diff --git a/src/mame/drivers/ace.c b/src/mame/drivers/ace.c
index 970cd84bb5f..9672fc67762 100644
--- a/src/mame/drivers/ace.c
+++ b/src/mame/drivers/ace.c
@@ -74,7 +74,7 @@ static VIDEO_UPDATE( ace )
}
/* first of all, fill the screen with the background color */
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
drawgfx(bitmap,screen->machine->gfx[1],
diff --git a/src/mame/drivers/astrocorp.c b/src/mame/drivers/astrocorp.c
index fe1e70ec004..7e0f7235e62 100644
--- a/src/mame/drivers/astrocorp.c
+++ b/src/mame/drivers/astrocorp.c
@@ -79,11 +79,11 @@ static VIDEO_UPDATE(astrocorp)
{
if (astrocorp_screen_enable & 1)
{
- fillbitmap(bitmap,screen->machine->pens[0xff],cliprect);
+ bitmap_fill(bitmap,cliprect,screen->machine->pens[0xff]);
draw_sprites(screen->machine,bitmap,cliprect);
}
else
- fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+ bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
return 0;
}
diff --git a/src/mame/drivers/backfire.c b/src/mame/drivers/backfire.c
index 5889c88e856..34c74215c55 100644
--- a/src/mame/drivers/backfire.c
+++ b/src/mame/drivers/backfire.c
@@ -181,8 +181,8 @@ static VIDEO_UPDATE(backfire)
if (screen == left_screen)
{
- fillbitmap(priority_bitmap,0,NULL);
- fillbitmap(bitmap,0x100,cliprect);
+ bitmap_fill(priority_bitmap,NULL,0);
+ bitmap_fill(bitmap,cliprect,0x100);
if (backfire_left_priority[0] == 0)
{
@@ -201,8 +201,8 @@ static VIDEO_UPDATE(backfire)
}
else if (screen == right_screen)
{
- fillbitmap(priority_bitmap,0,NULL);
- fillbitmap(bitmap,0x500,cliprect);
+ bitmap_fill(priority_bitmap,NULL,0);
+ bitmap_fill(bitmap,cliprect,0x500);
if (backfire_right_priority[0] == 0)
{
diff --git a/src/mame/drivers/bigfghtr.c b/src/mame/drivers/bigfghtr.c
index 6bf65370e73..b14d64401b5 100644
--- a/src/mame/drivers/bigfghtr.c
+++ b/src/mame/drivers/bigfghtr.c
@@ -256,7 +256,7 @@ static VIDEO_UPDATE( bigfghtr )
}
else
{
- fillbitmap( bitmap, get_black_pen(screen->machine), cliprect );
+ bitmap_fill( bitmap, cliprect , get_black_pen(screen->machine));
}
if( sprite_enable ) draw_sprites(screen->machine, bitmap, cliprect, 2 );
diff --git a/src/mame/drivers/bishjan.c b/src/mame/drivers/bishjan.c
index 50946116367..579e6779746 100644
--- a/src/mame/drivers/bishjan.c
+++ b/src/mame/drivers/bishjan.c
@@ -108,7 +108,7 @@ if (input_code_pressed(KEYCODE_Z))
tilemap_set_scrollx( tmap1, 0, scroll1_x); tilemap_set_scrolly( tmap1, 0, scroll1_y );
tilemap_set_scrollx( tmap2, 0, scroll2_x); tilemap_set_scrolly( tmap2, 0, scroll2_y );
- fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+ bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
if (layers_ctrl & 1) tilemap_draw(bitmap,cliprect, tmap1, 0, 0);
if (layers_ctrl & 2) tilemap_draw(bitmap,cliprect, tmap2, 0, 0);
diff --git a/src/mame/drivers/bmcbowl.c b/src/mame/drivers/bmcbowl.c
index 689d0072410..869de9964b5 100644
--- a/src/mame/drivers/bmcbowl.c
+++ b/src/mame/drivers/bmcbowl.c
@@ -132,7 +132,7 @@ static VIDEO_UPDATE( bmcbowl )
*/
int x,y,z,pixdat;
- fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+ bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
z=0;
for (y=0;y<230;y++)
diff --git a/src/mame/drivers/bnstars.c b/src/mame/drivers/bnstars.c
index e193f1acfd8..51f7dd8ec1d 100644
--- a/src/mame/drivers/bnstars.c
+++ b/src/mame/drivers/bnstars.c
@@ -493,11 +493,11 @@ static VIDEO_UPDATE(bnstars)
const device_config *left_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "left");
const device_config *right_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "right");
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
if (screen==left_screen)
{
- fillbitmap(bitmap,0,cliprect); /* bg color */
+ bitmap_fill(bitmap,cliprect,0); /* bg color */
tilemap_set_scrollx(ms32_bg_tilemap[0], 0, ms32_bg0_scroll[0x00/4] + ms32_bg0_scroll[0x08/4] + 0x10 );
@@ -515,7 +515,7 @@ static VIDEO_UPDATE(bnstars)
}
else if (screen == right_screen)
{
- fillbitmap(bitmap,0x8000+0,cliprect); /* bg color */
+ bitmap_fill(bitmap,cliprect,0x8000+0); /* bg color */
tilemap_set_scrollx(ms32_bg_tilemap[1], 0, ms32_bg1_scroll[0x00/4] + ms32_bg1_scroll[0x08/4] + 0x10 );
diff --git a/src/mame/drivers/cardline.c b/src/mame/drivers/cardline.c
index 86860de5fa3..5f33c8f896d 100644
--- a/src/mame/drivers/cardline.c
+++ b/src/mame/drivers/cardline.c
@@ -35,7 +35,7 @@ static int cardline_video;
static VIDEO_UPDATE( cardline )
{
int x,y;
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
for(y=0;y<32;y++)
{
for(x=0;x<64;x++)
diff --git a/src/mame/drivers/cowrace.c b/src/mame/drivers/cowrace.c
index 8130659cbcf..e8652354494 100644
--- a/src/mame/drivers/cowrace.c
+++ b/src/mame/drivers/cowrace.c
@@ -40,7 +40,7 @@ static VIDEO_START( cowrace )
static VIDEO_UPDATE( cowrace )
{
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
tilemap_draw(bitmap,cliprect, tmap, 0, 0);
return 0;
}
diff --git a/src/mame/drivers/cps3.c b/src/mame/drivers/cps3.c
index 0cbf3301e64..4fc4e689c6c 100644
--- a/src/mame/drivers/cps3.c
+++ b/src/mame/drivers/cps3.c
@@ -885,7 +885,7 @@ static VIDEO_START(cps3)
renderbuffer_clip.min_y = 0;
renderbuffer_clip.max_y = 224-1;
- fillbitmap(renderbuffer_bitmap,0x3f,&renderbuffer_clip);
+ bitmap_fill(renderbuffer_bitmap,&renderbuffer_clip,0x3f);
}
@@ -1031,7 +1031,7 @@ static VIDEO_UPDATE(cps3)
renderbuffer_clip.min_y = 0;
renderbuffer_clip.max_y = ((224*fszx)>>16)-1;
- fillbitmap(renderbuffer_bitmap,0,&renderbuffer_clip);
+ bitmap_fill(renderbuffer_bitmap,&renderbuffer_clip,0);
/* Sprites */
{
diff --git a/src/mame/drivers/cshooter.c b/src/mame/drivers/cshooter.c
index 17f6865957e..bbd08acaa46 100644
--- a/src/mame/drivers/cshooter.c
+++ b/src/mame/drivers/cshooter.c
@@ -145,7 +145,7 @@ static VIDEO_START(cshooter)
static VIDEO_UPDATE(cshooter)
{
- fillbitmap(bitmap, 0/*get_black_pen(screen->screen->machine)*/, cliprect);
+ bitmap_fill(bitmap, cliprect, 0/*get_black_pen(screen->screen->machine)*/);
tilemap_mark_all_tiles_dirty(cshooter_txtilemap);
//sprites
diff --git a/src/mame/drivers/cubeqst.c b/src/mame/drivers/cubeqst.c
index 0efabfcf9e5..3a159ba9dde 100644
--- a/src/mame/drivers/cubeqst.c
+++ b/src/mame/drivers/cubeqst.c
@@ -112,7 +112,7 @@ static VIDEO_UPDATE( cubeqst )
*/
/* Bit 3 selects LD/#GRAPHICS */
- fillbitmap(bitmap, colormap[255], cliprect);
+ bitmap_fill(bitmap, cliprect, colormap[255]);
cpu_push_context(screen->machine->cpu[LINE_CPU]);
diff --git a/src/mame/drivers/cultures.c b/src/mame/drivers/cultures.c
index 7437a28d208..6412a10434f 100644
--- a/src/mame/drivers/cultures.c
+++ b/src/mame/drivers/cultures.c
@@ -92,7 +92,7 @@ static VIDEO_UPDATE( cultures )
tilemap_draw(bitmap, cliprect, bg1_tilemap, 0, 0);
}
else
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
return 0;
}
diff --git a/src/mame/drivers/darkhors.c b/src/mame/drivers/darkhors.c
index 76040f7298b..5507373c915 100644
--- a/src/mame/drivers/darkhors.c
+++ b/src/mame/drivers/darkhors.c
@@ -165,7 +165,7 @@ static VIDEO_UPDATE( darkhors )
}
#endif
- fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+ bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
tilemap_set_scrollx(darkhors_tmap,0, (darkhors_tmapscroll[0] >> 16) - 5);
tilemap_set_scrolly(darkhors_tmap,0, (darkhors_tmapscroll[0] & 0xffff) - 0xff );
diff --git a/src/mame/drivers/dblewing.c b/src/mame/drivers/dblewing.c
index 9f315d07c99..24b5ed3ea01 100644
--- a/src/mame/drivers/dblewing.c
+++ b/src/mame/drivers/dblewing.c
@@ -156,8 +156,8 @@ static VIDEO_UPDATE(dblewing)
flip_screen_set( deco16_pf12_control[0]&0x80 );
deco16_pf12_update(deco16_pf1_rowscroll,deco16_pf2_rowscroll);
- fillbitmap(bitmap,0,cliprect); /* not Confirmed */
- fillbitmap(priority_bitmap,0,NULL);
+ bitmap_fill(bitmap,cliprect,0); /* not Confirmed */
+ bitmap_fill(priority_bitmap,NULL,0);
deco16_tilemap_2_draw(bitmap,cliprect,0,2);
deco16_tilemap_1_draw(bitmap,cliprect,0,4);
diff --git a/src/mame/drivers/ddenlovr.c b/src/mame/drivers/ddenlovr.c
index 0bf4cdf922b..4cc7f9ddc3b 100644
--- a/src/mame/drivers/ddenlovr.c
+++ b/src/mame/drivers/ddenlovr.c
@@ -1242,7 +1242,7 @@ VIDEO_UPDATE(ddenlovr)
if (input_code_pressed_once(KEYCODE_F)) { base++; while ((gfx[base] & 0xf0) != 0x30) base++; }
#endif
- fillbitmap(bitmap,ddenlovr_bgcolor,cliprect);
+ bitmap_fill(bitmap,cliprect,ddenlovr_bgcolor);
#ifdef MAME_DEBUG
if (input_code_pressed(KEYCODE_Z))
diff --git a/src/mame/drivers/deco156.c b/src/mame/drivers/deco156.c
index 2df091fc05f..22801749e5c 100644
--- a/src/mame/drivers/deco156.c
+++ b/src/mame/drivers/deco156.c
@@ -135,8 +135,8 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan
static VIDEO_UPDATE( wcvol95 )
{
- fillbitmap(priority_bitmap,0,NULL);
- fillbitmap(bitmap,0,NULL);
+ bitmap_fill(priority_bitmap,NULL,0);
+ bitmap_fill(bitmap,NULL,0);
deco16_pf12_update(deco16_pf1_rowscroll,deco16_pf2_rowscroll);
diff --git a/src/mame/drivers/discoboy.c b/src/mame/drivers/discoboy.c
index b5a665c4110..4acf5b9683a 100644
--- a/src/mame/drivers/discoboy.c
+++ b/src/mame/drivers/discoboy.c
@@ -137,7 +137,7 @@ static VIDEO_UPDATE( discoboy )
palette_set_color(screen->machine, (i/2)+0x400, MAKE_RGB(r, g, b));
}
- fillbitmap(bitmap, 0x3ff, cliprect);
+ bitmap_fill(bitmap, cliprect, 0x3ff);
for (y=0;y<32;y++)
{
diff --git a/src/mame/drivers/dmndrby.c b/src/mame/drivers/dmndrby.c
index 3bb18300d89..8f5e730a98a 100644
--- a/src/mame/drivers/dmndrby.c
+++ b/src/mame/drivers/dmndrby.c
@@ -141,7 +141,7 @@ static VIDEO_UPDATE(dderby)
int x,y,count;
const gfx_element *gfx = screen->machine->gfx[0];
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
count=0;
for (y=0;y<32;y++)
diff --git a/src/mame/drivers/dunhuang.c b/src/mame/drivers/dunhuang.c
index b94f3ab8205..df392428060 100644
--- a/src/mame/drivers/dunhuang.c
+++ b/src/mame/drivers/dunhuang.c
@@ -125,7 +125,7 @@ if (input_code_pressed(KEYCODE_Z))
}
#endif
- fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+ bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
switch (dunhuang_layers)
{
diff --git a/src/mame/drivers/dwarfd.c b/src/mame/drivers/dwarfd.c
index f8b2f7719fb..76fb5cfea36 100644
--- a/src/mame/drivers/dwarfd.c
+++ b/src/mame/drivers/dwarfd.c
@@ -529,7 +529,7 @@ static void drawCrt(running_machine *machine, bitmap_t *bitmap,const rectangle *
static VIDEO_UPDATE( dwarfd )
{
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
drawCrt(screen->machine,bitmap,cliprect);
return 0;
}
diff --git a/src/mame/drivers/esh.c b/src/mame/drivers/esh.c
index e646867e9d1..0e424c5dfe9 100644
--- a/src/mame/drivers/esh.c
+++ b/src/mame/drivers/esh.c
@@ -43,7 +43,7 @@ static VIDEO_UPDATE( esh )
int charx, chary;
/* clear */
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
/* Draw tiles */
for (charx = 0; charx < 32; charx++)
diff --git a/src/mame/drivers/fcrash.c b/src/mame/drivers/fcrash.c
index bc4c6e4b209..a0413b0cb45 100644
--- a/src/mame/drivers/fcrash.c
+++ b/src/mame/drivers/fcrash.c
@@ -254,9 +254,9 @@ static VIDEO_UPDATE( fcrash )
tilemap_set_enable(cps1_bg_tilemap[2],1);
/* Blank screen */
- fillbitmap(bitmap,0xbff,cliprect);
+ bitmap_fill(bitmap,cliprect,0xbff);
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
l0 = (layercontrol >> 0x06) & 03;
l1 = (layercontrol >> 0x08) & 03;
l2 = (layercontrol >> 0x0a) & 03;
@@ -325,9 +325,9 @@ static VIDEO_UPDATE( kodb )
tilemap_set_enable(cps1_bg_tilemap[2],1);
/* Blank screen */
- fillbitmap(bitmap,0xbff,cliprect);
+ bitmap_fill(bitmap,cliprect,0xbff);
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
l0 = (layercontrol >> 0x06) & 03;
l1 = (layercontrol >> 0x08) & 03;
l2 = (layercontrol >> 0x0a) & 03;
diff --git a/src/mame/drivers/filetto.c b/src/mame/drivers/filetto.c
index eed4ee3026c..c2ae71bd57f 100644
--- a/src/mame/drivers/filetto.c
+++ b/src/mame/drivers/filetto.c
@@ -265,7 +265,7 @@ static VIDEO_UPDATE( filetto )
xxxx xx1x Select graphics
xxxx xxx1 80x25 text
*/
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
if(vga_mode[0] & 8)
{
diff --git a/src/mame/drivers/firebeat.c b/src/mame/drivers/firebeat.c
index af7727014e9..b1eb8355683 100644
--- a/src/mame/drivers/firebeat.c
+++ b/src/mame/drivers/firebeat.c
@@ -476,7 +476,7 @@ static VIDEO_UPDATE(firebeat)
else
chip = 1;
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
if (mame_stricmp(screen->machine->gamedrv->name, "popn7") == 0)
{
diff --git a/src/mame/drivers/firefox.c b/src/mame/drivers/firefox.c
index 9fbcd35c316..31c90906f6a 100644
--- a/src/mame/drivers/firefox.c
+++ b/src/mame/drivers/firefox.c
@@ -168,7 +168,7 @@ static VIDEO_UPDATE( firefox )
int sprite;
int gfxtop = video_screen_get_visible_area(screen)->min_y;
- fillbitmap( bitmap, palette_get_color(screen->machine, 256), cliprect );
+ bitmap_fill( bitmap, cliprect, palette_get_color(screen->machine, 256) );
for( sprite = 0; sprite < 32; sprite++ )
{
diff --git a/src/mame/drivers/galaxi.c b/src/mame/drivers/galaxi.c
index 14a7b2cf12b..8842e340355 100644
--- a/src/mame/drivers/galaxi.c
+++ b/src/mame/drivers/galaxi.c
@@ -143,7 +143,7 @@ static VIDEO_UPDATE(galaxi)
#endif
if (layers_ctrl & 1) tilemap_draw(bitmap,cliprect, bg1_tmap, TILEMAP_DRAW_OPAQUE, 0);
- else fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+ else bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
if (layers_ctrl & 2) tilemap_draw(bitmap,cliprect, bg2_tmap, 0, 0);
if (layers_ctrl & 4) tilemap_draw(bitmap,cliprect, bg3_tmap, 0, 0);
if (layers_ctrl & 8) tilemap_draw(bitmap,cliprect, bg4_tmap, 0, 0);
diff --git a/src/mame/drivers/galpani3.c b/src/mame/drivers/galpani3.c
index 5d8e90584e3..078446782e9 100644
--- a/src/mame/drivers/galpani3.c
+++ b/src/mame/drivers/galpani3.c
@@ -182,7 +182,7 @@ static VIDEO_UPDATE(galpani3)
UINT16 pixdata1;
const pen_t *paldata = screen->machine->pens;
- fillbitmap(bitmap, 0x0000, cliprect);
+ bitmap_fill(bitmap, cliprect, 0x0000);
{
int drawy, drawx;
@@ -324,7 +324,7 @@ static VIDEO_UPDATE(galpani3)
}
}
- fillbitmap(sprite_bitmap_1, 0x0000, cliprect);
+ bitmap_fill(sprite_bitmap_1, cliprect, 0x0000);
skns_draw_sprites(screen->machine, sprite_bitmap_1, cliprect, galpani3_spriteram32, spriteram_size, memory_region(screen->machine,"gfx1"), memory_region_length (screen->machine, "gfx1"), galpani3_spc_regs );
diff --git a/src/mame/drivers/gamecstl.c b/src/mame/drivers/gamecstl.c
index 149bdf2dd40..1e71df0042a 100644
--- a/src/mame/drivers/gamecstl.c
+++ b/src/mame/drivers/gamecstl.c
@@ -132,7 +132,7 @@ static VIDEO_UPDATE(gamecstl)
UINT32 *cga = cga_ram;
int index = 0;
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
for (j=0; j < 25; j++)
{
diff --git a/src/mame/drivers/gpworld.c b/src/mame/drivers/gpworld.c
index e5c6ae432dc..59a22096629 100644
--- a/src/mame/drivers/gpworld.c
+++ b/src/mame/drivers/gpworld.c
@@ -204,7 +204,7 @@ static void gpworld_draw_sprites(running_machine *machine, bitmap_t *bitmap, con
static VIDEO_UPDATE( gpworld )
{
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
gpworld_draw_tiles(screen->machine, bitmap, cliprect);
gpworld_draw_sprites(screen->machine, bitmap, cliprect);
diff --git a/src/mame/drivers/gticlub.c b/src/mame/drivers/gticlub.c
index 4f735ad69c8..872e05f1b96 100644
--- a/src/mame/drivers/gticlub.c
+++ b/src/mame/drivers/gticlub.c
@@ -274,7 +274,7 @@ static VIDEO_START( hangplt )
static VIDEO_UPDATE( hangplt )
{
- fillbitmap(bitmap, screen->machine->pens[0], cliprect);
+ bitmap_fill(bitmap, cliprect, screen->machine->pens[0]);
if (strcmp(screen->tag, "left") == 0)
{
diff --git a/src/mame/drivers/guab.c b/src/mame/drivers/guab.c
index d6b355c2d8d..02c1f1f87a6 100644
--- a/src/mame/drivers/guab.c
+++ b/src/mame/drivers/guab.c
@@ -219,7 +219,7 @@ static VIDEO_UPDATE( guab )
/* If blanked, fill with black */
if (state.blanked)
{
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
return 0;
}
diff --git a/src/mame/drivers/halleys.c b/src/mame/drivers/halleys.c
index 882b2f9aecc..78ad6e8102f 100644
--- a/src/mame/drivers/halleys.c
+++ b/src/mame/drivers/halleys.c
@@ -1429,7 +1429,7 @@ static VIDEO_UPDATE( halleys )
copy_scroll_xp(bitmap, render_layer[4], *scrollx1, *scrolly1);
}
else
- fillbitmap(bitmap, bgcolor, cliprect);
+ bitmap_fill(bitmap, cliprect, bgcolor);
#ifdef MAME_DEBUG
if (input_port_read(screen->machine, "DEBUG")) copy_scroll_xp(bitmap, render_layer[3], *scrollx0, *scrolly0); // not used???
@@ -1452,7 +1452,7 @@ static VIDEO_UPDATE( benberob )
if (io_ram[0xa0] & 0x80)
copy_scroll_op(bitmap, render_layer[2], *scrollx1, *scrolly1);
else
- fillbitmap(bitmap, bgcolor, cliprect);
+ bitmap_fill(bitmap, cliprect, bgcolor);
copy_fixed_xp (bitmap, render_layer[1]);
copy_fixed_xp (bitmap, render_layer[0]);
diff --git a/src/mame/drivers/hanaroku.c b/src/mame/drivers/hanaroku.c
index 459ab66ae9e..1a6388a7f49 100644
--- a/src/mame/drivers/hanaroku.c
+++ b/src/mame/drivers/hanaroku.c
@@ -67,7 +67,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta
static VIDEO_UPDATE(hanaroku)
{
- fillbitmap(bitmap, 0x1f0, cliprect); // ???
+ bitmap_fill(bitmap, cliprect, 0x1f0); // ???
draw_sprites(screen->machine, bitmap, cliprect);
return 0;
}
diff --git a/src/mame/drivers/hotblock.c b/src/mame/drivers/hotblock.c
index dfd2cff3ff6..9ce74beee51 100644
--- a/src/mame/drivers/hotblock.c
+++ b/src/mame/drivers/hotblock.c
@@ -126,7 +126,7 @@ static VIDEO_UPDATE(hotblock)
int i;
static const int xxx=320,yyy=204;
- fillbitmap(bitmap, get_black_pen(screen->machine), 0);
+ bitmap_fill(bitmap, 0, get_black_pen(screen->machine));
for (i=0;i<256;i++)
{
diff --git a/src/mame/drivers/igs009.c b/src/mame/drivers/igs009.c
index 124cf01acd9..4fa4e8ff6c9 100644
--- a/src/mame/drivers/igs009.c
+++ b/src/mame/drivers/igs009.c
@@ -107,7 +107,7 @@ static VIDEO_UPDATE(jingbell)
int x,y,z, tmap, ystart = 0;
rectangle myclip;
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
memcpy(&myclip,cliprect,sizeof(myclip));
@@ -137,7 +137,7 @@ static VIDEO_UPDATE(jingbell)
}
else tilemap_draw(bitmap, cliprect, bg_tilemap, TILEMAP_DRAW_OPAQUE, 0);
}
- else fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ else bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
if (layers_ctrl & 2) tilemap_draw(bitmap, cliprect, fg_tilemap, 0, 0);
diff --git a/src/mame/drivers/igs_180.c b/src/mame/drivers/igs_180.c
index 9782340eb27..8162f62809d 100644
--- a/src/mame/drivers/igs_180.c
+++ b/src/mame/drivers/igs_180.c
@@ -218,7 +218,7 @@ static int debug_viewer(bitmap_t *bitmap,const rectangle *cliprect)
if (w <= 0) w = 0;
if (w > 1024) w = 1024;
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
draw_sprite(bitmap, cliprect, 0,0, w,h, 0,0, 0, a);
@@ -249,7 +249,7 @@ static VIDEO_UPDATE(igs_180)
return 0;
if (layers_ctrl & 1) tilemap_draw(bitmap,cliprect,bg_tilemap,TILEMAP_DRAW_OPAQUE,0);
- else fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+ else bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
if (layers_ctrl & 4) draw_sprites(screen->machine,bitmap,cliprect);
diff --git a/src/mame/drivers/igs_m027.c b/src/mame/drivers/igs_m027.c
index c345e15ad01..72fe36c02eb 100644
--- a/src/mame/drivers/igs_m027.c
+++ b/src/mame/drivers/igs_m027.c
@@ -143,7 +143,7 @@ static VIDEO_START(igs_majhong)
static VIDEO_UPDATE(igs_majhong)
{
//??????????
- fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+ bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
//??????
tilemap_draw(bitmap,cliprect,igs_bg_tilemap,0,0);
diff --git a/src/mame/drivers/intrscti.c b/src/mame/drivers/intrscti.c
index ef2db43704a..8c38919715f 100644
--- a/src/mame/drivers/intrscti.c
+++ b/src/mame/drivers/intrscti.c
@@ -68,7 +68,7 @@ static VIDEO_UPDATE(intrscti)
int y,x;
int count;
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
count = 0;
for (y=0;y<64;y++)
diff --git a/src/mame/drivers/istellar.c b/src/mame/drivers/istellar.c
index 864f9eff72c..6939d52b4d4 100644
--- a/src/mame/drivers/istellar.c
+++ b/src/mame/drivers/istellar.c
@@ -45,7 +45,7 @@ static VIDEO_UPDATE( istellar )
int charx, chary;
/* clear */
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
/* DEBUG */
/*
diff --git a/src/mame/drivers/jalmah.c b/src/mame/drivers/jalmah.c
index 242d0e2b1ad..4455fcf18dd 100644
--- a/src/mame/drivers/jalmah.c
+++ b/src/mame/drivers/jalmah.c
@@ -400,7 +400,7 @@ static VIDEO_UPDATE( jalmah )
tilemap_set_scrolly( sc3_tilemap_2, 0, jm_scrollram[7] & 0x1ff);
tilemap_set_scrolly( sc3_tilemap_3, 0, jm_scrollram[7] & 0x3ff);
- fillbitmap(bitmap, screen->machine->pens[0x10f], cliprect);//selectable by a ram address?
+ bitmap_fill(bitmap, cliprect, screen->machine->pens[0x10f]);//selectable by a ram address?
for(cur_prin=0;cur_prin<4;cur_prin++)
{
@@ -421,7 +421,7 @@ static VIDEO_UPDATE( urashima )
tilemap_set_scrolly( sc0_tilemap_0, 0, jm_scrollram[4]);
tilemap_set_scrolly( sc3_tilemap_0, 0, jm_scrollram[7]);
- fillbitmap(bitmap, screen->machine->pens[0x1ff], cliprect);//selectable by a ram address?
+ bitmap_fill(bitmap, cliprect, screen->machine->pens[0x1ff]);//selectable by a ram address?
if(jm_vregs[0] & 1) { tilemap_draw(bitmap,cliprect,sc0_tilemap_0,0,0); }
if(jm_vregs[3] & 1) { tilemap_draw(bitmap,cliprect,sc3_tilemap_0,0,0); }
return 0;
diff --git a/src/mame/drivers/jchan.c b/src/mame/drivers/jchan.c
index 27071035e2a..bbf32d6e733 100644
--- a/src/mame/drivers/jchan.c
+++ b/src/mame/drivers/jchan.c
@@ -376,12 +376,12 @@ static VIDEO_UPDATE(jchan)
UINT16 pixdata1;
UINT16 pixdata2;
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
VIDEO_UPDATE_CALL(jchan_view2);
- fillbitmap(sprite_bitmap_1, 0x0000, cliprect);
- fillbitmap(sprite_bitmap_2, 0x0000, cliprect);
+ bitmap_fill(sprite_bitmap_1, cliprect, 0x0000);
+ bitmap_fill(sprite_bitmap_2, cliprect, 0x0000);
skns_draw_sprites(screen->machine, sprite_bitmap_1, cliprect, jchan_sprite_ram32_1, 0x4000, memory_region(screen->machine,"gfx1"), memory_region_length (screen->machine, "gfx1"), jchan_sprite_regs32_1 );
skns_draw_sprites(screen->machine, sprite_bitmap_2, cliprect, jchan_sprite_ram32_2, 0x4000, memory_region(screen->machine,"gfx2"), memory_region_length (screen->machine, "gfx2"), jchan_sprite_regs32_2 );
diff --git a/src/mame/drivers/jollyjgr.c b/src/mame/drivers/jollyjgr.c
index ab09dc6ba04..2ea0f143e5f 100644
--- a/src/mame/drivers/jollyjgr.c
+++ b/src/mame/drivers/jollyjgr.c
@@ -319,7 +319,7 @@ static VIDEO_UPDATE( jollyjgr )
{
int offs;
- fillbitmap(bitmap,32,cliprect);
+ bitmap_fill(bitmap,cliprect,32);
tilemap_draw(bitmap,cliprect,bg_tilemap,0,0);
diff --git a/src/mame/drivers/konamim2.c b/src/mame/drivers/konamim2.c
index 74243da4f61..2e6405ca4eb 100644
--- a/src/mame/drivers/konamim2.c
+++ b/src/mame/drivers/konamim2.c
@@ -227,7 +227,7 @@ static VIDEO_UPDATE( m2 )
}
else
{
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
}
return 0;
}
diff --git a/src/mame/drivers/lastfght.c b/src/mame/drivers/lastfght.c
index 90e0ebd6d10..402156fc5e5 100644
--- a/src/mame/drivers/lastfght.c
+++ b/src/mame/drivers/lastfght.c
@@ -104,7 +104,7 @@ static VIDEO_UPDATE( lastfght )
count = base;
- fillbitmap( bitmap, get_black_pen(screen->machine), cliprect );
+ bitmap_fill( bitmap, cliprect , get_black_pen(screen->machine));
for ( y = 0 ; y < 256; y++ )
{
for ( x = 0; x < 512; x++ )
diff --git a/src/mame/drivers/lgp.c b/src/mame/drivers/lgp.c
index 188a1500104..2880d5061fe 100644
--- a/src/mame/drivers/lgp.c
+++ b/src/mame/drivers/lgp.c
@@ -87,7 +87,7 @@ static VIDEO_UPDATE( lgp )
palette_set_color(screen->machine, 0, MAKE_ARGB(0,0,0,0));
/* clear */
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
/* Draw tiles */
for (charx = 0; charx < 32; charx++)
diff --git a/src/mame/drivers/limenko.c b/src/mame/drivers/limenko.c
index 8fb78223d05..1c89b8633d9 100644
--- a/src/mame/drivers/limenko.c
+++ b/src/mame/drivers/limenko.c
@@ -113,8 +113,8 @@ static WRITE32_HANDLER( spriteram_buffer_w )
clip.min_y = 0;
clip.max_y = 239;
- fillbitmap(sprites_bitmap_pri,0,&clip);
- fillbitmap(sprites_bitmap,0,&clip);
+ bitmap_fill(sprites_bitmap_pri,&clip,0);
+ bitmap_fill(sprites_bitmap,&clip,0);
// toggle spriterams location in the memory map
spriteram_bit ^= 1;
@@ -449,7 +449,7 @@ static VIDEO_UPDATE( limenko )
{
// limenko_videoreg[4] ???? It always has this value: 0xffeffff8 (2 signed bytes? values: -17 and -8 ?)
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
tilemap_set_enable(bg_tilemap, limenko_videoreg[0] & 4);
tilemap_set_enable(md_tilemap, limenko_videoreg[0] & 2);
diff --git a/src/mame/drivers/littlerb.c b/src/mame/drivers/littlerb.c
index dc8ec9ebe92..e1379aa8d6a 100644
--- a/src/mame/drivers/littlerb.c
+++ b/src/mame/drivers/littlerb.c
@@ -338,7 +338,7 @@ static VIDEO_UPDATE(littlerb)
int x,y,offs, code;
int xsize,ysize;
UINT16* spriteregion = &littlerb_region4[0x400];
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
/* the spriteram format is something like this .. */
for (offs=0x26/2;offs<0xc00;offs+=6) // start at 00x26?
diff --git a/src/mame/drivers/marinedt.c b/src/mame/drivers/marinedt.c
index 0c35357515c..f7c8054b77d 100644
--- a/src/mame/drivers/marinedt.c
+++ b/src/mame/drivers/marinedt.c
@@ -470,10 +470,10 @@ static VIDEO_UPDATE( marinedt )
{
int sx, sy;
- fillbitmap(tile, 0, NULL);
+ bitmap_fill(tile, NULL, 0);
tilemap_draw(tile, cliprect, tx_tilemap, 0, 0);
- fillbitmap(obj1, 0, NULL);
+ bitmap_fill(obj1, NULL, 0);
drawgfx(obj1, screen->machine->gfx[1],
OBJ_CODE(marinedt_obj1_a),
OBJ_COLOR(marinedt_obj1_a),
@@ -481,7 +481,7 @@ static VIDEO_UPDATE( marinedt )
0, 0,
NULL, TRANSPARENCY_PEN, 0);
- fillbitmap(obj2, 0, NULL);
+ bitmap_fill(obj2, NULL, 0);
drawgfx(obj2, screen->machine->gfx[2],
OBJ_CODE(marinedt_obj2_a),
OBJ_COLOR(marinedt_obj2_a),
@@ -489,7 +489,7 @@ static VIDEO_UPDATE( marinedt )
0, 0,
NULL, TRANSPARENCY_PEN, 0);
- fillbitmap(bitmap, 0, NULL);
+ bitmap_fill(bitmap, NULL, 0);
if (marinedt_pd & 0x02)
copybitmap_trans(bitmap, obj2, 0, 0, OBJ_X(marinedt_obj2_x), OBJ_Y(marinedt_obj2_y), cliprect, 0);
diff --git a/src/mame/drivers/mazerbla.c b/src/mame/drivers/mazerbla.c
index cfb02d97cd6..a790ec2cb6a 100644
--- a/src/mame/drivers/mazerbla.c
+++ b/src/mame/drivers/mazerbla.c
@@ -134,7 +134,7 @@ VIDEO_UPDATE( test_vcu )
color_base = 0x0;
- fillbitmap(bitmap,0,NULL);
+ bitmap_fill(bitmap,NULL,0);
//logerror("-->frame\n");
@@ -144,17 +144,17 @@ VIDEO_UPDATE( test_vcu )
if (planes_enabled[2])
copybitmap_trans(bitmap,tmpbitmaps[2],0,0,0,0,cliprect,color_base);
- fillbitmap(tmpbitmaps[2],color_base,NULL);
+ bitmap_fill(tmpbitmaps[2],NULL,color_base);
if (planes_enabled[1])
copybitmap_trans(bitmap,tmpbitmaps[1],0,0,0,0,cliprect,color_base);
- fillbitmap(tmpbitmaps[1],color_base,NULL);
+ bitmap_fill(tmpbitmaps[1],NULL,color_base);
if (planes_enabled[0])
copybitmap_trans(bitmap,tmpbitmaps[0],0,0,0,0,cliprect,color_base);
- fillbitmap(tmpbitmaps[0],color_base,NULL);
+ bitmap_fill(tmpbitmaps[0],NULL,color_base);
if (input_code_pressed_once(KEYCODE_1)) /* plane 1 */
{
@@ -247,7 +247,7 @@ static VIDEO_UPDATE( greatgun )
if (game_id==GREATGUN)
color_base = 0x0;
-//fillbitmap(bitmap,0,NULL);
+//bitmap_fill(bitmap,NULL,0);
copybitmap (bitmap,tmpbitmaps[3],0,0,0,0,cliprect);
copybitmap_trans(bitmap,tmpbitmaps[2],0,0,0,0,cliprect,color_base);
@@ -267,7 +267,7 @@ static VIDEO_UPDATE( mazerbla )
if (game_id==GREATGUN)
color_base = 0x0;
-//fillbitmap(bitmap,0,NULL);
+//bitmap_fill(bitmap,NULL,0);
copybitmap (bitmap,tmpbitmaps[3],0,0,0,0,cliprect); //text
copybitmap_trans(bitmap,tmpbitmaps[2],0,0,0,0,cliprect,0);
diff --git a/src/mame/drivers/mediagx.c b/src/mame/drivers/mediagx.c
index 1f2443d07e4..2d92b31660d 100644
--- a/src/mame/drivers/mediagx.c
+++ b/src/mame/drivers/mediagx.c
@@ -319,7 +319,7 @@ static void draw_cga(running_machine *machine, bitmap_t *bitmap, const rectangle
static VIDEO_UPDATE(mediagx)
{
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
draw_framebuffer(screen->machine, bitmap, cliprect);
diff --git a/src/mame/drivers/meritm.c b/src/mame/drivers/meritm.c
index 3e3adc128d9..bc297668b8c 100644
--- a/src/mame/drivers/meritm.c
+++ b/src/mame/drivers/meritm.c
@@ -353,7 +353,7 @@ static VIDEO_UPDATE( meritm )
popmessage("Layer 1 %sabled",layer1_enabled ? "en" : "dis");
}
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
if ( layer0_enabled )
{
diff --git a/src/mame/drivers/midas.c b/src/mame/drivers/midas.c
index 4b06a280e25..9438898be08 100644
--- a/src/mame/drivers/midas.c
+++ b/src/mame/drivers/midas.c
@@ -170,7 +170,7 @@ static VIDEO_UPDATE( livequiz )
}
#endif
- fillbitmap(bitmap,4095,cliprect);
+ bitmap_fill(bitmap,cliprect,4095);
if (layers_ctrl & 2) draw_sprites(screen->machine, bitmap,cliprect);
if (layers_ctrl & 1) tilemap_draw(bitmap,cliprect, tmap, 0, 0);
diff --git a/src/mame/drivers/mirage.c b/src/mame/drivers/mirage.c
index c3fe00e5880..2d5f08d507c 100644
--- a/src/mame/drivers/mirage.c
+++ b/src/mame/drivers/mirage.c
@@ -123,7 +123,7 @@ static VIDEO_UPDATE(mirage)
flip_screen_set( deco16_pf12_control[0]&0x80 );
deco16_pf12_update(deco16_pf1_rowscroll,deco16_pf2_rowscroll);
- fillbitmap(bitmap,256,cliprect); /* not verified */
+ bitmap_fill(bitmap,cliprect,256); /* not verified */
deco16_tilemap_2_draw(bitmap,cliprect,TILEMAP_DRAW_OPAQUE,0);
deco16_tilemap_1_draw(bitmap,cliprect,0,0);
diff --git a/src/mame/drivers/missb2.c b/src/mame/drivers/missb2.c
index 83c74462920..83096fd6965 100644
--- a/src/mame/drivers/missb2.c
+++ b/src/mame/drivers/missb2.c
@@ -35,7 +35,7 @@ static VIDEO_UPDATE( missb2 )
/* and sprites) are stored in the same memory region, and information on */
/* the background character columns is stored in the area dd00-dd3f */
- fillbitmap(bitmap,255,cliprect);
+ bitmap_fill(bitmap,cliprect,255);
if (!bublbobl_video_enable) return 0;
diff --git a/src/mame/drivers/mlanding.c b/src/mame/drivers/mlanding.c
index b06e37fccad..faffe37cc80 100644
--- a/src/mame/drivers/mlanding.c
+++ b/src/mame/drivers/mlanding.c
@@ -209,7 +209,7 @@ static VIDEO_START(mlanding)
static VIDEO_UPDATE(mlanding)
{
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
updateChars(screen->machine);
diff --git a/src/mame/drivers/mpu4drvr.c b/src/mame/drivers/mpu4drvr.c
index 7820eaee661..cdcf9a67030 100644
--- a/src/mame/drivers/mpu4drvr.c
+++ b/src/mame/drivers/mpu4drvr.c
@@ -450,7 +450,7 @@ static VIDEO_UPDATE( mpu4_vid )
int x,y,count = 0;
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
for (i = 0; i < 0x1000; i++)
{
diff --git a/src/mame/drivers/murogem.c b/src/mame/drivers/murogem.c
index 8848f933bed..dc435b39009 100644
--- a/src/mame/drivers/murogem.c
+++ b/src/mame/drivers/murogem.c
@@ -171,7 +171,7 @@ static VIDEO_UPDATE(murogem)
int xx,yy,count;
count = 0x000;
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
for (yy=0;yy<32;yy++)
{
diff --git a/src/mame/drivers/mwarr.c b/src/mame/drivers/mwarr.c
index f03a070009b..a2de71732e3 100644
--- a/src/mame/drivers/mwarr.c
+++ b/src/mame/drivers/mwarr.c
@@ -399,7 +399,7 @@ static VIDEO_UPDATE( mwarr )
{
int i;
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
if(vidattrram[6] & 1)
{
diff --git a/src/mame/drivers/namcoic.c b/src/mame/drivers/namcoic.c
index 2b224c72040..cb74de2e814 100644
--- a/src/mame/drivers/namcoic.c
+++ b/src/mame/drivers/namcoic.c
@@ -420,7 +420,7 @@ namcos2_draw_sprites(running_machine *machine, bitmap_t *bitmap, const rectangle
int loop;
if( pri==0 )
{
- fillbitmap( priority_bitmap, 0, cliprect );
+ bitmap_fill( priority_bitmap, cliprect , 0);
}
for( loop=0; loop < 128; loop++ )
{
@@ -535,7 +535,7 @@ namcos2_draw_sprites_metalhawk(running_machine *machine, bitmap_t *bitmap, const
int loop;
if( pri==0 )
{
- fillbitmap( priority_bitmap, 0, cliprect );
+ bitmap_fill( priority_bitmap, cliprect , 0);
}
for( loop=0; loop < 128; loop++ )
{
@@ -953,7 +953,7 @@ namco_obj_draw(running_machine *machine, bitmap_t *bitmap, const rectangle *clip
// int offs = spriteram16[0x18000/2]; /* end-of-sprite-list */
if( pri==0 )
{
- fillbitmap( priority_bitmap, 0, cliprect );
+ bitmap_fill( priority_bitmap, cliprect , 0);
}
// if( offs==0 )
{ /* boot */
diff --git a/src/mame/drivers/namcos23.c b/src/mame/drivers/namcos23.c
index b76a112ba64..ef7a5992758 100644
--- a/src/mame/drivers/namcos23.c
+++ b/src/mame/drivers/namcos23.c
@@ -873,8 +873,8 @@ DrawPoly( bitmap_t *bitmap, const UINT32 *pSource, int n, int bNew )
static VIDEO_UPDATE( ss23 )
{
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
- fillbitmap(priority_bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
+ bitmap_fill(priority_bitmap, cliprect, 0);
tilemap_mark_all_tiles_dirty(bgtilemap);
tilemap_draw( bitmap, cliprect, bgtilemap, 0/*flags*/, 0/*priority*/ ); /* opaque */
@@ -886,7 +886,7 @@ static VIDEO_UPDATE( ss23 )
pSource = pSource + pSource[code];
- fillbitmap( bitmap, 0, 0 );
+ bitmap_fill( bitmap, 0 , 0);
for(;;)
{
UINT32 opcode = *pSource++;
diff --git a/src/mame/drivers/nwk-tr.c b/src/mame/drivers/nwk-tr.c
index 83a94dcc0e0..8d5921925ae 100644
--- a/src/mame/drivers/nwk-tr.c
+++ b/src/mame/drivers/nwk-tr.c
@@ -517,7 +517,7 @@ void K001604_draw_back_layer(int chip, bitmap_t *bitmap, const rectangle *clipre
{
int layer;
int num_layers;
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
num_layers = K001604_layer_size ? 2 : 1;
@@ -720,7 +720,7 @@ static VIDEO_UPDATE( nwktr )
{
const device_config *voodoo = device_list_find_by_tag(screen->machine->config->devicelist, VOODOO_GRAPHICS, "voodoo");
- fillbitmap(bitmap, screen->machine->pens[0], cliprect);
+ bitmap_fill(bitmap, cliprect, screen->machine->pens[0]);
voodoo_update(voodoo, bitmap, cliprect);
diff --git a/src/mame/drivers/panicr.c b/src/mame/drivers/panicr.c
index 1e887678a29..98aadcce6e7 100644
--- a/src/mame/drivers/panicr.c
+++ b/src/mame/drivers/panicr.c
@@ -220,7 +220,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan
static VIDEO_UPDATE( panicr)
{
- fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+ bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
tilemap_mark_all_tiles_dirty( txttilemap );
tilemap_set_scrollx( bgtilemap,0, ((scrollram[0x02]&0x0f)<<12)+((scrollram[0x02]&0xf0)<<4)+((scrollram[0x04]&0x7f)<<1)+((scrollram[0x04]&0x80)>>7) );
tilemap_draw(bitmap,cliprect,bgtilemap,0,0);
diff --git a/src/mame/drivers/pturn.c b/src/mame/drivers/pturn.c
index c09b88dd65c..4e5b6b5aff5 100644
--- a/src/mame/drivers/pturn.c
+++ b/src/mame/drivers/pturn.c
@@ -132,7 +132,7 @@ static VIDEO_UPDATE(pturn)
int sx, sy;
int flipx, flipy;
- fillbitmap(bitmap, bgcolor, cliprect);
+ bitmap_fill(bitmap, cliprect, bgcolor);
tilemap_draw(bitmap,cliprect,pturn_bgmap,0,0);
for ( offs = 0x80-4 ; offs >=0 ; offs -= 4)
{
diff --git a/src/mame/drivers/quizpun2.c b/src/mame/drivers/quizpun2.c
index 9c28506f536..a4ae59fc0a3 100644
--- a/src/mame/drivers/quizpun2.c
+++ b/src/mame/drivers/quizpun2.c
@@ -99,9 +99,9 @@ static VIDEO_UPDATE(quizpun2)
#endif
if (layers_ctrl & 1) tilemap_draw(bitmap,cliprect, bg_tmap, TILEMAP_DRAW_OPAQUE, 0);
- else fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+ else bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
-fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
if (layers_ctrl & 2) tilemap_draw(bitmap,cliprect, fg_tmap, 0, 0);
return 0;
diff --git a/src/mame/drivers/rabbit.c b/src/mame/drivers/rabbit.c
index 771ffbf5c41..de552c231e1 100644
--- a/src/mame/drivers/rabbit.c
+++ b/src/mame/drivers/rabbit.c
@@ -224,7 +224,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta
UINT32 *source = (rabbit_spriteram+ (todraw*2))-2;
UINT32 *finish = rabbit_spriteram;
-// fillbitmap(rabbit_sprite_bitmap, 0x0, &rabbit_sprite_clip); // sloooow
+// bitmap_fill(rabbit_sprite_bitmap, &rabbit_sprite_clip, 0x0); // sloooow
while( source>=finish )
{
@@ -411,7 +411,7 @@ static VIDEO_UPDATE(rabbit)
{
int prilevel;
- fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+ bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
// popmessage("%08x %08x", rabbit_viewregs0[0], rabbit_viewregs0[1]);
// popmessage("%08x %08x %08x %08x %08x %08x", rabbit_tilemap_regs[0][0],rabbit_tilemap_regs[0][1],rabbit_tilemap_regs[0][2],rabbit_tilemap_regs[0][3],rabbit_tilemap_regs[0][4],rabbit_tilemap_regs[0][5]);
@@ -1152,7 +1152,7 @@ static VIDEO_UPDATE( tmmjprd )
// popmessage("%08x %08x %08x %08x %08x", rabbit_viewregs10[0],rabbit_viewregs10[1],rabbit_viewregs10[2],rabbit_viewregs10[3],rabbit_viewregs10[4]);
- fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+ bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
tilemap_draw(bitmap,cliprect,rabbit_tilemap[3],0,0);
tilemap_draw(bitmap,cliprect,rabbit_tilemap[1],0,0); //same as 3?
tilemap_draw(bitmap,cliprect,rabbit_tilemap[2],0,0);
diff --git a/src/mame/drivers/raiden2.c b/src/mame/drivers/raiden2.c
index eed7f10e698..f86b6708a44 100644
--- a/src/mame/drivers/raiden2.c
+++ b/src/mame/drivers/raiden2.c
@@ -537,7 +537,7 @@ static VIDEO_UPDATE ( raiden2 )
#endif
#endif
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
if (!input_code_pressed(KEYCODE_Q))
tilemap_draw(bitmap, cliprect, background_layer, 0, 0);
diff --git a/src/mame/drivers/sbowling.c b/src/mame/drivers/sbowling.c
index 11bea1c3354..f2aa522eaa6 100644
--- a/src/mame/drivers/sbowling.c
+++ b/src/mame/drivers/sbowling.c
@@ -94,7 +94,7 @@ static WRITE8_HANDLER( sbw_videoram_w )
static VIDEO_UPDATE(sbowling)
{
- fillbitmap(bitmap,0x18,cliprect);
+ bitmap_fill(bitmap,cliprect,0x18);
tilemap_draw(bitmap,cliprect,sb_tilemap,0,0);
copybitmap_trans(bitmap,tmpbitmap,0,0,0,0,cliprect, color_prom_address);
return 0;
diff --git a/src/mame/drivers/segac2.c b/src/mame/drivers/segac2.c
index 601317a676e..27db95038d9 100644
--- a/src/mame/drivers/segac2.c
+++ b/src/mame/drivers/segac2.c
@@ -1392,7 +1392,7 @@ VIDEO_UPDATE(segac2_new)
{
if (!segac2_enable_display)
{
- fillbitmap(bitmap, get_black_pen(screen->machine), NULL);
+ bitmap_fill(bitmap, NULL, get_black_pen(screen->machine));
return 0;
}
diff --git a/src/mame/drivers/segald.c b/src/mame/drivers/segald.c
index 65639f86ac7..3a86f03b81a 100644
--- a/src/mame/drivers/segald.c
+++ b/src/mame/drivers/segald.c
@@ -80,7 +80,7 @@ static void astron_draw_sprites(bitmap_t *bitmap, const rectangle *cliprect)
static VIDEO_UPDATE( astron )
{
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
astron_draw_characters(screen->machine, bitmap, cliprect);
astron_draw_sprites(bitmap, cliprect);
diff --git a/src/mame/drivers/skylncr.c b/src/mame/drivers/skylncr.c
index c1f9532a644..d01e35f56df 100644
--- a/src/mame/drivers/skylncr.c
+++ b/src/mame/drivers/skylncr.c
@@ -83,7 +83,7 @@ static VIDEO_START( skylncr )
static VIDEO_UPDATE( skylncr )
{
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
tilemap_draw(bitmap,cliprect, tmap2, 0, 0);
tilemap_draw(bitmap,cliprect, tmap, 0, 0);
return 0;
diff --git a/src/mame/drivers/sliver.c b/src/mame/drivers/sliver.c
index 379912a9a73..47699ae36ee 100644
--- a/src/mame/drivers/sliver.c
+++ b/src/mame/drivers/sliver.c
@@ -288,7 +288,7 @@ static void blit_gfx(running_machine *machine)
static WRITE16_HANDLER( fifo_clear_w )
{
- fillbitmap(sliver_bitmap_fg, 0,0);
+ bitmap_fill(sliver_bitmap_fg, 0,0);
fptr=0;
tmp_counter=0;
}
@@ -310,7 +310,7 @@ static void render_jpeg(running_machine *machine)
int addr=jpeg_addr;
UINT8 *rom;
- fillbitmap(sliver_bitmap_bg, 0,0);
+ bitmap_fill(sliver_bitmap_bg, 0,0);
if(jpeg_addr<0)
{
return;
diff --git a/src/mame/drivers/snowbros.c b/src/mame/drivers/snowbros.c
index e697a90d41d..94656f8dd34 100644
--- a/src/mame/drivers/snowbros.c
+++ b/src/mame/drivers/snowbros.c
@@ -83,7 +83,7 @@ static WRITE16_HANDLER( snowbros_flipscreen_w )
static VIDEO_UPDATE( snowbros )
{
/* This clears & redraws the entire screen each pass */
- fillbitmap(bitmap,0xf0,cliprect);
+ bitmap_fill(bitmap,cliprect,0xf0);
pandora_update(screen->machine,bitmap,cliprect);
return 0;
}
diff --git a/src/mame/drivers/srmp5.c b/src/mame/drivers/srmp5.c
index f8ad5ac3e0b..d64e6c06a42 100644
--- a/src/mame/drivers/srmp5.c
+++ b/src/mame/drivers/srmp5.c
@@ -69,7 +69,7 @@ static VIDEO_UPDATE( srmp5 )
UINT8 *pixels=(UINT8 *)tileram;
const rectangle *visarea = video_screen_get_visible_area(screen);
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
while((sprite_list[SUBLIST_OFFSET]&SPRITE_LIST_END_MARKER)==0 && sprite_list<sprite_list_end)
{
diff --git a/src/mame/drivers/srmp6.c b/src/mame/drivers/srmp6.c
index 1c05a6d6873..bbf3ac840cf 100644
--- a/src/mame/drivers/srmp6.c
+++ b/src/mame/drivers/srmp6.c
@@ -178,7 +178,7 @@ static VIDEO_UPDATE(srmp6)
UINT16 b;
} temp;
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
#if 0
/* debug */
diff --git a/src/mame/drivers/steaser.c b/src/mame/drivers/steaser.c
index 75237eeb39e..63150f36808 100644
--- a/src/mame/drivers/steaser.c
+++ b/src/mame/drivers/steaser.c
@@ -66,7 +66,7 @@ static WRITE16_HANDLER(blitter_9b8000_w)
if(of==0)
{
- fillbitmap(tmpbitmap,get_black_pen(space->machine),0);
+ bitmap_fill(tmpbitmap,NULL,get_black_pen(space->machine));
return;
}
diff --git a/src/mame/drivers/subsino.c b/src/mame/drivers/subsino.c
index 4e4d384214e..25d5fb0ef1a 100644
--- a/src/mame/drivers/subsino.c
+++ b/src/mame/drivers/subsino.c
@@ -68,7 +68,7 @@ static VIDEO_START( subsino )
static VIDEO_UPDATE( subsino )
{
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
tilemap_draw(bitmap,cliprect, tmap, 0, 0);
return 0;
}
diff --git a/src/mame/drivers/taitowlf.c b/src/mame/drivers/taitowlf.c
index 19ed5220839..55c590142b0 100644
--- a/src/mame/drivers/taitowlf.c
+++ b/src/mame/drivers/taitowlf.c
@@ -77,7 +77,7 @@ static VIDEO_UPDATE(taitowlf)
UINT32 *cga = cga_ram;
int index = 0;
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
for (j=0; j < 25; j++)
{
diff --git a/src/mame/drivers/tecmosys.c b/src/mame/drivers/tecmosys.c
index 8db3d9f7a65..3daf674a580 100644
--- a/src/mame/drivers/tecmosys.c
+++ b/src/mame/drivers/tecmosys.c
@@ -582,13 +582,13 @@ ADDRESS_MAP_END
static VIDEO_START(deroon)
{
sprite_bitmap = auto_bitmap_alloc(320,240,BITMAP_FORMAT_INDEXED16);
- fillbitmap(sprite_bitmap, 0x4000, NULL);
+ bitmap_fill(sprite_bitmap, NULL, 0x4000);
tmp_tilemap_composebitmap = auto_bitmap_alloc(320,240,BITMAP_FORMAT_INDEXED16);
tmp_tilemap_renderbitmap = auto_bitmap_alloc(320,240,BITMAP_FORMAT_INDEXED16);
- fillbitmap(tmp_tilemap_composebitmap, 0x0000, NULL);
- fillbitmap(tmp_tilemap_renderbitmap, 0x0000, NULL);
+ bitmap_fill(tmp_tilemap_composebitmap, NULL, 0x0000);
+ bitmap_fill(tmp_tilemap_renderbitmap, NULL, 0x0000);
txt_tilemap = tilemap_create(get_tile_info,tilemap_scan_rows,8,8,32*2,32*2);
@@ -611,7 +611,7 @@ static void tecmosys_render_sprites_to_bitmap(running_machine *machine, bitmap_t
int i;
/* render sprites (with priority information) to temp bitmap */
- fillbitmap(sprite_bitmap, 0x0000, NULL);
+ bitmap_fill(sprite_bitmap, NULL, 0x0000);
/* there are multiple spritelists in here, to allow for buffering */
for (i=(tecmosys_spritelist*0x4000)/2;i<((tecmosys_spritelist+1)*0x4000)/2;i+=8)
{
@@ -795,7 +795,7 @@ static void tecmosys_do_final_mix(running_machine *machine, bitmap_t* bitmap)
static VIDEO_UPDATE(deroon)
{
- fillbitmap(bitmap,screen->machine->pens[0x4000],cliprect);
+ bitmap_fill(bitmap,cliprect,screen->machine->pens[0x4000]);
tilemap_set_scrolly( bg0tilemap, 0, tecmosys_c80000regs[1]+16);
@@ -807,21 +807,21 @@ static VIDEO_UPDATE(deroon)
tilemap_set_scrolly( bg2tilemap, 0, tecmosys_b00000regs[1]+17);
tilemap_set_scrollx( bg2tilemap, 0, tecmosys_b00000regs[0]+106);
- fillbitmap(tmp_tilemap_composebitmap,0,cliprect);
+ bitmap_fill(tmp_tilemap_composebitmap,cliprect,0);
- fillbitmap(tmp_tilemap_renderbitmap,0,cliprect);
+ bitmap_fill(tmp_tilemap_renderbitmap,cliprect,0);
tilemap_draw(tmp_tilemap_renderbitmap,cliprect,bg0tilemap,0,0);
tecmosys_tilemap_copy_to_compose(0x0000);
- fillbitmap(tmp_tilemap_renderbitmap,0,cliprect);
+ bitmap_fill(tmp_tilemap_renderbitmap,cliprect,0);
tilemap_draw(tmp_tilemap_renderbitmap,cliprect,bg1tilemap,0,0);
tecmosys_tilemap_copy_to_compose(0x4000);
- fillbitmap(tmp_tilemap_renderbitmap,0,cliprect);
+ bitmap_fill(tmp_tilemap_renderbitmap,cliprect,0);
tilemap_draw(tmp_tilemap_renderbitmap,cliprect,bg2tilemap,0,0);
tecmosys_tilemap_copy_to_compose(0x8000);
- fillbitmap(tmp_tilemap_renderbitmap,0,cliprect);
+ bitmap_fill(tmp_tilemap_renderbitmap,cliprect,0);
tilemap_draw(tmp_tilemap_renderbitmap,cliprect,txt_tilemap,0,0);
tecmosys_tilemap_copy_to_compose(0xc000);
diff --git a/src/mame/drivers/tmaster.c b/src/mame/drivers/tmaster.c
index 0daccb8f96a..e7512d384ce 100644
--- a/src/mame/drivers/tmaster.c
+++ b/src/mame/drivers/tmaster.c
@@ -296,7 +296,7 @@ static VIDEO_UPDATE( tmaster )
if (layers_ctrl & 1) copybitmap (bitmap,tmaster_bitmap[0][(tmaster_regs[0x02/2]>>8)&1],0,0,0,0,cliprect);
- else fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+ else bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
if (layers_ctrl & 2) copybitmap_trans (bitmap,tmaster_bitmap[1][(tmaster_regs[0x02/2]>>9)&1],0,0,0,0,cliprect,0xff);
diff --git a/src/mame/drivers/trvmadns.c b/src/mame/drivers/trvmadns.c
index 175ef9c27e2..409da4485ee 100644
--- a/src/mame/drivers/trvmadns.c
+++ b/src/mame/drivers/trvmadns.c
@@ -271,7 +271,7 @@ static VIDEO_START( trvmadns )
static VIDEO_UPDATE( trvmadns )
{
- fillbitmap(bitmap,0xd,cliprect);
+ bitmap_fill(bitmap,cliprect,0xd);
tilemap_draw(bitmap,cliprect,bg_tilemap,0,0);
diff --git a/src/mame/drivers/ttchamp.c b/src/mame/drivers/ttchamp.c
index 07206cc3cc0..c10a27649a9 100644
--- a/src/mame/drivers/ttchamp.c
+++ b/src/mame/drivers/ttchamp.c
@@ -56,7 +56,7 @@ static VIDEO_UPDATE(ttchamp)
// int i;
static const int xxx=320,yyy=204;
- fillbitmap(bitmap, get_black_pen(screen->machine), 0);
+ bitmap_fill(bitmap, 0, get_black_pen(screen->machine));
// for (i=0;i<256;i++)
// {
diff --git a/src/mame/drivers/twins.c b/src/mame/drivers/twins.c
index 3c45f60da50..96a03bae275 100644
--- a/src/mame/drivers/twins.c
+++ b/src/mame/drivers/twins.c
@@ -102,7 +102,7 @@ static VIDEO_UPDATE(twins)
int i;
static const int xxx=320,yyy=204;
- fillbitmap(bitmap, get_black_pen(screen->machine), 0);
+ bitmap_fill(bitmap, 0, get_black_pen(screen->machine));
for (i=0;i<0x100;i++)
{
@@ -207,7 +207,7 @@ static VIDEO_UPDATE(twinsa)
int i;
static const int xxx=320,yyy=204;
- fillbitmap(bitmap, get_black_pen(screen->machine), 0);
+ bitmap_fill(bitmap, 0, get_black_pen(screen->machine));
for (i=0;i<0x1000-3;i+=3)
{
diff --git a/src/mame/drivers/vamphalf.c b/src/mame/drivers/vamphalf.c
index 252adc66319..bf822eb9c56 100644
--- a/src/mame/drivers/vamphalf.c
+++ b/src/mame/drivers/vamphalf.c
@@ -418,7 +418,7 @@ static void draw_sprites(const device_config *screen, bitmap_t *bitmap)
static VIDEO_UPDATE( common )
{
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
draw_sprites(screen, bitmap);
return 0;
}
diff --git a/src/mame/drivers/vmetal.c b/src/mame/drivers/vmetal.c
index e562420bb17..bbd7962de73 100644
--- a/src/mame/drivers/vmetal.c
+++ b/src/mame/drivers/vmetal.c
@@ -405,8 +405,8 @@ static VIDEO_START(varia)
static VIDEO_UPDATE(varia)
{
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
+ bitmap_fill(priority_bitmap,cliprect,0);
tilemap_set_scrollx(vmetal_mid2tilemap,0, vmetal_videoregs[0x06a/2]-64 /*+ vmetal_videoregs[0x066/2]*/);
tilemap_set_scrollx(vmetal_mid1tilemap,0, vmetal_videoregs[0x07a/2]-64 /*+ vmetal_videoregs[0x076/2]*/);
diff --git a/src/mame/drivers/wheelfir.c b/src/mame/drivers/wheelfir.c
index 8d358749cdf..f8e25989f37 100644
--- a/src/mame/drivers/wheelfir.c
+++ b/src/mame/drivers/wheelfir.c
@@ -302,7 +302,7 @@ static VIDEO_UPDATE(wheelfir)
copybitmap(bitmap, wheelfir_tmp_bitmap[2], 0, 0, 0, 0, cliprect);
//copybitmap_trans(bitmap, wheelfir_tmp_bitmap[1], 0, 0, 0, 0, cliprect, 0);
copybitmap_trans(bitmap, wheelfir_tmp_bitmap[0], 0, 0, 0, 0, cliprect, 0);
- fillbitmap(wheelfir_tmp_bitmap[0], 0,video_screen_get_visible_area(screen));
+ bitmap_fill(wheelfir_tmp_bitmap[0], video_screen_get_visible_area(screen),0);
if ( input_code_pressed(KEYCODE_R) )
{
@@ -605,7 +605,7 @@ static TIMER_CALLBACK( scanline_timer_callback )
static VIDEO_EOF( wheelfir )
{
scanline_counter = -1;
- fillbitmap(wheelfir_tmp_bitmap[0], 0,video_screen_get_visible_area(machine->primary_screen));
+ bitmap_fill(wheelfir_tmp_bitmap[0], video_screen_get_visible_area(machine->primary_screen),0);
timer_adjust_oneshot(frame_timer, attotime_zero, 0);
timer_adjust_oneshot(scanline_timer, attotime_zero, 0);
diff --git a/src/mame/drivers/zr107.c b/src/mame/drivers/zr107.c
index ffe5e2aae16..a0a05e7ab79 100644
--- a/src/mame/drivers/zr107.c
+++ b/src/mame/drivers/zr107.c
@@ -227,7 +227,7 @@ static VIDEO_START( jetwave )
static VIDEO_UPDATE( jetwave )
{
- fillbitmap(bitmap, screen->machine->pens[0], cliprect);
+ bitmap_fill(bitmap, cliprect, screen->machine->pens[0]);
K001604_tile_update(screen->machine, 0);
K001005_draw(bitmap, cliprect);
@@ -275,7 +275,7 @@ static VIDEO_START( zr107 )
static VIDEO_UPDATE( zr107 )
{
- fillbitmap(bitmap, screen->machine->pens[0], cliprect);
+ bitmap_fill(bitmap, cliprect, screen->machine->pens[0]);
K056832_set_LayerOffset(0, -29, -27);
K056832_set_LayerOffset(1, -29, -27);
diff --git a/src/mame/video/1943.c b/src/mame/video/1943.c
index f433cff6fa1..b35e257c9ae 100644
--- a/src/mame/video/1943.c
+++ b/src/mame/video/1943.c
@@ -269,7 +269,7 @@ VIDEO_UPDATE( 1943 )
if (sc2on)
tilemap_draw(bitmap, cliprect, bg2_tilemap, 0, 0);
else
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
if (objon) draw_sprites(screen->machine, bitmap, cliprect, 0);
if (sc1on) tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0);
diff --git a/src/mame/video/aeroboto.c b/src/mame/video/aeroboto.c
index 4f8903520e9..d91210f160b 100644
--- a/src/mame/video/aeroboto.c
+++ b/src/mame/video/aeroboto.c
@@ -159,7 +159,7 @@ VIDEO_UPDATE( aeroboto )
if (star_color < 0xd0) { star_color = 0xd0; sky_color = 0; }
star_color += 2;
- fillbitmap(bitmap, sky_color, cliprect);
+ bitmap_fill(bitmap, cliprect, sky_color);
// actual scroll speed is unknown but it can be adjusted by changing the SCROLL_SPEED constant
sx += (char)(*aeroboto_starx - ox);
@@ -191,7 +191,7 @@ VIDEO_UPDATE( aeroboto )
{
sx = ox = *aeroboto_starx;
sy = oy = *aeroboto_stary;
- fillbitmap(bitmap, sky_color, cliprect);
+ bitmap_fill(bitmap, cliprect, sky_color);
}
for (y = 0;y < 64; y++)
diff --git a/src/mame/video/aerofgt.c b/src/mame/video/aerofgt.c
index b327630e0d0..ce1f40d04a1 100644
--- a/src/mame/video/aerofgt.c
+++ b/src/mame/video/aerofgt.c
@@ -787,7 +787,7 @@ VIDEO_UPDATE( pspikes )
tilemap_set_scrollx(bg1_tilemap,(i + scrolly) & 0xff,aerofgt_rasterram[i]);
tilemap_set_scrolly(bg1_tilemap,0,scrolly);
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
tilemap_draw(bitmap,cliprect,bg1_tilemap,0,0);
turbofrc_draw_sprites(screen->machine,bitmap,cliprect,0,-1);
@@ -858,7 +858,7 @@ VIDEO_UPDATE( karatblz )
tilemap_set_scrollx(bg2_tilemap,0,bg2scrollx-4);
tilemap_set_scrolly(bg2_tilemap,0,bg2scrolly);
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
tilemap_draw(bitmap,cliprect,bg1_tilemap,0,0);
tilemap_draw(bitmap,cliprect,bg2_tilemap,0,0);
@@ -883,7 +883,7 @@ VIDEO_UPDATE( spinlbrk )
tilemap_set_scrollx(bg2_tilemap,0,bg2scrollx-4);
// tilemap_set_scrolly(bg2_tilemap,0,bg2scrolly);
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
tilemap_draw(bitmap,cliprect,bg1_tilemap,0,0);
tilemap_draw(bitmap,cliprect,bg2_tilemap,0,1);
@@ -909,7 +909,7 @@ VIDEO_UPDATE( turbofrc )
tilemap_set_scrollx(bg2_tilemap,0,bg2scrollx-7);
tilemap_set_scrolly(bg2_tilemap,0,bg2scrolly+2);
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
tilemap_draw(bitmap,cliprect,bg1_tilemap,0,0);
tilemap_draw(bitmap,cliprect,bg2_tilemap,0,1);
@@ -929,7 +929,7 @@ VIDEO_UPDATE( aerofgt )
tilemap_set_scrollx(bg2_tilemap,0,aerofgt_rasterram[0x0200]-20);
tilemap_set_scrolly(bg2_tilemap,0,bg2scrolly);
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
tilemap_draw(bitmap,cliprect,bg1_tilemap,0,0);
@@ -956,7 +956,7 @@ VIDEO_UPDATE( aerfboot )
tilemap_set_scrollx(bg2_tilemap,0,bg2scrollx+172);
tilemap_set_scrolly(bg2_tilemap,0,bg2scrolly+2);
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
tilemap_draw(bitmap,cliprect,bg1_tilemap,0,0);
tilemap_draw(bitmap,cliprect,bg2_tilemap,0,1);
@@ -979,7 +979,7 @@ VIDEO_UPDATE( aerfboo2 )
tilemap_set_scrollx(bg2_tilemap,0,bg2scrollx-7);
tilemap_set_scrolly(bg2_tilemap,0,bg2scrolly+2);
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
tilemap_draw(bitmap,cliprect,bg1_tilemap,0,0);
tilemap_draw(bitmap,cliprect,bg2_tilemap,0,1);
@@ -1002,7 +1002,7 @@ VIDEO_UPDATE( wbbc97 )
tilemap_set_scrollx(bg1_tilemap,(i + scrolly) & 0xff,aerofgt_rasterram[i]);
tilemap_set_scrolly(bg1_tilemap,0,scrolly);
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
if(wbbc97_bitmap_enable)
{
diff --git a/src/mame/video/ajax.c b/src/mame/video/ajax.c
index 4d0ef7720c1..a8c8245bc19 100644
--- a/src/mame/video/ajax.c
+++ b/src/mame/video/ajax.c
@@ -93,9 +93,9 @@ VIDEO_UPDATE( ajax )
{
K052109_tilemap_update();
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
- fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+ bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
tilemap_draw(bitmap,cliprect,K052109_tilemap[2],0,1);
if (ajax_priority)
{
diff --git a/src/mame/video/aliens.c b/src/mame/video/aliens.c
index bf354eb24db..ae31cfd5e3d 100644
--- a/src/mame/video/aliens.c
+++ b/src/mame/video/aliens.c
@@ -75,8 +75,8 @@ VIDEO_UPDATE( aliens )
{
K052109_tilemap_update();
- fillbitmap(priority_bitmap,0,cliprect);
- fillbitmap(bitmap,layer_colorbase[1] * 16,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
+ bitmap_fill(bitmap,cliprect,layer_colorbase[1] * 16);
tilemap_draw(bitmap,cliprect,K052109_tilemap[1],0,1);
tilemap_draw(bitmap,cliprect,K052109_tilemap[2],0,2);
tilemap_draw(bitmap,cliprect,K052109_tilemap[0],0,4);
diff --git a/src/mame/video/alpha68k.c b/src/mame/video/alpha68k.c
index 6e561b67f81..efac8ca63af 100644
--- a/src/mame/video/alpha68k.c
+++ b/src/mame/video/alpha68k.c
@@ -132,7 +132,7 @@ VIDEO_UPDATE( alpha68k_II )
last_bank=bank_base;
tilemap_set_flip(ALL_TILEMAPS,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
- fillbitmap(bitmap,2047,cliprect);
+ bitmap_fill(bitmap,cliprect,2047);
//AT
draw_sprites(screen->machine, bitmap,cliprect,0,0x07c0,0x0800);
draw_sprites(screen->machine, bitmap,cliprect,1,0x0000,0x0800);
@@ -271,7 +271,7 @@ VIDEO_UPDATE( alpha68k_V )
last_bank=bank_base;
tilemap_set_flip(ALL_TILEMAPS,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
- fillbitmap(bitmap,4095,cliprect);
+ bitmap_fill(bitmap,cliprect,4095);
/* This appears to be correct priority */
if (alpha68k_microcontroller_id == 0x8814) /* Sky Adventure */
@@ -307,7 +307,7 @@ VIDEO_UPDATE( alpha68k_V_sb )
last_bank=bank_base;
tilemap_set_flip(ALL_TILEMAPS,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0);
- fillbitmap(bitmap,4095,cliprect);
+ bitmap_fill(bitmap,cliprect,4095);
/* This appears to be correct priority */
draw_sprites_V(screen->machine,bitmap,cliprect,0,0x07c0,0x0800,0x4000,0x8000,0x3fff);
@@ -352,7 +352,7 @@ VIDEO_UPDATE( alpha68k_I )
{
int yshift = (alpha68k_microcontroller_id == 0x890a) ? 1 : 0; // The Next Space is 1 pixel off
- fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+ bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
/* This appears to be correct priority */
draw_sprites_I(screen->machine, bitmap,cliprect,2,0x0800,yshift);
@@ -479,7 +479,7 @@ static void kyros_draw_sprites(running_machine *machine, bitmap_t *bitmap, const
VIDEO_UPDATE( kyros )
{
colortable_entry_set_value(screen->machine->colortable, 0x100, *videoram16 & 0xff);
- fillbitmap(bitmap, 0x100, cliprect); //AT
+ bitmap_fill(bitmap, cliprect, 0x100); //AT
kyros_draw_sprites(screen->machine, bitmap,cliprect,2,0x0800);
kyros_draw_sprites(screen->machine, bitmap,cliprect,3,0x0c00);
@@ -537,7 +537,7 @@ static void sstingry_draw_sprites(running_machine *machine, bitmap_t *bitmap, co
VIDEO_UPDATE( sstingry )
{
colortable_entry_set_value(screen->machine->colortable, 0x100, *videoram16 & 0xff);
- fillbitmap(bitmap, 0x100, cliprect); //AT
+ bitmap_fill(bitmap, cliprect, 0x100); //AT
sstingry_draw_sprites(screen->machine, bitmap,cliprect,2,0x0800);
sstingry_draw_sprites(screen->machine, bitmap,cliprect,3,0x0c00);
diff --git a/src/mame/video/ambush.c b/src/mame/video/ambush.c
index f4058bc6fb9..d7b6c7d67d1 100644
--- a/src/mame/video/ambush.c
+++ b/src/mame/video/ambush.c
@@ -95,7 +95,7 @@ VIDEO_UPDATE( ambush )
int offs;
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
/* Draw the background priority characters */
diff --git a/src/mame/video/angelkds.c b/src/mame/video/angelkds.c
index 757bde7bc00..8bc1d5f168a 100644
--- a/src/mame/video/angelkds.c
+++ b/src/mame/video/angelkds.c
@@ -280,7 +280,7 @@ VIDEO_UPDATE( angelkds )
const rectangle *visarea = video_screen_get_visible_area(screen);
rectangle clip;
- fillbitmap(bitmap,0x3f,cliprect); /* is there a register controling the colour?, we currently use the last colour of the tx palette */
+ bitmap_fill(bitmap,cliprect,0x3f); /* is there a register controling the colour?, we currently use the last colour of the tx palette */
/* draw top of screen */
clip.min_x = 8*0;
diff --git a/src/mame/video/argus.c b/src/mame/video/argus.c
index 646e1bb4960..1fcd3af5ee6 100644
--- a/src/mame/video/argus.c
+++ b/src/mame/video/argus.c
@@ -1233,7 +1233,7 @@ VIDEO_UPDATE( valtric )
if (argus_bg_status & 1) /* Backgound enable */
valtric_draw_mosaic(screen, bitmap, cliprect);
else
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
valtric_draw_sprites(screen->machine, bitmap, cliprect);
tilemap_draw(bitmap, cliprect, tx_tilemap, 0, 0);
return 0;
@@ -1246,7 +1246,7 @@ VIDEO_UPDATE( butasan )
if (argus_bg_status & 1) /* Backgound enable */
tilemap_draw(bitmap, cliprect, bg0_tilemap, 0, 0);
else
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
if (butasan_bg1_status & 1) tilemap_draw(bitmap, cliprect, bg1_tilemap, 0, 0);
butasan_draw_sprites(screen->machine, bitmap, cliprect);
tilemap_draw(bitmap, cliprect, tx_tilemap, 0, 0);
diff --git a/src/mame/video/armedf.c b/src/mame/video/armedf.c
index 71561aba2b9..1903c20db68 100644
--- a/src/mame/video/armedf.c
+++ b/src/mame/video/armedf.c
@@ -327,7 +327,7 @@ VIDEO_UPDATE( armedf )
}
- fillbitmap( bitmap, 0xff, cliprect );
+ bitmap_fill( bitmap, cliprect , 0xff);
if (armedf_vreg & 0x0800) tilemap_draw( bitmap, cliprect, bg_tilemap, 0, 0);
/*if( armedf_vreg & 0x0800 )
{
@@ -335,7 +335,7 @@ VIDEO_UPDATE( armedf )
}
else
{
- fillbitmap( bitmap, get_black_pen(screen->machine)&0x0f, cliprect );
+ bitmap_fill( bitmap, cliprect , get_black_pen(screen->machine)&0x0f);
}*/
if ((mcu_mode&0x0030)==0x0030) tilemap_draw( bitmap, cliprect, armedf_tx_tilemap, 0, 0);
diff --git a/src/mame/video/asterix.c b/src/mame/video/asterix.c
index 5fa40408165..4cf91ee8f38 100644
--- a/src/mame/video/asterix.c
+++ b/src/mame/video/asterix.c
@@ -116,8 +116,8 @@ VIDEO_UPDATE( asterix )
sortlayers(layer, layerpri);
- fillbitmap(priority_bitmap, 0, cliprect);
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(priority_bitmap, cliprect, 0);
+ bitmap_fill(bitmap, cliprect, 0);
K056832_tilemap_draw(screen->machine, bitmap, cliprect, layer[0], 0, 1);
K056832_tilemap_draw(screen->machine, bitmap, cliprect, layer[1], 0, 2);
diff --git a/src/mame/video/asuka.c b/src/mame/video/asuka.c
index debb56b65eb..b9852adb06c 100644
--- a/src/mame/video/asuka.c
+++ b/src/mame/video/asuka.c
@@ -53,10 +53,10 @@ VIDEO_UPDATE( asuka )
layer[1] = layer[0]^1;
layer[2] = 2;
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
/* Ensure screen blanked even when bottom layer not drawn due to disable bit */
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[0],TILEMAP_DRAW_OPAQUE,1);
TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[1],0,2);
@@ -78,10 +78,10 @@ VIDEO_UPDATE( bonzeadv )
layer[1] = layer[0]^1;
layer[2] = 2;
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
/* Ensure screen blanked even when bottom layer not drawn due to disable bit */
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[0],TILEMAP_DRAW_OPAQUE,1);
TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[1],0,2);
diff --git a/src/mame/video/atarig42.c b/src/mame/video/atarig42.c
index 7ec2a306d83..7dfabc912a7 100644
--- a/src/mame/video/atarig42.c
+++ b/src/mame/video/atarig42.c
@@ -228,7 +228,7 @@ void atarig42_scanline_update(const device_config *screen, int scanline)
VIDEO_UPDATE( atarig42 )
{
/* draw the playfield */
- fillbitmap(priority_bitmap, 0, cliprect);
+ bitmap_fill(priority_bitmap, cliprect, 0);
tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 0, 0);
tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 1, 1);
tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 2, 2);
diff --git a/src/mame/video/atarigx2.c b/src/mame/video/atarigx2.c
index a93c8946ff1..2425a985e38 100644
--- a/src/mame/video/atarigx2.c
+++ b/src/mame/video/atarigx2.c
@@ -226,7 +226,7 @@ void atarigx2_scanline_update(const device_config *screen, int scanline)
VIDEO_UPDATE( atarigx2 )
{
/* draw the playfield */
- fillbitmap(priority_bitmap, 0, cliprect);
+ bitmap_fill(priority_bitmap, cliprect, 0);
tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 0, 0);
tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 1, 1);
tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 2, 2);
diff --git a/src/mame/video/atarimo.c b/src/mame/video/atarimo.c
index fee5a93c27e..55c375337ac 100644
--- a/src/mame/video/atarimo.c
+++ b/src/mame/video/atarimo.c
@@ -407,7 +407,7 @@ void atarimo_init(running_machine *machine, int map, const atarimo_desc *desc)
/* allocate the temp bitmap */
mo->bitmap = auto_bitmap_alloc(video_screen_get_width(machine->primary_screen), video_screen_get_height(machine->primary_screen), BITMAP_FORMAT_INDEXED16);
- fillbitmap(mo->bitmap, desc->transpen, NULL);
+ bitmap_fill(mo->bitmap, NULL, desc->transpen);
/* allocate the spriteram */
mo->spriteram = auto_malloc(sizeof(mo->spriteram[0]) * mo->spriteramsize);
diff --git a/src/mame/video/atarirle.c b/src/mame/video/atarirle.c
index fa6d23320ef..a896f6fcb3f 100644
--- a/src/mame/video/atarirle.c
+++ b/src/mame/video/atarirle.c
@@ -346,16 +346,16 @@ void atarirle_init(running_machine *machine, int map, const atarirle_desc *desc)
mo->vram[0][0] = auto_bitmap_alloc(width, height, BITMAP_FORMAT_INDEXED16);
mo->vram[0][1] = auto_bitmap_alloc(width, height, BITMAP_FORMAT_INDEXED16);
- fillbitmap(mo->vram[0][0], 0, NULL);
- fillbitmap(mo->vram[0][1], 0, NULL);
+ bitmap_fill(mo->vram[0][0], NULL, 0);
+ bitmap_fill(mo->vram[0][1], NULL, 0);
/* allocate alternate bitmaps if needed */
if (mo->vrammask.mask != 0)
{
mo->vram[1][0] = auto_bitmap_alloc(width, height, BITMAP_FORMAT_INDEXED16);
mo->vram[1][1] = auto_bitmap_alloc(width, height, BITMAP_FORMAT_INDEXED16);
- fillbitmap(mo->vram[1][0], 0, NULL);
- fillbitmap(mo->vram[1][1], 0, NULL);
+ bitmap_fill(mo->vram[1][0], NULL, 0);
+ bitmap_fill(mo->vram[1][1], NULL, 0);
}
mo->partial_scanline = -1;
@@ -411,9 +411,9 @@ void atarirle_control_w(running_machine *machine, int map, UINT8 bits)
//logerror(" partial erase %d-%d (frame %d)\n", cliprect.min_y, cliprect.max_y, (oldbits & ATARIRLE_CONTROL_FRAME) >> 2);
/* erase the bitmap */
- fillbitmap(mo->vram[0][(oldbits & ATARIRLE_CONTROL_FRAME) >> 2], 0, &cliprect);
+ bitmap_fill(mo->vram[0][(oldbits & ATARIRLE_CONTROL_FRAME) >> 2], &cliprect, 0);
if (mo->vrammask.mask != 0)
- fillbitmap(mo->vram[1][(oldbits & ATARIRLE_CONTROL_FRAME) >> 2], 0, &cliprect);
+ bitmap_fill(mo->vram[1][(oldbits & ATARIRLE_CONTROL_FRAME) >> 2], &cliprect, 0);
}
/* update the bits */
@@ -473,9 +473,9 @@ VIDEO_EOF( atarirle )
//logerror(" partial erase %d-%d (frame %d)\n", cliprect.min_y, cliprect.max_y, (mo->control_bits & ATARIRLE_CONTROL_FRAME) >> 2);
/* erase the bitmap */
- fillbitmap(mo->vram[0][(mo->control_bits & ATARIRLE_CONTROL_FRAME) >> 2], 0, &cliprect);
+ bitmap_fill(mo->vram[0][(mo->control_bits & ATARIRLE_CONTROL_FRAME) >> 2], &cliprect, 0);
if (mo->vrammask.mask != 0)
- fillbitmap(mo->vram[1][(mo->control_bits & ATARIRLE_CONTROL_FRAME) >> 2], 0, &cliprect);
+ bitmap_fill(mo->vram[1][(mo->control_bits & ATARIRLE_CONTROL_FRAME) >> 2], &cliprect, 0);
}
/* reset the partial scanline to -1 so we can detect full updates */
diff --git a/src/mame/video/atarisy2.c b/src/mame/video/atarisy2.c
index 25ea9553b92..d8f3339c14c 100644
--- a/src/mame/video/atarisy2.c
+++ b/src/mame/video/atarisy2.c
@@ -334,7 +334,7 @@ VIDEO_UPDATE( atarisy2 )
int x, y, r;
/* draw the playfield */
- fillbitmap(priority_bitmap, 0, cliprect);
+ bitmap_fill(priority_bitmap, cliprect, 0);
tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 0, 0);
tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 1, 1);
tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 2, 2);
diff --git a/src/mame/video/batman.c b/src/mame/video/batman.c
index 518d9a6d40d..7b8cf64e1af 100644
--- a/src/mame/video/batman.c
+++ b/src/mame/video/batman.c
@@ -206,7 +206,7 @@ VIDEO_UPDATE( batman )
int x, y, r;
/* draw the playfield */
- fillbitmap(priority_bitmap, 0, cliprect);
+ bitmap_fill(priority_bitmap, cliprect, 0);
tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 0, 0x00);
tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 1, 0x01);
tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 2, 0x02);
diff --git a/src/mame/video/bigstrkb.c b/src/mame/video/bigstrkb.c
index b764cb196d7..f30efc387ad 100644
--- a/src/mame/video/bigstrkb.c
+++ b/src/mame/video/bigstrkb.c
@@ -126,7 +126,7 @@ VIDEO_START(bigstrkb)
VIDEO_UPDATE(bigstrkb)
{
-// fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+// bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
tilemap_set_scrollx(bsb_tilemap2,0, bsb_vidreg1[0]+(256-14));
tilemap_set_scrolly(bsb_tilemap2,0, bsb_vidreg2[0]);
diff --git a/src/mame/video/bionicc.c b/src/mame/video/bionicc.c
index 7f1f19d7d10..29938ec2bac 100644
--- a/src/mame/video/bionicc.c
+++ b/src/mame/video/bionicc.c
@@ -231,7 +231,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta
VIDEO_UPDATE( bionicc )
{
- fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+ bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
tilemap_draw(bitmap,cliprect,fg_tilemap,1|TILEMAP_DRAW_LAYER1,0); /* nothing in FRONT */
tilemap_draw(bitmap,cliprect,bg_tilemap,0,0);
tilemap_draw(bitmap,cliprect,fg_tilemap,0|TILEMAP_DRAW_LAYER1,0);
diff --git a/src/mame/video/bishi.c b/src/mame/video/bishi.c
index 0ee289aae6a..13503ff5647 100644
--- a/src/mame/video/bishi.c
+++ b/src/mame/video/bishi.c
@@ -83,7 +83,7 @@ VIDEO_UPDATE(bishi)
sortlayers(layers, layerpri);
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
for (i = 0; i < 4; i++)
{
diff --git a/src/mame/video/blktiger.c b/src/mame/video/blktiger.c
index d6793f0d861..7435ca96164 100644
--- a/src/mame/video/blktiger.c
+++ b/src/mame/video/blktiger.c
@@ -226,7 +226,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta
VIDEO_UPDATE( blktiger )
{
- fillbitmap(bitmap,1023,cliprect);
+ bitmap_fill(bitmap,cliprect,1023);
if (bgon)
tilemap_draw(bitmap,cliprect,screen_layout ? bg_tilemap8x4 : bg_tilemap4x8,TILEMAP_DRAW_LAYER1,0);
diff --git a/src/mame/video/blmbycar.c b/src/mame/video/blmbycar.c
index 26f034f97a5..0235b7c8fbd 100644
--- a/src/mame/video/blmbycar.c
+++ b/src/mame/video/blmbycar.c
@@ -242,13 +242,13 @@ if (input_code_pressed(KEYCODE_Z))
}
#endif
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
if (layers_ctrl&1)
for (i = 0; i <= 1; i++)
tilemap_draw(bitmap, cliprect, tilemap_0, i, i);
else
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
if (layers_ctrl&2)
for (i = 0; i <= 1; i++)
diff --git a/src/mame/video/blockhl.c b/src/mame/video/blockhl.c
index a28116175a6..8789b26c3bd 100644
--- a/src/mame/video/blockhl.c
+++ b/src/mame/video/blockhl.c
@@ -54,7 +54,7 @@ VIDEO_START( blockhl )
VIDEO_UPDATE( blockhl )
{
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
K052109_tilemap_update();
diff --git a/src/mame/video/bloodbro.c b/src/mame/video/bloodbro.c
index c212117e5dd..1010353e4d2 100644
--- a/src/mame/video/bloodbro.c
+++ b/src/mame/video/bloodbro.c
@@ -233,7 +233,7 @@ VIDEO_UPDATE( bloodbro )
tilemap_set_scrollx(fg_tilemap,0,bloodbro_scroll[0x12]);
tilemap_set_scrolly(fg_tilemap,0,bloodbro_scroll[0x13]);
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
tilemap_draw(bitmap,cliprect,bg_tilemap,0,0);
tilemap_draw(bitmap,cliprect,fg_tilemap,0,1);
@@ -249,7 +249,7 @@ VIDEO_UPDATE( weststry )
// tilemap_set_scrollx(fg_tilemap,0,bloodbro_scroll[0x12]);
// tilemap_set_scrolly(fg_tilemap,0,bloodbro_scroll[0x13]);
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
tilemap_draw(bitmap,cliprect,bg_tilemap,0,0);
tilemap_draw(bitmap,cliprect,fg_tilemap,0,1);
@@ -266,7 +266,7 @@ VIDEO_UPDATE( skysmash )
tilemap_set_scrollx(fg_tilemap,0,bloodbro_scroll[0x0a]);
tilemap_set_scrolly(fg_tilemap,0,bloodbro_scroll[0x0b]); /* ? */
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
tilemap_draw(bitmap,cliprect,bg_tilemap,0,0);
tilemap_draw(bitmap,cliprect,fg_tilemap,0,1);
diff --git a/src/mame/video/blueprnt.c b/src/mame/video/blueprnt.c
index b89238443c2..129287cdd3e 100644
--- a/src/mame/video/blueprnt.c
+++ b/src/mame/video/blueprnt.c
@@ -122,7 +122,7 @@ VIDEO_UPDATE( blueprnt )
for (i = 0; i < 32; i++)
tilemap_set_scrolly(bg_tilemap, i, blueprnt_scrollram[30 - i]);
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0);
draw_sprites(screen->machine,bitmap, cliprect);
tilemap_draw(bitmap, cliprect, bg_tilemap, 1, 0);
diff --git a/src/mame/video/boogwing.c b/src/mame/video/boogwing.c
index 1cbff9a2a0c..65927357625 100644
--- a/src/mame/video/boogwing.c
+++ b/src/mame/video/boogwing.c
@@ -164,8 +164,8 @@ VIDEO_UPDATE(boogwing)
/* Draw playfields */
deco16_clear_sprite_priority_bitmap();
- fillbitmap(bitmap,screen->machine->pens[0x400],cliprect); /* pen not confirmed */
- fillbitmap(priority_bitmap,0,NULL);
+ bitmap_fill(bitmap,cliprect,screen->machine->pens[0x400]); /* pen not confirmed */
+ bitmap_fill(priority_bitmap,NULL,0);
// bit&0x8 is definitely some kind of palette effect
// bit&0x4 combines playfields
diff --git a/src/mame/video/bosco.c b/src/mame/video/bosco.c
index 2f306f07a61..947c1bf49e9 100644
--- a/src/mame/video/bosco.c
+++ b/src/mame/video/bosco.c
@@ -308,7 +308,7 @@ VIDEO_UPDATE( bosco )
fg_clip.min_x = 28*8;
}
- fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+ bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
draw_stars(bitmap,cliprect);
tilemap_draw(bitmap,&bg_clip,bg_tilemap,0,0);
diff --git a/src/mame/video/bottom9.c b/src/mame/video/bottom9.c
index abc03ea8177..ff9257c1fe7 100644
--- a/src/mame/video/bottom9.c
+++ b/src/mame/video/bottom9.c
@@ -81,7 +81,7 @@ VIDEO_UPDATE( bottom9 )
K052109_tilemap_update();
/* note: FIX layer is not used */
- fillbitmap(bitmap,layer_colorbase[1],cliprect);
+ bitmap_fill(bitmap,cliprect,layer_colorbase[1]);
// if (bottom9_video_enable)
{
K051960_sprites_draw(bitmap,cliprect,1,1);
diff --git a/src/mame/video/boxer.c b/src/mame/video/boxer.c
index 0667c4a7a2d..c421191af41 100644
--- a/src/mame/video/boxer.c
+++ b/src/mame/video/boxer.c
@@ -65,7 +65,7 @@ VIDEO_UPDATE( boxer )
int i;
int j;
- fillbitmap(bitmap, 1, cliprect);
+ bitmap_fill(bitmap, cliprect, 1);
for (i = 0; i < 16; i++)
{
diff --git a/src/mame/video/bublbobl.c b/src/mame/video/bublbobl.c
index e483029344f..ad7cbed1182 100644
--- a/src/mame/video/bublbobl.c
+++ b/src/mame/video/bublbobl.c
@@ -30,7 +30,7 @@ VIDEO_UPDATE( bublbobl )
/* the background character columns is stored in the area dd00-dd3f */
/* This clears & redraws the entire screen each pass */
- fillbitmap(bitmap,255,cliprect);
+ bitmap_fill(bitmap,cliprect,255);
if (!bublbobl_video_enable) return 0;
diff --git a/src/mame/video/buggychl.c b/src/mame/video/buggychl.c
index b6bb7d4ac07..30c85aec204 100644
--- a/src/mame/video/buggychl.c
+++ b/src/mame/video/buggychl.c
@@ -245,7 +245,7 @@ VIDEO_UPDATE( buggychl )
if (sky_on)
draw_sky(bitmap, cliprect);
else
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
/* decode modified characters */
for (code = 0;code < 256;code++)
diff --git a/src/mame/video/bwing.c b/src/mame/video/bwing.c
index 6fe7324eac2..c1f9168d53d 100644
--- a/src/mame/video/bwing.c
+++ b/src/mame/video/bwing.c
@@ -274,7 +274,7 @@ VIDEO_UPDATE( bwing )
tilemap_draw(bitmap, cliprect, bgmap, 0, 0);
}
else
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
// draw low priority sprites
draw_sprites(screen->machine, bitmap, cliprect, buffered_spriteram, 0);
diff --git a/src/mame/video/canyon.c b/src/mame/video/canyon.c
index cb2bd5d5275..29dfa482d02 100644
--- a/src/mame/video/canyon.c
+++ b/src/mame/video/canyon.c
@@ -77,7 +77,7 @@ static void draw_bombs(bitmap_t *bitmap, const rectangle* cliprect)
if (rect.max_x > cliprect->max_x) rect.max_x = cliprect->max_x;
if (rect.max_y > cliprect->max_y) rect.max_y = cliprect->max_y;
- fillbitmap(bitmap, 1 + 2 * i, &rect);
+ bitmap_fill(bitmap, &rect, 1 + 2 * i);
}
}
diff --git a/src/mame/video/capbowl.c b/src/mame/video/capbowl.c
index e5e01e3106c..cb868ea0a94 100644
--- a/src/mame/video/capbowl.c
+++ b/src/mame/video/capbowl.c
@@ -175,7 +175,7 @@ VIDEO_UPDATE( capbowl )
/* if we're blanked, just fill with black */
if (state.blanked)
{
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
return 0;
}
diff --git a/src/mame/video/carpolo.c b/src/mame/video/carpolo.c
index 4fc16d6cf9b..a493c699b68 100644
--- a/src/mame/video/carpolo.c
+++ b/src/mame/video/carpolo.c
@@ -373,8 +373,8 @@ static int check_sprite_sprite_collision(running_machine *machine,
normalize_coordinates(&x1, &y1, &x2, &y2);
- fillbitmap(sprite_sprite_collision_bitmap1, 0, 0);
- fillbitmap(sprite_sprite_collision_bitmap2, 0, 0);
+ bitmap_fill(sprite_sprite_collision_bitmap1, 0, 0);
+ bitmap_fill(sprite_sprite_collision_bitmap2, 0, 0);
drawgfx(sprite_sprite_collision_bitmap1,machine->gfx[0],
code1,0,
@@ -428,8 +428,8 @@ static int check_sprite_left_goal_collision(running_machine *machine, int x1, in
normalize_coordinates(&x1, &y1, &x2, &y2);
- fillbitmap(sprite_goal_collision_bitmap1, 0, 0);
- fillbitmap(sprite_goal_collision_bitmap2, 0, 0);
+ bitmap_fill(sprite_goal_collision_bitmap1, 0, 0);
+ bitmap_fill(sprite_goal_collision_bitmap2, 0, 0);
drawgfx(sprite_goal_collision_bitmap1,machine->gfx[0],
code1,0,
@@ -487,8 +487,8 @@ static int check_sprite_right_goal_collision(running_machine *machine, int x1, i
normalize_coordinates(&x1, &y1, &x2, &y2);
- fillbitmap(sprite_goal_collision_bitmap1, 0, 0);
- fillbitmap(sprite_goal_collision_bitmap2, 0, 0);
+ bitmap_fill(sprite_goal_collision_bitmap1, 0, 0);
+ bitmap_fill(sprite_goal_collision_bitmap2, 0, 0);
drawgfx(sprite_goal_collision_bitmap1,machine->gfx[0],
code1,0,
diff --git a/src/mame/video/cave.c b/src/mame/video/cave.c
index 25ccb5553f7..a3de332e1b0 100644
--- a/src/mame/video/cave.c
+++ b/src/mame/video/cave.c
@@ -857,7 +857,7 @@ static void cave_sprite_check(const device_config *screen, const rectangle *clip
if (clip->min_y == visarea->min_y)
{
if(!(sprite_zbuf_baseval += MAX_SPRITE_NUM))
- fillbitmap(sprite_zbuf,0,visarea);
+ bitmap_fill(sprite_zbuf,visarea,0);
}
break;
@@ -866,7 +866,7 @@ static void cave_sprite_check(const device_config *screen, const rectangle *clip
if (clip->min_y == visarea->min_y)
{
if(!(sprite_zbuf_baseval += MAX_SPRITE_NUM))
- fillbitmap(sprite_zbuf,0,visarea);
+ bitmap_fill(sprite_zbuf,visarea,0);
}
break;
@@ -1548,7 +1548,7 @@ VIDEO_UPDATE( cave )
cave_sprite_check(screen, cliprect);
- fillbitmap(bitmap,background_color,cliprect);
+ bitmap_fill(bitmap,cliprect,background_color);
/*
Tiles and sprites are ordered by priority (0 back, 3 front) with
diff --git a/src/mame/video/cbasebal.c b/src/mame/video/cbasebal.c
index fd513b1096c..0f49b9ac409 100644
--- a/src/mame/video/cbasebal.c
+++ b/src/mame/video/cbasebal.c
@@ -176,7 +176,7 @@ VIDEO_UPDATE( cbasebal )
if (bg_on)
tilemap_draw(bitmap,cliprect,bg_tilemap,0,0);
else
- fillbitmap(bitmap,768,cliprect);
+ bitmap_fill(bitmap,cliprect,768);
if (obj_on)
draw_sprites(screen->machine, bitmap,cliprect);
diff --git a/src/mame/video/ccastles.c b/src/mame/video/ccastles.c
index 9fe56d4bf83..297ea3e98fd 100644
--- a/src/mame/video/ccastles.c
+++ b/src/mame/video/ccastles.c
@@ -280,7 +280,7 @@ VIDEO_UPDATE( ccastles )
int x, y, offs;
/* draw the sprites */
- fillbitmap(spritebitmap, 0x0f, cliprect);
+ bitmap_fill(spritebitmap, cliprect, 0x0f);
for (offs = 0; offs < 320/2; offs += 4)
{
int x = spriteaddr[offs+3];
diff --git a/src/mame/video/cclimber.c b/src/mame/video/cclimber.c
index 0ab47daeccd..be8041d8caa 100644
--- a/src/mame/video/cclimber.c
+++ b/src/mame/video/cclimber.c
@@ -626,7 +626,7 @@ static void swimmer_draw_sprites(bitmap_t *bitmap, gfx_element **gfx, const rect
VIDEO_UPDATE( cclimber )
{
- fillbitmap(bitmap, CCLIMBER_BG_PEN, cliprect);
+ bitmap_fill(bitmap, cliprect, CCLIMBER_BG_PEN);
draw_playfield(bitmap, cliprect);
/* draw the "big sprite" under the regular sprites */
@@ -693,10 +693,10 @@ VIDEO_UPDATE( swimmer )
rectangle split_rect_right = { 0x100 - SWIMMER_BG_SPLIT, 0xff, 0, 0xff };
sect_rect(&split_rect_left, cliprect);
- fillbitmap(bitmap, SWIMMER_SIDE_BG_PEN, &split_rect_left);
+ bitmap_fill(bitmap, &split_rect_left, SWIMMER_SIDE_BG_PEN);
sect_rect(&split_rect_right, cliprect);
- fillbitmap(bitmap, CCLIMBER_BG_PEN, &split_rect_right);
+ bitmap_fill(bitmap, &split_rect_right, CCLIMBER_BG_PEN);
}
else
{
@@ -704,14 +704,14 @@ VIDEO_UPDATE( swimmer )
rectangle split_rect_right = { SWIMMER_BG_SPLIT, 0xff, 0, 0xff };
sect_rect(&split_rect_left, cliprect);
- fillbitmap(bitmap, CCLIMBER_BG_PEN, &split_rect_left);
+ bitmap_fill(bitmap, &split_rect_left, CCLIMBER_BG_PEN);
sect_rect(&split_rect_right, cliprect);
- fillbitmap(bitmap, SWIMMER_SIDE_BG_PEN, &split_rect_right);
+ bitmap_fill(bitmap, &split_rect_right, SWIMMER_SIDE_BG_PEN);
}
}
else
- fillbitmap(bitmap, CCLIMBER_BG_PEN, cliprect);
+ bitmap_fill(bitmap, cliprect, CCLIMBER_BG_PEN);
draw_playfield(bitmap, cliprect);
@@ -739,7 +739,7 @@ VIDEO_UPDATE( toprollr )
scroll_area_clip.min_x = 4*8;
scroll_area_clip.max_x = 29*8-1;
- fillbitmap(bitmap, CCLIMBER_BG_PEN, cliprect);
+ bitmap_fill(bitmap, cliprect, CCLIMBER_BG_PEN);
tilemap_set_scrollx(toproller_bg_tilemap, 0, toprollr_bg_videoram[0]);
tilemap_set_flip(toproller_bg_tilemap, (CCLIMBER_FLIP_X ? TILEMAP_FLIPX : 0) |
diff --git a/src/mame/video/changela.c b/src/mame/video/changela.c
index ee3abbcddd8..95186ebe3fb 100644
--- a/src/mame/video/changela.c
+++ b/src/mame/video/changela.c
@@ -663,10 +663,10 @@ static TIMER_CALLBACK( changela_scanline_callback )
/* clear the current scanline first */
rectangle rect = { 0, 255, sy, sy };
- fillbitmap(river_bitmap, 0x00, &rect);
- fillbitmap(obj0_bitmap, 0x00, &rect);
- fillbitmap(tree0_bitmap, 0x00, &rect);
- fillbitmap(tree1_bitmap, 0x00, &rect);
+ bitmap_fill(river_bitmap, &rect, 0x00);
+ bitmap_fill(obj0_bitmap, &rect, 0x00);
+ bitmap_fill(tree0_bitmap, &rect, 0x00);
+ bitmap_fill(tree1_bitmap, &rect, 0x00);
draw_river(machine, river_bitmap, sy);
draw_obj0(machine, obj0_bitmap, sy);
diff --git a/src/mame/video/cheekyms.c b/src/mame/video/cheekyms.c
index 8ec026a1fee..92551a6b41d 100644
--- a/src/mame/video/cheekyms.c
+++ b/src/mame/video/cheekyms.c
@@ -165,7 +165,7 @@ VIDEO_UPDATE( cheekyms )
tilemap_mark_all_tiles_dirty(ALL_TILEMAPS);
tilemap_set_flip(ALL_TILEMAPS, flip ? TILEMAP_FLIPX | TILEMAP_FLIPY : 0);
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
/* sprites go under the playfield */
draw_sprites(screen->machine->gfx, bitmap, cliprect, flip);
diff --git a/src/mame/video/chqflag.c b/src/mame/video/chqflag.c
index e187a67760d..5914e4d4049 100644
--- a/src/mame/video/chqflag.c
+++ b/src/mame/video/chqflag.c
@@ -76,7 +76,7 @@ VIDEO_START( chqflag )
VIDEO_UPDATE( chqflag )
{
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
K051316_zoom_draw_1(bitmap,cliprect,TILEMAP_DRAW_LAYER1,0);
K051960_sprites_draw(bitmap,cliprect,0,0);
diff --git a/src/mame/video/circusc.c b/src/mame/video/circusc.c
index 3215f9bf423..25431b4eaf6 100644
--- a/src/mame/video/circusc.c
+++ b/src/mame/video/circusc.c
@@ -212,7 +212,7 @@ VIDEO_UPDATE( circusc )
for (i = 10;i < 32;i++)
tilemap_set_scrolly(bg_tilemap,i,*circusc_scroll);
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
tilemap_draw(bitmap,cliprect,bg_tilemap,1,0);
draw_sprites(screen->machine,bitmap,cliprect);
tilemap_draw(bitmap,cliprect,bg_tilemap,0,0);
diff --git a/src/mame/video/cischeat.c b/src/mame/video/cischeat.c
index 3f5e1d0cc9a..dbcd365624c 100644
--- a/src/mame/video/cischeat.c
+++ b/src/mame/video/cischeat.c
@@ -1167,7 +1167,7 @@ VIDEO_UPDATE( bigrun )
cischeat_tmap_SET_SCROLL(1)
cischeat_tmap_SET_SCROLL(2)
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
for (i = 7; i >= 4; i--)
{ /* bitmap, road, min_priority, max_priority, transparency */
@@ -1220,7 +1220,7 @@ VIDEO_UPDATE( cischeat )
cischeat_tmap_SET_SCROLL(1)
cischeat_tmap_SET_SCROLL(2)
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
/* bitmap, road, priority, transparency */
if (megasys1_active_layers & 0x10) cischeat_draw_road(screen->machine,bitmap,cliprect,0,7,5,TRANSPARENCY_NONE);
@@ -1228,7 +1228,7 @@ VIDEO_UPDATE( cischeat )
flag = 0;
cischeat_tmap_DRAW(0)
-// else fillbitmap(bitmap,0,cliprect);
+// else bitmap_fill(bitmap,cliprect,0);
cischeat_tmap_DRAW(1)
if (megasys1_active_layers & 0x08) cischeat_draw_sprites(screen->machine,bitmap,cliprect,15,3);
@@ -1276,7 +1276,7 @@ VIDEO_UPDATE( f1gpstar )
cischeat_tmap_SET_SCROLL(1)
cischeat_tmap_SET_SCROLL(2)
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
/* 1: clouds 5, grad 7, road 0 2: clouds 5, grad 7, road 0, tunnel roof 0 */
@@ -1286,7 +1286,7 @@ VIDEO_UPDATE( f1gpstar )
flag = 0;
cischeat_tmap_DRAW(0)
-// else fillbitmap(bitmap,0,cliprect);
+// else bitmap_fill(bitmap,cliprect,0);
cischeat_tmap_DRAW(1)
/* road 1!! 0!! */ /* bitmap, road, min_priority, max_priority, transparency */
@@ -1359,11 +1359,11 @@ if ( input_code_pressed(KEYCODE_Z) || input_code_pressed(KEYCODE_X) )
// cischeat_tmap_SET_SCROLL(1)
cischeat_tmap_SET_SCROLL(2)
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
flag = 0;
cischeat_tmap_DRAW(0)
-// else fillbitmap(bitmap,0,cliprect);
+// else bitmap_fill(bitmap,cliprect,0);
// cischeat_tmap_DRAW(1)
if (megasys1_active_layers & 0x08) cischeat_draw_sprites(screen->machine,bitmap,cliprect,0,15);
cischeat_tmap_DRAW(2)
diff --git a/src/mame/video/cloud9.c b/src/mame/video/cloud9.c
index 1c4407c97f9..60be223f36d 100644
--- a/src/mame/video/cloud9.c
+++ b/src/mame/video/cloud9.c
@@ -260,7 +260,7 @@ VIDEO_UPDATE( cloud9 )
int x, y, offs;
/* draw the sprites */
- fillbitmap(spritebitmap, 0x00, cliprect);
+ bitmap_fill(spritebitmap, cliprect, 0x00);
for (offs = 0; offs < 0x20; offs++)
if (spriteaddr[offs + 0x00] != 0)
{
diff --git a/src/mame/video/cninja.c b/src/mame/video/cninja.c
index 0285421f38b..dc4e1de0af3 100644
--- a/src/mame/video/cninja.c
+++ b/src/mame/video/cninja.c
@@ -402,8 +402,8 @@ VIDEO_UPDATE( cninja )
deco16_pf34_update(deco16_pf3_rowscroll,deco16_pf4_rowscroll);
/* Draw playfields */
- fillbitmap(priority_bitmap,0,cliprect);
- fillbitmap(bitmap,512,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
+ bitmap_fill(bitmap,cliprect,512);
deco16_tilemap_4_draw(bitmap,cliprect,TILEMAP_DRAW_OPAQUE,1);
deco16_tilemap_3_draw(bitmap,cliprect,0,2);
deco16_tilemap_2_draw(bitmap,cliprect,TILEMAP_DRAW_LAYER1,2);
@@ -419,8 +419,8 @@ VIDEO_UPDATE( edrandy )
deco16_pf12_update(deco16_pf1_rowscroll,deco16_pf2_rowscroll);
deco16_pf34_update(deco16_pf3_rowscroll,deco16_pf4_rowscroll);
- fillbitmap(priority_bitmap,0,cliprect);
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
+ bitmap_fill(bitmap,cliprect,0);
deco16_tilemap_4_draw(bitmap,cliprect,TILEMAP_DRAW_OPAQUE,1);
if (deco16_raster_display_position)
raster_pf3_draw(bitmap,cliprect,0,2);
@@ -451,8 +451,8 @@ VIDEO_UPDATE( robocop2 )
deco16_pf34_update(deco16_pf3_rowscroll,deco16_pf4_rowscroll);
/* Draw playfields */
- fillbitmap(priority_bitmap,0,cliprect);
- fillbitmap(bitmap,0x200,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
+ bitmap_fill(bitmap,cliprect,0x200);
if ((deco16_priority&4)==0)
deco16_tilemap_4_draw(bitmap,cliprect,TILEMAP_DRAW_OPAQUE,1);
@@ -487,7 +487,7 @@ VIDEO_UPDATE( mutantf )
deco16_pf34_update(deco16_pf3_rowscroll,deco16_pf4_rowscroll);
/* Draw playfields */
- fillbitmap(bitmap,0x400,cliprect); /* Confirmed */
+ bitmap_fill(bitmap,cliprect,0x400); /* Confirmed */
/* There is no priority prom on this board, but there is a
priority control word, the only values used in game appear
@@ -511,14 +511,14 @@ VIDEO_UPDATE( mutantf )
then when two alpha blended shadows overlapped then they would be 25%
transparent against the background, rather than 50% */
if (deco16_priority&1) {
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
mutantf_draw_sprites(screen->machine,bitmap,cliprect,buffered_spriteram16,3);
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
mutantf_draw_sprites(screen->machine,bitmap,cliprect,buffered_spriteram16_2,4);
} else {
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
mutantf_draw_sprites(screen->machine,bitmap,cliprect,buffered_spriteram16_2,4);
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
mutantf_draw_sprites(screen->machine,bitmap,cliprect,buffered_spriteram16,3);
}
deco16_tilemap_1_draw(bitmap,cliprect,0,0);
diff --git a/src/mame/video/combatsc.c b/src/mame/video/combatsc.c
index 8df42c9450a..2ab3d6b2c07 100644
--- a/src/mame/video/combatsc.c
+++ b/src/mame/video/combatsc.c
@@ -520,7 +520,7 @@ VIDEO_UPDATE( combasc )
tilemap_set_scrolly(bg_tilemap[0],0,K007121_ctrlram[0][0x02]);
tilemap_set_scrolly(bg_tilemap[1],0,K007121_ctrlram[1][0x02]);
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
if (priority == 0)
{
@@ -561,11 +561,11 @@ VIDEO_UPDATE( combasc )
clip = *cliprect;
clip.max_x = clip.min_x + 7;
- fillbitmap(bitmap,0,&clip);
+ bitmap_fill(bitmap,&clip,0);
clip = *cliprect;
clip.min_x = clip.max_x - 7;
- fillbitmap(bitmap,0,&clip);
+ bitmap_fill(bitmap,&clip,0);
}
return 0;
}
diff --git a/src/mame/video/cosmic.c b/src/mame/video/cosmic.c
index 6ccf8b40fa3..303f7e8d385 100644
--- a/src/mame/video/cosmic.c
+++ b/src/mame/video/cosmic.c
@@ -545,7 +545,7 @@ static void nomnlnd_draw_background(const device_config *screen, bitmap_t *bitma
VIDEO_UPDATE( cosmicg )
{
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
draw_bitmap(screen->machine, bitmap, cliprect);
return 0;
}
@@ -553,7 +553,7 @@ VIDEO_UPDATE( cosmicg )
VIDEO_UPDATE( panic )
{
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
draw_bitmap(screen->machine, bitmap, cliprect);
draw_sprites(screen->machine, bitmap, cliprect, 0x07, 1);
return 0;
@@ -562,7 +562,7 @@ VIDEO_UPDATE( panic )
VIDEO_UPDATE( cosmica )
{
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
cosmica_draw_starfield(screen, bitmap, cliprect);
draw_bitmap(screen->machine, bitmap, cliprect);
draw_sprites(screen->machine, bitmap, cliprect, 0x0f, 0);
@@ -572,7 +572,7 @@ VIDEO_UPDATE( cosmica )
VIDEO_UPDATE( magspot )
{
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
draw_bitmap(screen->machine, bitmap, cliprect);
draw_sprites(screen->machine, bitmap, cliprect, 0x07, 0);
return 0;
@@ -581,7 +581,7 @@ VIDEO_UPDATE( magspot )
VIDEO_UPDATE( devzone )
{
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
if (background_enable)
devzone_draw_grid(screen->machine, bitmap, cliprect);
@@ -597,7 +597,7 @@ VIDEO_UPDATE( nomnlnd )
/* according to the video summation logic on pg4, the trees and river
have the highest priority */
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
draw_bitmap(screen->machine, bitmap, cliprect);
draw_sprites(screen->machine, bitmap, cliprect, 0x07, 0);
diff --git a/src/mame/video/cps1.c b/src/mame/video/cps1.c
index b56806f5cb9..45a87e1ed30 100644
--- a/src/mame/video/cps1.c
+++ b/src/mame/video/cps1.c
@@ -2745,7 +2745,7 @@ VIDEO_UPDATE( cps1 )
{
// CPS1 games use pen 0xbff as background color; this is used in 3wonders,
// mtwins (explosion during attract), mercs (intermission).
- fillbitmap(bitmap,0xbff,cliprect);
+ bitmap_fill(bitmap,cliprect,0xbff);
}
else
{
@@ -2754,7 +2754,7 @@ VIDEO_UPDATE( cps1 )
// 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).
- fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+ bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
}
cps1_render_stars(screen, bitmap,cliprect);
@@ -2764,7 +2764,7 @@ VIDEO_UPDATE( cps1 )
l1 = (layercontrol >> 0x08) & 03;
l2 = (layercontrol >> 0x0a) & 03;
l3 = (layercontrol >> 0x0c) & 03;
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
if (cps_version == 1)
{
diff --git a/src/mame/video/crshrace.c b/src/mame/video/crshrace.c
index bc94f134096..ec3ab752832 100644
--- a/src/mame/video/crshrace.c
+++ b/src/mame/video/crshrace.c
@@ -187,11 +187,11 @@ VIDEO_UPDATE( crshrace )
{
if (gfxctrl & 0x04) /* display disable? */
{
- fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+ bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
return 0;
}
- fillbitmap(bitmap,0x1ff,cliprect);
+ bitmap_fill(bitmap,cliprect,0x1ff);
switch (gfxctrl & 0xfb)
{
diff --git a/src/mame/video/darkmist.c b/src/mame/video/darkmist.c
index 99a659b6227..28b97d48ad8 100644
--- a/src/mame/video/darkmist.c
+++ b/src/mame/video/darkmist.c
@@ -141,7 +141,7 @@ VIDEO_UPDATE( darkmist)
tilemap_set_scrollx(fgtilemap, 0, DM_GETSCROLL(0xa));
tilemap_set_scrolly(fgtilemap, 0, DM_GETSCROLL(0xe));
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
if(darkmist_hw & DISPLAY_BG)
tilemap_draw(bitmap,cliprect,bgtilemap, 0,0);
diff --git a/src/mame/video/dassault.c b/src/mame/video/dassault.c
index 363774b3a00..37b60db57bb 100644
--- a/src/mame/video/dassault.c
+++ b/src/mame/video/dassault.c
@@ -172,8 +172,8 @@ VIDEO_UPDATE( dassault )
/* Draw playfields/update priority bitmap */
deco16_clear_sprite_priority_bitmap();
- fillbitmap(priority_bitmap,0,cliprect);
- fillbitmap(bitmap,screen->machine->pens[3072],cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
+ bitmap_fill(bitmap,cliprect,screen->machine->pens[3072]);
deco16_tilemap_4_draw(bitmap,cliprect,TILEMAP_DRAW_OPAQUE,0);
/* The middle playfields can be swapped priority-wise */
diff --git a/src/mame/video/dbz.c b/src/mame/video/dbz.c
index 9e12b045442..6e03067906b 100644
--- a/src/mame/video/dbz.c
+++ b/src/mame/video/dbz.c
@@ -157,7 +157,7 @@ VIDEO_UPDATE( dbz )
sortlayers(layer, layerpri);
- fillbitmap(priority_bitmap, 0, cliprect);
+ bitmap_fill(priority_bitmap, cliprect, 0);
for(plane = 0; plane < 5; plane++)
{
diff --git a/src/mame/video/dc.c b/src/mame/video/dc.c
index 7e0acb4633b..a4d455499f2 100644
--- a/src/mame/video/dc.c
+++ b/src/mame/video/dc.c
@@ -764,7 +764,7 @@ static void testdrawscreen(const running_machine *machine,bitmap_t *bitmap,const
rs=state_ta.renderselect;
c=pvrta_regs[ISP_BACKGND_T];
c=memory_read_dword(space,0x05000000+((c&0xfffff8)>>1)+(3+3)*4);
- fillbitmap(bitmap,c,cliprect);
+ bitmap_fill(bitmap,cliprect,c);
#if 0
stride=pvrta_regs[FB_W_LINESTRIDE] << 3;
c=pvrta_regs[ISP_BACKGND_T];
@@ -1066,7 +1066,7 @@ static int useframebuffer=1;
if ((useframebuffer) && !state_ta.start_render_received)
{
if (pvrta_regs[VO_CONTROL] & (1 << 3))
- fillbitmap(bitmap,pvrta_regs[VO_BORDER_COL] & 0xFFFFFF,cliprect);
+ bitmap_fill(bitmap,cliprect,pvrta_regs[VO_BORDER_COL] & 0xFFFFFF);
else
testdrawscreenframebuffer(bitmap,cliprect);
return 0;
@@ -1077,7 +1077,7 @@ static int useframebuffer=1;
useframebuffer=0;
testdrawscreen(screen->machine,bitmap,cliprect);
if (pvrta_regs[VO_CONTROL] & (1 << 3))
- fillbitmap(bitmap,pvrta_regs[VO_BORDER_COL] & 0xFFFFFF,cliprect);
+ bitmap_fill(bitmap,cliprect,pvrta_regs[VO_BORDER_COL] & 0xFFFFFF);
state_ta.start_render_received=0;
state_ta.renderselect= -1;
dc_sysctrl_regs[SB_ISTNRM] |= IST_EOR_TSP; // TSP end of render
diff --git a/src/mame/video/dcon.c b/src/mame/video/dcon.c
index 7f5f2bcaf27..6092a28dd62 100644
--- a/src/mame/video/dcon.c
+++ b/src/mame/video/dcon.c
@@ -269,7 +269,7 @@ static void draw_sprites(running_machine* machine, bitmap_t *bitmap,const rectan
VIDEO_UPDATE( dcon )
{
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
/* Setup the tilemaps */
tilemap_set_scrollx( background_layer,0, dcon_scroll_ram[0] );
@@ -282,7 +282,7 @@ VIDEO_UPDATE( dcon )
if ((dcon_enable&1)!=1)
tilemap_draw(bitmap,cliprect,background_layer,0,0);
else
- fillbitmap(bitmap,15,cliprect); /* Should always be black, not pen 15 */
+ bitmap_fill(bitmap,cliprect,15); /* Should always be black, not pen 15 */
tilemap_draw(bitmap,cliprect,midground_layer,0,1);
tilemap_draw(bitmap,cliprect,foreground_layer,0,2);
@@ -296,7 +296,7 @@ VIDEO_UPDATE( sdgndmps )
{
static int last_gfx_bank=0;
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
/* Gfx banking */
if (last_gfx_bank!=dcon_gfx_bank_select)
@@ -318,7 +318,7 @@ VIDEO_UPDATE( sdgndmps )
if ((dcon_enable&1)!=1)
tilemap_draw(bitmap,cliprect,background_layer,0,0);
else
- fillbitmap(bitmap,15,cliprect); /* Should always be black, not pen 15 */
+ bitmap_fill(bitmap,cliprect,15); /* Should always be black, not pen 15 */
tilemap_draw(bitmap,cliprect,midground_layer,0,1);
tilemap_draw(bitmap,cliprect,foreground_layer,0,2);
diff --git a/src/mame/video/deadang.c b/src/mame/video/deadang.c
index 4c58c1f018d..13e0b77c092 100644
--- a/src/mame/video/deadang.c
+++ b/src/mame/video/deadang.c
@@ -147,8 +147,8 @@ VIDEO_UPDATE( deadang )
tilemap_set_enable(pf2_layer,!(deadang_scroll_ram[0x34]&4));
flip_screen_set( deadang_scroll_ram[0x34]&0x40 );
- fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
+ bitmap_fill(priority_bitmap,cliprect,0);
tilemap_draw(bitmap,cliprect,pf3_layer,0,1);
tilemap_draw(bitmap,cliprect,pf1_layer,0,2);
tilemap_draw(bitmap,cliprect,pf2_layer,0,4);
diff --git a/src/mame/video/dec0.c b/src/mame/video/dec0.c
index 8107c1dced9..cb2754820d2 100644
--- a/src/mame/video/dec0.c
+++ b/src/mame/video/dec0.c
@@ -450,7 +450,7 @@ VIDEO_UPDATE( birdtry )
/* This game doesn't have the extra playfield chip on the game board, but
the palette does show through. */
- fillbitmap(bitmap,screen->machine->pens[768],cliprect);
+ bitmap_fill(bitmap,cliprect,screen->machine->pens[768]);
dec0_pf2_draw(bitmap,cliprect,0);
draw_sprites(screen->machine,bitmap,cliprect,0x00,0x00);
dec0_pf1_draw(bitmap,cliprect,0);
diff --git a/src/mame/video/deco16ic.c b/src/mame/video/deco16ic.c
index 1ad83f7af23..9eca8df6b50 100644
--- a/src/mame/video/deco16ic.c
+++ b/src/mame/video/deco16ic.c
@@ -832,7 +832,7 @@ void deco16_print_debug_info(bitmap_t *bitmap)
void deco16_clear_sprite_priority_bitmap(void)
{
if (sprite_priority_bitmap)
- fillbitmap(sprite_priority_bitmap,0,NULL);
+ bitmap_fill(sprite_priority_bitmap,NULL,0);
}
/* A special pdrawgfx z-buffered sprite renderer that is needed to properly draw multiple sprite sources with alpha */
diff --git a/src/mame/video/deco32.c b/src/mame/video/deco32.c
index 2d42009e728..acc3adb64e8 100644
--- a/src/mame/video/deco32.c
+++ b/src/mame/video/deco32.c
@@ -1244,12 +1244,12 @@ VIDEO_UPDATE( captaven )
tilemap_set_enable(pf2_tilemap,pf2_enable);
tilemap_set_enable(pf3_tilemap,pf3_enable);
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
if ((deco32_pri&1)==0) {
if (pf3_enable)
tilemap_draw(bitmap,cliprect,pf3_tilemap,TILEMAP_DRAW_OPAQUE,0);
else
- fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+ bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
if (deco32_raster_display_position)
tilemap_raster_draw(bitmap,cliprect,0,1);
@@ -1263,7 +1263,7 @@ VIDEO_UPDATE( captaven )
tilemap_draw(bitmap,cliprect,pf2_tilemap,0,0);
}
else
- fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+ bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
tilemap_draw(bitmap,cliprect,pf3_tilemap,0,1);
}
@@ -1314,7 +1314,7 @@ VIDEO_UPDATE( dragngun )
tilemap_set_enable(pf4_tilemap, deco32_pf34_control[5]&0x8000);
if ((deco32_pf34_control[5]&0x8000)==0)
- fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+ bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
tilemap_draw(bitmap,cliprect,pf4_tilemap,0,0);
tilemap_draw(bitmap,cliprect,pf3_tilemap,0,0);
@@ -1400,8 +1400,8 @@ VIDEO_UPDATE( fghthist )
/* Draw screen */
deco16_clear_sprite_priority_bitmap();
- fillbitmap(priority_bitmap,0,cliprect);
- fillbitmap(bitmap,screen->machine->pens[0x000],cliprect); // Palette index not confirmed
+ bitmap_fill(priority_bitmap,cliprect,0);
+ bitmap_fill(bitmap,cliprect,screen->machine->pens[0x000]); // Palette index not confirmed
tilemap_draw(bitmap,cliprect,pf4_tilemap,0,1);
tilemap_draw(bitmap,cliprect,pf3_tilemap,0,4);
tilemap_draw(bitmap,cliprect,pf2_tilemap,0,16);
@@ -1591,12 +1591,12 @@ VIDEO_UPDATE( nslasher )
if (deco32_ace_ram_dirty)
updateAceRam(screen->machine);
- fillbitmap(sprite0_mix_bitmap,0,cliprect);
- fillbitmap(sprite1_mix_bitmap,0,cliprect);
- fillbitmap(priority_bitmap,0,cliprect);
- fillbitmap(tilemap_alpha_bitmap,0,cliprect);
+ bitmap_fill(sprite0_mix_bitmap,cliprect,0);
+ bitmap_fill(sprite1_mix_bitmap,cliprect,0);
+ bitmap_fill(priority_bitmap,cliprect,0);
+ bitmap_fill(tilemap_alpha_bitmap,cliprect,0);
if ((deco32_pf34_control[5]&0x8000)==0)
- fillbitmap(bitmap,screen->machine->pens[0x200],cliprect);
+ bitmap_fill(bitmap,cliprect,screen->machine->pens[0x200]);
/* Draw sprites to temporary bitmaps, saving alpha & priority info for later mixing */
nslasher_draw_sprites(screen->machine,sprite0_mix_bitmap,cliprect,buffered_spriteram32,3);
@@ -1604,7 +1604,7 @@ VIDEO_UPDATE( nslasher )
/* Render alpha-blended tilemap to seperate buffer for proper mixing */
if (alphaTilemap)
- fillbitmap(tilemap_alpha_bitmap,0,cliprect);
+ bitmap_fill(tilemap_alpha_bitmap,cliprect,0);
/* Draw playfields & sprites */
if (deco32_pri&2)
diff --git a/src/mame/video/deco_mlc.c b/src/mame/video/deco_mlc.c
index e510b93a6f6..0ff4213c947 100644
--- a/src/mame/video/deco_mlc.c
+++ b/src/mame/video/deco_mlc.c
@@ -505,7 +505,7 @@ static void draw_sprites(running_machine* machine, bitmap_t *bitmap,const rectan
if (lastRasterMode!=0 && rasterDirty)
{
// blitRaster(bitmap, rasterMode);
-// fillbitmap(temp_bitmap,0,cliprect);
+// bitmap_fill(temp_bitmap,cliprect,0);
rasterDirty=0;
}
lastRasterMode=rasterMode;
@@ -527,8 +527,8 @@ VIDEO_EOF( mlc )
VIDEO_UPDATE( mlc )
{
-// fillbitmap(temp_bitmap,0,cliprect);
- fillbitmap(bitmap,screen->machine->pens[0],cliprect); /* Pen 0 fill colour confirmed from Skull Fang level 2 */
+// bitmap_fill(temp_bitmap,cliprect,0);
+ bitmap_fill(bitmap,cliprect,screen->machine->pens[0]); /* Pen 0 fill colour confirmed from Skull Fang level 2 */
draw_sprites(screen->machine,bitmap,cliprect);
return 0;
}
diff --git a/src/mame/video/decocass.c b/src/mame/video/decocass.c
index dcc2b8a7ab4..8b2e41fae70 100644
--- a/src/mame/video/decocass.c
+++ b/src/mame/video/decocass.c
@@ -647,7 +647,7 @@ VIDEO_UPDATE( decocass )
}
#endif
- fillbitmap( bitmap, 0, cliprect );
+ bitmap_fill( bitmap, cliprect , 0);
decode_modified(screen->machine, decocass_fgvideoram, 0x20 );
diff --git a/src/mame/video/deniam.c b/src/mame/video/deniam.c
index 3263c8e1010..66186160e55 100644
--- a/src/mame/video/deniam.c
+++ b/src/mame/video/deniam.c
@@ -390,7 +390,7 @@ VIDEO_UPDATE( deniam )
tilemap_set_scrollx(fg_tilemap,0,fg_scrollx & 0x1ff);
tilemap_set_scrolly(fg_tilemap,0,fg_scrolly & 0x0ff);
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
tilemap_draw(bitmap,cliprect,bg_tilemap,0,1);
tilemap_draw(bitmap,cliprect,fg_tilemap,0,2);
diff --git a/src/mame/video/destroyr.c b/src/mame/video/destroyr.c
index 30e91bd1ebc..5016505b18f 100644
--- a/src/mame/video/destroyr.c
+++ b/src/mame/video/destroyr.c
@@ -19,7 +19,7 @@ VIDEO_UPDATE( destroyr )
int i;
int j;
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
/* draw major objects */
diff --git a/src/mame/video/dietgo.c b/src/mame/video/dietgo.c
index 08eeadf2d1a..8783404d477 100644
--- a/src/mame/video/dietgo.c
+++ b/src/mame/video/dietgo.c
@@ -83,7 +83,7 @@ VIDEO_UPDATE(dietgo)
flip_screen_set( deco16_pf12_control[0]&0x80 );
deco16_pf12_update(deco16_pf1_rowscroll,deco16_pf2_rowscroll);
- fillbitmap(bitmap,256,cliprect); /* not verified */
+ bitmap_fill(bitmap,cliprect,256); /* not verified */
deco16_tilemap_2_draw(bitmap,cliprect,TILEMAP_DRAW_OPAQUE,0);
deco16_tilemap_1_draw(bitmap,cliprect,0,0);
diff --git a/src/mame/video/diverboy.c b/src/mame/video/diverboy.c
index 36073c24cd5..8666aabef44 100644
--- a/src/mame/video/diverboy.c
+++ b/src/mame/video/diverboy.c
@@ -47,7 +47,7 @@ static void draw_sprites(running_machine* machine, bitmap_t *bitmap, const recta
VIDEO_UPDATE(diverboy)
{
-// fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+// bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
draw_sprites(screen->machine,bitmap,cliprect);
return 0;
}
diff --git a/src/mame/video/djmain.c b/src/mame/video/djmain.c
index 3f711b367c2..7b995bfeab9 100644
--- a/src/mame/video/djmain.c
+++ b/src/mame/video/djmain.c
@@ -173,7 +173,7 @@ VIDEO_UPDATE( djmain )
order[j] = temp;
}
- fillbitmap(bitmap, screen->machine->pens[0], cliprect);
+ bitmap_fill(bitmap, cliprect, screen->machine->pens[0]);
for (i = 0; i < NUM_LAYERS + 1; i++)
{
diff --git a/src/mame/video/docastle.c b/src/mame/video/docastle.c
index fa6b13756ec..7726aee30d5 100644
--- a/src/mame/video/docastle.c
+++ b/src/mame/video/docastle.c
@@ -129,7 +129,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta
{
int offs;
- fillbitmap(priority_bitmap,1,NULL);
+ bitmap_fill(priority_bitmap,NULL,1);
for (offs = spriteram_size - 4;offs >= 0;offs -= 4)
{
diff --git a/src/mame/video/dooyong.c b/src/mame/video/dooyong.c
index 28d3d86720b..f235dfa4e2d 100644
--- a/src/mame/video/dooyong.c
+++ b/src/mame/video/dooyong.c
@@ -507,8 +507,8 @@ static void rshark_draw_sprites(running_machine *machine, bitmap_t *bitmap, cons
VIDEO_UPDATE( lastday )
{
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
- fillbitmap(priority_bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
+ bitmap_fill(priority_bitmap, cliprect, 0);
tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 1);
tilemap_draw(bitmap, cliprect, fg_tilemap, 0, 2);
@@ -521,8 +521,8 @@ VIDEO_UPDATE( lastday )
VIDEO_UPDATE( gulfstrm )
{
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
- fillbitmap(priority_bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
+ bitmap_fill(priority_bitmap, cliprect, 0);
tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 1);
tilemap_draw(bitmap, cliprect, fg_tilemap, 0, 2);
@@ -534,8 +534,8 @@ VIDEO_UPDATE( gulfstrm )
VIDEO_UPDATE( pollux )
{
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
- fillbitmap(priority_bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
+ bitmap_fill(priority_bitmap, cliprect, 0);
tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 1);
tilemap_draw(bitmap, cliprect, fg_tilemap, 0, 2);
@@ -547,8 +547,8 @@ VIDEO_UPDATE( pollux )
VIDEO_UPDATE( flytiger )
{
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
- fillbitmap(priority_bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
+ bitmap_fill(priority_bitmap, cliprect, 0);
if (flytiger_pri)
{
@@ -569,8 +569,8 @@ VIDEO_UPDATE( flytiger )
VIDEO_UPDATE( bluehawk )
{
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
- fillbitmap(priority_bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
+ bitmap_fill(priority_bitmap, cliprect, 0);
tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 1);
tilemap_draw(bitmap, cliprect, fg_tilemap, 0, 2);
@@ -583,7 +583,7 @@ VIDEO_UPDATE( bluehawk )
VIDEO_UPDATE( primella )
{
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0);
if (tx_pri) tilemap_draw(bitmap, cliprect, tx_tilemap, 0, 0);
@@ -594,8 +594,8 @@ VIDEO_UPDATE( primella )
VIDEO_UPDATE( rshark )
{
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
- fillbitmap(priority_bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
+ bitmap_fill(priority_bitmap, cliprect, 0);
tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 1);
tilemap_draw(bitmap, cliprect, bg2_tilemap, 0, (rshark_pri ? 2 : 1));
@@ -608,8 +608,8 @@ VIDEO_UPDATE( rshark )
VIDEO_UPDATE( popbingo )
{
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
- fillbitmap(priority_bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
+ bitmap_fill(priority_bitmap, cliprect, 0);
tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 1);
diff --git a/src/mame/video/dynax.c b/src/mame/video/dynax.c
index 2bf40d183d8..e97067e93f3 100644
--- a/src/mame/video/dynax.c
+++ b/src/mame/video/dynax.c
@@ -1100,7 +1100,7 @@ static int debug_viewer(running_machine *machine, bitmap_t *bitmap,const rectang
dynax_blit_palettes = (c & 0xf) * 0x111;
dynax_blit_palbank = (c >> 4) & 1;
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
memset(dynax_pixmap[0][0],0,sizeof(UINT8)*0x100*0x100);
if (layer_layout != LAYOUT_MJDIALQ2)
memset(dynax_pixmap[0][1],0,sizeof(UINT8)*0x100*0x100);
@@ -1126,10 +1126,8 @@ VIDEO_UPDATE( hanamai )
if (debug_viewer(screen->machine,bitmap,cliprect)) return 0;
layers_ctrl &= debug_mask();
- fillbitmap(
- bitmap,
- (dynax_blit_backpen & 0xff) + (dynax_blit_palbank & 1) * 256,
- cliprect);
+ bitmap_fill(bitmap, cliprect,
+ (dynax_blit_backpen & 0xff) + (dynax_blit_palbank & 1) * 256);
/* bit 4 = display enable? */
if (!(hanamai_priority & 0x10)) return 0;
@@ -1162,10 +1160,8 @@ VIDEO_UPDATE( hnoridur )
if (debug_viewer(screen->machine,bitmap,cliprect)) return 0;
layers_ctrl &= debug_mask();
- fillbitmap(
- bitmap,
- (dynax_blit_backpen & 0xff) + (dynax_blit_palbank & 0x0f) * 256,
- cliprect);
+ bitmap_fill(bitmap, cliprect,
+ (dynax_blit_backpen & 0xff) + (dynax_blit_palbank & 0x0f) * 256);
pri = hanamai_priority >> 4;
@@ -1197,10 +1193,8 @@ VIDEO_UPDATE( sprtmtch )
if (debug_viewer(screen->machine,bitmap,cliprect)) return 0;
layers_ctrl &= debug_mask();
- fillbitmap(
- bitmap,
- (dynax_blit_backpen & 0xff) + (dynax_blit_palbank & 1) * 256,
- cliprect);
+ bitmap_fill(bitmap, cliprect,
+ (dynax_blit_backpen & 0xff) + (dynax_blit_palbank & 1) * 256);
if (layers_ctrl & 1) hanamai_copylayer( bitmap, cliprect, 0 );
if (layers_ctrl & 2) hanamai_copylayer( bitmap, cliprect, 1 );
@@ -1218,10 +1212,8 @@ VIDEO_UPDATE( jantouki )
if (debug_viewer(screen->machine,bitmap,cliprect)) return 0;
layers_ctrl &= debug_mask();
- fillbitmap(
- bitmap,
- (dynax_blit_backpen & 0xff) + (dynax_blit_palbank & 1) * 256,
- cliprect);
+ bitmap_fill(bitmap, cliprect,
+ (dynax_blit_backpen & 0xff) + (dynax_blit_palbank & 1) * 256);
if (screen == top_screen)
{
@@ -1249,10 +1241,8 @@ VIDEO_UPDATE( mjdialq2 )
if (debug_viewer(screen->machine,bitmap,cliprect)) return 0;
layers_ctrl &= debug_mask();
- fillbitmap(
- bitmap,
- (dynax_blit_backpen & 0xff) + (dynax_blit_palbank & 1) * 256,
- cliprect);
+ bitmap_fill(bitmap, cliprect,
+ (dynax_blit_backpen & 0xff) + (dynax_blit_palbank & 1) * 256);
if (layers_ctrl & 1) mjdialq2_copylayer( bitmap, cliprect, 0 );
if (layers_ctrl & 2) mjdialq2_copylayer( bitmap, cliprect, 1 );
@@ -1275,7 +1265,7 @@ VIDEO_UPDATE(htengoku)
// format and let VIDEO_UPDATE(ddenlovr) do the final compositing (priorities + palettes)
for (layer = 0; layer < 4; layer++)
{
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
hanamai_copylayer( bitmap, cliprect, layer );
for (y=0; y < 256; y++)
diff --git a/src/mame/video/dynduke.c b/src/mame/video/dynduke.c
index c858981caf1..69e9942daff 100644
--- a/src/mame/video/dynduke.c
+++ b/src/mame/video/dynduke.c
@@ -178,7 +178,7 @@ static void draw_background(running_machine *machine, bitmap_t *bitmap, const re
/* if we're disabled, don't draw */
if (!back_enable)
{
- fillbitmap(bitmap,get_black_pen(machine),cliprect);
+ bitmap_fill(bitmap,cliprect,get_black_pen(machine));
return;
}
diff --git a/src/mame/video/equites.c b/src/mame/video/equites.c
index c52913ed62e..a13990ae79f 100644
--- a/src/mame/video/equites.c
+++ b/src/mame/video/equites.c
@@ -457,7 +457,7 @@ static void splndrbt_copy_bg(running_machine *machine, bitmap_t *dst_bitmap, con
VIDEO_UPDATE( equites )
{
- fillbitmap(bitmap, bgcolor, cliprect);
+ bitmap_fill(bitmap, cliprect, bgcolor);
tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0);
@@ -470,7 +470,7 @@ VIDEO_UPDATE( equites )
VIDEO_UPDATE( splndrbt )
{
- fillbitmap(bitmap, bgcolor, cliprect);
+ bitmap_fill(bitmap, cliprect, bgcolor);
splndrbt_copy_bg(screen->machine, bitmap, cliprect);
diff --git a/src/mame/video/esd16.c b/src/mame/video/esd16.c
index f14b79471cf..eacdcd8b3a9 100644
--- a/src/mame/video/esd16.c
+++ b/src/mame/video/esd16.c
@@ -325,7 +325,7 @@ VIDEO_UPDATE( esd16 )
{
int layers_ctrl = -1;
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
tilemap_set_scrollx(esdtilemap_0, 0, esd16_scroll_0[0]);
tilemap_set_scrolly(esdtilemap_0, 0, esd16_scroll_0[1]);
@@ -343,7 +343,7 @@ if ( input_code_pressed(KEYCODE_Z) )
#endif
if (layers_ctrl & 1) tilemap_draw(bitmap,cliprect,esdtilemap_0,0,0);
- else fillbitmap(bitmap,0,cliprect);
+ else bitmap_fill(bitmap,cliprect,0);
if (layers_ctrl & 2) tilemap_draw(bitmap,cliprect,esdtilemap_1,0,1);
@@ -356,7 +356,7 @@ VIDEO_UPDATE( hedpanic )
{
int layers_ctrl = -1;
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
#ifdef MAME_DEBUG
@@ -385,7 +385,7 @@ if ( input_code_pressed(KEYCODE_Z) )
}
else
{
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
}
diff --git a/src/mame/video/exedexes.c b/src/mame/video/exedexes.c
index 69dbb285c23..21eef94d607 100644
--- a/src/mame/video/exedexes.c
+++ b/src/mame/video/exedexes.c
@@ -222,7 +222,7 @@ VIDEO_UPDATE( exedexes )
tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0);
}
else
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
draw_sprites(screen->machine, bitmap, cliprect, 1);
diff --git a/src/mame/video/exidy.c b/src/mame/video/exidy.c
index 44b1af8ffa7..c017d8828d6 100644
--- a/src/mame/video/exidy.c
+++ b/src/mame/video/exidy.c
@@ -305,7 +305,7 @@ static void check_collision(running_machine *machine)
return;
/* draw sprite 1 */
- fillbitmap(motion_object_1_vid, 0xff, &clip);
+ bitmap_fill(motion_object_1_vid, &clip, 0xff);
if (sprite_1_enabled())
{
org_1_x = 236 - *exidy_sprite1_xpos - 4;
@@ -316,7 +316,7 @@ static void check_collision(running_machine *machine)
}
/* draw sprite 2 */
- fillbitmap(motion_object_2_vid, 0xff, &clip);
+ bitmap_fill(motion_object_2_vid, &clip, 0xff);
org_2_x = 236 - *exidy_sprite2_xpos - 4;
org_2_y = 244 - *exidy_sprite2_ypos - 4;
drawgfx(motion_object_2_vid, machine->gfx[0],
@@ -324,7 +324,7 @@ static void check_collision(running_machine *machine)
0, 0, 0, 0, &clip, TRANSPARENCY_PEN, 0);
/* draw sprite 2 clipped to sprite 1's location */
- fillbitmap(motion_object_2_clip, 0xff, &clip);
+ bitmap_fill(motion_object_2_clip, &clip, 0xff);
if (sprite_1_enabled())
{
sx = org_2_x - org_1_x;
diff --git a/src/mame/video/exzisus.c b/src/mame/video/exzisus.c
index 0147fa8ac5f..f5f741cfb9a 100644
--- a/src/mame/video/exzisus.c
+++ b/src/mame/video/exzisus.c
@@ -83,7 +83,7 @@ VIDEO_UPDATE( exzisus )
int gfx_num, gfx_attr, gfx_offs;
/* Is this correct ? */
- fillbitmap(bitmap, 1023, cliprect);
+ bitmap_fill(bitmap, cliprect, 1023);
/* ---------- 1st TC0010VCU ---------- */
sx = 0;
diff --git a/src/mame/video/f1gp.c b/src/mame/video/f1gp.c
index 7385f0a3663..58980149446 100644
--- a/src/mame/video/f1gp.c
+++ b/src/mame/video/f1gp.c
@@ -350,7 +350,7 @@ VIDEO_UPDATE( f1gp )
- fillbitmap(priority_bitmap, 0, cliprect);
+ bitmap_fill(priority_bitmap, cliprect, 0);
K053936_0_zoom_draw(bitmap,cliprect,roz_tilemap,0,0);
@@ -401,7 +401,7 @@ VIDEO_UPDATE( f1gpb )
tilemap_set_scrolly(fg_tilemap,0,f1gpb_fgregs[0] + 8);
- fillbitmap(priority_bitmap, 0, cliprect);
+ bitmap_fill(priority_bitmap, cliprect, 0);
tilemap_draw_roz(bitmap, cliprect, roz_tilemap,
startx << 13, starty << 13,
@@ -492,7 +492,7 @@ static void f1gp2_draw_sprites(running_machine *machine,bitmap_t *bitmap,const r
VIDEO_UPDATE( f1gp2 )
{
if (gfxctrl & 4) /* blank screen */
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
else
{
switch (gfxctrl & 3)
diff --git a/src/mame/video/fantland.c b/src/mame/video/fantland.c
index bc29d70b938..33b892b0531 100644
--- a/src/mame/video/fantland.c
+++ b/src/mame/video/fantland.c
@@ -138,7 +138,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan
VIDEO_UPDATE( fantland )
{
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
draw_sprites(screen->machine,bitmap,cliprect);
return 0;
diff --git a/src/mame/video/fastfred.c b/src/mame/video/fastfred.c
index 6d74543711c..c9b303b301f 100644
--- a/src/mame/video/fastfred.c
+++ b/src/mame/video/fastfred.c
@@ -310,7 +310,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta
VIDEO_UPDATE( fastfred )
{
- fillbitmap(bitmap, *fastfred_background_color, cliprect);
+ bitmap_fill(bitmap, cliprect, *fastfred_background_color);
tilemap_draw(bitmap,cliprect,bg_tilemap,0,0);
draw_sprites(screen->machine, bitmap, cliprect);
diff --git a/src/mame/video/firetrk.c b/src/mame/video/firetrk.c
index 3bab5001162..97b2a6bf230 100644
--- a/src/mame/video/firetrk.c
+++ b/src/mame/video/firetrk.c
@@ -369,7 +369,7 @@ VIDEO_UPDATE( firetrk )
tilemap_set_scrolly(tilemap1, 0, *firetrk_scroll_y);
tilemap_set_scrolly(tilemap2, 0, *firetrk_scroll_y);
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
tilemap_draw(bitmap, &playfield_window, tilemap1, 0, 0);
firetrk_draw_car(screen->machine->gfx, bitmap, &playfield_window, 0, firetrk_flash);
firetrk_draw_car(screen->machine->gfx, bitmap, &playfield_window, 1, firetrk_flash);
@@ -380,11 +380,11 @@ VIDEO_UPDATE( firetrk )
{
tilemap_draw(helper1, &playfield_window, tilemap2, 0, 0);
- fillbitmap(helper2, 0xff, &playfield_window);
+ bitmap_fill(helper2, &playfield_window, 0xff);
firetrk_draw_car(screen->machine->gfx, helper2, &playfield_window, 0, FALSE);
check_collision(0);
- fillbitmap(helper2, 0xff, &playfield_window);
+ bitmap_fill(helper2, &playfield_window, 0xff);
firetrk_draw_car(screen->machine->gfx, helper2, &playfield_window, 1, FALSE);
check_collision(1);
@@ -403,7 +403,7 @@ VIDEO_UPDATE( superbug )
tilemap_set_scrolly(tilemap1, 0, *firetrk_scroll_y);
tilemap_set_scrolly(tilemap2, 0, *firetrk_scroll_y);
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
tilemap_draw(bitmap, &playfield_window, tilemap1, 0, 0);
superbug_draw_car(screen->machine->gfx, bitmap, &playfield_window, firetrk_flash);
draw_text(screen->machine->gfx, bitmap, cliprect, firetrk_alpha_num_ram + 0x00, 296, 0x10, 0x10);
@@ -413,7 +413,7 @@ VIDEO_UPDATE( superbug )
{
tilemap_draw(helper1, &playfield_window, tilemap2, 0, 0);
- fillbitmap(helper2, 0xff, &playfield_window);
+ bitmap_fill(helper2, &playfield_window, 0xff);
superbug_draw_car(screen->machine->gfx, helper2, &playfield_window, FALSE);
check_collision(0);
@@ -432,7 +432,7 @@ VIDEO_UPDATE( montecar )
tilemap_set_scrolly(tilemap1, 0, *firetrk_scroll_y);
tilemap_set_scrolly(tilemap2, 0, *firetrk_scroll_y);
- fillbitmap(bitmap, 0x2c, cliprect);
+ bitmap_fill(bitmap, cliprect, 0x2c);
tilemap_draw(bitmap, &playfield_window, tilemap1, 0, 0);
montecar_draw_car(screen->machine->gfx, bitmap, &playfield_window, 0, FALSE);
montecar_draw_car(screen->machine->gfx, bitmap, &playfield_window, 1, FALSE);
@@ -443,11 +443,11 @@ VIDEO_UPDATE( montecar )
{
tilemap_draw(helper1, &playfield_window, tilemap2, 0, 0);
- fillbitmap(helper2, 0xff, &playfield_window);
+ bitmap_fill(helper2, &playfield_window, 0xff);
montecar_draw_car(screen->machine->gfx, helper2, &playfield_window, 0, TRUE);
check_collision(0);
- fillbitmap(helper2, 0xff, &playfield_window);
+ bitmap_fill(helper2, &playfield_window, 0xff);
montecar_draw_car(screen->machine->gfx, helper2, &playfield_window, 1, TRUE);
check_collision(1);
}
diff --git a/src/mame/video/fitfight.c b/src/mame/video/fitfight.c
index b3c8dac2797..e1b14e8349d 100644
--- a/src/mame/video/fitfight.c
+++ b/src/mame/video/fitfight.c
@@ -114,7 +114,7 @@ VIDEO_UPDATE(fitfight)
vblank = (fof_700000[0] & 0x8000);
if (vblank > 0)
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
else {
// if (input_code_pressed(KEYCODE_Q))
// scrollbak = ((fof_a00000[0]&0xff00) >> 5) - ((fof_700000[0] & 0x0038) >> 3);
diff --git a/src/mame/video/foodf.c b/src/mame/video/foodf.c
index 749804f2b2d..a2222d7932c 100644
--- a/src/mame/video/foodf.c
+++ b/src/mame/video/foodf.c
@@ -126,7 +126,7 @@ VIDEO_UPDATE( foodf )
tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, TILEMAP_DRAW_OPAQUE, 0);
/* then draw the non-transparent parts with a priority of 1 */
- fillbitmap(priority_bitmap, 0, 0);
+ bitmap_fill(priority_bitmap, 0, 0);
tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 0, 1);
/* draw the motion objects front-to-back */
diff --git a/src/mame/video/funkyjet.c b/src/mame/video/funkyjet.c
index 83910d3f023..4656824c61b 100644
--- a/src/mame/video/funkyjet.c
+++ b/src/mame/video/funkyjet.c
@@ -82,7 +82,7 @@ VIDEO_UPDATE( funkyjet )
flip_screen_set( deco16_pf12_control[0]&0x80 );
deco16_pf12_update(deco16_pf1_rowscroll,deco16_pf2_rowscroll);
- fillbitmap(bitmap,768,cliprect);
+ bitmap_fill(bitmap,cliprect,768);
deco16_tilemap_2_draw(bitmap,cliprect,TILEMAP_DRAW_OPAQUE,0);
deco16_tilemap_1_draw(bitmap,cliprect,0,0);
draw_sprites(screen->machine,bitmap,cliprect);
diff --git a/src/mame/video/funybubl.c b/src/mame/video/funybubl.c
index 4386d959895..a86ff63ec60 100644
--- a/src/mame/video/funybubl.c
+++ b/src/mame/video/funybubl.c
@@ -81,7 +81,7 @@ VIDEO_UPDATE(funybubl)
offs = 0;
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
/* tilemap .. convert it .. banking makes it slightly more annoying but still easy */
diff --git a/src/mame/video/fuukifg2.c b/src/mame/video/fuukifg2.c
index 660c766327e..3aba5460bf8 100644
--- a/src/mame/video/fuukifg2.c
+++ b/src/mame/video/fuukifg2.c
@@ -341,8 +341,8 @@ VIDEO_UPDATE( fuuki16 )
// fuuki16_draw_layer(bitmap,cliprect, tm_back, TILEMAP_DRAW_OPAQUE, 0);
/* Actually, bg colour is simply the last pen i.e. 0x1fff -pjp */
- fillbitmap(bitmap,(0x800*4)-1,cliprect);
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,(0x800*4)-1);
+ bitmap_fill(priority_bitmap,cliprect,0);
fuuki16_draw_layer(bitmap,cliprect, tm_back, 0, 1);
fuuki16_draw_layer(bitmap,cliprect, tm_middle, 0, 2);
diff --git a/src/mame/video/fuukifg3.c b/src/mame/video/fuukifg3.c
index 8cf37815020..bb7811f286c 100644
--- a/src/mame/video/fuukifg3.c
+++ b/src/mame/video/fuukifg3.c
@@ -367,8 +367,8 @@ VIDEO_UPDATE( fuuki32 )
tilemap_set_scrolly(tilemap_3, 0, layer2_scrolly);
/* The bg colour is the last pen i.e. 0x1fff */
- fillbitmap(bitmap,(0x800*4)-1,cliprect);
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,(0x800*4)-1);
+ bitmap_fill(priority_bitmap,cliprect,0);
fuuki32_draw_layer(bitmap,cliprect, tm_back, 0, 1);
fuuki32_draw_layer(bitmap,cliprect, tm_middle, 0, 2);
diff --git a/src/mame/video/gaelco.c b/src/mame/video/gaelco.c
index 3b268a91c1b..95a631165c3 100644
--- a/src/mame/video/gaelco.c
+++ b/src/mame/video/gaelco.c
@@ -195,8 +195,8 @@ VIDEO_UPDATE( maniacsq )
tilemap_set_scrolly(pant[1], 0, gaelco_vregs[2]);
tilemap_set_scrollx(pant[1], 0, gaelco_vregs[3]);
- fillbitmap(priority_bitmap,0,cliprect);
- fillbitmap( bitmap, 0, cliprect );
+ bitmap_fill(priority_bitmap,cliprect,0);
+ bitmap_fill( bitmap, cliprect , 0);
tilemap_draw(bitmap,cliprect,pant[1],3,0);
tilemap_draw(bitmap,cliprect,pant[0],3,0);
@@ -222,8 +222,8 @@ VIDEO_UPDATE( bigkarnk )
tilemap_set_scrolly(pant[1], 0, gaelco_vregs[2]);
tilemap_set_scrollx(pant[1], 0, gaelco_vregs[3]);
- fillbitmap(priority_bitmap,0,cliprect);
- fillbitmap( bitmap, 0, cliprect );
+ bitmap_fill(priority_bitmap,cliprect,0);
+ bitmap_fill( bitmap, cliprect , 0);
tilemap_draw(bitmap,cliprect,pant[1],TILEMAP_DRAW_LAYER1 | 3,0);
tilemap_draw(bitmap,cliprect,pant[0],TILEMAP_DRAW_LAYER1 | 3,0);
diff --git a/src/mame/video/gaelco2.c b/src/mame/video/gaelco2.c
index b78b3b0cf24..de5e739c271 100644
--- a/src/mame/video/gaelco2.c
+++ b/src/mame/video/gaelco2.c
@@ -456,7 +456,7 @@ VIDEO_UPDATE( gaelco2 )
}
/* draw screen */
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
tilemap_draw(bitmap, cliprect, pant[1], 0, 0);
tilemap_draw(bitmap, cliprect, pant[0], 0, 0);
@@ -488,7 +488,7 @@ VIDEO_UPDATE( gaelco2_dual )
}
/* draw screen */
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
if (screen == right_screen)
{
diff --git a/src/mame/video/gaiden.c b/src/mame/video/gaiden.c
index d2cab8d0bde..18b27149f16 100644
--- a/src/mame/video/gaiden.c
+++ b/src/mame/video/gaiden.c
@@ -563,8 +563,8 @@ static void drgnbowl_draw_sprites(running_machine *machine, bitmap_t *bitmap, co
VIDEO_UPDATE( gaiden )
{
- fillbitmap(priority_bitmap, 0, cliprect);
- fillbitmap(bitmap, 0x200, cliprect);
+ bitmap_fill(priority_bitmap, cliprect, 0);
+ bitmap_fill(bitmap, cliprect, 0x200);
tilemap_draw(bitmap, cliprect, background, 0, 1);
tilemap_draw(bitmap, cliprect, foreground, 0, 2);
@@ -576,11 +576,11 @@ VIDEO_UPDATE( gaiden )
VIDEO_UPDATE( raiga )
{
- fillbitmap(priority_bitmap, 0, cliprect);
+ bitmap_fill(priority_bitmap, cliprect, 0);
- fillbitmap(tile_bitmap_bg, 0x200, cliprect);
- fillbitmap(tile_bitmap_fg, 0, cliprect);
- fillbitmap(sprite_bitmap, 0, cliprect);
+ bitmap_fill(tile_bitmap_bg, cliprect, 0x200);
+ bitmap_fill(tile_bitmap_fg, cliprect, 0);
+ bitmap_fill(sprite_bitmap, cliprect, 0);
/* draw tilemaps into a 16-bit bitmap */
tilemap_draw(tile_bitmap_bg, cliprect,background, 0, 1);
@@ -600,7 +600,7 @@ VIDEO_UPDATE( raiga )
VIDEO_UPDATE( drgnbowl )
{
- fillbitmap(priority_bitmap, 0, cliprect);
+ bitmap_fill(priority_bitmap, cliprect, 0);
tilemap_draw(bitmap, cliprect, background, 0, 1);
tilemap_draw(bitmap, cliprect, foreground, 0, 2);
diff --git a/src/mame/video/galaga.c b/src/mame/video/galaga.c
index 45c67222bd9..f619b03cfa8 100644
--- a/src/mame/video/galaga.c
+++ b/src/mame/video/galaga.c
@@ -581,7 +581,7 @@ static void draw_stars(bitmap_t *bitmap, const rectangle *cliprect )
VIDEO_UPDATE( galaga )
{
- fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+ bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
draw_stars(bitmap,cliprect);
draw_sprites(screen->machine,bitmap,cliprect);
tilemap_draw(bitmap,cliprect,tx_tilemap,0,0);
diff --git a/src/mame/video/galastrm.c b/src/mame/video/galastrm.c
index 06fa53377dd..853f59cbe08 100644
--- a/src/mame/video/galastrm.c
+++ b/src/mame/video/galastrm.c
@@ -484,9 +484,9 @@ VIDEO_UPDATE( galastrm )
pivlayer[1] = pivlayer[0]^1;
pivlayer[2] = 2;
- fillbitmap(bitmap, 0, cliprect);
- fillbitmap(priority_bitmap, 0, &clip);
- fillbitmap(tmpbitmaps, 0, &clip);
+ bitmap_fill(bitmap, cliprect, 0);
+ bitmap_fill(priority_bitmap, &clip, 0);
+ bitmap_fill(tmpbitmaps, &clip, 0);
TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,pivlayer[0],0,0);
TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,pivlayer[1],0,0);
@@ -527,10 +527,10 @@ VIDEO_UPDATE( galastrm )
draw_sprites(screen->machine,tmpbitmaps,&clip,primasks,1);
copybitmap_trans(bitmap,polybitmap,0,0, 0,0,cliprect,0);
- fillbitmap(polybitmap, 0, &clip);
+ bitmap_fill(polybitmap, &clip, 0);
tc0610_rotate_draw(screen->machine,polybitmap,tmpbitmaps,cliprect);
- fillbitmap(priority_bitmap, 0, cliprect);
+ bitmap_fill(priority_bitmap, cliprect, 0);
draw_sprites(screen->machine,bitmap,cliprect,primasks,0);
if (!input_code_pressed(KEYCODE_B)) TC0480SCP_tilemap_draw(bitmap,cliprect,layer[4],0,0);
@@ -573,10 +573,10 @@ VIDEO_UPDATE( galastrm )
draw_sprites(screen->machine,tmpbitmaps,&clip,primasks,1);
copybitmap_trans(bitmap,polybitmap,0,0, 0,0,cliprect,0);
- fillbitmap(polybitmap, 0, &clip);
+ bitmap_fill(polybitmap, &clip, 0);
tc0610_rotate_draw(screen->machine,polybitmap,tmpbitmaps,cliprect);
- fillbitmap(priority_bitmap, 0, cliprect);
+ bitmap_fill(priority_bitmap, cliprect, 0);
draw_sprites(screen->machine,bitmap,cliprect,primasks,0);
TC0480SCP_tilemap_draw(bitmap,cliprect,layer[4],0,0);
diff --git a/src/mame/video/galaxian.c b/src/mame/video/galaxian.c
index ebc96553998..f222c78fb47 100644
--- a/src/mame/video/galaxian.c
+++ b/src/mame/video/galaxian.c
@@ -972,7 +972,7 @@ static int flip_and_clip(rectangle *draw, int xstart, int xend, const rectangle
void galaxian_draw_background(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect)
{
/* erase the background to black first */
- fillbitmap(bitmap, RGB_BLACK, cliprect);
+ bitmap_fill(bitmap, cliprect, RGB_BLACK);
/* update the star origin to the current frame */
stars_update_origin(machine);
@@ -1003,12 +1003,12 @@ void frogger_draw_background(running_machine *machine, bitmap_t *bitmap, const r
draw = *cliprect;
draw.max_x = MIN(draw.max_x, (128-8) * GALAXIAN_XSCALE - 1);
if (draw.min_x <= draw.max_x)
- fillbitmap(bitmap, RGB_BLACK, &draw);
+ bitmap_fill(bitmap, &draw, RGB_BLACK);
draw = *cliprect;
draw.min_x = MAX(draw.min_x, (128-8) * GALAXIAN_XSCALE);
if (draw.min_x <= draw.max_x)
- fillbitmap(bitmap, MAKE_RGB(0,0,0x47), &draw);
+ bitmap_fill(bitmap, &draw, MAKE_RGB(0,0,0x47));
}
else
{
@@ -1017,12 +1017,12 @@ void frogger_draw_background(running_machine *machine, bitmap_t *bitmap, const r
draw = *cliprect;
draw.max_x = MIN(draw.max_x, (128+8) * GALAXIAN_XSCALE - 1);
if (draw.min_x <= draw.max_x)
- fillbitmap(bitmap, MAKE_RGB(0,0,0x47), &draw);
+ bitmap_fill(bitmap, &draw, MAKE_RGB(0,0,0x47));
draw = *cliprect;
draw.min_x = MAX(draw.min_x, (128+8) * GALAXIAN_XSCALE);
if (draw.min_x <= draw.max_x)
- fillbitmap(bitmap, RGB_BLACK, &draw);
+ bitmap_fill(bitmap, &draw, RGB_BLACK);
}
}
@@ -1054,7 +1054,7 @@ void amidar_draw_background(running_machine *machine, bitmap_t *bitmap, const re
UINT8 red = ((~prom[x] & 0x02) && background_red) ? 0x7c : 0x00;
UINT8 green = ((~prom[x] & 0x02) && background_green) ? 0x3c : 0x00;
UINT8 blue = ((~prom[x] & 0x01) && background_blue) ? 0x47 : 0x00;
- fillbitmap(bitmap, MAKE_RGB(red, green, blue), &draw);
+ bitmap_fill(bitmap, &draw, MAKE_RGB(red, green, blue));
}
}
@@ -1068,14 +1068,14 @@ void turtles_draw_background(running_machine *machine, bitmap_t *bitmap, const r
GREEN - 470 ohm resistor
BLUE - 390 ohm resistor
*/
- fillbitmap(bitmap, MAKE_RGB(background_red * 0x55, background_green * 0x47, background_blue * 0x55), cliprect);
+ bitmap_fill(bitmap, cliprect, MAKE_RGB(background_red * 0x55, background_green * 0x47, background_blue * 0x55));
}
void scramble_draw_background(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect)
{
/* blue background - 390 ohm resistor */
- fillbitmap(bitmap, background_enable ? MAKE_RGB(0,0,0x56) : RGB_BLACK, cliprect);
+ bitmap_fill(bitmap, cliprect, background_enable ? MAKE_RGB(0,0,0x56) : RGB_BLACK);
/* update the star origin to the current frame */
stars_update_origin(machine);
@@ -1104,7 +1104,7 @@ void scramble_draw_background(running_machine *machine, bitmap_t *bitmap, const
void jumpbug_draw_background(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect)
{
/* blue background - 390 ohm resistor */
- fillbitmap(bitmap, background_enable ? MAKE_RGB(0,0,0x56) : RGB_BLACK, cliprect);
+ bitmap_fill(bitmap, cliprect, background_enable ? MAKE_RGB(0,0,0x56) : RGB_BLACK);
/* update the star origin to the current frame */
stars_update_origin(machine);
diff --git a/src/mame/video/galaxold.c b/src/mame/video/galaxold.c
index d3675275b27..cecc89929ef 100644
--- a/src/mame/video/galaxold.c
+++ b/src/mame/video/galaxold.c
@@ -1269,22 +1269,22 @@ static void dambustr_draw_bullets(bitmap_t *bitmap, int offs, int x, int y, cons
static void galaxold_draw_background(bitmap_t *bitmap, const rectangle *cliprect)
{
/* plain black background */
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
}
static void scramble_draw_background(bitmap_t *bitmap, const rectangle *cliprect)
{
if (background_enable)
- fillbitmap(bitmap,BACKGROUND_COLOR_BASE,cliprect);
+ bitmap_fill(bitmap,cliprect,BACKGROUND_COLOR_BASE);
else
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
}
static void turtles_draw_background(bitmap_t *bitmap, const rectangle *cliprect)
{
int color = (background_blue << 2) | (background_green << 1) | background_red;
- fillbitmap(bitmap,BACKGROUND_COLOR_BASE + color,cliprect);
+ bitmap_fill(bitmap,cliprect,BACKGROUND_COLOR_BASE + color);
}
static void stratgyx_draw_background(bitmap_t *bitmap, const rectangle *cliprect)
@@ -1338,7 +1338,7 @@ static void minefld_draw_background(bitmap_t *bitmap, const rectangle *cliprect)
plot_box(bitmap, 248, 0, 16, 256, BACKGROUND_COLOR_BASE);
}
else
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
}
static void rescue_draw_background(bitmap_t *bitmap, const rectangle *cliprect)
@@ -1356,7 +1356,7 @@ static void rescue_draw_background(bitmap_t *bitmap, const rectangle *cliprect)
plot_box(bitmap, 248, 0, 16, 256, BACKGROUND_COLOR_BASE);
}
else
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
}
static void mariner_draw_background(bitmap_t *bitmap, const rectangle *cliprect)
diff --git a/src/mame/video/galivan.c b/src/mame/video/galivan.c
index 3ad22f055e0..31eada34f41 100644
--- a/src/mame/video/galivan.c
+++ b/src/mame/video/galivan.c
@@ -392,7 +392,7 @@ VIDEO_UPDATE( galivan )
tilemap_set_scrolly(bg_tilemap,0,scrolly[0] + 256 * (scrolly[1] & 0x07));
if (layers & 0x40)
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
else
tilemap_draw(bitmap,cliprect,bg_tilemap,0,0);
@@ -416,7 +416,7 @@ VIDEO_UPDATE( ninjemak )
tilemap_set_scrolly(bg_tilemap,0,scrolly[0] + 256 * (scrolly[1] & 0xff));
if (ninjemak_dispdisable)
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
else
tilemap_draw(bitmap,cliprect,bg_tilemap,0,0);
diff --git a/src/mame/video/galpani2.c b/src/mame/video/galpani2.c
index dccfe612d62..6c8c2c24cc1 100644
--- a/src/mame/video/galpani2.c
+++ b/src/mame/video/galpani2.c
@@ -163,8 +163,8 @@ if (input_code_pressed(KEYCODE_Z))
if (msk != 0) layers_ctrl &= msk; }
#endif
- fillbitmap(bitmap,0,cliprect);
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
+ bitmap_fill(priority_bitmap,cliprect,0);
if (layers_ctrl & 0x1)
{
diff --git a/src/mame/video/galpanic.c b/src/mame/video/galpanic.c
index d5cbeeeb07f..61d032870f4 100644
--- a/src/mame/video/galpanic.c
+++ b/src/mame/video/galpanic.c
@@ -123,7 +123,7 @@ VIDEO_UPDATE( comad )
// if(galpanic_clear_sprites)
{
- fillbitmap(sprites_bitmap,0,cliprect);
+ bitmap_fill(sprites_bitmap,cliprect,0);
comad_draw_sprites(screen->machine,bitmap,cliprect);
}
// else
diff --git a/src/mame/video/gaplus.c b/src/mame/video/gaplus.c
index 67821d48314..b959f1305e9 100644
--- a/src/mame/video/gaplus.c
+++ b/src/mame/video/gaplus.c
@@ -321,7 +321,7 @@ VIDEO_UPDATE( gaplus )
/* flip screen control is embedded in RAM */
flip_screen_set(gaplus_spriteram[0x1f7f-0x800] & 1);
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
starfield_render(screen->machine, bitmap);
diff --git a/src/mame/video/gcpinbal.c b/src/mame/video/gcpinbal.c
index 19a8a84d6cd..8145f0b708b 100644
--- a/src/mame/video/gcpinbal.c
+++ b/src/mame/video/gcpinbal.c
@@ -317,8 +317,8 @@ VIDEO_UPDATE( gcpinbal )
tilemap_set_scrolly(gcpinbal_tilemap[i], 0, gcpinbal_scrolly[i]);
}
- fillbitmap(priority_bitmap,0,cliprect);
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
+ bitmap_fill(bitmap, cliprect, 0);
layer[0] = 0;
layer[1] = 1;
diff --git a/src/mame/video/genesis.c b/src/mame/video/genesis.c
index f6b1f8e967d..f2d7ebdade3 100644
--- a/src/mame/video/genesis.c
+++ b/src/mame/video/genesis.c
@@ -269,7 +269,7 @@ VIDEO_UPDATE( genesis )
VIDEO_UPDATE( segac2 )
{
if (!display_enable)
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
else
VIDEO_UPDATE_CALL(genesis);
return 0;
diff --git a/src/mame/video/gijoe.c b/src/mame/video/gijoe.c
index 77e0ca5d318..5b30653e8e0 100644
--- a/src/mame/video/gijoe.c
+++ b/src/mame/video/gijoe.c
@@ -143,8 +143,8 @@ VIDEO_UPDATE( gijoe )
sortlayers(layer, layer_pri);
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
- fillbitmap(priority_bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
+ bitmap_fill(priority_bitmap, cliprect, 0);
K056832_tilemap_draw(screen->machine, bitmap,cliprect, layer[0], 0, 1);
K056832_tilemap_draw(screen->machine, bitmap,cliprect, layer[1], 0, 2);
diff --git a/src/mame/video/ginganin.c b/src/mame/video/ginganin.c
index 5164559396c..346e94c288f 100644
--- a/src/mame/video/ginganin.c
+++ b/src/mame/video/ginganin.c
@@ -280,7 +280,7 @@ if (input_code_pressed(KEYCODE_Z))
if (layers_ctrl1 & 1) tilemap_draw(bitmap,cliprect, bg_tilemap, 0,0);
- else fillbitmap(bitmap,0,cliprect);
+ else bitmap_fill(bitmap,cliprect,0);
if (layers_ctrl1 & 2) tilemap_draw(bitmap,cliprect, fg_tilemap, 0,0);
if (layers_ctrl1 & 8) draw_sprites(screen->machine, bitmap,cliprect);
diff --git a/src/mame/video/gladiatr.c b/src/mame/video/gladiatr.c
index d7cdc9af973..a97939b2e37 100644
--- a/src/mame/video/gladiatr.c
+++ b/src/mame/video/gladiatr.c
@@ -304,6 +304,6 @@ VIDEO_UPDATE( gladiatr )
tilemap_draw(bitmap,cliprect,fg_tilemap,0,0);
}
else
- fillbitmap( bitmap, get_black_pen(screen->machine), cliprect );
+ bitmap_fill( bitmap, cliprect , get_black_pen(screen->machine));
return 0;
}
diff --git a/src/mame/video/glass.c b/src/mame/video/glass.c
index 61592c1dc5f..46f7c435fce 100644
--- a/src/mame/video/glass.c
+++ b/src/mame/video/glass.c
@@ -104,7 +104,7 @@ WRITE16_HANDLER( glass_blitter_w )
}
}
} else {
- fillbitmap(screen_bitmap, 0, 0);
+ bitmap_fill(screen_bitmap, 0, 0);
}
}
}
@@ -202,7 +202,7 @@ VIDEO_UPDATE( glass )
tilemap_set_scrollx(pant[1], 0, glass_vregs[3]);
/* draw layers + sprites */
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
copybitmap(bitmap,screen_bitmap,0,0,0x18,0x24,cliprect);
tilemap_draw(bitmap,cliprect,pant[1],0,0);
tilemap_draw(bitmap,cliprect,pant[0],0,0);
diff --git a/src/mame/video/goal92.c b/src/mame/video/goal92.c
index e180c240a92..cfa21b61caf 100644
--- a/src/mame/video/goal92.c
+++ b/src/mame/video/goal92.c
@@ -162,7 +162,7 @@ VIDEO_UPDATE( goal92 )
tilemap_set_scrolly(foreground_layer, 0, goal92_scrollram16[3] + 8);
}
- fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+ bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
tilemap_draw(bitmap,cliprect,background_layer,0,0);
draw_sprites(screen->machine,bitmap,cliprect,2);
diff --git a/src/mame/video/gomoku.c b/src/mame/video/gomoku.c
index 305a1d89e47..82e20c1e7ac 100644
--- a/src/mame/video/gomoku.c
+++ b/src/mame/video/gomoku.c
@@ -127,7 +127,7 @@ VIDEO_START( gomoku )
tilemap_set_transparent_pen(fg_tilemap,0);
/* make background bitmap */
- fillbitmap(gomoku_bg_bitmap, 0x20, 0);
+ bitmap_fill(gomoku_bg_bitmap, 0, 0x20);
// board
for (y = 0; y < 256; y++)
@@ -228,7 +228,7 @@ VIDEO_UPDATE( gomoku )
}
else
{
- fillbitmap(bitmap, 0x20, 0);
+ bitmap_fill(bitmap, 0, 0x20);
}
tilemap_draw(bitmap, cliprect, fg_tilemap, 0, 0);
diff --git a/src/mame/video/gottlieb.c b/src/mame/video/gottlieb.c
index c35533b82fd..a52de8ff9c5 100644
--- a/src/mame/video/gottlieb.c
+++ b/src/mame/video/gottlieb.c
@@ -220,7 +220,7 @@ VIDEO_UPDATE( gottlieb )
if (!background_priority)
tilemap_draw(bitmap, cliprect, bg_tilemap, TILEMAP_DRAW_OPAQUE, 0);
else
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
/* draw the sprites */
draw_sprites(screen->machine, bitmap, cliprect);
diff --git a/src/mame/video/gradius3.c b/src/mame/video/gradius3.c
index 6a3287dcf23..0a89411c4fe 100644
--- a/src/mame/video/gradius3.c
+++ b/src/mame/video/gradius3.c
@@ -145,7 +145,7 @@ VIDEO_UPDATE( gradius3 )
K052109_tilemap_update();
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
if (gradius3_priority == 0)
{
tilemap_draw(bitmap,cliprect,K052109_tilemap[1],TILEMAP_DRAW_OPAQUE,2);
diff --git a/src/mame/video/groundfx.c b/src/mame/video/groundfx.c
index c099223855f..d8031ed10d7 100644
--- a/src/mame/video/groundfx.c
+++ b/src/mame/video/groundfx.c
@@ -240,8 +240,8 @@ VIDEO_UPDATE( groundfx )
pivlayer[1] = pivlayer[0]^1;
pivlayer[2] = 2;
- fillbitmap(priority_bitmap,0,cliprect);
- fillbitmap(bitmap,0,cliprect); /* wrong color? */
+ bitmap_fill(priority_bitmap,cliprect,0);
+ bitmap_fill(bitmap,cliprect,0); /* wrong color? */
TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,pivlayer[0],TILEMAP_DRAW_OPAQUE,0);
TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,pivlayer[1],0,0);
diff --git a/src/mame/video/gstriker.c b/src/mame/video/gstriker.c
index 668c9195794..652dab7e06f 100644
--- a/src/mame/video/gstriker.c
+++ b/src/mame/video/gstriker.c
@@ -534,7 +534,7 @@ WRITE16_HANDLER( gsx_videoram3_w )
VIDEO_UPDATE(gstriker)
{
- fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+ bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
// Sandwitched screen/sprite0/score/sprite1. Surely wrong, probably
// needs sprite orthogonality
diff --git a/src/mame/video/gticlub.c b/src/mame/video/gticlub.c
index eab9e6eb6d0..227fc6bb8d2 100644
--- a/src/mame/video/gticlub.c
+++ b/src/mame/video/gticlub.c
@@ -976,8 +976,8 @@ void K001005_swap_buffers(running_machine *machine)
//if (K001005_status == 2)
{
- fillbitmap(K001005_bitmap[K001005_bitmap_page], machine->pens[0], &K001005_cliprect);
- fillbitmap(K001005_zbuffer, 0xffffffff, &K001005_cliprect);
+ bitmap_fill(K001005_bitmap[K001005_bitmap_page], &K001005_cliprect, machine->pens[0]);
+ bitmap_fill(K001005_zbuffer, &K001005_cliprect, 0xffffffff);
}
}
diff --git a/src/mame/video/gunbustr.c b/src/mame/video/gunbustr.c
index 37be1a8168d..0746567e6b4 100644
--- a/src/mame/video/gunbustr.c
+++ b/src/mame/video/gunbustr.c
@@ -230,7 +230,7 @@ VIDEO_UPDATE( gunbustr )
layer[3] = (priority &0x000f) >> 0; /* tells us which is top */
layer[4] = 4; /* text layer always over bg layers */
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
/* We have to assume 2nd to bottom layer is always underneath
sprites as pdrawgfx cannot yet cope with more than 4 layers */
diff --git a/src/mame/video/gunsmoke.c b/src/mame/video/gunsmoke.c
index dd47d882dce..b5b65e0cdaf 100644
--- a/src/mame/video/gunsmoke.c
+++ b/src/mame/video/gunsmoke.c
@@ -188,7 +188,7 @@ VIDEO_UPDATE( gunsmoke )
if (bgon)
tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0);
else
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
if (objon) draw_sprites(screen->machine, bitmap, cliprect);
if (chon) tilemap_draw(bitmap, cliprect, fg_tilemap, 0, 0);
diff --git a/src/mame/video/hng64.c b/src/mame/video/hng64.c
index ec674a15214..a9ce06c88f6 100644
--- a/src/mame/video/hng64.c
+++ b/src/mame/video/hng64.c
@@ -1241,7 +1241,7 @@ static void hng64_drawtilemap1( bitmap_t *bitmap, const rectangle *cliprect )
VIDEO_UPDATE( hng64 )
{
- fillbitmap(bitmap, get_black_pen(screen->machine), 0);
+ bitmap_fill(bitmap, 0, get_black_pen(screen->machine));
// Debug
// for (int iii = 0; iii < 0x0f; iii++)
diff --git a/src/mame/video/homedata.c b/src/mame/video/homedata.c
index 87ad5ae75b5..f1bc8211579 100644
--- a/src/mame/video/homedata.c
+++ b/src/mame/video/homedata.c
@@ -681,7 +681,7 @@ VIDEO_UPDATE( mrokumei )
/* blank screen */
if (homedata_vreg[0x3] == 0xc1 && homedata_vreg[0x4] == 0xc0 && homedata_vreg[0x5] == 0xff)
{
- fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+ bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
return 0;
}
@@ -743,7 +743,7 @@ VIDEO_UPDATE( reikaids )
}
- fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+ bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
pri = (blitter_bank & 0x70) >> 4;
for (i = 0;i < 4;i++)
@@ -789,7 +789,7 @@ VIDEO_UPDATE( reikaids )
}
- fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+ bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
pri = (blitter_bank & 0x70) >> 4;
for (i = 0;i < 4;i++)
@@ -806,7 +806,7 @@ VIDEO_UPDATE( pteacher )
/* blank screen */
if (homedata_vreg[0x3] == 0xc1 && homedata_vreg[0x4] == 0xc0 && homedata_vreg[0x5] == 0xff)
{
- fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+ bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
return 0;
}
diff --git a/src/mame/video/hyhoo.c b/src/mame/video/hyhoo.c
index cabc87bfe86..96326ca1f3f 100644
--- a/src/mame/video/hyhoo.c
+++ b/src/mame/video/hyhoo.c
@@ -243,7 +243,7 @@ VIDEO_UPDATE( hyhoo )
if (hyhoo_dispflag)
copybitmap(bitmap, hyhoo_tmpbitmap, hyhoo_flipscreen, hyhoo_flipscreen, 0, 0, cliprect);
else
- fillbitmap(bitmap, RGB_BLACK, cliprect);
+ bitmap_fill(bitmap, cliprect, RGB_BLACK);
return 0;
}
diff --git a/src/mame/video/hyprduel.c b/src/mame/video/hyprduel.c
index 68fda9fc203..1decc81a563 100644
--- a/src/mame/video/hyprduel.c
+++ b/src/mame/video/hyprduel.c
@@ -635,8 +635,8 @@ VIDEO_UPDATE( hyprduel )
hyprduel_sprite_yoffs = hyprduel_videoregs[0x04/2] - video_screen_get_height(screen) / 2;
/* The background color is selected by a register */
- fillbitmap(priority_bitmap,0,cliprect);
- fillbitmap(bitmap,((hyprduel_videoregs[0x12/2] & 0x0fff) ^ 0x0ff) + 0x1000,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
+ bitmap_fill(bitmap,cliprect,((hyprduel_videoregs[0x12/2] & 0x0fff) ^ 0x0ff) + 0x1000);
/* Screen Control Register:
@@ -664,7 +664,7 @@ if (input_code_pressed(KEYCODE_Z))
if (input_code_pressed(KEYCODE_E)) msk |= 0x04;
if (input_code_pressed(KEYCODE_A)) msk |= 0x08;
if (msk != 0)
- { fillbitmap(bitmap,0,cliprect);
+ { bitmap_fill(bitmap,cliprect,0);
layers_ctrl &= msk; }
popmessage("%x-%x-%x:%04x %04x %04x",
diff --git a/src/mame/video/ikki.c b/src/mame/video/ikki.c
index ee126725710..97f1a94483f 100644
--- a/src/mame/video/ikki.c
+++ b/src/mame/video/ikki.c
@@ -70,7 +70,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta
int y;
offs_t offs;
- fillbitmap(sprite_bitmap, punch_through_pen, cliprect);
+ bitmap_fill(sprite_bitmap, cliprect, punch_through_pen);
for (offs = 0; offs < 0x800; offs += 4)
{
diff --git a/src/mame/video/inufuku.c b/src/mame/video/inufuku.c
index a6666c3922c..e2daec19504 100644
--- a/src/mame/video/inufuku.c
+++ b/src/mame/video/inufuku.c
@@ -233,8 +233,8 @@ VIDEO_UPDATE( inufuku )
{
int i;
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
- fillbitmap(priority_bitmap, 0, NULL);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
+ bitmap_fill(priority_bitmap, NULL, 0);
if (inufuku_bg_raster) {
tilemap_set_scroll_rows(inufuku_bg_tilemap, 512);
diff --git a/src/mame/video/itech8.c b/src/mame/video/itech8.c
index cb1dbebbace..1c70322a972 100644
--- a/src/mame/video/itech8.c
+++ b/src/mame/video/itech8.c
@@ -633,7 +633,7 @@ VIDEO_UPDATE( itech8_2layer )
/* if we're blanked, just fill with black */
if (tms_state.blanked)
{
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
return 0;
}
@@ -668,7 +668,7 @@ VIDEO_UPDATE( itech8_grmatch )
/* if we're blanked, just fill with black */
if (tms_state.blanked)
{
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
return 0;
}
@@ -716,7 +716,7 @@ VIDEO_UPDATE( itech8_2page )
/* if we're blanked, just fill with black */
if (tms_state.blanked)
{
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
return 0;
}
@@ -747,7 +747,7 @@ VIDEO_UPDATE( itech8_2page_large )
/* if we're blanked, just fill with black */
if (tms_state.blanked)
{
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
return 0;
}
diff --git a/src/mame/video/jaguar.c b/src/mame/video/jaguar.c
index 0a2f4dee49e..dcceec52aea 100644
--- a/src/mame/video/jaguar.c
+++ b/src/mame/video/jaguar.c
@@ -838,7 +838,7 @@ VIDEO_UPDATE( cojag )
/* if not enabled, just blank */
if (!(gpu_regs[VMODE] & 1))
{
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
return 0;
}
diff --git a/src/mame/video/jedi.c b/src/mame/video/jedi.c
index 947dae37215..3307aeaa0d2 100644
--- a/src/mame/video/jedi.c
+++ b/src/mame/video/jedi.c
@@ -333,7 +333,7 @@ static VIDEO_UPDATE( jedi )
/* if no video, clear it all to black */
if (*state->video_off & 0x01)
- fillbitmap(bitmap, RGB_BLACK, cliprect);
+ bitmap_fill(bitmap, cliprect, RGB_BLACK);
else
{
/* draw the background/text layers, followed by the sprites
diff --git a/src/mame/video/kan_panb.c b/src/mame/video/kan_panb.c
index b06e29b7a9d..96fb982dd0f 100644
--- a/src/mame/video/kan_panb.c
+++ b/src/mame/video/kan_panb.c
@@ -12,7 +12,7 @@ VIDEO_UPDATE( honeydol )
/* not standard snowbros video */
- fillbitmap(bitmap,0xf0,cliprect);
+ bitmap_fill(bitmap,cliprect,0xf0);
for (offs = 0x0000/2;offs < 0x2000/2;offs += 8)
{
@@ -98,7 +98,7 @@ VIDEO_UPDATE( twinadv )
/* not standard snowbros video */
- fillbitmap(bitmap,0xf0,cliprect);
+ bitmap_fill(bitmap,cliprect,0xf0);
for (offs = 0x0000/2;offs < 0x2000/2;offs += 8)
{
@@ -148,7 +148,7 @@ VIDEO_UPDATE( wintbob )
{
int offs;
- fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+ bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
for (offs = 0;offs < spriteram_size/2;offs += 8)
{
@@ -216,7 +216,7 @@ VIDEO_UPDATE( snowbro3 )
/* This clears & redraws the entire screen each pass */
- fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+ bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
for (offs = 0;offs < spriteram_size/2;offs += 8)
{
diff --git a/src/mame/video/kan_pand.c b/src/mame/video/kan_pand.c
index 0b3dd6dd400..b1dfe501a0f 100644
--- a/src/mame/video/kan_pand.c
+++ b/src/mame/video/kan_pand.c
@@ -156,7 +156,7 @@ void pandora_eof(running_machine *machine)
assert(pandora_spriteram != NULL);
// the games can disable the clearing of the sprite bitmap, to leave sprite trails
- if (pandora_clear_bitmap) fillbitmap(pandora_sprites_bitmap,0,video_screen_get_visible_area(machine->primary_screen));
+ if (pandora_clear_bitmap) bitmap_fill(pandora_sprites_bitmap,video_screen_get_visible_area(machine->primary_screen),0);
pandora_draw(machine, pandora_sprites_bitmap, video_screen_get_visible_area(machine->primary_screen));
}
diff --git a/src/mame/video/kaneko16.c b/src/mame/video/kaneko16.c
index 6bac8b3806f..31f9848d969 100644
--- a/src/mame/video/kaneko16.c
+++ b/src/mame/video/kaneko16.c
@@ -950,7 +950,7 @@ static void kaneko16_render_sprites(running_machine *machine, bitmap_t *bitmap,
}
else
{
- fillbitmap(sprites_bitmap,0,cliprect);
+ bitmap_fill(sprites_bitmap,cliprect,0);
kaneko16_draw_sprites(machine,bitmap,cliprect);
}
}
@@ -978,19 +978,19 @@ static void kaneko16_render_15bpp_bitmap(running_machine *machine, bitmap_t *bit
static void kaneko16_fill_bitmap(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect)
{
if(kaneko16_sprite_type == 1)
- fillbitmap(bitmap,0x7f00,cliprect);
+ bitmap_fill(bitmap,cliprect,0x7f00);
else
/* Fill the bitmap with pen 0. This is wrong, but will work most of
the times. To do it right, each pixel should be drawn with pen 0
of the bottomost tile that covers it (which is pretty tricky to do) */
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
}
static VIDEO_UPDATE( common )
{
int i;
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
kaneko16_prepare_first_tilemap_chip(screen->machine, bitmap, cliprect);
kaneko16_prepare_second_tilemap_chip(screen->machine, bitmap, cliprect);
diff --git a/src/mame/video/konamiic.c b/src/mame/video/konamiic.c
index d4f5fd1bb5d..e7917aa1879 100644
--- a/src/mame/video/konamiic.c
+++ b/src/mame/video/konamiic.c
@@ -6469,7 +6469,7 @@ static int K056832_update_linemap(running_machine *machine, bitmap_t *bitmap, in
// *really ugly but it minimizes alteration to tilemap.c
memset (&zerorect, 0, sizeof(rectangle)); // zero dimension
tilemap_draw(bitmap, &zerorect, tmap, 0, 0); // dummy call to reset tile_dirty_map
- fillbitmap(xprmap, 0, 0); // reset pixel transparency_bitmap;
+ bitmap_fill(xprmap, 0, 0); // reset pixel transparency_bitmap;
memset(xprdata, TILEMAP_PIXEL_LAYER0, 0x800); // reset tile transparency_data;
}
else
diff --git a/src/mame/video/ksayakyu.c b/src/mame/video/ksayakyu.c
index ccc4f468c84..c0c46db5030 100644
--- a/src/mame/video/ksayakyu.c
+++ b/src/mame/video/ksayakyu.c
@@ -109,7 +109,7 @@ VIDEO_START(ksayakyu)
VIDEO_UPDATE(ksayakyu)
{
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
if(video_ctrl&1)
tilemap_draw(bitmap,cliprect,ksayakyu_tilemap,0,0);
draw_sprites(screen->machine,bitmap,cliprect);
diff --git a/src/mame/video/labyrunr.c b/src/mame/video/labyrunr.c
index fe456eef825..c0a4a05f022 100644
--- a/src/mame/video/labyrunr.c
+++ b/src/mame/video/labyrunr.c
@@ -175,8 +175,8 @@ VIDEO_UPDATE( labyrunr )
set_pens(screen->machine->colortable);
- fillbitmap(priority_bitmap,0,cliprect);
- fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
+ bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
if(~K007121_ctrlram[0][3] & 0x20)
{
diff --git a/src/mame/video/ladybug.c b/src/mame/video/ladybug.c
index 7eb4eb04e4d..37190d89676 100644
--- a/src/mame/video/ladybug.c
+++ b/src/mame/video/ladybug.c
@@ -363,7 +363,7 @@ VIDEO_UPDATE( ladybug )
int offs;
// clear the bg bitmap
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
for (offs = 0; offs < 32; offs++)
{
@@ -406,7 +406,7 @@ VIDEO_UPDATE( sraider )
}
// clear the bg bitmap
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
// draw the stars
if (flip_screen_get())
diff --git a/src/mame/video/lasso.c b/src/mame/video/lasso.c
index 1b11e3373a3..5be0ebb6ea9 100644
--- a/src/mame/video/lasso.c
+++ b/src/mame/video/lasso.c
@@ -383,7 +383,7 @@ static void draw_lasso(bitmap_t *bitmap, const rectangle *cliprect)
VIDEO_UPDATE( lasso )
{
palette_set_color(screen->machine, 0, get_color(*lasso_back_color));
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0);
draw_lasso(bitmap, cliprect);
@@ -395,7 +395,7 @@ VIDEO_UPDATE( lasso )
VIDEO_UPDATE( chameleo )
{
palette_set_color(screen->machine, 0, get_color(*lasso_back_color));
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0);
draw_sprites(screen->machine, bitmap, cliprect, 0);
@@ -415,7 +415,7 @@ VIDEO_UPDATE( wwjgtin )
if (wwjgtin_track_enable)
tilemap_draw(bitmap, cliprect, track_tilemap, 0, 0);
else
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
draw_sprites(screen->machine, bitmap, cliprect, 1); // reverse order
tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0);
diff --git a/src/mame/video/legionna.c b/src/mame/video/legionna.c
index 4313a11019e..ed2b1df866b 100644
--- a/src/mame/video/legionna.c
+++ b/src/mame/video/legionna.c
@@ -344,7 +344,7 @@ VIDEO_UPDATE( legionna )
tilemap_set_scrolly( foreground_layer, 0, legionna_scrollram16[5] );
- fillbitmap(bitmap,get_black_pen(screen->machine),cliprect); /* wrong color? */
+ bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine)); /* wrong color? */
/* legionna_layer_disable is a guess based on 'stage 1' screen in heatbrl */
@@ -377,7 +377,7 @@ VIDEO_UPDATE( godzilla )
tilemap_set_scrollx( foreground_layer, 0, legionna_scrollram16[4] );
tilemap_set_scrolly( foreground_layer, 0, legionna_scrollram16[5] );
- fillbitmap(bitmap,0x0200,cliprect);
+ bitmap_fill(bitmap,cliprect,0x0200);
if (!(legionna_layer_disable&0x0001))
{
@@ -421,7 +421,7 @@ VIDEO_UPDATE( sdgndmrb )
tilemap_set_scrollx( text_layer, 0, legionna_scrollram16[6] );
tilemap_set_scrolly( text_layer, 0, legionna_scrollram16[7] );
- fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+ bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
if(!(sdgndmrb_pri_n & 1))
tilemap_draw(bitmap,cliprect,background_layer,0,0);
diff --git a/src/mame/video/lemmings.c b/src/mame/video/lemmings.c
index 6dae54e6b73..2b1cafe7222 100644
--- a/src/mame/video/lemmings.c
+++ b/src/mame/video/lemmings.c
@@ -102,7 +102,7 @@ VIDEO_START( lemmings )
sprite_triple_buffer_1 = (UINT16*)auto_malloc(0x800);
tilemap_set_transparent_pen(vram_tilemap,0);
- fillbitmap(bitmap0,0x100,0);
+ bitmap_fill(bitmap0,0,0x100);
}
VIDEO_EOF( lemmings )
@@ -177,7 +177,7 @@ VIDEO_UPDATE( lemmings )
}
}
- fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+ bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
draw_sprites(screen->machine,bitmap,cliprect,sprite_triple_buffer_1,1,0x0000);
/* Pixel layer can be windowed in hardware (two player mode) */
diff --git a/src/mame/video/lethal.c b/src/mame/video/lethal.c
index 5300d9dca1e..d711e122e29 100644
--- a/src/mame/video/lethal.c
+++ b/src/mame/video/lethal.c
@@ -115,8 +115,8 @@ extern UINT16 *K056832_videoram;
VIDEO_UPDATE(lethalen)
{
- fillbitmap(bitmap, 7168, cliprect);
- fillbitmap(priority_bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 7168);
+ bitmap_fill(priority_bitmap, cliprect, 0);
K056832_tilemap_draw(screen->machine, bitmap, cliprect, 3, 0, 1);
K056832_tilemap_draw(screen->machine, bitmap, cliprect, 2, 0, 2);
diff --git a/src/mame/video/liberate.c b/src/mame/video/liberate.c
index 462817e2e4c..7aa205b22a8 100644
--- a/src/mame/video/liberate.c
+++ b/src/mame/video/liberate.c
@@ -366,7 +366,7 @@ VIDEO_UPDATE( prosoccr )
tilemap_set_scrollx(background_tilemap,0,-deco16_io_ram[0]);
if (background_disable)
- fillbitmap(bitmap,32,cliprect);
+ bitmap_fill(bitmap,cliprect,32);
else
tilemap_draw(bitmap,cliprect,background_tilemap,0,0);
boomrang_draw_sprites(screen->machine,bitmap,cliprect,0);
@@ -378,7 +378,7 @@ VIDEO_UPDATE( prosport )
{
int mx,my,tile,color,offs;
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
prosport_draw_sprites(screen->machine,bitmap,cliprect);
@@ -406,7 +406,7 @@ VIDEO_UPDATE( boomrang )
tilemap_set_scrollx(background_tilemap,0,-deco16_io_ram[0]);
if (background_disable)
- fillbitmap(bitmap,32,cliprect);
+ bitmap_fill(bitmap,cliprect,32);
else
tilemap_draw(bitmap,cliprect,background_tilemap,TILEMAP_DRAW_LAYER1,0);
@@ -424,7 +424,7 @@ VIDEO_UPDATE( liberate )
tilemap_set_scrollx(background_tilemap,0,-deco16_io_ram[0]);
if (background_disable)
- fillbitmap(bitmap,32,cliprect);
+ bitmap_fill(bitmap,cliprect,32);
else
tilemap_draw(bitmap,cliprect,background_tilemap,0,0);
diff --git a/src/mame/video/liberatr.c b/src/mame/video/liberatr.c
index d07493eb337..23bdf1eb5a9 100644
--- a/src/mame/video/liberatr.c
+++ b/src/mame/video/liberatr.c
@@ -363,7 +363,7 @@ VIDEO_UPDATE( liberatr )
pen_t pens[NUM_PENS];
get_pens(pens);
- fillbitmap(bitmap, RGB_BLACK, cliprect);
+ bitmap_fill(bitmap, cliprect, RGB_BLACK);
liberatr_draw_planet(bitmap, pens);
liberatr_draw_bitmap(bitmap, pens);
diff --git a/src/mame/video/lkage.c b/src/mame/video/lkage.c
index 0ce931e1cb8..bde55a67759 100644
--- a/src/mame/video/lkage.c
+++ b/src/mame/video/lkage.c
@@ -195,7 +195,7 @@ VIDEO_UPDATE( lkage )
tilemap_set_scrollx(bg_tilemap,0,lkage_scroll[4]);
tilemap_set_scrolly(bg_tilemap,0,lkage_scroll[5]);
- fillbitmap(priority_bitmap, 0, cliprect);
+ bitmap_fill(priority_bitmap, cliprect, 0);
if ((lkage_vreg[2] & 0xf0) == 0xf0)
{
tilemap_draw( bitmap,cliprect,bg_tilemap,0,1 );
diff --git a/src/mame/video/lockon.c b/src/mame/video/lockon.c
index b6ac6bc9df6..ada2eac4818 100644
--- a/src/mame/video/lockon.c
+++ b/src/mame/video/lockon.c
@@ -957,7 +957,7 @@ VIDEO_UPDATE( lockon )
/* If screen output is disabled, fill with black */
if ( !BIT(lockon_ctrl_reg, 7) )
{
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
return 0;
}
diff --git a/src/mame/video/lordgun.c b/src/mame/video/lordgun.c
index a2b2b2e0005..aa979ae4773 100644
--- a/src/mame/video/lordgun.c
+++ b/src/mame/video/lordgun.c
@@ -282,7 +282,7 @@ if (input_code_pressed(KEYCODE_Z))
if (lordgun_whitescreen)
{
- fillbitmap( bitmap, get_white_pen(screen->machine), cliprect );
+ bitmap_fill( bitmap, cliprect , get_white_pen(screen->machine));
return 0;
}
@@ -299,7 +299,7 @@ if (input_code_pressed(KEYCODE_Z))
tilemap_set_scrollx( tilemap_3, 0, *lordgun_scroll_x_3 );
tilemap_set_scrolly( tilemap_3, 0, *lordgun_scroll_y_3 );
- fillbitmap( bitmap, 0, cliprect );
+ bitmap_fill( bitmap, cliprect , 0);
if (layers_ctrl & 4) tilemap_draw(bitmap, cliprect, tilemap_2, 0, 0);
if (layers_ctrl & 1) tilemap_draw(bitmap, cliprect, tilemap_0, 0, 0);
diff --git a/src/mame/video/lsasquad.c b/src/mame/video/lsasquad.c
index a02e042156f..8bd2a514376 100644
--- a/src/mame/video/lsasquad.c
+++ b/src/mame/video/lsasquad.c
@@ -202,7 +202,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta
VIDEO_UPDATE( lsasquad )
{
- fillbitmap(bitmap,511,cliprect);
+ bitmap_fill(bitmap,cliprect,511);
draw_layer(screen->machine,bitmap,cliprect,lsasquad_scrollram + 0x000);
draw_layer(screen->machine,bitmap,cliprect,lsasquad_scrollram + 0x080);
@@ -214,7 +214,7 @@ VIDEO_UPDATE( lsasquad )
VIDEO_UPDATE( daikaiju )
{
- fillbitmap(bitmap,511,cliprect);
+ bitmap_fill(bitmap,cliprect,511);
drawbg(screen->machine,bitmap,cliprect,0); // bottom
draw_sprites(screen->machine,bitmap,cliprect);
drawbg(screen->machine,bitmap,cliprect,1); // top = pallete $d ?
diff --git a/src/mame/video/m10.c b/src/mame/video/m10.c
index 9464e5eb5e6..b54cc38f704 100644
--- a/src/mame/video/m10.c
+++ b/src/mame/video/m10.c
@@ -135,7 +135,7 @@ VIDEO_UPDATE( m10 )
static const int xpos[4] = { 4*8, 26*8, 7*8, 6*8};
int i;
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
decodegfx(back_gfx, state->chargen,0,4);
for (i=0;i<4;i++)
diff --git a/src/mame/video/m107.c b/src/mame/video/m107.c
index c0e8eb6a3b6..91197753257 100644
--- a/src/mame/video/m107.c
+++ b/src/mame/video/m107.c
@@ -281,7 +281,7 @@ static void m107_screenrefresh(running_machine *machine, bitmap_t *bitmap, const
tilemap_draw(bitmap, cliprect, pf_layer[3].tmap, 1, 0);
}
else
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
tilemap_draw(bitmap, cliprect, pf_layer[2].tmap, 0, 0);
tilemap_draw(bitmap, cliprect, pf_layer[2].tmap, 1, 0);
diff --git a/src/mame/video/m52.c b/src/mame/video/m52.c
index ea5e93a78ff..0d75f1d67d8 100644
--- a/src/mame/video/m52.c
+++ b/src/mame/video/m52.c
@@ -346,7 +346,7 @@ static void draw_background(running_machine *machine, bitmap_t *bitmap, const re
rect.max_y = ypos + 2 * BGHEIGHT - 1;
}
- fillbitmap(bitmap, machine->gfx[image]->color_base + 3, &rect);
+ bitmap_fill(bitmap, &rect, machine->gfx[image]->color_base + 3);
}
@@ -361,7 +361,7 @@ VIDEO_UPDATE( m52 )
{
int offs;
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
if (!(bgcontrol & 0x20))
{
diff --git a/src/mame/video/m62.c b/src/mame/video/m62.c
index 92701725db0..4d77c956e81 100644
--- a/src/mame/video/m62.c
+++ b/src/mame/video/m62.c
@@ -578,11 +578,11 @@ VIDEO_UPDATE( ldrun3 )
my_cliprect.min_y = 0*8;
my_cliprect.max_y = 1*8-1;
- fillbitmap(bitmap,get_black_pen(screen->machine),&my_cliprect);
+ bitmap_fill(bitmap,&my_cliprect,get_black_pen(screen->machine));
my_cliprect.min_y = 31*8;
my_cliprect.max_y = 32*8-1;
- fillbitmap(bitmap,get_black_pen(screen->machine),&my_cliprect);
+ bitmap_fill(bitmap,&my_cliprect,get_black_pen(screen->machine));
}
return 0;
diff --git a/src/mame/video/m72.c b/src/mame/video/m72.c
index 08a09226ce7..0e5215197fa 100644
--- a/src/mame/video/m72.c
+++ b/src/mame/video/m72.c
@@ -510,7 +510,7 @@ VIDEO_UPDATE( m72 )
{
if (video_off)
{
- fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+ bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
return 0;
}
@@ -535,7 +535,7 @@ VIDEO_UPDATE( majtitle )
if (video_off)
{
- fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+ bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
return 0;
}
diff --git a/src/mame/video/m90.c b/src/mame/video/m90.c
index 1102c841b5e..32c62327664 100644
--- a/src/mame/video/m90.c
+++ b/src/mame/video/m90.c
@@ -349,11 +349,11 @@ VIDEO_UPDATE( m90 )
tilemap_set_scrollx( pf2_wide_layer,0, m90_video_control_data[3]+256-2 );
}
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
if (video_enable) {
if (!pf2_enable)
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
if (pf2_enable)
{
@@ -436,7 +436,7 @@ VIDEO_UPDATE( m90 )
draw_sprites(screen->machine,bitmap,cliprect);
} else {
- fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+ bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
}
return 0;
@@ -445,8 +445,8 @@ VIDEO_UPDATE( m90 )
VIDEO_UPDATE( bomblord )
{
int i;
- fillbitmap(priority_bitmap,0,cliprect);
- fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
+ bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
/* Setup scrolling */
if (m90_video_control_data[6]&0x20) {
@@ -496,8 +496,8 @@ VIDEO_UPDATE( bomblord )
VIDEO_UPDATE( dynablsb )
{
- fillbitmap(priority_bitmap,0,cliprect);
- fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
+ bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
if (!(m90_video_data[0xf008/2] & 0x4000)) {
tilemap_mark_all_tiles_dirty(pf1_wide_layer);
diff --git a/src/mame/video/m92.c b/src/mame/video/m92.c
index 47642fe06b4..517c9a30430 100644
--- a/src/mame/video/m92.c
+++ b/src/mame/video/m92.c
@@ -430,7 +430,7 @@ static void m92_update_scroll_positions(void)
static void m92_screenrefresh(running_machine *machine, bitmap_t *bitmap,const rectangle *cliprect)
{
- fillbitmap(priority_bitmap, 0, cliprect);
+ bitmap_fill(priority_bitmap, cliprect, 0);
if ((~pf_master_control[2] >> 4) & 1)
{
@@ -440,7 +440,7 @@ static void m92_screenrefresh(running_machine *machine, bitmap_t *bitmap,const r
tilemap_draw(bitmap, cliprect, pf_layer[2].tmap, TILEMAP_DRAW_LAYER0, 1);
}
else
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
tilemap_draw(bitmap, cliprect, pf_layer[1].wide_tmap, TILEMAP_DRAW_LAYER1, 0);
tilemap_draw(bitmap, cliprect, pf_layer[1].tmap, TILEMAP_DRAW_LAYER1, 0);
diff --git a/src/mame/video/macrossp.c b/src/mame/video/macrossp.c
index 65da5903469..7329f64887e 100644
--- a/src/mame/video/macrossp.c
+++ b/src/mame/video/macrossp.c
@@ -369,7 +369,7 @@ VIDEO_UPDATE(macrossp)
int layers[3],layerpri[3];
- fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+ bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
layers[0] = 0;
layerpri[0] = (macrossp_scra_videoregs[0] & 0x0000c000) >> 14;
diff --git a/src/mame/video/madalien.c b/src/mame/video/madalien.c
index da83a2c2cd2..b0082b5e5c9 100644
--- a/src/mame/video/madalien.c
+++ b/src/mame/video/madalien.c
@@ -264,7 +264,7 @@ static VIDEO_UPDATE( madalien )
// mode 3 - transition from A to B
int scroll_mode = *madalien_scroll & 3;
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
draw_edges(bitmap, cliprect, flip, scroll_mode);
draw_foreground(screen->machine, bitmap, cliprect, flip);
diff --git a/src/mame/video/magmax.c b/src/mame/video/magmax.c
index 7da11e54682..8fdc237abc7 100644
--- a/src/mame/video/magmax.c
+++ b/src/mame/video/magmax.c
@@ -98,7 +98,7 @@ VIDEO_UPDATE( magmax )
/* copy the background graphics */
if (*magmax_vreg & 0x40) /* background disable */
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
else
{
int v;
@@ -107,7 +107,7 @@ VIDEO_UPDATE( magmax )
UINT32 scroll_v = (*magmax_scroll_y) & 0xff;
/*clear background-over-sprites bitmap*/
- fillbitmap(tmpbitmap, 0, NULL);
+ bitmap_fill(tmpbitmap, NULL, 0);
for (v = 2*8; v < 30*8; v++) /*only for visible area*/
{
diff --git a/src/mame/video/mainevt.c b/src/mame/video/mainevt.c
index d87046cfec1..394b9dc9b4f 100644
--- a/src/mame/video/mainevt.c
+++ b/src/mame/video/mainevt.c
@@ -93,7 +93,7 @@ VIDEO_UPDATE( mainevt )
{
K052109_tilemap_update();
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
tilemap_draw(bitmap,cliprect,K052109_tilemap[1],TILEMAP_DRAW_OPAQUE,1);
tilemap_draw(bitmap,cliprect,K052109_tilemap[2],1,2); /* low priority part of layer */
tilemap_draw(bitmap,cliprect,K052109_tilemap[2],0,4); /* high priority part of layer */
diff --git a/src/mame/video/malzak.c b/src/mame/video/malzak.c
index cdc563c8f53..d25f62b35e8 100644
--- a/src/mame/video/malzak.c
+++ b/src/mame/video/malzak.c
@@ -74,7 +74,7 @@ VIDEO_UPDATE( malzak )
bitmap_t *s2636_0_bitmap;
bitmap_t *s2636_1_bitmap;
- fillbitmap(bitmap,0,0);
+ bitmap_fill(bitmap,0,0);
// SAA 5050 - Teletext character generator
for (sy = 24; sy >= 0; sy--)
diff --git a/src/mame/video/mappy.c b/src/mame/video/mappy.c
index 2f6d5e81416..56d83d0ce8f 100644
--- a/src/mame/video/mappy.c
+++ b/src/mame/video/mappy.c
@@ -540,7 +540,7 @@ VIDEO_UPDATE( superpac )
tilemap_draw(bitmap,cliprect,bg_tilemap,TILEMAP_DRAW_OPAQUE | TILEMAP_DRAW_ALL_CATEGORIES,0);
- fillbitmap(sprite_bitmap,15,cliprect);
+ bitmap_fill(sprite_bitmap,cliprect,15);
mappy_draw_sprites(screen->machine,sprite_bitmap,cliprect,0,0,15);
copybitmap_trans(bitmap,sprite_bitmap,0,0,0,0,cliprect,15);
diff --git a/src/mame/video/mcatadv.c b/src/mame/video/mcatadv.c
index 9388678a937..1c17de7e81e 100644
--- a/src/mame/video/mcatadv.c
+++ b/src/mame/video/mcatadv.c
@@ -202,8 +202,8 @@ VIDEO_UPDATE( mcatadv )
{
int i;
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
- fillbitmap(priority_bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
+ bitmap_fill(priority_bitmap, cliprect, 0);
if(mcatadv_scroll[2] != palette_bank1) {
palette_bank1 = mcatadv_scroll[2];
diff --git a/src/mame/video/mcr.c b/src/mame/video/mcr.c
index f1a6beec93d..cd8e4df8bca 100644
--- a/src/mame/video/mcr.c
+++ b/src/mame/video/mcr.c
@@ -389,7 +389,7 @@ VIDEO_UPDATE( mcr )
tilemap_set_flip(bg_tilemap, mcr_cocktail_flip ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0);
/* draw the background */
- fillbitmap(priority_bitmap, 0, cliprect);
+ bitmap_fill(priority_bitmap, cliprect, 0);
tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0x00);
tilemap_draw(bitmap, cliprect, bg_tilemap, 1, 0x10);
tilemap_draw(bitmap, cliprect, bg_tilemap, 2, 0x20);
diff --git a/src/mame/video/mcr3.c b/src/mame/video/mcr3.c
index a97efb61a45..d0e428b4664 100644
--- a/src/mame/video/mcr3.c
+++ b/src/mame/video/mcr3.c
@@ -192,7 +192,7 @@ static void mcr3_update_sprites(running_machine *machine, bitmap_t *bitmap, cons
{
int offs;
- fillbitmap(priority_bitmap, 1, cliprect);
+ bitmap_fill(priority_bitmap, cliprect, 1);
/* loop over sprite RAM */
for (offs = spriteram_size - 4; offs >= 0; offs -= 4)
diff --git a/src/mame/video/mcr68.c b/src/mame/video/mcr68.c
index c1d4538ec6f..21cc583a5ed 100644
--- a/src/mame/video/mcr68.c
+++ b/src/mame/video/mcr68.c
@@ -195,7 +195,7 @@ static void mcr68_update_sprites(running_machine *machine, bitmap_t *bitmap, con
sprite_clip.max_x -= mcr68_sprite_clip;
sect_rect(&sprite_clip, cliprect);
- fillbitmap(priority_bitmap,1,&sprite_clip);
+ bitmap_fill(priority_bitmap,&sprite_clip,1);
/* loop over sprite RAM */
for (offs = spriteram_size / 2 - 4;offs >= 0;offs -= 4)
@@ -241,7 +241,7 @@ static void zwackery_update_sprites(running_machine *machine, bitmap_t *bitmap,
{
int offs;
- fillbitmap(priority_bitmap,1,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,1);
/* loop over sprite RAM */
for (offs = spriteram_size / 2 - 4;offs >= 0;offs -= 4)
diff --git a/src/mame/video/megasys1.c b/src/mame/video/megasys1.c
index 7c60e5c61fc..cef0a189797 100644
--- a/src/mame/video/megasys1.c
+++ b/src/mame/video/megasys1.c
@@ -974,7 +974,7 @@ VIDEO_UPDATE( megasys1 )
}
}
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
flag = TILEMAP_DRAW_OPAQUE;
primask = 0;
@@ -1000,7 +1000,7 @@ VIDEO_UPDATE( megasys1 )
if (flag != 0)
{
flag = 0;
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
}
if (megasys1_sprite_flag & 0x100) /* sprites are split */
diff --git a/src/mame/video/mermaid.c b/src/mame/video/mermaid.c
index fb3f979a240..812c014c6c4 100644
--- a/src/mame/video/mermaid.c
+++ b/src/mame/video/mermaid.c
@@ -294,8 +294,8 @@ VIDEO_EOF( mermaid )
// check collision sprite - background
- fillbitmap(helper,0,&rect);
- fillbitmap(helper2,0,&rect);
+ bitmap_fill(helper,&rect,0);
+ bitmap_fill(helper2,&rect,0);
tilemap_draw(helper, &rect, bg_tilemap, 0, 0);
@@ -306,8 +306,8 @@ VIDEO_EOF( mermaid )
// check collision sprite - foreground
- fillbitmap(helper,0,&rect);
- fillbitmap(helper2,0,&rect);
+ bitmap_fill(helper,&rect,0);
+ bitmap_fill(helper2,&rect,0);
tilemap_draw(helper, &rect, fg_tilemap, 0, 0);
@@ -318,8 +318,8 @@ VIDEO_EOF( mermaid )
// check collision sprite - sprite
- fillbitmap(helper,0,&rect);
- fillbitmap(helper2,0,&rect);
+ bitmap_fill(helper,&rect,0);
+ bitmap_fill(helper2,&rect,0);
for (offs2 = spriteram_size - 4; offs2 >= 0; offs2 -= 4)
if (offs != offs2)
@@ -408,8 +408,8 @@ VIDEO_EOF( mermaid )
// check collision sprite - sprite
- fillbitmap(helper,0,&rect);
- fillbitmap(helper2,0,&rect);
+ bitmap_fill(helper,&rect,0);
+ bitmap_fill(helper2,&rect,0);
for (offs2 = spriteram_size - 4; offs2 >= 0; offs2 -= 4)
if (offs != offs2)
@@ -498,8 +498,8 @@ VIDEO_EOF( mermaid )
// check collision sprite - sprite
- fillbitmap(helper,0,&rect);
- fillbitmap(helper2,0,&rect);
+ bitmap_fill(helper,&rect,0);
+ bitmap_fill(helper2,&rect,0);
for (offs2 = spriteram_size - 4; offs2 >= 0; offs2 -= 4)
if (offs != offs2)
diff --git a/src/mame/video/metlclsh.c b/src/mame/video/metlclsh.c
index eea4bece7e1..3f71a7a3fd0 100644
--- a/src/mame/video/metlclsh.c
+++ b/src/mame/video/metlclsh.c
@@ -237,7 +237,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan
VIDEO_UPDATE( metlclsh )
{
- fillbitmap(bitmap,0x10,cliprect);
+ bitmap_fill(bitmap,cliprect,0x10);
tilemap_draw(bitmap,cliprect,fg_tilemap,1,0); // low priority tiles of foreground
if (metlclsh_scrollx[0] & 0x08) // background (if enabled)
diff --git a/src/mame/video/metro.c b/src/mame/video/metro.c
index 81bcc7c5fda..3e316edc7f0 100644
--- a/src/mame/video/metro.c
+++ b/src/mame/video/metro.c
@@ -914,8 +914,8 @@ VIDEO_UPDATE( metro )
metro_sprite_yoffs = metro_videoregs[0x04/2] - video_screen_get_height(screen) / 2;
/* The background color is selected by a register */
- fillbitmap(priority_bitmap,0,cliprect);
- fillbitmap(bitmap,((metro_videoregs[0x12/2] & 0x0fff)) + 0x1000,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
+ bitmap_fill(bitmap,cliprect,((metro_videoregs[0x12/2] & 0x0fff)) + 0x1000);
/* Screen Control Register:
@@ -957,7 +957,7 @@ if (input_code_pressed(KEYCODE_Z))
if (input_code_pressed(KEYCODE_E)) msk |= 4;
if (input_code_pressed(KEYCODE_A)) msk |= 8;
if (msk != 0)
- { fillbitmap(bitmap,0,cliprect);
+ { bitmap_fill(bitmap,cliprect,0);
layers_ctrl &= msk; }
popmessage("l %x-%x-%x r %04x %04x %04x",
diff --git a/src/mame/video/mexico86.c b/src/mame/video/mexico86.c
index 57583b56b49..b8cd3783736 100644
--- a/src/mame/video/mexico86.c
+++ b/src/mame/video/mexico86.c
@@ -32,7 +32,7 @@ VIDEO_UPDATE( mexico86 )
/* and sprites) are stored in the same memory region, and information on */
/* the background character columns is stored inthe area dd00-dd3f */
- fillbitmap(bitmap,255,cliprect);
+ bitmap_fill(bitmap,cliprect,255);
sx = 0;
/* the score display seems to be outside of the main objectram. */
@@ -109,7 +109,7 @@ VIDEO_UPDATE( kikikai )
int goffs,code,color,y;
int tx, ty;
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
sx = 0;
for (offs=0; offs<mexico86_objectram_size; offs+=4)
{
diff --git a/src/mame/video/mitchell.c b/src/mame/video/mitchell.c
index 0f84ed600e0..0705aea0f9a 100644
--- a/src/mame/video/mitchell.c
+++ b/src/mame/video/mitchell.c
@@ -283,7 +283,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan
VIDEO_UPDATE( pang )
{
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
tilemap_draw(bitmap,cliprect,bg_tilemap,0,0);
draw_sprites(screen->machine, bitmap,cliprect);
return 0;
diff --git a/src/mame/video/mjkjidai.c b/src/mame/video/mjkjidai.c
index 64f143d7d4f..4e47c48c137 100644
--- a/src/mame/video/mjkjidai.c
+++ b/src/mame/video/mjkjidai.c
@@ -129,7 +129,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan
VIDEO_UPDATE( mjkjidai )
{
if (!display_enable)
- fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+ bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
else
{
tilemap_draw(bitmap,cliprect,bg_tilemap,0,0);
diff --git a/src/mame/video/mjsister.c b/src/mame/video/mjsister.c
index 7a35cba8154..2fe35aaff43 100644
--- a/src/mame/video/mjsister.c
+++ b/src/mame/video/mjsister.c
@@ -104,6 +104,6 @@ VIDEO_UPDATE( mjsister )
copybitmap_trans(bitmap,mjsister_tmpbitmap1,f,f,2,0,cliprect,0);
}
else
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
return 0;
}
diff --git a/src/mame/video/model1.c b/src/mame/video/model1.c
index dd89fdcc561..71b542b42d7 100644
--- a/src/mame/video/model1.c
+++ b/src/mame/video/model1.c
@@ -1507,8 +1507,8 @@ VIDEO_UPDATE(model1)
ayyc = cos(ayy);
ayys = sin(ayy);
- fillbitmap(priority_bitmap, 0, NULL);
- fillbitmap(bitmap, screen->machine->pens[0], cliprect);
+ bitmap_fill(priority_bitmap, NULL, 0);
+ bitmap_fill(bitmap, cliprect, screen->machine->pens[0]);
sys24_tile_draw(screen->machine, bitmap, cliprect, 6, 0, 0);
sys24_tile_draw(screen->machine, bitmap, cliprect, 4, 0, 0);
diff --git a/src/mame/video/model2.c b/src/mame/video/model2.c
index 11805d7d62c..5fef5d1ca29 100644
--- a/src/mame/video/model2.c
+++ b/src/mame/video/model2.c
@@ -2735,8 +2735,8 @@ VIDEO_UPDATE(model2)
logerror("--- frame ---\n");
sys24_tile_update(screen->machine);
- fillbitmap(bitmap, screen->machine->pens[0], cliprect);
- fillbitmap(sys24_bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, screen->machine->pens[0]);
+ bitmap_fill(sys24_bitmap, cliprect, 0);
sys24_tile_draw(screen->machine, sys24_bitmap, cliprect, 7, 0, 0);
sys24_tile_draw(screen->machine, sys24_bitmap, cliprect, 6, 0, 0);
@@ -2754,7 +2754,7 @@ VIDEO_UPDATE(model2)
/* have the rasterizer output the frame */
model2_3d_frame_end( bitmap, cliprect );
- fillbitmap(sys24_bitmap, 0, cliprect);
+ bitmap_fill(sys24_bitmap, cliprect, 0);
sys24_tile_draw(screen->machine, sys24_bitmap, cliprect, 3, 0, 0);
sys24_tile_draw(screen->machine, sys24_bitmap, cliprect, 2, 0, 0);
sys24_tile_draw(screen->machine, sys24_bitmap, cliprect, 1, 0, 0);
diff --git a/src/mame/video/model3.c b/src/mame/video/model3.c
index 3cf6508fb99..c003a1754f2 100644
--- a/src/mame/video/model3.c
+++ b/src/mame/video/model3.c
@@ -431,7 +431,7 @@ VIDEO_UPDATE( model3 )
debug_layer_disable ^= 0x10;
}
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
if (!(debug_layer_disable & 0x8))
draw_layer(bitmap, cliprect, 3, (model3_layer_enable >> 3) & 0x1);
@@ -442,8 +442,8 @@ VIDEO_UPDATE( model3 )
if( !(debug_layer_disable & 0x10) )
{
// if(real3d_display_list) {
-// fillbitmap(zbuffer, 0, cliprect);
-// fillbitmap(bitmap3d, 0x8000, cliprect);
+// bitmap_fill(zbuffer, cliprect, 0);
+// bitmap_fill(bitmap3d, cliprect, 0x8000);
// real3d_traverse_display_list();
// }
copybitmap_trans(bitmap, bitmap3d, 0, 0, 0, 0, cliprect, 0x8000);
@@ -820,8 +820,8 @@ void real3d_display_list_end(void)
};
}
texture_fifo_pos = 0;
- fillbitmap(zbuffer, 0, NULL);
- fillbitmap(bitmap3d, 0x8000, NULL);
+ bitmap_fill(zbuffer, NULL, 0);
+ bitmap_fill(bitmap3d, NULL, 0x8000);
real3d_traverse_display_list();
// real3d_display_list = 1;
}
diff --git a/src/mame/video/momoko.c b/src/mame/video/momoko.c
index 8499e1337ba..3468978f92e 100644
--- a/src/mame/video/momoko.c
+++ b/src/mame/video/momoko.c
@@ -152,7 +152,7 @@ VIDEO_UPDATE( momoko )
}
}
else
- fillbitmap(bitmap, 256, cliprect);
+ bitmap_fill(bitmap, cliprect, 256);
/* draw sprites (momoko) */
diff --git a/src/mame/video/moo.c b/src/mame/video/moo.c
index 14a28f748e7..d27ff4c8773 100644
--- a/src/mame/video/moo.c
+++ b/src/mame/video/moo.c
@@ -146,7 +146,7 @@ VIDEO_UPDATE(moo)
K054338_update_all_shadows(screen->machine);
K054338_fill_backcolor(screen->machine, bitmap, 0);
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
if (layerpri[0] < K053251_get_priority(K053251_CI1)) /* bucky hides back layer behind background */
K056832_tilemap_draw(screen->machine, bitmap, cliprect, layers[0], 0, 1);
diff --git a/src/mame/video/mrdo.c b/src/mame/video/mrdo.c
index c6f2c85556f..0c2b30b5f7d 100644
--- a/src/mame/video/mrdo.c
+++ b/src/mame/video/mrdo.c
@@ -245,7 +245,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan
VIDEO_UPDATE( mrdo )
{
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
tilemap_draw(bitmap,cliprect,bg_tilemap,0,0);
tilemap_draw(bitmap,cliprect,fg_tilemap,0,0);
draw_sprites(screen->machine,bitmap,cliprect);
diff --git a/src/mame/video/ms32.c b/src/mame/video/ms32.c
index cc4f156d109..df40a69e1bc 100644
--- a/src/mame/video/ms32.c
+++ b/src/mame/video/ms32.c
@@ -485,11 +485,11 @@ VIDEO_UPDATE( ms32 )
tilemap_set_scrolly(ms32_bg_tilemap, 0, scrolly);
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
/* TODO: 0 is correct for gametngk, but break f1superb scrolling grid (text at
top and bottom of the screen becomes black on black) */
- fillbitmap(bitmap,0,cliprect); /* bg color */
+ bitmap_fill(bitmap,cliprect,0); /* bg color */
/* priority hack, we really need to figure out what priority ram is I think */
diff --git a/src/mame/video/namcofl.c b/src/mame/video/namcofl.c
index 000efb4572b..a78b12878d1 100644
--- a/src/mame/video/namcofl.c
+++ b/src/mame/video/namcofl.c
@@ -148,7 +148,7 @@ VIDEO_UPDATE( namcofl )
handle_mcu(screen->machine);
namcofl_install_palette(screen->machine);
- fillbitmap( bitmap, get_black_pen(screen->machine), cliprect );
+ bitmap_fill( bitmap, cliprect , get_black_pen(screen->machine));
for( pri=0; pri<16; pri++ )
{
diff --git a/src/mame/video/namcona1.c b/src/mame/video/namcona1.c
index f54600837f5..eabb3951547 100644
--- a/src/mame/video/namcona1.c
+++ b/src/mame/video/namcona1.c
@@ -725,9 +725,9 @@ VIDEO_UPDATE( namcona1 )
roz_dirty = 0;
}
- fillbitmap( priority_bitmap,0,cliprect );
+ bitmap_fill( priority_bitmap,cliprect ,0);
- fillbitmap( bitmap, 0xff, cliprect ); /* background color? */
+ bitmap_fill( bitmap, cliprect , 0xff); /* background color? */
for( priority = 0; priority<8; priority++ )
{
diff --git a/src/mame/video/namconb1.c b/src/mame/video/namconb1.c
index f43f644f9cd..c9149924e14 100644
--- a/src/mame/video/namconb1.c
+++ b/src/mame/video/namconb1.c
@@ -149,7 +149,7 @@ VIDEO_UPDATE( namconb1 )
if( clip.max_x > cliprect->max_x ){ clip.max_x = cliprect->max_x; }
if( clip.max_y > cliprect->max_y ){ clip.max_y = cliprect->max_y; }
- fillbitmap( bitmap, get_black_pen(screen->machine), cliprect );
+ bitmap_fill( bitmap, cliprect , get_black_pen(screen->machine));
video_update_common( screen->machine, bitmap, &clip, 0 );
@@ -188,7 +188,7 @@ VIDEO_UPDATE( namconb2 )
if( clip.max_x > cliprect->max_x ){ clip.max_x = cliprect->max_x; }
if( clip.max_y > cliprect->max_y ){ clip.max_y = cliprect->max_y; }
- fillbitmap( bitmap, get_black_pen(screen->machine), cliprect );
+ bitmap_fill( bitmap, cliprect , get_black_pen(screen->machine));
if( memcmp(tilemap_tile_bank,namconb1_tilebank32,sizeof(tilemap_tile_bank))!=0 )
{
diff --git a/src/mame/video/namcos1.c b/src/mame/video/namcos1.c
index ce0e96967b3..d4c91acdc5b 100644
--- a/src/mame/video/namcos1.c
+++ b/src/mame/video/namcos1.c
@@ -349,7 +349,7 @@ VIDEO_UPDATE( namcos1 )
/* background color */
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
/* berabohm uses asymmetrical visibility windows to iris on the character */
i = ((namcos1_cus116[0] << 8) | namcos1_cus116[1]) - 1; // min x
@@ -388,7 +388,7 @@ VIDEO_UPDATE( namcos1 )
}
- fillbitmap(priority_bitmap, 0, &new_clip);
+ bitmap_fill(priority_bitmap, &new_clip, 0);
/* bit 0-2 priority */
/* bit 3 disable */
diff --git a/src/mame/video/namcos2.c b/src/mame/video/namcos2.c
index dc75bf089c8..a7b7a85839a 100644
--- a/src/mame/video/namcos2.c
+++ b/src/mame/video/namcos2.c
@@ -346,7 +346,7 @@ VIDEO_UPDATE( namcos2_default )
int pri;
UpdatePalette(screen->machine);
- fillbitmap( bitmap, get_black_pen(screen->machine), cliprect );
+ bitmap_fill( bitmap, cliprect , get_black_pen(screen->machine));
ApplyClip( &clip, cliprect );
/* HACK: enable ROZ layer only if it has priority > 0 */
@@ -383,7 +383,7 @@ VIDEO_UPDATE( finallap )
int pri;
UpdatePalette(screen->machine);
- fillbitmap( bitmap, get_black_pen(screen->machine), cliprect );
+ bitmap_fill( bitmap, cliprect , get_black_pen(screen->machine));
ApplyClip( &clip, cliprect );
for( pri=0; pri<16; pri++ )
@@ -420,7 +420,7 @@ VIDEO_UPDATE( luckywld )
int pri;
UpdatePalette(screen->machine);
- fillbitmap( bitmap, get_black_pen(screen->machine), cliprect );
+ bitmap_fill( bitmap, cliprect , get_black_pen(screen->machine));
ApplyClip( &clip, cliprect );
for( pri=0; pri<16; pri++ )
@@ -453,7 +453,7 @@ VIDEO_UPDATE( sgunner )
int pri;
UpdatePalette(screen->machine);
- fillbitmap( bitmap, get_black_pen(screen->machine), cliprect );
+ bitmap_fill( bitmap, cliprect , get_black_pen(screen->machine));
ApplyClip( &clip, cliprect );
for( pri=0; pri<8; pri++ )
@@ -479,7 +479,7 @@ VIDEO_UPDATE( metlhawk )
int pri;
UpdatePalette(screen->machine);
- fillbitmap( bitmap, get_black_pen(screen->machine), cliprect );
+ bitmap_fill( bitmap, cliprect , get_black_pen(screen->machine));
ApplyClip( &clip, cliprect );
for( pri=0; pri<16; pri++ )
diff --git a/src/mame/video/namcos21.c b/src/mame/video/namcos21.c
index 158608bdce8..0743f3da7c5 100644
--- a/src/mame/video/namcos21.c
+++ b/src/mame/video/namcos21.c
@@ -181,7 +181,7 @@ VIDEO_UPDATE( namcos21 )
int pivot = 3;
int pri;
update_palette(screen->machine);
- fillbitmap( bitmap, 0xff, cliprect );
+ bitmap_fill( bitmap, cliprect , 0xff);
if( namcos2_gametype != NAMCOS21_WINRUN91 )
{ /* draw low priority 2d sprites */
diff --git a/src/mame/video/namcos22.c b/src/mame/video/namcos22.c
index f4cd9ecec7f..852b2bb0aae 100644
--- a/src/mame/video/namcos22.c
+++ b/src/mame/video/namcos22.c
@@ -1579,7 +1579,7 @@ static void DrawCharacterLayer(running_machine *machine, bitmap_t *bitmap, const
cgsomethingisdirty = 0;
}
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
tilemap_set_scrollx( bgtilemap,0, (dx-0x35c)&0x3ff );
tilemap_set_scrolly( bgtilemap,0, dy&0x3ff );
tilemap_set_palette_offset( bgtilemap, mixer.palBase*256 );
@@ -2275,7 +2275,7 @@ VIDEO_UPDATE( namcos22s )
UINT32 bgColor;
UpdateVideoMixer();
bgColor = (mixer.rBackColor<<16)|(mixer.gBackColor<<8)|mixer.bBackColor;
- fillbitmap( bitmap, bgColor, cliprect );
+ bitmap_fill( bitmap, cliprect , bgColor);
UpdatePaletteS(screen->machine);
DrawCharacterLayer(screen->machine, bitmap, cliprect );
DrawPolygons( bitmap );
@@ -2324,7 +2324,7 @@ VIDEO_UPDATE( namcos22s )
VIDEO_UPDATE( namcos22 )
{
UpdateVideoMixer();
- fillbitmap( bitmap, get_black_pen(screen->machine), cliprect );
+ bitmap_fill( bitmap, cliprect , get_black_pen(screen->machine));
UpdatePalette(screen->machine);
DrawCharacterLayer(screen->machine, bitmap, cliprect );
DrawPolygons( bitmap );
diff --git a/src/mame/video/namcos86.c b/src/mame/video/namcos86.c
index 90bc38ab223..682753b447a 100644
--- a/src/mame/video/namcos86.c
+++ b/src/mame/video/namcos86.c
@@ -358,9 +358,9 @@ VIDEO_UPDATE( namcos86 )
set_scroll(2);
set_scroll(3);
- fillbitmap(priority_bitmap, 0, cliprect);
+ bitmap_fill(priority_bitmap, cliprect, 0);
- fillbitmap(bitmap,screen->machine->gfx[0]->color_base + 8*backcolor+7,cliprect);
+ bitmap_fill(bitmap,cliprect,screen->machine->gfx[0]->color_base + 8*backcolor+7);
for (layer = 0;layer < 8;layer++)
{
diff --git a/src/mame/video/nbmj8688.c b/src/mame/video/nbmj8688.c
index cf0bba8344d..fb82e1ce600 100644
--- a/src/mame/video/nbmj8688.c
+++ b/src/mame/video/nbmj8688.c
@@ -707,7 +707,7 @@ VIDEO_UPDATE( mbmj8688 )
copybitmap(bitmap, mjsikaku_tmpbitmap, 0, 0, 0, scrolly - 256, cliprect);
}
else
- fillbitmap(bitmap, 0, 0);
+ bitmap_fill(bitmap, 0, 0);
return 0;
}
diff --git a/src/mame/video/nbmj8891.c b/src/mame/video/nbmj8891.c
index 8f4b0d465b4..9772c816859 100644
--- a/src/mame/video/nbmj8891.c
+++ b/src/mame/video/nbmj8891.c
@@ -566,7 +566,7 @@ VIDEO_UPDATE( nbmj8891 )
copyscrollbitmap(bitmap, nbmj8891_tmpbitmap0, 0, 0, 1, &scrolly, cliprect);
}
else
- fillbitmap(bitmap, 0xff, 0);
+ bitmap_fill(bitmap, 0, 0xff);
return 0;
}
diff --git a/src/mame/video/nbmj8991.c b/src/mame/video/nbmj8991.c
index b0272e9fe7c..8a6a7d2d6a2 100644
--- a/src/mame/video/nbmj8991.c
+++ b/src/mame/video/nbmj8991.c
@@ -346,7 +346,7 @@ VIDEO_UPDATE( nbmj8991_type1 )
copyscrollbitmap(bitmap, nbmj8991_tmpbitmap, 1, &scrollx, 1, &scrolly, cliprect);
}
else
- fillbitmap(bitmap, 0, 0);
+ bitmap_fill(bitmap, 0, 0);
return 0;
}
@@ -385,7 +385,7 @@ VIDEO_UPDATE( nbmj8991_type2 )
copyscrollbitmap(bitmap, nbmj8991_tmpbitmap, 1, &scrollx, 1, &scrolly, cliprect);
}
else
- fillbitmap(bitmap, 0, 0);
+ bitmap_fill(bitmap, 0, 0);
return 0;
}
diff --git a/src/mame/video/nbmj9195.c b/src/mame/video/nbmj9195.c
index 4a77abd994a..509b7949c0b 100644
--- a/src/mame/video/nbmj9195.c
+++ b/src/mame/video/nbmj9195.c
@@ -516,7 +516,7 @@ VIDEO_UPDATE( nbmj9195 )
// nbmj9195 1layer
copyscrollbitmap(bitmap, nbmj9195_tmpbitmap[0], SCANLINE_MAX, nbmj9195_scrollx_raster[0], 1, &scrolly[0], cliprect);
else
- fillbitmap(bitmap, 0x0ff, 0);
+ bitmap_fill(bitmap, 0, 0x0ff);
if (nbmj9195_dispflag[1])
{
diff --git a/src/mame/video/nemesis.c b/src/mame/video/nemesis.c
index 7b5a39f3a23..3ebb48dd643 100644
--- a/src/mame/video/nemesis.c
+++ b/src/mame/video/nemesis.c
@@ -388,8 +388,8 @@ VIDEO_UPDATE( nemesis )
update_gfx(screen->machine);
- fillbitmap(priority_bitmap,0,cliprect);
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
+ bitmap_fill(bitmap,cliprect,0);
tilemap_set_scrolly( background, 0, (nemesis_yscroll[0x180] & 0xff) );
@@ -417,8 +417,8 @@ VIDEO_UPDATE( salamand )
update_gfx(screen->machine);
- fillbitmap(priority_bitmap,0,cliprect);
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
+ bitmap_fill(bitmap,cliprect,0);
clip.min_x = 0;
clip.max_x = 255;
diff --git a/src/mame/video/neogeo.c b/src/mame/video/neogeo.c
index 938a405c13b..e6eebee55b7 100644
--- a/src/mame/video/neogeo.c
+++ b/src/mame/video/neogeo.c
@@ -928,7 +928,7 @@ VIDEO_RESET( neogeo )
VIDEO_UPDATE( neogeo )
{
/* fill with background color first */
- fillbitmap(bitmap, pens[0x0fff], cliprect);
+ bitmap_fill(bitmap, cliprect, pens[0x0fff]);
draw_sprites(bitmap, cliprect->min_y);
diff --git a/src/mame/video/ninjakd2.c b/src/mame/video/ninjakd2.c
index f0cb7d85afd..ba709f85017 100644
--- a/src/mame/video/ninjakd2.c
+++ b/src/mame/video/ninjakd2.c
@@ -419,7 +419,7 @@ static void erase_sprites(running_machine* const machine, bitmap_t* const bitmap
// if sprite overdraw is disabled, clear the sprite framebuffer
// if sprite overdraw is enabled, only clear palettes 0-B and F, and leave C-E on screen
if (!sprite_overdraw_enabled)
- fillbitmap(sp_bitmap, 15, cliprect);
+ bitmap_fill(sp_bitmap, cliprect, 15);
else
{
int x,y;
@@ -460,7 +460,7 @@ VIDEO_UPDATE( ninjakd2 )
update_sprites(screen->machine);
sprites_updated = 1;
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0);
@@ -476,7 +476,7 @@ VIDEO_UPDATE( robokid )
update_sprites(screen->machine);
sprites_updated = 1;
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
tilemap_draw(bitmap, cliprect, bg0_tilemap, 0, 0);
@@ -496,7 +496,7 @@ VIDEO_UPDATE( omegaf )
update_sprites(screen->machine);
sprites_updated = 1;
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
tilemap_draw(bitmap, cliprect, bg0_tilemap, 0, 0);
diff --git a/src/mame/video/ninjaw.c b/src/mame/video/ninjaw.c
index b1303c87233..30b29d394a6 100644
--- a/src/mame/video/ninjaw.c
+++ b/src/mame/video/ninjaw.c
@@ -181,7 +181,7 @@ VIDEO_UPDATE( ninjaw )
nodraw = TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,screen_number,layer[0],TILEMAP_DRAW_OPAQUE,0); /* left */
/* Ensure screen blanked even when bottom layers not drawn due to disable bit */
- if (nodraw) fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ if (nodraw) bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
/* Sprites can be under/over the layer below text layer */
draw_sprites(screen->machine,bitmap,cliprect,1,xoffs,8); // draw sprites with priority 1 which are under the mid layer
diff --git a/src/mame/video/niyanpai.c b/src/mame/video/niyanpai.c
index fd377482d0e..4e2142607c8 100644
--- a/src/mame/video/niyanpai.c
+++ b/src/mame/video/niyanpai.c
@@ -444,7 +444,7 @@ VIDEO_UPDATE( niyanpai )
if (niyanpai_dispflag[0])
copyscrollbitmap(bitmap, niyanpai_tmpbitmap[0], 1, &scrollx[0], 1, &scrolly[0], cliprect);
else
- fillbitmap(bitmap, 0x00ff, 0);
+ bitmap_fill(bitmap, 0, 0x00ff);
if (niyanpai_dispflag[1])
copyscrollbitmap_trans(bitmap, niyanpai_tmpbitmap[1], 1, &scrollx[1], 1, &scrolly[1], cliprect, 0x01ff);
diff --git a/src/mame/video/oneshot.c b/src/mame/video/oneshot.c
index db2541bd4c1..98e0f8a3853 100644
--- a/src/mame/video/oneshot.c
+++ b/src/mame/video/oneshot.c
@@ -159,7 +159,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta
VIDEO_UPDATE( oneshot )
{
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
tilemap_set_scrollx(oneshot_mid_tilemap,0, oneshot_scroll[0]-0x1f5);
tilemap_set_scrolly(oneshot_mid_tilemap,0, oneshot_scroll[1]);
@@ -174,7 +174,7 @@ VIDEO_UPDATE( oneshot )
VIDEO_UPDATE( maddonna )
{
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
tilemap_set_scrolly(oneshot_mid_tilemap,0, oneshot_scroll[1]); // other registers aren't used so we don't know which layers they relate to
diff --git a/src/mame/video/othldrby.c b/src/mame/video/othldrby.c
index 2058a81bcbe..ad0f9fb28e7 100644
--- a/src/mame/video/othldrby.c
+++ b/src/mame/video/othldrby.c
@@ -197,9 +197,9 @@ VIDEO_UPDATE( othldrby )
}
}
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
for (layer = 0;layer < 3;layer++)
tilemap_draw(bitmap,cliprect,bg_tilemap[layer],0,0);
diff --git a/src/mame/video/othunder.c b/src/mame/video/othunder.c
index 7b4e362fd18..149d8924534 100644
--- a/src/mame/video/othunder.c
+++ b/src/mame/video/othunder.c
@@ -229,10 +229,10 @@ VIDEO_UPDATE( othunder )
layer[1] = layer[0]^1;
layer[2] = 2;
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
/* Ensure screen blanked even when bottom layer not drawn due to disable bit */
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[0],TILEMAP_DRAW_OPAQUE,1);
TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[1],0,2);
diff --git a/src/mame/video/overdriv.c b/src/mame/video/overdriv.c
index 5f66b795e59..035e03b0a54 100644
--- a/src/mame/video/overdriv.c
+++ b/src/mame/video/overdriv.c
@@ -77,7 +77,7 @@ VIDEO_UPDATE( overdriv )
zoom_colorbase[1] = K053251_get_palette_index(K053251_CI3);
zoom_colorbase[0] = K053251_get_palette_index(K053251_CI4);
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
K051316_zoom_draw_0(bitmap,cliprect,0,0);
K051316_zoom_draw_1(bitmap,cliprect,0,1);
diff --git a/src/mame/video/pacland.c b/src/mame/video/pacland.c
index bed3c02f94c..7875e5d572a 100644
--- a/src/mame/video/pacland.c
+++ b/src/mame/video/pacland.c
@@ -203,7 +203,7 @@ VIDEO_START( pacland )
int color;
fg_bitmap = video_screen_auto_bitmap_alloc(machine->primary_screen);
- fillbitmap(fg_bitmap, 0xffff, NULL);
+ bitmap_fill(fg_bitmap, NULL, 0xffff);
bg_tilemap = tilemap_create(get_bg_tile_info,tilemap_scan_rows,8,8,64,32);
fg_tilemap = tilemap_create(get_fg_tile_info,tilemap_scan_rows,8,8,64,32);
@@ -385,7 +385,7 @@ VIDEO_UPDATE( pacland )
/* draw high priority sprite pixels, setting priority bitmap to non-zero
wherever there is a high-priority pixel; note that we draw to the bitmap
which is safe because the bg_tilemap draw will overwrite everything */
- fillbitmap(priority_bitmap, 0x00, cliprect);
+ bitmap_fill(priority_bitmap, cliprect, 0x00);
draw_sprites(screen->machine, bitmap, cliprect, 0);
/* draw background */
diff --git a/src/mame/video/pacman.c b/src/mame/video/pacman.c
index de16b90b33a..6b9b62afcbb 100644
--- a/src/mame/video/pacman.c
+++ b/src/mame/video/pacman.c
@@ -218,7 +218,7 @@ WRITE8_HANDLER( pacman_flipscreen_w )
VIDEO_UPDATE( pacman )
{
if (bgpriority != 0)
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
else
tilemap_draw(bitmap,cliprect,bg_tilemap,TILEMAP_DRAW_OPAQUE,0);
diff --git a/src/mame/video/paradise.c b/src/mame/video/paradise.c
index 9d32166a16a..092933e70ea 100644
--- a/src/mame/video/paradise.c
+++ b/src/mame/video/paradise.c
@@ -243,7 +243,7 @@ if (input_code_pressed(KEYCODE_Z))
}
#endif
- fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+ bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
if (!(paradise_priority & 4)) /* Screen blanking */
return 0;
@@ -273,7 +273,7 @@ if (input_code_pressed(KEYCODE_Z))
/* no pix layer, no tilemap_0, different priority bits */
VIDEO_UPDATE( torus )
{
- fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+ bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
if (!(paradise_priority & 2)) /* Screen blanking */
return 0;
@@ -303,7 +303,7 @@ VIDEO_UPDATE( torus )
/* I don't know how the priority bits work on this one */
VIDEO_UPDATE( madball )
{
- fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+ bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
tilemap_draw(bitmap,cliprect, tilemap_0, 0,0);
tilemap_draw(bitmap,cliprect, tilemap_1, 0,0);
tilemap_draw(bitmap,cliprect, tilemap_2, 0,0);
diff --git a/src/mame/video/parodius.c b/src/mame/video/parodius.c
index fdeaa968d76..ddc0c1d8b9a 100644
--- a/src/mame/video/parodius.c
+++ b/src/mame/video/parodius.c
@@ -87,8 +87,8 @@ VIDEO_UPDATE( parodius )
sortlayers(layer,layerpri);
- fillbitmap(priority_bitmap,0,cliprect);
- fillbitmap(bitmap,16 * bg_colorbase,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
+ bitmap_fill(bitmap,cliprect,16 * bg_colorbase);
tilemap_draw(bitmap,cliprect,K052109_tilemap[layer[0]],0,1);
tilemap_draw(bitmap,cliprect,K052109_tilemap[layer[1]],0,2);
tilemap_draw(bitmap,cliprect,K052109_tilemap[layer[2]],0,4);
diff --git a/src/mame/video/pastelg.c b/src/mame/video/pastelg.c
index 398a9fc70f2..88112af3949 100644
--- a/src/mame/video/pastelg.c
+++ b/src/mame/video/pastelg.c
@@ -281,7 +281,7 @@ VIDEO_UPDATE( pastelg )
*BITMAP_ADDR16(bitmap, y, x) = pastelg_videoram[(y * width) + x];
}
else
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
return 0;
}
diff --git a/src/mame/video/pgm.c b/src/mame/video/pgm.c
index 38df96c556b..9610c9f1524 100644
--- a/src/mame/video/pgm.c
+++ b/src/mame/video/pgm.c
@@ -322,7 +322,7 @@ VIDEO_UPDATE( pgm )
{
int y;
- fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+ bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
pgm_sprite_source = pgm_spritebufferram;
draw_sprites(screen->machine, 1, bitmap);
diff --git a/src/mame/video/pitnrun.c b/src/mame/video/pitnrun.c
index 7e3d577c93e..e87134f9bb4 100644
--- a/src/mame/video/pitnrun.c
+++ b/src/mame/video/pitnrun.c
@@ -248,7 +248,7 @@ VIDEO_UPDATE( pitnrun )
}
#endif
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
if(!(pitnrun_ha&4))
tilemap_draw(bitmap,cliprect,bg, 0,0);
diff --git a/src/mame/video/pktgaldx.c b/src/mame/video/pktgaldx.c
index 65012b18bfc..51f23ea4e33 100644
--- a/src/mame/video/pktgaldx.c
+++ b/src/mame/video/pktgaldx.c
@@ -88,8 +88,8 @@ VIDEO_UPDATE(pktgaldx)
flip_screen_set( deco16_pf12_control[0]&0x80 );
deco16_pf12_update(deco16_pf1_rowscroll,deco16_pf2_rowscroll);
- fillbitmap(bitmap,0,cliprect); /* not Confirmed */
- fillbitmap(priority_bitmap,0,NULL);
+ bitmap_fill(bitmap,cliprect,0); /* not Confirmed */
+ bitmap_fill(priority_bitmap,NULL,0);
deco16_tilemap_2_draw(bitmap,cliprect,0,0);
draw_sprites(screen->machine,bitmap,cliprect);
@@ -109,7 +109,7 @@ VIDEO_UPDATE(pktgaldb)
int tileno;
int colour;
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
/* the bootleg seems to treat the tilemaps as sprites */
for (offset = 0;offset<0x1600/2;offset+=8)
diff --git a/src/mame/video/playch10.c b/src/mame/video/playch10.c
index 954da615666..6b29d1ff0d2 100644
--- a/src/mame/video/playch10.c
+++ b/src/mame/video/playch10.c
@@ -148,7 +148,7 @@ VIDEO_UPDATE( playch10 )
/* render the ppu */
ppu2c0x_render( 0, bitmap, 0, 0, 0, 0 );
else
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
}
else
{
@@ -157,7 +157,7 @@ VIDEO_UPDATE( playch10 )
if ( !pc10_sdcs )
tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0);
else
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
}
}
else /* Single Monitor version */
diff --git a/src/mame/video/playmark.c b/src/mame/video/playmark.c
index 33418afa199..37aedce2fe7 100644
--- a/src/mame/video/playmark.c
+++ b/src/mame/video/playmark.c
@@ -412,7 +412,7 @@ static void draw_bitmap(bitmap_t *bitmap, const rectangle *cliprect)
VIDEO_UPDATE( bigtwin )
{
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
tilemap_draw(bitmap,cliprect,fg_tilemap,0,0);
if (bg_enable)
@@ -424,7 +424,7 @@ VIDEO_UPDATE( bigtwin )
VIDEO_UPDATE( excelsr )
{
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
tilemap_draw(bitmap,cliprect,fg_tilemap,0,1);
if (bg_enable)
@@ -450,7 +450,7 @@ VIDEO_UPDATE( wbeachvl )
tilemap_set_scrollx(fg_tilemap,0,fgscrollx);
}
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
tilemap_draw(bitmap,cliprect,bg_tilemap,0,1);
tilemap_draw(bitmap,cliprect,fg_tilemap,0,2);
@@ -461,7 +461,7 @@ VIDEO_UPDATE( wbeachvl )
VIDEO_UPDATE( hrdtimes )
{
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
// video enabled
if(playmark_scroll[6] & 1)
@@ -472,6 +472,6 @@ VIDEO_UPDATE( hrdtimes )
tilemap_draw(bitmap,cliprect,tx_tilemap,0,0);
}
else
- fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+ bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
return 0;
}
diff --git a/src/mame/video/plygonet.c b/src/mame/video/plygonet.c
index d8829429834..fedc1c9202d 100644
--- a/src/mame/video/plygonet.c
+++ b/src/mame/video/plygonet.c
@@ -87,8 +87,8 @@ VIDEO_START( polygonet )
VIDEO_UPDATE( polygonet )
{
- fillbitmap(priority_bitmap, 0, NULL);
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ bitmap_fill(priority_bitmap, NULL, 0);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
tilemap_draw(bitmap, cliprect, ttl_tilemap, 0, 1<<0);
return 0;
diff --git a/src/mame/video/poolshrk.c b/src/mame/video/poolshrk.c
index 57073f77b17..fc531ed8b38 100644
--- a/src/mame/video/poolshrk.c
+++ b/src/mame/video/poolshrk.c
@@ -35,7 +35,7 @@ VIDEO_UPDATE( poolshrk )
tilemap_mark_all_tiles_dirty(bg_tilemap);
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
/* draw sprites */
diff --git a/src/mame/video/popeye.c b/src/mame/video/popeye.c
index 63141499681..8dcd4936530 100644
--- a/src/mame/video/popeye.c
+++ b/src/mame/video/popeye.c
@@ -280,7 +280,7 @@ static void draw_background(running_machine *machine, bitmap_t *bitmap, const re
set_background_palette(machine, (*popeye_palettebank & 0x08) >> 3);
if (popeye_background_pos[1] == 0) /* no background */
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
else
{
/* copy the background graphics */
diff --git a/src/mame/video/powerins.c b/src/mame/video/powerins.c
index fc84998b8e0..00ec316fe6c 100644
--- a/src/mame/video/powerins.c
+++ b/src/mame/video/powerins.c
@@ -366,7 +366,7 @@ if (input_code_pressed(KEYCODE_Z))
#endif
if (layers_ctrl&1) tilemap_draw(bitmap,cliprect, tilemap_0, 0, 0);
- else fillbitmap(bitmap,0,cliprect);
+ else bitmap_fill(bitmap,cliprect,0);
if (layers_ctrl&8) draw_sprites(screen->machine,bitmap,cliprect);
if (layers_ctrl&2) tilemap_draw(bitmap,cliprect, tilemap_1, 0, 0);
return 0;
diff --git a/src/mame/video/psikyo.c b/src/mame/video/psikyo.c
index 5297b17d2d9..82bb93f71c6 100644
--- a/src/mame/video/psikyo.c
+++ b/src/mame/video/psikyo.c
@@ -576,9 +576,9 @@ VIDEO_UPDATE( psikyo )
tilemap_set_transparent_pen(tilemap_1_size2,(layer1_ctrl & 8 ?0:15));
tilemap_set_transparent_pen(tilemap_1_size3,(layer1_ctrl & 8 ?0:15));
- fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+ bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
if (layers_ctrl & 1)
tilemap_draw(bitmap,cliprect,tmptilemap0, layer0_ctrl & 2 ? TILEMAP_DRAW_OPAQUE : 0, 1);
diff --git a/src/mame/video/psikyo4.c b/src/mame/video/psikyo4.c
index c95599e37e6..4af376e6ce9 100644
--- a/src/mame/video/psikyo4.c
+++ b/src/mame/video/psikyo4.c
@@ -130,12 +130,12 @@ VIDEO_UPDATE( psikyo4 )
if (screen == left_screen)
{
- fillbitmap(bitmap, 0x1000, cliprect);
+ bitmap_fill(bitmap, cliprect, 0x1000);
draw_sprites(screen->machine, bitmap, cliprect, 0x0000);
}
if (screen == right_screen)
{
- fillbitmap(bitmap, 0x1001, cliprect);
+ bitmap_fill(bitmap, cliprect, 0x1001);
draw_sprites(screen->machine, bitmap, cliprect, 0x2000);
}
return 0;
diff --git a/src/mame/video/psikyosh.c b/src/mame/video/psikyosh.c
index 9516519e595..9d5f7e410ec 100644
--- a/src/mame/video/psikyosh.c
+++ b/src/mame/video/psikyosh.c
@@ -294,7 +294,7 @@ static void draw_bglayerscroll(running_machine *machine, int layer, bitmap_t *bi
/* Looks better with blending and one scroll value than with 1D linescroll and no zoom */
#if 0
int bg_scrollx[256], bg_scrolly[512];
- fillbitmap(zoom_bitmap, get_black_pen(screen->machine), NULL);
+ bitmap_fill(zoom_bitmap, NULL, get_black_pen(screen->machine));
for (offs=0; offs<(0x400/4); offs++) /* 224 values for each */
{
bg_scrollx[offs] = (psikyosh_bgram[(scrollbank*0x800)/4 + offs - 0x4000/4] & 0x000001ff) >> 0;
@@ -1130,8 +1130,8 @@ static void psikyosh_postlineblend( bitmap_t *bitmap, const rectangle *cliprect
VIDEO_UPDATE( psikyosh ) /* Note the z-buffer on each sprite to get correct priority */
{
int i;
- fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
- fillbitmap(z_bitmap,0,cliprect); /* z-buffer */
+ bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
+ bitmap_fill(z_bitmap,cliprect,0); /* z-buffer */
psikyosh_prelineblend(bitmap, cliprect);
diff --git a/src/mame/video/psx.c b/src/mame/video/psx.c
index bd168ecf4f1..754520d1ba4 100644
--- a/src/mame/video/psx.c
+++ b/src/mame/video/psx.c
@@ -307,7 +307,7 @@ static void DebugMesh( running_machine *machine, int n_coordx, int n_coordy )
if( m_b_debugclear )
{
- fillbitmap( debugmesh, 0x0000, NULL );
+ bitmap_fill( debugmesh, NULL , 0x0000);
m_b_debugclear = 0;
}
@@ -815,7 +815,7 @@ VIDEO_UPDATE( psx )
if( ( m_n_gpustatus & ( 1 << 0x17 ) ) != 0 )
{
/* todo: only draw to necessary area */
- fillbitmap( bitmap, 0, cliprect );
+ bitmap_fill( bitmap, cliprect , 0);
}
else
{
diff --git a/src/mame/video/psychic5.c b/src/mame/video/psychic5.c
index a532166da7a..710870d45a6 100644
--- a/src/mame/video/psychic5.c
+++ b/src/mame/video/psychic5.c
@@ -442,7 +442,7 @@ static void draw_background(running_machine *machine, bitmap_t *bitmap, const re
VIDEO_UPDATE( psychic5 )
{
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
if (psychic5_bg_status & 1) /* Backgound enable */
draw_background(screen->machine, bitmap, cliprect);
if (!(title_screen & 1))
@@ -456,7 +456,7 @@ VIDEO_UPDATE( bombsa )
if (psychic5_bg_status & 1) /* Backgound enable */
tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0);
else
- fillbitmap(bitmap, screen->machine->pens[0x0ff], cliprect);
+ bitmap_fill(bitmap, cliprect, screen->machine->pens[0x0ff]);
draw_sprites(screen->machine, bitmap, cliprect);
tilemap_draw(bitmap, cliprect, fg_tilemap, 0, 0);
return 0;
diff --git a/src/mame/video/qdrmfgp.c b/src/mame/video/qdrmfgp.c
index f22f9110880..ad6ae0fd6e9 100644
--- a/src/mame/video/qdrmfgp.c
+++ b/src/mame/video/qdrmfgp.c
@@ -59,7 +59,7 @@ VIDEO_START( qdrmfgp2 )
VIDEO_UPDATE( qdrmfgp )
{
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
K056832_tilemap_draw(screen->machine, bitmap,cliprect, 3, 0, 1);
K056832_tilemap_draw(screen->machine, bitmap,cliprect, 2, 0, 2);
diff --git a/src/mame/video/quizdna.c b/src/mame/video/quizdna.c
index 8d73fb213e5..32ac485e30a 100644
--- a/src/mame/video/quizdna.c
+++ b/src/mame/video/quizdna.c
@@ -202,6 +202,6 @@ VIDEO_UPDATE( quizdna )
tilemap_draw(bitmap, cliprect, quizdna_fg_tilemap, 0, 0);
}
else
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
return 0;
}
diff --git a/src/mame/video/rallyx.c b/src/mame/video/rallyx.c
index 0cccdddd36e..4a96b06964e 100644
--- a/src/mame/video/rallyx.c
+++ b/src/mame/video/rallyx.c
@@ -662,7 +662,7 @@ VIDEO_UPDATE( rallyx )
fg_clip.min_x = 28*8;
}
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
tilemap_draw(bitmap,&bg_clip,bg_tilemap,0,0);
tilemap_draw(bitmap,&fg_clip,fg_tilemap,0,0);
@@ -694,7 +694,7 @@ VIDEO_UPDATE( jungler )
fg_clip.min_x = 28*8;
}
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
/* tile priority doesn't seem to be supported in Jungler */
tilemap_draw(bitmap,&bg_clip,bg_tilemap,0,0);
@@ -739,7 +739,7 @@ VIDEO_UPDATE( locomotn )
fg_clip.min_x = 28*8;
}
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
tilemap_draw(bitmap,&bg_clip,bg_tilemap,0,0);
tilemap_draw(bitmap,&fg_clip,fg_tilemap,0,0);
diff --git a/src/mame/video/rastan.c b/src/mame/video/rastan.c
index 892a2b01a93..6ab882ecd47 100644
--- a/src/mame/video/rastan.c
+++ b/src/mame/video/rastan.c
@@ -102,7 +102,7 @@ VIDEO_UPDATE( rastan )
layer[0] = 0;
layer[1] = 1;
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
PC080SN_tilemap_draw(bitmap,cliprect,0,layer[0],TILEMAP_DRAW_OPAQUE,1);
PC080SN_tilemap_draw(bitmap,cliprect,0,layer[1],0,2);
@@ -122,7 +122,7 @@ VIDEO_UPDATE( opwolf )
layer[0] = 0;
layer[1] = 1;
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
PC080SN_tilemap_draw(bitmap,cliprect,0,layer[0],TILEMAP_DRAW_OPAQUE,1);
PC080SN_tilemap_draw(bitmap,cliprect,0,layer[1],0,2);
@@ -146,7 +146,7 @@ VIDEO_UPDATE( rainbow )
layer[0] = 0;
layer[1] = 1;
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
PC080SN_tilemap_draw(bitmap,cliprect,0,layer[0],TILEMAP_DRAW_OPAQUE,1);
PC080SN_tilemap_draw(bitmap,cliprect,0,layer[1],0,2);
@@ -178,7 +178,7 @@ VIDEO_UPDATE( jumping )
layer[0] = 0;
layer[1] = 1;
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
PC080SN_tilemap_draw(bitmap,cliprect,0,layer[0],TILEMAP_DRAW_OPAQUE,0);
diff --git a/src/mame/video/realbrk.c b/src/mame/video/realbrk.c
index 60d73e3f033..ae62d3a18c8 100644
--- a/src/mame/video/realbrk.c
+++ b/src/mame/video/realbrk.c
@@ -297,8 +297,8 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan
// buffer the tile and rotate it into bitmap
if( rot )
{
- fillbitmap( tmpbitmap0, 0, &spritetile_clip );
- fillbitmap( tmpbitmap1, 0, &spritetile_clip );
+ bitmap_fill( tmpbitmap0, &spritetile_clip , 0);
+ bitmap_fill( tmpbitmap1, &spritetile_clip , 0);
drawgfxzoom( tmpbitmap0,machine->gfx[gfx],
code++,
color,
@@ -516,11 +516,11 @@ if ( input_code_pressed(KEYCODE_Z) )
if (disable_video)
{
- fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+ bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
return 0;
}
else
- fillbitmap(bitmap,realbrk_vregs[0xc/2] & 0x7fff,cliprect);
+ bitmap_fill(bitmap,cliprect,realbrk_vregs[0xc/2] & 0x7fff);
if (layers_ctrl & 2) tilemap_draw(bitmap,cliprect,tilemap_1,0,0);
if (layers_ctrl & 1) tilemap_draw(bitmap,cliprect,tilemap_0,0,0);
@@ -584,11 +584,11 @@ if ( input_code_pressed(KEYCODE_Z) )
if (disable_video)
{
- fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+ bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
return 0;
}
else
- fillbitmap(bitmap,realbrk_vregs[0xc/2] & 0x7fff,cliprect);
+ bitmap_fill(bitmap,cliprect,realbrk_vregs[0xc/2] & 0x7fff);
diff --git a/src/mame/video/redclash.c b/src/mame/video/redclash.c
index c7156635968..b3e72c15d3e 100644
--- a/src/mame/video/redclash.c
+++ b/src/mame/video/redclash.c
@@ -421,7 +421,7 @@ VIDEO_EOF( redclash )
VIDEO_UPDATE( redclash )
{
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
redclash_draw_stars(bitmap, cliprect, 0x60, 0, 0x00, 0xff);
draw_sprites(screen->machine, bitmap, cliprect);
draw_bullets(bitmap, cliprect);
diff --git a/src/mame/video/relief.c b/src/mame/video/relief.c
index b6bb008b315..b1fa8fc7032 100644
--- a/src/mame/video/relief.c
+++ b/src/mame/video/relief.c
@@ -111,7 +111,7 @@ VIDEO_UPDATE( relief )
int x, y, r;
/* draw the playfield */
- fillbitmap(priority_bitmap, 0, cliprect);
+ bitmap_fill(priority_bitmap, cliprect, 0);
tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 0, 0);
tilemap_draw(bitmap, cliprect, atarigen_playfield2_tilemap, 0, 1);
diff --git a/src/mame/video/rohga.c b/src/mame/video/rohga.c
index b89aaa97e16..f9a8fb0dcdc 100644
--- a/src/mame/video/rohga.c
+++ b/src/mame/video/rohga.c
@@ -444,8 +444,8 @@ static void update_rohga(running_machine *machine, bitmap_t *bitmap, const recta
deco16_pf34_update(deco16_pf3_rowscroll,deco16_pf4_rowscroll);
/* Draw playfields */
- fillbitmap(priority_bitmap,0,cliprect);
- fillbitmap(bitmap,machine->pens[768],cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
+ bitmap_fill(bitmap,cliprect,machine->pens[768]);
switch (deco16_priority&3)
{
@@ -501,7 +501,7 @@ VIDEO_UPDATE( wizdfire )
deco16_pf34_update(deco16_pf3_rowscroll,deco16_pf4_rowscroll);
/* Draw playfields - Palette of 2nd playfield chip visible if playfields turned off */
- fillbitmap(bitmap,screen->machine->pens[512],cliprect);
+ bitmap_fill(bitmap,cliprect,screen->machine->pens[512]);
deco16_tilemap_4_draw(bitmap,cliprect,TILEMAP_DRAW_OPAQUE,0);
wizdfire_draw_sprites(screen->machine,bitmap,cliprect,buffered_spriteram16,4,3);
@@ -530,8 +530,8 @@ VIDEO_UPDATE( nitrobal )
deco16_pf34_update(deco16_pf3_rowscroll,deco16_pf4_rowscroll);
/* Draw playfields - Palette of 2nd playfield chip visible if playfields turned off */
- fillbitmap(bitmap,screen->machine->pens[512],cliprect);
- fillbitmap(priority_bitmap,0,NULL);
+ bitmap_fill(bitmap,cliprect,screen->machine->pens[512]);
+ bitmap_fill(priority_bitmap,NULL,0);
deco16_clear_sprite_priority_bitmap();
/* pf3 and pf4 are combined into a single 8bpp bitmap */
diff --git a/src/mame/video/rollerg.c b/src/mame/video/rollerg.c
index 65857e8635a..2b70e5752fa 100644
--- a/src/mame/video/rollerg.c
+++ b/src/mame/video/rollerg.c
@@ -68,8 +68,8 @@ VIDEO_START( rollerg )
VIDEO_UPDATE( rollerg )
{
- fillbitmap(priority_bitmap,0,cliprect);
- fillbitmap(bitmap,16 * bg_colorbase,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
+ bitmap_fill(bitmap,cliprect,16 * bg_colorbase);
K051316_zoom_draw_0(bitmap,cliprect,0,1);
K053245_sprites_draw(0,bitmap,cliprect);
return 0;
diff --git a/src/mame/video/rollrace.c b/src/mame/video/rollrace.c
index 1e47da35a06..44050cee9f2 100644
--- a/src/mame/video/rollrace.c
+++ b/src/mame/video/rollrace.c
@@ -67,7 +67,7 @@ VIDEO_UPDATE( rollrace )
const UINT8 *mem = memory_region(screen->machine, "user1");
/* fill in background colour*/
- fillbitmap(bitmap,ra_bkgpen,cliprect);
+ bitmap_fill(bitmap,cliprect,ra_bkgpen);
/* draw road */
for (offs = videoram_size - 1;offs >= 0;offs--)
diff --git a/src/mame/video/rungun.c b/src/mame/video/rungun.c
index 085148db4c7..bb3395853c4 100644
--- a/src/mame/video/rungun.c
+++ b/src/mame/video/rungun.c
@@ -114,8 +114,8 @@ VIDEO_START(rng)
VIDEO_UPDATE(rng)
{
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
- fillbitmap(priority_bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
+ bitmap_fill(priority_bitmap, cliprect, 0);
K053936_0_zoom_draw(bitmap, cliprect, rng_936_tilemap, 0, 0);
diff --git a/src/mame/video/segag80r.c b/src/mame/video/segag80r.c
index 91df029cbbc..75da2d97e5b 100644
--- a/src/mame/video/segag80r.c
+++ b/src/mame/video/segag80r.c
@@ -747,7 +747,7 @@ static void draw_background_page_scroll(bitmap_t *bitmap, const rectangle *clipr
/* if disabled, draw nothing */
if (!bg_enable)
{
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
return;
}
@@ -787,7 +787,7 @@ static void draw_background_full_scroll(bitmap_t *bitmap, const rectangle *clipr
/* if disabled, draw nothing */
if (!bg_enable)
{
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
return;
}
diff --git a/src/mame/video/segahang.c b/src/mame/video/segahang.c
index d89edff94e3..61f6bfdfc0b 100644
--- a/src/mame/video/segahang.c
+++ b/src/mame/video/segahang.c
@@ -60,12 +60,12 @@ VIDEO_UPDATE( hangon )
/* if no drawing is happening, fill with black and get out */
if (!segaic16_display_enable)
{
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
return 0;
}
/* reset priorities */
- fillbitmap(priority_bitmap, 0, cliprect);
+ bitmap_fill(priority_bitmap, cliprect, 0);
/* draw the low priority road layer */
segaic16_road_draw(0, bitmap, cliprect, SEGAIC16_ROAD_BACKGROUND);
diff --git a/src/mame/video/segaorun.c b/src/mame/video/segaorun.c
index 5266737489b..a2953180806 100644
--- a/src/mame/video/segaorun.c
+++ b/src/mame/video/segaorun.c
@@ -58,7 +58,7 @@ VIDEO_START( outrun )
VIDEO_UPDATE( shangon )
{
/* reset priorities */
- fillbitmap(priority_bitmap, 0, cliprect);
+ bitmap_fill(priority_bitmap, cliprect, 0);
/* draw the low priority road layer */
segaic16_road_draw(0, bitmap, cliprect, SEGAIC16_ROAD_BACKGROUND);
@@ -91,12 +91,12 @@ VIDEO_UPDATE( outrun )
/* if no drawing is happening, fill with black and get out */
if (!segaic16_display_enable)
{
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
return 0;
}
/* reset priorities */
- fillbitmap(priority_bitmap, 0, cliprect);
+ bitmap_fill(priority_bitmap, cliprect, 0);
/* draw the low priority road layer */
segaic16_road_draw(0, bitmap, cliprect, SEGAIC16_ROAD_BACKGROUND);
diff --git a/src/mame/video/segas16a.c b/src/mame/video/segas16a.c
index da5b3653bf7..a87a5774107 100644
--- a/src/mame/video/segas16a.c
+++ b/src/mame/video/segas16a.c
@@ -41,12 +41,12 @@ VIDEO_UPDATE( system16a )
/* if no drawing is happening, fill with black and get out */
if (!segaic16_display_enable)
{
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
return 0;
}
/* reset priorities */
- fillbitmap(priority_bitmap, 0, cliprect);
+ bitmap_fill(priority_bitmap, cliprect, 0);
/* draw background opaquely first, not setting any priorities */
segaic16_tilemap_draw(screen->machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_BACKGROUND, 0 | TILEMAP_DRAW_OPAQUE, 0x00);
diff --git a/src/mame/video/segas16b.c b/src/mame/video/segas16b.c
index 77ca7a16e55..e1456c7d320 100644
--- a/src/mame/video/segas16b.c
+++ b/src/mame/video/segas16b.c
@@ -53,12 +53,12 @@ VIDEO_UPDATE( system16b )
/* if no drawing is happening, fill with black and get out */
if (!segaic16_display_enable)
{
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
return 0;
}
/* reset priorities */
- fillbitmap(priority_bitmap, 0, cliprect);
+ bitmap_fill(priority_bitmap, cliprect, 0);
/* draw background opaquely first, not setting any priorities */
segaic16_tilemap_draw(screen->machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_BACKGROUND, 0 | TILEMAP_DRAW_OPAQUE, 0x00);
diff --git a/src/mame/video/segas18.c b/src/mame/video/segas18.c
index 213bbce9497..dfd1a90d5d1 100644
--- a/src/mame/video/segas18.c
+++ b/src/mame/video/segas18.c
@@ -205,7 +205,7 @@ VIDEO_UPDATE( system18 )
/* if no drawing is happening, fill with black and get out */
if (!segaic16_display_enable)
{
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
return 0;
}
@@ -214,7 +214,7 @@ VIDEO_UPDATE( system18 )
system18_vdp_update(tempbitmap, cliprect);
/* reset priorities */
- fillbitmap(priority_bitmap, 0, cliprect);
+ bitmap_fill(priority_bitmap, cliprect, 0);
/* draw background opaquely first, not setting any priorities */
segaic16_tilemap_draw(screen->machine, 0, bitmap, cliprect, SEGAIC16_TILEMAP_BACKGROUND, 0 | TILEMAP_DRAW_OPAQUE, 0x00);
@@ -242,7 +242,7 @@ VIDEO_UPDATE( system18 )
#if DEBUG_VDP
if (vdp_enable && input_code_pressed(KEYCODE_V))
{
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
update_system18_vdp(bitmap, cliprect);
}
if (vdp_enable && input_code_pressed(KEYCODE_B))
diff --git a/src/mame/video/segas24.c b/src/mame/video/segas24.c
index 0c024d71343..a9cf1bc1858 100644
--- a/src/mame/video/segas24.c
+++ b/src/mame/video/segas24.c
@@ -27,14 +27,14 @@ VIDEO_UPDATE(system24)
int order[12], spri[4];
if(sys24_mixer_get_reg(13) & 1) {
- fillbitmap(bitmap, get_black_pen(screen->machine), 0);
+ bitmap_fill(bitmap, 0, get_black_pen(screen->machine));
return 0;
}
sys24_tile_update(screen->machine);
- fillbitmap(priority_bitmap, 0, 0);
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(priority_bitmap, 0, 0);
+ bitmap_fill(bitmap, cliprect, 0);
for(i=0; i<12; i++)
order[i] = i;
diff --git a/src/mame/video/segas32.c b/src/mame/video/segas32.c
index 7845531662d..a9a2f2bb53d 100644
--- a/src/mame/video/segas32.c
+++ b/src/mame/video/segas32.c
@@ -1570,11 +1570,11 @@ static UINT8 update_tilemaps(const device_config *screen, const rectangle *clipr
static void sprite_erase_buffer(void)
{
/* erase the visible sprite buffer and clear the checksums */
- fillbitmap(layer_data[MIXER_LAYER_SPRITES].bitmap, 0xffff, NULL);
+ bitmap_fill(layer_data[MIXER_LAYER_SPRITES].bitmap, NULL, 0xffff);
/* for multi32, erase the other buffer as well */
if (is_multi32)
- fillbitmap(layer_data[MIXER_LAYER_MULTISPR].bitmap, 0xffff, NULL);
+ bitmap_fill(layer_data[MIXER_LAYER_MULTISPR].bitmap, NULL, 0xffff);
}
@@ -2460,7 +2460,7 @@ VIDEO_UPDATE( system32 )
/* if the display is off, punt */
if (!system32_displayenable[0])
{
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
return 0;
}
@@ -2640,7 +2640,7 @@ VIDEO_UPDATE( multi32 )
/* if the display is off, punt */
if (!system32_displayenable[(screen == left_screen) ? 0 : 1])
{
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
return 0;
}
diff --git a/src/mame/video/segaxbd.c b/src/mame/video/segaxbd.c
index 440900589f1..19b43f8420f 100644
--- a/src/mame/video/segaxbd.c
+++ b/src/mame/video/segaxbd.c
@@ -68,12 +68,12 @@ VIDEO_UPDATE( xboard )
/* if no drawing is happening, fill with black and get out */
if (!segaic16_display_enable)
{
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
return 0;
}
/* reset priorities */
- fillbitmap(priority_bitmap, 0, cliprect);
+ bitmap_fill(priority_bitmap, cliprect, 0);
/* draw the low priority road layer */
segaic16_road_draw(0, bitmap, cliprect, SEGAIC16_ROAD_BACKGROUND);
diff --git a/src/mame/video/segaybd.c b/src/mame/video/segaybd.c
index 1b27d3c5309..5983491bc15 100644
--- a/src/mame/video/segaybd.c
+++ b/src/mame/video/segaybd.c
@@ -57,7 +57,7 @@ VIDEO_UPDATE( yboard )
/* if no drawing is happening, fill with black and get out */
if (!segaic16_display_enable)
{
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
return 0;
}
diff --git a/src/mame/video/seibuspi.c b/src/mame/video/seibuspi.c
index a3715b49138..9f23b46aee7 100644
--- a/src/mame/video/seibuspi.c
+++ b/src/mame/video/seibuspi.c
@@ -624,7 +624,7 @@ VIDEO_UPDATE( spi )
}
if( layer_enable & 0x1 )
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
if (!(layer_enable & 0x1))
combine_tilemap(screen->machine, bitmap, cliprect, back_layer, spi_scrollram[0] & 0xffff, (spi_scrollram[0] >> 16) & 0xffff, 1, back_rowscroll);
diff --git a/src/mame/video/sengokmj.c b/src/mame/video/sengokmj.c
index 56848e87c82..74d453fe7a6 100644
--- a/src/mame/video/sengokmj.c
+++ b/src/mame/video/sengokmj.c
@@ -125,7 +125,7 @@ VIDEO_START( sengokmj )
VIDEO_UPDATE( sengokmj )
{
- fillbitmap(bitmap, screen->machine->pens[0x7ff], cliprect); //black pen
+ bitmap_fill(bitmap, cliprect, screen->machine->pens[0x7ff]); //black pen
if(!(sengokmj_layer_en & 1))
tilemap_draw(bitmap,cliprect,bg_tilemap,0,0);
diff --git a/src/mame/video/senjyo.c b/src/mame/video/senjyo.c
index 879619571bb..f8c607496a1 100644
--- a/src/mame/video/senjyo.c
+++ b/src/mame/video/senjyo.c
@@ -174,7 +174,7 @@ static void draw_bgbitmap(running_machine *machine, bitmap_t *bitmap,const recta
if (senjyo_bgstripes == 0xff) /* off */
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
else
{
pen = 0;
diff --git a/src/mame/video/seta.c b/src/mame/video/seta.c
index 298be624b4e..8b433dec66b 100644
--- a/src/mame/video/seta.c
+++ b/src/mame/video/seta.c
@@ -887,7 +887,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan
VIDEO_UPDATE( seta_no_layers )
{
set_pens(screen->machine);
- fillbitmap(bitmap,0x1f0,cliprect);
+ bitmap_fill(bitmap,cliprect,0x1f0);
draw_sprites(screen->machine,bitmap,cliprect);
return 0;
}
@@ -977,7 +977,7 @@ if (input_code_pressed(KEYCODE_Z))
}
#endif
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
if (order & 1) // swap the layers?
{
diff --git a/src/mame/video/seta2.c b/src/mame/video/seta2.c
index 5ab6e7c1e95..8bd06b9235e 100644
--- a/src/mame/video/seta2.c
+++ b/src/mame/video/seta2.c
@@ -375,7 +375,7 @@ VIDEO_START( seta2_offset )
VIDEO_UPDATE( seta2 )
{
/* Black or pen 0? */
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
if (seta2_vregs[0x30/2] & 1) return 0; // BLANK SCREEN
diff --git a/src/mame/video/sf.c b/src/mame/video/sf.c
index 76bfeab02e8..b96f25915a5 100644
--- a/src/mame/video/sf.c
+++ b/src/mame/video/sf.c
@@ -228,7 +228,7 @@ VIDEO_UPDATE( sf )
if (sf_active & 0x20)
tilemap_draw(bitmap,cliprect,bg_tilemap,0,0);
else
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
tilemap_draw(bitmap,cliprect,fg_tilemap,0,0);
diff --git a/src/mame/video/shadfrce.c b/src/mame/video/shadfrce.c
index 54decb623d2..2d5ba6b6ceb 100644
--- a/src/mame/video/shadfrce.c
+++ b/src/mame/video/shadfrce.c
@@ -151,7 +151,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta
VIDEO_UPDATE( shadfrce )
{
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
if(shadfrce_video_enable)
{
@@ -162,7 +162,7 @@ VIDEO_UPDATE( shadfrce )
}
else
{
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
}
return 0;
diff --git a/src/mame/video/shootout.c b/src/mame/video/shootout.c
index 826e8ad9c05..2e07a650ef5 100644
--- a/src/mame/video/shootout.c
+++ b/src/mame/video/shootout.c
@@ -156,7 +156,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta
VIDEO_UPDATE( shootout )
{
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
tilemap_draw(bitmap,cliprect,background,0,0);
tilemap_draw(bitmap,cliprect,foreground,0,1);
@@ -166,7 +166,7 @@ VIDEO_UPDATE( shootout )
VIDEO_UPDATE( shootouj )
{
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
tilemap_draw(bitmap,cliprect,background,0,0);
tilemap_draw(bitmap,cliprect,foreground,0,1);
diff --git a/src/mame/video/silkroad.c b/src/mame/video/silkroad.c
index e8c2a39b990..893fc094e5f 100644
--- a/src/mame/video/silkroad.c
+++ b/src/mame/video/silkroad.c
@@ -153,7 +153,7 @@ VIDEO_START(silkroad)
VIDEO_UPDATE(silkroad)
{
- fillbitmap(bitmap,0x7c0,cliprect);
+ bitmap_fill(bitmap,cliprect,0x7c0);
tilemap_set_scrollx( fg_tilemap, 0, ((silkroad_regs[0] & 0xffff0000) >> 16) );
tilemap_set_scrolly( fg_tilemap, 0, (silkroad_regs[0] & 0x0000ffff) >> 0 );
diff --git a/src/mame/video/simpl156.c b/src/mame/video/simpl156.c
index 3f0c1c4d5da..da319199443 100644
--- a/src/mame/video/simpl156.c
+++ b/src/mame/video/simpl156.c
@@ -113,11 +113,11 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan
VIDEO_UPDATE( simpl156 )
{
- fillbitmap(priority_bitmap,0,NULL);
+ bitmap_fill(priority_bitmap,NULL,0);
deco16_pf12_update(deco16_pf1_rowscroll,deco16_pf2_rowscroll);
- fillbitmap(bitmap,256,cliprect);
+ bitmap_fill(bitmap,cliprect,256);
deco16_tilemap_2_draw(bitmap,cliprect,0,2);
deco16_tilemap_1_draw(bitmap,cliprect,0,4);
diff --git a/src/mame/video/simpsons.c b/src/mame/video/simpsons.c
index f547ec7fa1d..c9f8a57f6b4 100644
--- a/src/mame/video/simpsons.c
+++ b/src/mame/video/simpsons.c
@@ -162,8 +162,8 @@ VIDEO_UPDATE( simpsons )
sortlayers(layer,layerpri);
- fillbitmap(priority_bitmap,0,cliprect);
- fillbitmap(bitmap,16 * bg_colorbase,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
+ bitmap_fill(bitmap,cliprect,16 * bg_colorbase);
tilemap_draw(bitmap,cliprect,K052109_tilemap[layer[0]],0,1);
tilemap_draw(bitmap,cliprect,K052109_tilemap[layer[1]],0,2);
tilemap_draw(bitmap,cliprect,K052109_tilemap[layer[2]],0,4);
diff --git a/src/mame/video/skyfox.c b/src/mame/video/skyfox.c
index 7f7e359d430..f48626a004c 100644
--- a/src/mame/video/skyfox.c
+++ b/src/mame/video/skyfox.c
@@ -287,7 +287,7 @@ static void draw_background(running_machine *machine, bitmap_t *bitmap, const re
VIDEO_UPDATE( skyfox )
{
- fillbitmap(bitmap,255,cliprect); // the bg is black
+ bitmap_fill(bitmap,cliprect,255); // the bg is black
draw_background(screen->machine, bitmap, cliprect);
draw_sprites(screen->machine, bitmap, cliprect);
return 0;
diff --git a/src/mame/video/skyraid.c b/src/mame/video/skyraid.c
index 68b86b1143f..52575dd5b6a 100644
--- a/src/mame/video/skyraid.c
+++ b/src/mame/video/skyraid.c
@@ -67,7 +67,7 @@ static void draw_terrain(running_machine *machine, bitmap_t* bitmap, const recta
r.max_y = y + 1;
r.max_x = x + 31 - count;
- fillbitmap(bitmap, color, &r);
+ bitmap_fill(bitmap, &r, color);
x += 32 - count;
}
@@ -141,7 +141,7 @@ static void draw_trapezoid(running_machine *machine, bitmap_t* dst, bitmap_t* sr
VIDEO_UPDATE( skyraid )
{
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
draw_terrain(screen->machine, helper, cliprect);
draw_sprites(screen->machine, helper, cliprect);
diff --git a/src/mame/video/slapshot.c b/src/mame/video/slapshot.c
index de1c6126255..316401da787 100644
--- a/src/mame/video/slapshot.c
+++ b/src/mame/video/slapshot.c
@@ -578,8 +578,8 @@ VIDEO_UPDATE( slapshot )
spritepri[2] = TC0360PRI_regs[7] & 0x0f;
spritepri[3] = TC0360PRI_regs[7] >> 4;
- fillbitmap(priority_bitmap,0,cliprect);
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
+ bitmap_fill(bitmap,cliprect,0);
#ifdef MAME_DEBUG
if (dislayer[layer[0]]==0)
diff --git a/src/mame/video/snk68.c b/src/mame/video/snk68.c
index 26e827a670e..ca684e2b35d 100644
--- a/src/mame/video/snk68.c
+++ b/src/mame/video/snk68.c
@@ -264,7 +264,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta
VIDEO_UPDATE( pow )
{
- fillbitmap(bitmap, 0x7ff, cliprect);
+ bitmap_fill(bitmap, cliprect, 0x7ff);
/* This appears to be the correct priority order */
draw_sprites(screen->machine, bitmap, cliprect, 2);
diff --git a/src/mame/video/spbactn.c b/src/mame/video/spbactn.c
index f6d8c944548..fdd8151bce2 100644
--- a/src/mame/video/spbactn.c
+++ b/src/mame/video/spbactn.c
@@ -121,7 +121,7 @@ VIDEO_UPDATE( spbactn )
{
int offs, sx, sy;
- fillbitmap(tile_bitmap_fg, 0, cliprect);
+ bitmap_fill(tile_bitmap_fg, cliprect, 0);
/* draw table bg gfx */
for (sx = sy = offs = 0; offs < 0x4000 / 2; offs++)
diff --git a/src/mame/video/spcforce.c b/src/mame/video/spcforce.c
index e18da2a5da8..1986474347a 100644
--- a/src/mame/video/spcforce.c
+++ b/src/mame/video/spcforce.c
@@ -25,7 +25,7 @@ VIDEO_UPDATE( spcforce )
/* draw the characters as sprites because they could be overlapping */
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
for (offs = 0; offs < videoram_size; offs++)
diff --git a/src/mame/video/speedspn.c b/src/mame/video/speedspn.c
index e8c942162a1..61e5a3ae084 100644
--- a/src/mame/video/speedspn.c
+++ b/src/mame/video/speedspn.c
@@ -94,7 +94,7 @@ VIDEO_UPDATE(speedspn)
{
if (speedspn_display_disable)
{
- fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+ bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
return 0;
}
diff --git a/src/mame/video/sprint8.c b/src/mame/video/sprint8.c
index d5240bfd42f..d3b12533b4d 100644
--- a/src/mame/video/sprint8.c
+++ b/src/mame/video/sprint8.c
@@ -183,7 +183,7 @@ VIDEO_EOF( sprint8 )
tilemap_draw(helper2, visarea, tilemap2, 0, 0);
- fillbitmap(helper1, 0x20, visarea);
+ bitmap_fill(helper1, visarea, 0x20);
draw_sprites(machine, helper1, visarea);
diff --git a/src/mame/video/spy.c b/src/mame/video/spy.c
index 3af0df7632d..ab484914fa9 100644
--- a/src/mame/video/spy.c
+++ b/src/mame/video/spy.c
@@ -68,10 +68,10 @@ VIDEO_UPDATE( spy )
{
K052109_tilemap_update();
- fillbitmap(priority_bitmap, 0, cliprect);
+ bitmap_fill(priority_bitmap, cliprect, 0);
if (!spy_video_enable)
- fillbitmap(bitmap,16 * layer_colorbase[0],cliprect);
+ bitmap_fill(bitmap,cliprect,16 * layer_colorbase[0]);
else
{
tilemap_draw(bitmap,cliprect,K052109_tilemap[1],TILEMAP_DRAW_OPAQUE,1);
diff --git a/src/mame/video/srmp2.c b/src/mame/video/srmp2.c
index fbbc167add6..a389af8a056 100644
--- a/src/mame/video/srmp2.c
+++ b/src/mame/video/srmp2.c
@@ -434,7 +434,7 @@ static void mjyuugi_draw_sprites(running_machine *machine, bitmap_t *bitmap, con
VIDEO_UPDATE( srmp2 )
{
- fillbitmap(bitmap, 0x1ff, cliprect);
+ bitmap_fill(bitmap, cliprect, 0x1ff);
srmp2_draw_sprites(screen->machine, bitmap, cliprect);
return 0;
}
@@ -442,7 +442,7 @@ VIDEO_UPDATE( srmp2 )
VIDEO_UPDATE( srmp3 )
{
- fillbitmap(bitmap, 0x1f0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0x1f0);
srmp3_draw_sprites(screen->machine, bitmap, cliprect);
return 0;
}
@@ -450,7 +450,7 @@ VIDEO_UPDATE( srmp3 )
VIDEO_UPDATE( mjyuugi )
{
- fillbitmap(bitmap, 0x1f0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0x1f0);
mjyuugi_draw_sprites(screen->machine, bitmap, cliprect);
return 0;
}
diff --git a/src/mame/video/sshangha.c b/src/mame/video/sshangha.c
index 4bf04e450a4..5519cd81281 100644
--- a/src/mame/video/sshangha.c
+++ b/src/mame/video/sshangha.c
@@ -233,7 +233,7 @@ VIDEO_UPDATE( sshangha )
tilemap_set_scrolly( pf1_16x16_tilemap,0, sshangha_control_0[2] );
if ((sshangha_control_0[5]&0x8000)==0)
- fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+ bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
/* Super Shanghai has a mode where the two tilemaps are combined to
produce a 6bpp tilemap. We can't precompute this as any tiles can be
diff --git a/src/mame/video/sslam.c b/src/mame/video/sslam.c
index d65dbf95968..89c13fc7510 100644
--- a/src/mame/video/sslam.c
+++ b/src/mame/video/sslam.c
@@ -165,7 +165,7 @@ VIDEO_UPDATE(sslam)
{
if(!(sslam_regs[6] & 1))
{
- fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+ bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
return 0;
}
@@ -203,7 +203,7 @@ VIDEO_UPDATE(powerbls)
{
if(!(sslam_regs[6] & 1))
{
- fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+ bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
return 0;
}
diff --git a/src/mame/video/ssv.c b/src/mame/video/ssv.c
index 19c2cb6fc81..94adf903e4d 100644
--- a/src/mame/video/ssv.c
+++ b/src/mame/video/ssv.c
@@ -1158,7 +1158,7 @@ VIDEO_UPDATE( ssv )
}
/* The background color is the first one in the palette */
- fillbitmap(bitmap,0, cliprect);
+ bitmap_fill(bitmap,cliprect, 0);
if (!enable_video) return 0;
diff --git a/src/mame/video/st0016.c b/src/mame/video/st0016.c
index 224e6d16f70..17f743dd0a3 100644
--- a/src/mame/video/st0016.c
+++ b/src/mame/video/st0016.c
@@ -649,7 +649,7 @@ VIDEO_UPDATE( st0016 )
//super eagle shot
int x,y,dy;
- fillbitmap(speglsht_bitmap,0,NULL);
+ bitmap_fill(speglsht_bitmap,NULL,0);
dy=(speglsht_videoreg&0x20)?(256*512):0; //visible frame
for(y=0;y<256;y++)
@@ -690,7 +690,7 @@ VIDEO_UPDATE( st0016 )
}
}
- fillbitmap(bitmap,UNUSED_PEN,cliprect);
+ bitmap_fill(bitmap,cliprect,UNUSED_PEN);
draw_bgmap(screen->machine, bitmap,cliprect,0);
draw_sprites(screen->machine, bitmap,cliprect);
draw_bgmap(screen->machine, bitmap,cliprect,1);
diff --git a/src/mame/video/stactics.c b/src/mame/video/stactics.c
index ab80c19d033..bda99603c64 100644
--- a/src/mame/video/stactics.c
+++ b/src/mame/video/stactics.c
@@ -240,7 +240,7 @@ static void draw_background(stactics_state *state, bitmap_t *bitmap, const recta
{
int y;
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
/* for every row */
for (y = 0; y < 0x100; y++)
diff --git a/src/mame/video/starcrus.c b/src/mame/video/starcrus.c
index bed44516029..80ddb8bd3c6 100644
--- a/src/mame/video/starcrus.c
+++ b/src/mame/video/starcrus.c
@@ -197,8 +197,8 @@ static int collision_check_s1s2(running_machine *machine)
clip.min_y=0;
clip.max_y=15;
- fillbitmap(ship1_vid,0,&clip);
- fillbitmap(ship2_vid,0,&clip);
+ bitmap_fill(ship1_vid,&clip,0);
+ bitmap_fill(ship2_vid,&clip,0);
/* origin is with respect to ship1 */
@@ -255,8 +255,8 @@ static int collision_check_p1p2(running_machine *machine)
clip.min_y=0;
clip.max_y=15;
- fillbitmap(proj1_vid,0,&clip);
- fillbitmap(proj2_vid,0,&clip);
+ bitmap_fill(proj1_vid,&clip,0);
+ bitmap_fill(proj2_vid,&clip,0);
/* origin is with respect to proj1 */
@@ -319,9 +319,9 @@ static int collision_check_s1p1p2(running_machine *machine)
clip.min_y=0;
clip.max_y=15;
- fillbitmap(ship1_vid,0,&clip);
- fillbitmap(proj1_vid,0,&clip);
- fillbitmap(proj2_vid,0,&clip);
+ bitmap_fill(ship1_vid,&clip,0);
+ bitmap_fill(proj1_vid,&clip,0);
+ bitmap_fill(proj2_vid,&clip,0);
/* origin is with respect to ship1 */
@@ -401,9 +401,9 @@ static int collision_check_s2p1p2(running_machine *machine)
clip.min_y=0;
clip.max_y=15;
- fillbitmap(ship2_vid,0,&clip);
- fillbitmap(proj1_vid,0,&clip);
- fillbitmap(proj2_vid,0,&clip);
+ bitmap_fill(ship2_vid,&clip,0);
+ bitmap_fill(proj1_vid,&clip,0);
+ bitmap_fill(proj2_vid,&clip,0);
/* origin is with respect to ship2 */
@@ -467,7 +467,7 @@ static int collision_check_s2p1p2(running_machine *machine)
VIDEO_UPDATE( starcrus )
{
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
/* Draw ship 1 */
drawgfx(bitmap,
diff --git a/src/mame/video/starshp1.c b/src/mame/video/starshp1.c
index c68e9e92039..6068bc98baa 100644
--- a/src/mame/video/starshp1.c
+++ b/src/mame/video/starshp1.c
@@ -380,7 +380,7 @@ VIDEO_UPDATE( starshp1 )
{
set_pens(screen->machine->colortable);
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
if (starshp1_starfield_kill == 0)
draw_starfield(bitmap);
@@ -424,7 +424,7 @@ VIDEO_EOF( starshp1 )
if (rect.max_y > helper->height - 1)
rect.max_y = helper->height - 1;
- fillbitmap(helper, 0, visarea);
+ bitmap_fill(helper, visarea, 0);
if (starshp1_attract == 0)
draw_spaceship(machine, helper, visarea);
diff --git a/src/mame/video/stfight.c b/src/mame/video/stfight.c
index 64c80817110..75d29f3ae20 100644
--- a/src/mame/video/stfight.c
+++ b/src/mame/video/stfight.c
@@ -297,9 +297,9 @@ VIDEO_UPDATE( stfight )
{
set_pens(screen->machine->colortable);
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
- fillbitmap(bitmap,0,cliprect); /* in case bg_tilemap is disabled */
+ bitmap_fill(bitmap,cliprect,0); /* in case bg_tilemap is disabled */
tilemap_draw(bitmap,cliprect,bg_tilemap,0,0);
tilemap_draw(bitmap,cliprect,fg_tilemap,0,1);
diff --git a/src/mame/video/stvvdp2.c b/src/mame/video/stvvdp2.c
index 383de3142f4..0cf7dbbd498 100644
--- a/src/mame/video/stvvdp2.c
+++ b/src/mame/video/stvvdp2.c
@@ -4913,7 +4913,7 @@ static void stv_vdp2_draw_rotation_screen(running_machine *machine, bitmap_t *bi
if ( (stv_rbg_cache_data.is_cache_dirty & iRP) ||
memcmp(&stv_rbg_cache_data.layer_data[iRP-1],&stv2_current_tilemap,sizeof(stv2_current_tilemap)) != 0 )
{
- fillbitmap( stv_vdp2_roz_bitmap[iRP-1], get_black_pen(machine), &roz_clip_rect );
+ bitmap_fill( stv_vdp2_roz_bitmap[iRP-1], &roz_clip_rect , get_black_pen(machine));
stv_vdp2_check_tilemap(machine, stv_vdp2_roz_bitmap[iRP-1], &roz_clip_rect);
// prepare cache data
stv_rbg_cache_data.watch_vdp2_vram_writes |= iRP;
@@ -5064,7 +5064,7 @@ static void stv_vdp2_draw_back(running_machine *machine, bitmap_t *bitmap, const
UINT16 data;
if(!(STV_VDP2_BDCLMD & 1))
- fillbitmap(bitmap, get_black_pen(machine), cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(machine));
else
{
#if DEBUG_MODE
diff --git a/src/mame/video/suna16.c b/src/mame/video/suna16.c
index 0e03e7ecbd7..94ba77192bd 100644
--- a/src/mame/video/suna16.c
+++ b/src/mame/video/suna16.c
@@ -219,7 +219,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta
VIDEO_UPDATE( suna16 )
{
/* Suna Quiz indicates the background is the last pen */
- fillbitmap(bitmap,0xff,cliprect);
+ bitmap_fill(bitmap,cliprect,0xff);
draw_sprites(screen->machine, bitmap, cliprect, spriteram16, 0);
return 0;
}
@@ -238,7 +238,7 @@ if (input_code_pressed(KEYCODE_Z))
#endif
/* Suna Quiz indicates the background is the last pen */
- fillbitmap(bitmap,0xff,cliprect);
+ bitmap_fill(bitmap,cliprect,0xff);
if (layers_ctrl & 1) draw_sprites(screen->machine, bitmap, cliprect, spriteram16, 0);
if (layers_ctrl & 2) draw_sprites(screen->machine, bitmap, cliprect, spriteram16_2, 1);
return 0;
diff --git a/src/mame/video/suna8.c b/src/mame/video/suna8.c
index b8db9ed383d..11acd959927 100644
--- a/src/mame/video/suna8.c
+++ b/src/mame/video/suna8.c
@@ -410,7 +410,7 @@ static void draw_text_sprites(running_machine *machine, bitmap_t *bitmap,const r
VIDEO_UPDATE( suna8 )
{
/* see hardhead, hardhea2 test mode (press button 2 for both players) */
- fillbitmap(bitmap,0xff,cliprect);
+ bitmap_fill(bitmap,cliprect,0xff);
#ifdef MAME_DEBUG
#if TILEMAPS
diff --git a/src/mame/video/supbtime.c b/src/mame/video/supbtime.c
index 3afd60a7348..f8461c63a8e 100644
--- a/src/mame/video/supbtime.c
+++ b/src/mame/video/supbtime.c
@@ -93,7 +93,7 @@ VIDEO_UPDATE(supbtime)
flip_screen_set( deco16_pf12_control[0]&0x80 );
deco16_pf12_update(deco16_pf1_rowscroll,deco16_pf2_rowscroll);
- fillbitmap(bitmap,768,cliprect);
+ bitmap_fill(bitmap,cliprect,768);
deco16_tilemap_2_draw(bitmap,cliprect,0,0);
draw_sprites(screen->machine, bitmap,cliprect);
diff --git a/src/mame/video/superchs.c b/src/mame/video/superchs.c
index a811d87f125..dd95d9586f3 100644
--- a/src/mame/video/superchs.c
+++ b/src/mame/video/superchs.c
@@ -227,7 +227,7 @@ VIDEO_UPDATE( superchs )
layer[3] = (priority &0x000f) >> 0; /* tells us which is top */
layer[4] = 4; /* text layer always over bg layers */
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
/* We have to assume 2nd to bottom layer is always underneath
sprites as pdrawgfx cannot yet cope with more than 4 layers */
diff --git a/src/mame/video/suprnova.c b/src/mame/video/suprnova.c
index d5a0ec75c46..a02b151b033 100644
--- a/src/mame/video/suprnova.c
+++ b/src/mame/video/suprnova.c
@@ -1052,11 +1052,11 @@ VIDEO_UPDATE(skns)
}
}
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
- fillbitmap(tilemap_bitmap_lower, 0, NULL);
- fillbitmap(tilemap_bitmapflags_lower, 0, NULL);
- fillbitmap(tilemap_bitmap_higher, 0, NULL);
- fillbitmap(tilemap_bitmapflags_higher, 0, NULL);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
+ bitmap_fill(tilemap_bitmap_lower, NULL, 0);
+ bitmap_fill(tilemap_bitmapflags_lower, NULL, 0);
+ bitmap_fill(tilemap_bitmap_higher, NULL, 0);
+ bitmap_fill(tilemap_bitmapflags_higher, NULL, 0);
{
int supernova_pri_a;
@@ -1221,7 +1221,7 @@ VIDEO_UPDATE(skns)
}
}
- fillbitmap(sprite_bitmap, 0x0000, cliprect);
+ bitmap_fill(sprite_bitmap, cliprect, 0x0000);
skns_draw_sprites(screen->machine, sprite_bitmap, cliprect, spriteram32, spriteram_size, memory_region(screen->machine,"gfx1"), memory_region_length (screen->machine, "gfx1"), skns_spc_regs );
diff --git a/src/mame/video/suprslam.c b/src/mame/video/suprslam.c
index 3c65ae63eb8..45b2bab513c 100644
--- a/src/mame/video/suprslam.c
+++ b/src/mame/video/suprslam.c
@@ -150,7 +150,7 @@ VIDEO_START( suprslam )
VIDEO_UPDATE( suprslam )
{
- fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+ bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
K053936_0_zoom_draw(bitmap,cliprect,suprslam_bg_tilemap,0,0);
draw_sprites(screen->machine, bitmap, cliprect);
tilemap_draw(bitmap,cliprect,suprslam_screen_tilemap,0,0);
diff --git a/src/mame/video/surpratk.c b/src/mame/video/surpratk.c
index 4a996a7541a..b0f3bcb1bc1 100644
--- a/src/mame/video/surpratk.c
+++ b/src/mame/video/surpratk.c
@@ -88,8 +88,8 @@ VIDEO_UPDATE( surpratk )
sortlayers(layer,layerpri);
- fillbitmap(priority_bitmap,0,cliprect);
- fillbitmap(bitmap,16 * bg_colorbase,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
+ bitmap_fill(bitmap,cliprect,16 * bg_colorbase);
tilemap_draw(bitmap,cliprect,K052109_tilemap[layer[0]],0,1);
tilemap_draw(bitmap,cliprect,K052109_tilemap[layer[1]],0,2);
tilemap_draw(bitmap,cliprect,K052109_tilemap[layer[2]],0,4);
diff --git a/src/mame/video/system1.c b/src/mame/video/system1.c
index 0848dbdb7a9..196602e7fd5 100644
--- a/src/mame/video/system1.c
+++ b/src/mame/video/system1.c
@@ -536,7 +536,7 @@ VIDEO_UPDATE( system1 )
/* even if screen is off, sprites must still be drawn to update the collision table */
if (system1_video_mode & 0x10) /* screen off */
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
return 0;
}
@@ -677,7 +677,7 @@ VIDEO_UPDATE( choplifter )
/* even if screen is off, sprites must still be drawn to update the collision table */
if (system1_video_mode & 0x10) /* screen off */
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
#ifdef MAME_DEBUG
@@ -808,7 +808,7 @@ VIDEO_UPDATE( wbml )
/* even if screen is off, sprites must still be drawn to update the collision table */
if (system1_video_mode & 0x10) /* screen off */
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
return 0;
}
@@ -878,7 +878,7 @@ VIDEO_UPDATE( ufosensi )
/* even if screen is off, sprites must still be drawn to update the collision table */
if (system1_video_mode & 0x10) /* screen off */
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
return 0;
}
@@ -899,7 +899,7 @@ VIDEO_UPDATE( blockgal )
/* even if screen is off, sprites must still be drawn to update the collision table */
if (system1_video_mode & 0x10) /* screen off */
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
blockgal_kludgeoffset = 0;
return 0;
diff --git a/src/mame/video/system16.c b/src/mame/video/system16.c
index 45a2fd31f96..09eb0fc7a27 100644
--- a/src/mame/video/system16.c
+++ b/src/mame/video/system16.c
@@ -1060,7 +1060,7 @@ static void sys18_vh_screenrefresh_helper( void ){
VIDEO_UPDATE( system16 ){
if (!sys16_refreshenable)
{
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
return 0;
}
@@ -1068,7 +1068,7 @@ VIDEO_UPDATE( system16 ){
update_page();
sys16_vh_refresh_helper(); /* set scroll registers */
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
tilemap_draw( bitmap,cliprect, background, TILEMAP_DRAW_OPAQUE, 0x00 );
if(sys16_bg_priority_mode) tilemap_draw( bitmap,cliprect, background, TILEMAP_DRAW_OPAQUE | 1, 0x00 );
@@ -1092,7 +1092,7 @@ VIDEO_UPDATE( system18old ){
if (!sys16_refreshenable)
{
/* should it REALLY not clear the bitmap? ddcrew vdp gfx look ugly if i don't do it like this */
- fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+ bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
return 0;
}
@@ -1100,11 +1100,11 @@ VIDEO_UPDATE( system18old ){
update_page();
sys18_vh_screenrefresh_helper(); /* set scroll registers */
- fillbitmap(priority_bitmap,0,NULL);
+ bitmap_fill(priority_bitmap,NULL,0);
if(sys18_bg2_active)
tilemap_draw( bitmap,cliprect, background2, 0, 0 );
else
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
tilemap_draw( bitmap,cliprect, background, TILEMAP_DRAW_OPAQUE, 0 );
tilemap_draw( bitmap,cliprect, background, TILEMAP_DRAW_OPAQUE | 1, 0 ); //??
diff --git a/src/mame/video/tail2nos.c b/src/mame/video/tail2nos.c
index dd369e1be82..1102d10dbf9 100644
--- a/src/mame/video/tail2nos.c
+++ b/src/mame/video/tail2nos.c
@@ -190,6 +190,6 @@ VIDEO_UPDATE( tail2nos )
tilemap_draw(bitmap,cliprect,bg_tilemap,0,0);
}
else
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
return 0;
}
diff --git a/src/mame/video/taito_b.c b/src/mame/video/taito_b.c
index cb65961478d..ec2d2506c9b 100644
--- a/src/mame/video/taito_b.c
+++ b/src/mame/video/taito_b.c
@@ -596,7 +596,7 @@ VIDEO_UPDATE( taitob )
{
if ((video_control & 0x20) == 0)
{
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
return 0;
}
@@ -627,7 +627,7 @@ VIDEO_UPDATE( taitob )
VIDEO_EOF( taitob )
{
if (~video_control & 0x01)
- fillbitmap(framebuffer[framebuffer_page],0,video_screen_get_visible_area(machine->primary_screen));
+ bitmap_fill(framebuffer[framebuffer_page],video_screen_get_visible_area(machine->primary_screen),0);
if (~video_control & 0x80)
framebuffer_page ^= 1;
diff --git a/src/mame/video/taito_f2.c b/src/mame/video/taito_f2.c
index 8099032dfa7..095903761c0 100644
--- a/src/mame/video/taito_f2.c
+++ b/src/mame/video/taito_f2.c
@@ -1048,8 +1048,8 @@ VIDEO_UPDATE( ssi )
/* SSI only uses sprites, the tilemap registers are not even initialized.
(they are in Majestic 12, but the tilemaps are not used anyway) */
- fillbitmap(priority_bitmap,0,cliprect);
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
+ bitmap_fill(bitmap,cliprect,0);
draw_sprites(screen->machine, bitmap,cliprect,NULL, 0);
return 0;
}
@@ -1061,8 +1061,8 @@ VIDEO_UPDATE( yesnoj )
TC0100SCN_tilemap_update(screen->machine);
- fillbitmap(priority_bitmap,0,cliprect);
- fillbitmap(bitmap,0,cliprect); /* wrong color? */
+ bitmap_fill(priority_bitmap,cliprect,0);
+ bitmap_fill(bitmap,cliprect,0); /* wrong color? */
draw_sprites(screen->machine, bitmap,cliprect,NULL, 0);
TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,TC0100SCN_bottomlayer(0),0,0);
TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,TC0100SCN_bottomlayer(0)^1,0,0);
@@ -1077,8 +1077,8 @@ VIDEO_UPDATE( taitof2 )
TC0100SCN_tilemap_update(screen->machine);
- fillbitmap(priority_bitmap,0,cliprect);
- fillbitmap(bitmap,0,cliprect); /* wrong color? */
+ bitmap_fill(priority_bitmap,cliprect,0);
+ bitmap_fill(bitmap,cliprect,0); /* wrong color? */
TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,TC0100SCN_bottomlayer(0),0,0);
TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,TC0100SCN_bottomlayer(0)^1,0,0);
draw_sprites(screen->machine, bitmap,cliprect,NULL, 0);
@@ -1109,8 +1109,8 @@ VIDEO_UPDATE( taitof2_pri )
f2_spriteblendmode = TC0360PRI_regs[0]&0xc0;
- fillbitmap(priority_bitmap,0,cliprect);
- fillbitmap(bitmap,0,cliprect); /* wrong color? */
+ bitmap_fill(priority_bitmap,cliprect,0);
+ bitmap_fill(bitmap,cliprect,0); /* wrong color? */
TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[0],0,1);
TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[1],0,2);
@@ -1168,8 +1168,8 @@ VIDEO_UPDATE( taitof2_pri_roz )
f2_spriteblendmode = TC0360PRI_regs[0]&0xc0;
- fillbitmap(priority_bitmap,0,cliprect);
- fillbitmap(bitmap,0,cliprect); /* wrong color? */
+ bitmap_fill(priority_bitmap,cliprect,0);
+ bitmap_fill(bitmap,cliprect,0); /* wrong color? */
drawn=0;
for (i=0; i<16; i++)
@@ -1231,8 +1231,8 @@ VIDEO_UPDATE( thundfox )
spritepri[3] = TC0360PRI_regs[7] >> 4;
- fillbitmap(priority_bitmap,0,cliprect);
- fillbitmap(bitmap,0,cliprect); /* wrong color? */
+ bitmap_fill(priority_bitmap,cliprect,0);
+ bitmap_fill(bitmap,cliprect,0); /* wrong color? */
/*
@@ -1364,8 +1364,8 @@ VIDEO_UPDATE( metalb )
f2_spriteblendmode = TC0360PRI_regs[0]&0xc0;
- fillbitmap(priority_bitmap,0,cliprect);
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
+ bitmap_fill(bitmap,cliprect,0);
TC0480SCP_tilemap_draw(bitmap,cliprect,layer[0],0,1);
TC0480SCP_tilemap_draw(bitmap,cliprect,layer[1],0,2);
@@ -1411,8 +1411,8 @@ VIDEO_UPDATE( deadconx )
spritepri[2] = TC0360PRI_regs[7] & 0x0f;
spritepri[3] = TC0360PRI_regs[7] >> 4;
- fillbitmap(priority_bitmap,0,cliprect);
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
+ bitmap_fill(bitmap,cliprect,0);
TC0480SCP_tilemap_draw(bitmap,cliprect,layer[0],0,1);
TC0480SCP_tilemap_draw(bitmap,cliprect,layer[1],0,2);
diff --git a/src/mame/video/taito_f3.c b/src/mame/video/taito_f3.c
index 3602956ba10..c382d7ffc4b 100644
--- a/src/mame/video/taito_f3.c
+++ b/src/mame/video/taito_f3.c
@@ -3304,7 +3304,7 @@ VIDEO_UPDATE( f3 )
sy_fix[4]=-sy_fix[4];
}
- fillbitmap(pri_alp_bitmap,0,cliprect);
+ bitmap_fill(pri_alp_bitmap,cliprect,0);
/* sprites */
if (sprite_lag==0)
diff --git a/src/mame/video/taito_h.c b/src/mame/video/taito_h.c
index 85d520c1fbd..40c1022e834 100644
--- a/src/mame/video/taito_h.c
+++ b/src/mame/video/taito_h.c
@@ -420,7 +420,7 @@ VIDEO_UPDATE( syvalion )
taitoh_log_vram();
#endif
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
TC0080VCO_tilemap_draw(screen->machine,bitmap,cliprect,0,TILEMAP_DRAW_OPAQUE,0);
TC0080VCO_tilemap_draw(screen->machine,bitmap,cliprect,1,0,0);
@@ -438,7 +438,7 @@ VIDEO_UPDATE( recordbr )
taitoh_log_vram();
#endif
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
#ifdef MAME_DEBUG
if ( !input_code_pressed(KEYCODE_A) )
@@ -469,7 +469,7 @@ VIDEO_UPDATE( dleague )
taitoh_log_vram();
#endif
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
#ifdef MAME_DEBUG
if ( !input_code_pressed(KEYCODE_A) )
diff --git a/src/mame/video/taito_l.c b/src/mame/video/taito_l.c
index 98cba270280..4c22cff4dcd 100644
--- a/src/mame/video/taito_l.c
+++ b/src/mame/video/taito_l.c
@@ -318,7 +318,7 @@ VIDEO_UPDATE( taitol )
if (cur_ctrl & 0x20) /* display enable */
{
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
tilemap_draw(bitmap,cliprect,bg19_tilemap,0,0);
@@ -331,7 +331,7 @@ VIDEO_UPDATE( taitol )
tilemap_draw(bitmap,cliprect,ch1a_tilemap,0,0);
}
else
- fillbitmap(bitmap,screen->machine->pens[0],cliprect);
+ bitmap_fill(bitmap,cliprect,screen->machine->pens[0]);
return 0;
}
diff --git a/src/mame/video/taito_z.c b/src/mame/video/taito_z.c
index 4d26be6f217..97571720519 100644
--- a/src/mame/video/taito_z.c
+++ b/src/mame/video/taito_z.c
@@ -855,9 +855,9 @@ VIDEO_UPDATE( contcirc )
layer[1] = layer[0]^1;
layer[2] = 2;
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[0],0,0);
TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[1],0,1);
@@ -881,10 +881,10 @@ VIDEO_UPDATE( chasehq )
layer[1] = layer[0]^1;
layer[2] = 2;
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
/* Ensure screen blanked even when bottom layer not drawn due to disable bit */
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[0],TILEMAP_DRAW_OPAQUE,0);
TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[1],0,1);
@@ -906,10 +906,10 @@ VIDEO_UPDATE( bshark )
layer[1] = layer[0]^1;
layer[2] = 2;
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
/* Ensure screen blanked even when bottom layer not drawn due to disable bit */
- fillbitmap(bitmap, 0,cliprect);
+ bitmap_fill(bitmap, cliprect,0);
TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[0],TILEMAP_DRAW_OPAQUE,0);
TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[1],0,1);
@@ -931,10 +931,10 @@ VIDEO_UPDATE( sci )
layer[1] = layer[0]^1;
layer[2] = 2;
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
/* Ensure screen blanked even when bottom layer not drawn due to disable bit */
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[0],TILEMAP_DRAW_OPAQUE,0);
TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[1],0,1);
@@ -956,10 +956,10 @@ VIDEO_UPDATE( aquajack )
layer[1] = layer[0]^1;
layer[2] = 2;
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
/* Ensure screen blanked even when bottom layer not drawn due to disable bit */
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[0],TILEMAP_DRAW_OPAQUE,0);
TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[1],0,1);
@@ -981,10 +981,10 @@ VIDEO_UPDATE( spacegun )
layer[1] = layer[0]^1;
layer[2] = 2;
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
/* Ensure screen blanked even when bottom layer not drawn due to disable bit */
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[0],TILEMAP_DRAW_OPAQUE,1);
TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,0,layer[1],0,2);
@@ -1011,10 +1011,10 @@ VIDEO_UPDATE( dblaxle )
layer[3] = (priority &0x000f) >> 0; /* tells us which is top */
layer[4] = 4; /* text layer always over bg layers */
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
/* Ensure screen blanked - this shouldn't be necessary! */
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
TC0480SCP_tilemap_draw(bitmap,cliprect,layer[0],TILEMAP_DRAW_OPAQUE,0);
TC0480SCP_tilemap_draw(bitmap,cliprect,layer[1],0,0);
diff --git a/src/mame/video/taitoair.c b/src/mame/video/taitoair.c
index ea8958bc744..3439d6307d1 100644
--- a/src/mame/video/taitoair.c
+++ b/src/mame/video/taitoair.c
@@ -359,7 +359,7 @@ VIDEO_UPDATE( taitoair )
{
TC0080VCO_tilemap_update(screen->machine);
- fillbitmap(bitmap, 0x41, cliprect);
+ bitmap_fill(bitmap, cliprect, 0x41);
#ifdef MAME_DEBUG
if ( !input_code_pressed(KEYCODE_A) )
diff --git a/src/mame/video/taitojc.c b/src/mame/video/taitojc.c
index df64399e67d..fdd496cc490 100644
--- a/src/mame/video/taitojc.c
+++ b/src/mame/video/taitojc.c
@@ -254,7 +254,7 @@ VIDEO_UPDATE( taitojc )
}
*/
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
for (i=(0xc00/4)-2; i >= 0; i-=2)
{
@@ -642,6 +642,6 @@ void taitojc_clear_frame(running_machine *machine)
cliprect.max_x = video_screen_get_width(machine->primary_screen) - 1;
cliprect.max_y = video_screen_get_height(machine->primary_screen) - 1;
- fillbitmap(framebuffer, 0, &cliprect);
- fillbitmap(zbuffer, 0xffff, &cliprect);
+ bitmap_fill(framebuffer, &cliprect, 0);
+ bitmap_fill(zbuffer, &cliprect, 0xffff);
}
diff --git a/src/mame/video/taitosj.c b/src/mame/video/taitosj.c
index 1b92bb33f6d..294b44c208c 100644
--- a/src/mame/video/taitosj.c
+++ b/src/mame/video/taitosj.c
@@ -337,7 +337,7 @@ static int check_sprite_sprite_bitpattern(running_machine *machine,
}
/* draw the sprites into seperate bitmaps and check overlapping region */
- fillbitmap(sprite_layer_collbitmap1, TRANSPARENT_PEN, NULL);
+ bitmap_fill(sprite_layer_collbitmap1, NULL, TRANSPARENT_PEN);
drawgfx(sprite_sprite_collbitmap1, get_sprite_gfx_element(machine, which1),
taitosj_spriteram[SPRITE_RAM_PAGE_OFFSET + offs1 + 3] & 0x3f,
0,
@@ -346,7 +346,7 @@ static int check_sprite_sprite_bitpattern(running_machine *machine,
sx1, sy1,
0, TRANSPARENCY_PEN, 0);
- fillbitmap(sprite_sprite_collbitmap2, TRANSPARENT_PEN, NULL);
+ bitmap_fill(sprite_sprite_collbitmap2, NULL, TRANSPARENT_PEN);
drawgfx(sprite_sprite_collbitmap2, get_sprite_gfx_element(machine, which2),
taitosj_spriteram[SPRITE_RAM_PAGE_OFFSET + offs2 + 3] & 0x3f,
0,
@@ -493,7 +493,7 @@ static int check_sprite_layer_bitpattern(running_machine *machine, int which, re
int flip_y = (taitosj_spriteram[SPRITE_RAM_PAGE_OFFSET + offs + 2] & 0x02) ^ GLOBAL_FLIP_Y;
/* draw sprite into a bitmap and check if layers collide */
- fillbitmap(sprite_layer_collbitmap1, TRANSPARENT_PEN, NULL);
+ bitmap_fill(sprite_layer_collbitmap1, NULL, TRANSPARENT_PEN);
drawgfx(sprite_layer_collbitmap1, get_sprite_gfx_element(machine, which),
taitosj_spriteram[SPRITE_RAM_PAGE_OFFSET + offs + 3] & 0x3f,
0,
@@ -579,9 +579,9 @@ static void draw_layers(running_machine *machine)
{
offs_t offs;
- fillbitmap(taitosj_layer_bitmap[0], TRANSPARENT_PEN, NULL);
- fillbitmap(taitosj_layer_bitmap[1], TRANSPARENT_PEN, NULL);
- fillbitmap(taitosj_layer_bitmap[2], TRANSPARENT_PEN, NULL);
+ bitmap_fill(taitosj_layer_bitmap[0], NULL, TRANSPARENT_PEN);
+ bitmap_fill(taitosj_layer_bitmap[1], NULL, TRANSPARENT_PEN);
+ bitmap_fill(taitosj_layer_bitmap[2], NULL, TRANSPARENT_PEN);
for (offs = 0; offs < 0x0400; offs++)
{
@@ -773,7 +773,7 @@ static void copy_layers(running_machine *machine, bitmap_t *bitmap, const rectan
int i = 0;
/* fill the screen with the background color */
- fillbitmap(bitmap, 8 * (taitosj_colorbank[1] & 0x07), cliprect);
+ bitmap_fill(bitmap, cliprect, 8 * (taitosj_colorbank[1] & 0x07));
for (i = 0; i < 4; i++)
{
diff --git a/src/mame/video/tank8.c b/src/mame/video/tank8.c
index a245a90d792..19c98893ce2 100644
--- a/src/mame/video/tank8.c
+++ b/src/mame/video/tank8.c
@@ -189,7 +189,7 @@ static void draw_bullets(bitmap_t *bitmap, const rectangle *cliprect)
if (rect.max_y > cliprect->max_y)
rect.max_y = cliprect->max_y;
- fillbitmap(bitmap, (i << 1) | 0x01, &rect);
+ bitmap_fill(bitmap, &rect, (i << 1) | 0x01);
}
}
@@ -219,8 +219,8 @@ VIDEO_EOF( tank8 )
tilemap_draw(helper1, visarea, tank8_tilemap, 0, 0);
- fillbitmap(helper2, 8, visarea);
- fillbitmap(helper3, 8, visarea);
+ bitmap_fill(helper2, visarea, 8);
+ bitmap_fill(helper3, visarea, 8);
draw_sprites(machine, helper2, visarea);
draw_bullets(helper3, visarea);
diff --git a/src/mame/video/tatsumi.c b/src/mame/video/tatsumi.c
index f4e7f5289ff..dde3a257fd4 100644
--- a/src/mame/video/tatsumi.c
+++ b/src/mame/video/tatsumi.c
@@ -592,7 +592,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta
if (rotate)
{
render_y=0;
- fillbitmap(temp_bitmap, 0, 0);
+ bitmap_fill(temp_bitmap, 0, 0);
}
extent_x=extent_y=0;
@@ -1001,7 +1001,7 @@ VIDEO_UPDATE( apache3 )
{
update_cluts(screen->machine, 1024, 0, 2048);
- fillbitmap(bitmap,screen->machine->pens[0],cliprect);
+ bitmap_fill(bitmap,cliprect,screen->machine->pens[0]);
draw_sky(screen->machine, bitmap, cliprect, 256, apache3_a0000[1]);
draw_sprites(screen->machine, bitmap,cliprect,0, (tatsumi_sprite_control_ram[0x20]&0x1000) ? 0x1000 : 0);
tilemap_draw(bitmap,cliprect,tx_layer,0,0);
@@ -1018,8 +1018,8 @@ VIDEO_UPDATE( roundup5 )
tilemap_set_scrollx(tx_layer,0,24);
tilemap_set_scrolly(tx_layer,0,0); //(((roundupt_crt_reg[0xe]<<8)|roundupt_crt_reg[0xf])>>5) + 96);
- fillbitmap(bitmap,screen->machine->pens[384],cliprect); // todo
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,screen->machine->pens[384]); // todo
+ bitmap_fill(priority_bitmap,cliprect,0);
draw_sprites(screen->machine, priority_bitmap,cliprect,1,(tatsumi_sprite_control_ram[0xe0]&0x1000) ? 0x1000 : 0); // Alpha pass only
draw_road(screen->machine, bitmap,cliprect,priority_bitmap);
@@ -1040,7 +1040,7 @@ VIDEO_UPDATE( cyclwarr )
bigfight_last_bank=bigfight_bank;
}
- fillbitmap(bitmap,screen->machine->pens[0],cliprect);
+ bitmap_fill(bitmap,cliprect,screen->machine->pens[0]);
draw_bg(screen->machine, bitmap, layer3, &cyclwarr_videoram1[0x000], &cyclwarr_videoram1[0x100], cyclwarr_videoram1, bigfight_a40000[0], 8, -0x80, 512, 4096);
draw_bg(screen->machine, bitmap, layer2, &cyclwarr_videoram1[0x200], &cyclwarr_videoram1[0x300], cyclwarr_videoram1, bigfight_a40000[0], 8, -0x80, 512, 4096);
@@ -1064,7 +1064,7 @@ VIDEO_UPDATE( bigfight )
bigfight_last_bank=bigfight_bank;
}
- fillbitmap(bitmap,screen->machine->pens[0],cliprect);
+ bitmap_fill(bitmap,cliprect,screen->machine->pens[0]);
draw_bg(screen->machine, bitmap, layer3, &cyclwarr_videoram1[0x000], &cyclwarr_videoram1[0x100], cyclwarr_videoram1, bigfight_a40000[0], 8, -0x40, 1024, 2048);
draw_bg(screen->machine, bitmap, layer2, &cyclwarr_videoram1[0x200], &cyclwarr_videoram1[0x300], cyclwarr_videoram1, bigfight_a40000[0], 8, -0x40, 1024, 2048);
draw_bg(screen->machine, bitmap, layer1, &cyclwarr_videoram0[0x000], &cyclwarr_videoram0[0x100], cyclwarr_videoram0, bigfight_a40000[0], 8, -0x40, 1024, 2048);
diff --git a/src/mame/video/taxidrvr.c b/src/mame/video/taxidrvr.c
index b242f144564..7143122b2a7 100644
--- a/src/mame/video/taxidrvr.c
+++ b/src/mame/video/taxidrvr.c
@@ -24,7 +24,7 @@ VIDEO_UPDATE( taxidrvr )
if (taxidrvr_bghide)
{
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
/* kludge to fix scroll after death */
diff --git a/src/mame/video/tbowl.c b/src/mame/video/tbowl.c
index 7a4a0e5f31a..0e2c2527c65 100644
--- a/src/mame/video/tbowl.c
+++ b/src/mame/video/tbowl.c
@@ -228,7 +228,7 @@ VIDEO_UPDATE( tbowl )
tilemap_set_scrollx(tx_tilemap, 0, 0 );
tilemap_set_scrolly(tx_tilemap, 0, 0 );
- fillbitmap(bitmap,0x100,cliprect); /* is there a register controling the colour? looks odd when screen is blank */
+ bitmap_fill(bitmap,cliprect,0x100); /* is there a register controling the colour? looks odd when screen is blank */
tilemap_draw(bitmap,cliprect,bg_tilemap,0,0);
draw_sprites(screen->machine, bitmap,cliprect, 0);
tilemap_draw(bitmap,cliprect,bg2_tilemap,0,0);
@@ -243,7 +243,7 @@ VIDEO_UPDATE( tbowl )
tilemap_set_scrollx(tx_tilemap, 0, 32*8 );
tilemap_set_scrolly(tx_tilemap, 0, 0 );
- fillbitmap(bitmap,0x100,cliprect); /* is there a register controling the colour? looks odd when screen is blank */
+ bitmap_fill(bitmap,cliprect,0x100); /* is there a register controling the colour? looks odd when screen is blank */
tilemap_draw(bitmap,cliprect,bg_tilemap,0,0);
draw_sprites(screen->machine, bitmap,cliprect, 32*8);
tilemap_draw(bitmap,cliprect,bg2_tilemap,0,0);
diff --git a/src/mame/video/tecmo.c b/src/mame/video/tecmo.c
index 5cb8113867c..09091b2e08d 100644
--- a/src/mame/video/tecmo.c
+++ b/src/mame/video/tecmo.c
@@ -241,8 +241,8 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan
VIDEO_UPDATE( tecmo )
{
- fillbitmap(priority_bitmap,0,cliprect);
- fillbitmap(bitmap,0x100,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
+ bitmap_fill(bitmap,cliprect,0x100);
tilemap_draw(bitmap,cliprect,bg_tilemap,0,1);
tilemap_draw(bitmap,cliprect,fg_tilemap,0,2);
tilemap_draw(bitmap,cliprect,tx_tilemap,0,4);
diff --git a/src/mame/video/tecmo16.c b/src/mame/video/tecmo16.c
index cb0ee910a17..d801857d126 100644
--- a/src/mame/video/tecmo16.c
+++ b/src/mame/video/tecmo16.c
@@ -493,11 +493,11 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap_bg, bitmap_t
VIDEO_UPDATE( tecmo16 )
{
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
- fillbitmap(tile_bitmap_bg, 0x300, cliprect);
- fillbitmap(tile_bitmap_fg, 0, cliprect);
- fillbitmap(sprite_bitmap, 0, cliprect);
+ bitmap_fill(tile_bitmap_bg, cliprect, 0x300);
+ bitmap_fill(tile_bitmap_fg, cliprect, 0);
+ bitmap_fill(sprite_bitmap, cliprect, 0);
/* draw tilemaps into a 16-bit bitmap */
tilemap_draw(tile_bitmap_bg, cliprect,bg_tilemap, 0, 1);
diff --git a/src/mame/video/terracre.c b/src/mame/video/terracre.c
index d4d6f2f52ab..cebb000dc76 100644
--- a/src/mame/video/terracre.c
+++ b/src/mame/video/terracre.c
@@ -199,7 +199,7 @@ VIDEO_START( amazon )
VIDEO_UPDATE( amazon )
{
if( xscroll&0x2000 )
- fillbitmap( bitmap,get_black_pen(screen->machine),cliprect );
+ bitmap_fill( bitmap,cliprect ,get_black_pen(screen->machine));
else
tilemap_draw( bitmap,cliprect, background, 0, 0 );
diff --git a/src/mame/video/tetrisp2.c b/src/mame/video/tetrisp2.c
index b74eb307ae6..b6d98a8f50d 100644
--- a/src/mame/video/tetrisp2.c
+++ b/src/mame/video/tetrisp2.c
@@ -517,8 +517,8 @@ VIDEO_UPDATE( tetrisp2 )
flipscreen = (tetrisp2_systemregs[0x00] & 0x02);
/* Black background color */
- fillbitmap(bitmap, 0, cliprect);
- fillbitmap(priority_bitmap, 0, NULL);
+ bitmap_fill(bitmap, cliprect, 0);
+ bitmap_fill(priority_bitmap, NULL, 0);
/* Flip Screen */
if (flipscreen != flipscreen_old)
@@ -601,8 +601,8 @@ VIDEO_UPDATE( rockntread )
flipscreen = (tetrisp2_systemregs[0x00] & 0x02);
/* Black background color */
- fillbitmap(bitmap, 0, cliprect);
- fillbitmap(priority_bitmap, 0, NULL);
+ bitmap_fill(bitmap, cliprect, 0);
+ bitmap_fill(priority_bitmap, NULL, 0);
/* Flip Screen */
if (flipscreen != flipscreen_old)
@@ -696,8 +696,8 @@ VIDEO_UPDATE( rocknms )
tilemap_set_scrollx(tilemap_sub_rot, 0, rocknms_sub_rotregs[ 0 ] + 0x400);
tilemap_set_scrolly(tilemap_sub_rot, 0, rocknms_sub_rotregs[ 2 ] + 0x400);
- fillbitmap(bitmap, screen->machine->pens[0x0000], cliprect);
- fillbitmap(priority_bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, screen->machine->pens[0x0000]);
+ bitmap_fill(priority_bitmap, cliprect, 0);
asc_pri = scr_pri = rot_pri = 0;
@@ -749,8 +749,8 @@ VIDEO_UPDATE( rocknms )
tilemap_set_scrolly(tilemap_rot, 0, tetrisp2_rotregs[ 2 ] + 0x400);
/* Black background color */
- fillbitmap(bitmap, screen->machine->pens[0x0000], cliprect);
- fillbitmap(priority_bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, screen->machine->pens[0x0000]);
+ bitmap_fill(priority_bitmap, cliprect, 0);
asc_pri = scr_pri = rot_pri = 0;
diff --git a/src/mame/video/thedeep.c b/src/mame/video/thedeep.c
index 1e9f5926721..f2806d003c2 100644
--- a/src/mame/video/thedeep.c
+++ b/src/mame/video/thedeep.c
@@ -227,7 +227,7 @@ VIDEO_UPDATE( thedeep )
tilemap_set_scrolly(tilemap_0, x, y + scrolly);
}
- fillbitmap(bitmap,get_black_pen(screen->machine),cliprect);
+ bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
tilemap_draw(bitmap,cliprect,tilemap_0,0,0);
draw_sprites(screen->machine, bitmap,cliprect);
diff --git a/src/mame/video/thoop2.c b/src/mame/video/thoop2.c
index 4f2b6ad2112..12586cd212d 100644
--- a/src/mame/video/thoop2.c
+++ b/src/mame/video/thoop2.c
@@ -211,7 +211,7 @@ VIDEO_UPDATE( thoop2 )
thoop2_sort_sprites();
- fillbitmap( bitmap, 0, cliprect );
+ bitmap_fill( bitmap, cliprect , 0);
tilemap_draw(bitmap,cliprect,pant[1],TILEMAP_DRAW_LAYER1 | 3,0);
tilemap_draw(bitmap,cliprect,pant[0],TILEMAP_DRAW_LAYER1 | 3,0);
diff --git a/src/mame/video/thunderj.c b/src/mame/video/thunderj.c
index 574c563d4c4..f6b79f888ac 100644
--- a/src/mame/video/thunderj.c
+++ b/src/mame/video/thunderj.c
@@ -159,7 +159,7 @@ VIDEO_UPDATE( thunderj )
int x, y, r;
/* draw the playfield */
- fillbitmap(priority_bitmap, 0, cliprect);
+ bitmap_fill(priority_bitmap, cliprect, 0);
tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 0, 0x00);
tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 1, 0x01);
tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 2, 0x02);
diff --git a/src/mame/video/thunderx.c b/src/mame/video/thunderx.c
index 72c6d722548..bb55e70fcc2 100644
--- a/src/mame/video/thunderx.c
+++ b/src/mame/video/thunderx.c
@@ -70,10 +70,10 @@ VIDEO_UPDATE( scontra )
{
K052109_tilemap_update();
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
/* The background color is always from layer 1 - but it's always black anyway */
-// fillbitmap(bitmap,16 * layer_colorbase[1],cliprect);
+// bitmap_fill(bitmap,cliprect,16 * layer_colorbase[1]);
if (scontra_priority)
{
tilemap_draw(bitmap,cliprect,K052109_tilemap[2],TILEMAP_DRAW_OPAQUE,1);
diff --git a/src/mame/video/tmnt.c b/src/mame/video/tmnt.c
index 3384b66a31b..931bac0be6c 100644
--- a/src/mame/video/tmnt.c
+++ b/src/mame/video/tmnt.c
@@ -629,7 +629,7 @@ VIDEO_UPDATE( punkshot )
sortlayers(sorted_layer,layerpri);
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
tilemap_draw(bitmap,cliprect,K052109_tilemap[sorted_layer[0]],TILEMAP_DRAW_OPAQUE,1);
tilemap_draw(bitmap,cliprect,K052109_tilemap[sorted_layer[1]],0,2);
tilemap_draw(bitmap,cliprect,K052109_tilemap[sorted_layer[2]],0,4);
@@ -658,8 +658,8 @@ VIDEO_UPDATE( lgtnfght )
sortlayers(sorted_layer,layerpri);
- fillbitmap(priority_bitmap,0,cliprect);
- fillbitmap(bitmap,16 * bg_colorbase,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
+ bitmap_fill(bitmap,cliprect,16 * bg_colorbase);
tilemap_draw(bitmap,cliprect,K052109_tilemap[sorted_layer[0]],0,1);
tilemap_draw(bitmap,cliprect,K052109_tilemap[sorted_layer[1]],0,2);
tilemap_draw(bitmap,cliprect,K052109_tilemap[sorted_layer[2]],0,4);
@@ -703,8 +703,8 @@ VIDEO_UPDATE( glfgreat )
/* not sure about the 053936 priority, but it seems to work */
- fillbitmap(priority_bitmap,0,cliprect);
- fillbitmap(bitmap,16 * bg_colorbase,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
+ bitmap_fill(bitmap,cliprect,16 * bg_colorbase);
tilemap_draw(bitmap,cliprect,K052109_tilemap[sorted_layer[0]],0,1);
if (layerpri[0] >= 0x30 && layerpri[1] < 0x30)
{
@@ -798,8 +798,8 @@ VIDEO_UPDATE( thndrx2 )
sortlayers(sorted_layer,layerpri);
- fillbitmap(priority_bitmap,0,cliprect);
- fillbitmap(bitmap,16 * bg_colorbase,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
+ bitmap_fill(bitmap,cliprect,16 * bg_colorbase);
tilemap_draw(bitmap,cliprect,K052109_tilemap[sorted_layer[0]],0,1);
tilemap_draw(bitmap,cliprect,K052109_tilemap[sorted_layer[1]],0,2);
tilemap_draw(bitmap,cliprect,K052109_tilemap[sorted_layer[2]],0,4);
diff --git a/src/mame/video/tnzs.c b/src/mame/video/tnzs.c
index d341126fde3..5c00d6b75bc 100644
--- a/src/mame/video/tnzs.c
+++ b/src/mame/video/tnzs.c
@@ -197,7 +197,7 @@ VIDEO_UPDATE( tnzs )
/* Fill the background */
- fillbitmap(bitmap, 0x1f0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0x1f0);
/* Redraw the background tiles (c400-c5ff) */
draw_background(screen->machine, bitmap, cliprect, tnzs_objram + 0x400);
diff --git a/src/mame/video/toaplan1.c b/src/mame/video/toaplan1.c
index b2d5e27fa2b..5257b69e631 100644
--- a/src/mame/video/toaplan1.c
+++ b/src/mame/video/toaplan1.c
@@ -1153,7 +1153,7 @@ VIDEO_UPDATE( rallybik )
toaplan1_log_vram();
#endif
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
tilemap_draw(bitmap,cliprect,pf1_tilemap,TILEMAP_DRAW_OPAQUE | 0,0);
tilemap_draw(bitmap,cliprect,pf1_tilemap,TILEMAP_DRAW_OPAQUE | 1,0);
@@ -1177,8 +1177,8 @@ VIDEO_UPDATE( toaplan1 )
toaplan1_log_vram();
#endif
- fillbitmap(priority_bitmap,0,cliprect);
- fillbitmap(bitmap,0x120,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
+ bitmap_fill(bitmap,cliprect,0x120);
tilemap_draw(bitmap,cliprect,pf4_tilemap,TILEMAP_DRAW_OPAQUE,0);
for (priority = 8; priority < 16; priority++)
@@ -1204,8 +1204,8 @@ VIDEO_UPDATE( demonwld )
toaplan1_log_vram();
#endif
- fillbitmap(priority_bitmap,0,cliprect);
- fillbitmap(bitmap,0x120,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
+ bitmap_fill(bitmap,cliprect,0x120);
tilemap_draw(bitmap,cliprect,pf1_tilemap,TILEMAP_DRAW_OPAQUE | 0,0);
tilemap_draw(bitmap,cliprect,pf1_tilemap,TILEMAP_DRAW_OPAQUE | 1,0);
diff --git a/src/mame/video/toaplan2.c b/src/mame/video/toaplan2.c
index 2a85d556a0d..3557562cc4b 100644
--- a/src/mame/video/toaplan2.c
+++ b/src/mame/video/toaplan2.c
@@ -1483,7 +1483,7 @@ VIDEO_UPDATE( toaplan2_0 )
mark_sprite_priority(0);
mark_tile_priority(0);
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
for (priority = 0; priority < 16; priority++)
{
@@ -1510,7 +1510,7 @@ VIDEO_UPDATE( dogyuun_1 )
mark_tile_priority(0);
mark_tile_priority(1);
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
for (priority = 0; priority < 16; priority++)
{
@@ -1545,7 +1545,7 @@ VIDEO_UPDATE( batsugun_1 )
mark_tile_priority(0);
mark_tile_priority(1);
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
for (priority = 0; priority < 16; priority++)
{
@@ -1599,7 +1599,7 @@ VIDEO_UPDATE( batrider_0 )
objectbank_dirty = 0;
}
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
for (priority = 0; priority < 16; priority++)
{
@@ -1638,7 +1638,7 @@ VIDEO_UPDATE( mahoudai_0 )
mark_sprite_priority(0);
mark_tile_priority(0);
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
if (bg_tile_priority[0][0]) tilemap_draw(bitmap,cliprect,bg_tilemap[0],0,0);
if (fg_tile_priority[0][0]) tilemap_draw(bitmap,cliprect,fg_tilemap[0],0,0);
diff --git a/src/mame/video/toobin.c b/src/mame/video/toobin.c
index d4f1129533c..9129803ec2f 100644
--- a/src/mame/video/toobin.c
+++ b/src/mame/video/toobin.c
@@ -237,7 +237,7 @@ VIDEO_UPDATE( toobin )
int x, y;
/* draw the playfield */
- fillbitmap(priority_bitmap, 0, cliprect);
+ bitmap_fill(priority_bitmap, cliprect, 0);
tilemap_draw(pfbitmap, cliprect, atarigen_playfield_tilemap, 0, 0);
tilemap_draw(pfbitmap, cliprect, atarigen_playfield_tilemap, 1, 1);
tilemap_draw(pfbitmap, cliprect, atarigen_playfield_tilemap, 2, 2);
diff --git a/src/mame/video/topspeed.c b/src/mame/video/topspeed.c
index 035bd78a6b5..f52507d0ced 100644
--- a/src/mame/video/topspeed.c
+++ b/src/mame/video/topspeed.c
@@ -165,8 +165,8 @@ VIDEO_UPDATE( topspeed )
layer[2] = 1;
layer[3] = 0;
- fillbitmap(priority_bitmap,0,cliprect);
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
+ bitmap_fill(bitmap, cliprect, 0);
#ifdef MAME_DEBUG
if (dislayer[3]==0)
diff --git a/src/mame/video/tsamurai.c b/src/mame/video/tsamurai.c
index aa1d3208d07..d9334bc9d24 100644
--- a/src/mame/video/tsamurai.c
+++ b/src/mame/video/tsamurai.c
@@ -216,7 +216,7 @@ VIDEO_UPDATE( tsamurai )
Note that the background color register isn't well understood
(screenshots would be helpful)
*/
- fillbitmap(bitmap,bgcolor,cliprect);
+ bitmap_fill(bitmap,cliprect,bgcolor);
tilemap_draw(bitmap,cliprect,background,0,0);
draw_sprites(screen->machine, bitmap,cliprect);
tilemap_draw(bitmap,cliprect,foreground,0,0);
diff --git a/src/mame/video/tumbleb.c b/src/mame/video/tumbleb.c
index 51d505335f9..b458a0aeaae 100644
--- a/src/mame/video/tumbleb.c
+++ b/src/mame/video/tumbleb.c
@@ -748,7 +748,7 @@ VIDEO_UPDATE( fncywld )
VIDEO_UPDATE( jumppop )
{
-// fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+// bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
tilemap_set_scrollx( pf1_tilemap,0, jumppop_control[2]-0x3a0 );
tilemap_set_scrolly( pf1_tilemap,0, jumppop_control[3] );
diff --git a/src/mame/video/tumblep.c b/src/mame/video/tumblep.c
index 7d9e56f2f22..7fead213e31 100644
--- a/src/mame/video/tumblep.c
+++ b/src/mame/video/tumblep.c
@@ -90,7 +90,7 @@ VIDEO_UPDATE(tumblep)
flip_screen_set( deco16_pf12_control[0]&0x80 );
deco16_pf12_update(deco16_pf1_rowscroll,deco16_pf2_rowscroll);
- fillbitmap(bitmap,256,cliprect); /* not verified */
+ bitmap_fill(bitmap,cliprect,256); /* not verified */
deco16_tilemap_2_draw(bitmap,cliprect,TILEMAP_DRAW_OPAQUE,0);
deco16_tilemap_1_draw(bitmap,cliprect,0,0);
diff --git a/src/mame/video/tunhunt.c b/src/mame/video/tunhunt.c
index ca7298fe963..6bc1010c265 100644
--- a/src/mame/video/tunhunt.c
+++ b/src/mame/video/tunhunt.c
@@ -269,7 +269,7 @@ static void draw_box(bitmap_t *bitmap, const rectangle *cliprect)
{
/*
This is unnecessarily slow, but the box priorities aren't completely understood,
- yet. Once understood, this function should be converted to use fillbitmap with
+ yet. Once understood, this function should be converted to use bitmap_fill with
rectangular chunks instead of BITMAP_ADDR.
Tunnels:
diff --git a/src/mame/video/twin16.c b/src/mame/video/twin16.c
index 0de46bdc8ac..d7af59e6409 100644
--- a/src/mame/video/twin16.c
+++ b/src/mame/video/twin16.c
@@ -436,7 +436,7 @@ VIDEO_START( fround )
VIDEO_UPDATE( twin16 )
{
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
draw_layer( bitmap,1 );
if (twin16_custom_video)
diff --git a/src/mame/video/twincobr.c b/src/mame/video/twincobr.c
index 8122723b65d..b8b4e2204e5 100644
--- a/src/mame/video/twincobr.c
+++ b/src/mame/video/twincobr.c
@@ -500,7 +500,7 @@ VIDEO_UPDATE( toaplan0 )
if (wardner_sprite_hack) wardner_sprite_priority_hack();
- fillbitmap(bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0);
tilemap_draw(bitmap,cliprect,bg_tilemap,TILEMAP_DRAW_OPAQUE,0);
draw_sprites(screen->machine, bitmap,cliprect,0x0400);
diff --git a/src/mame/video/undrfire.c b/src/mame/video/undrfire.c
index d706addbfcb..e79cede8469 100644
--- a/src/mame/video/undrfire.c
+++ b/src/mame/video/undrfire.c
@@ -425,8 +425,8 @@ VIDEO_UPDATE( undrfire )
pivlayer[1] = pivlayer[0]^1;
pivlayer[2] = 2;
- fillbitmap(priority_bitmap,0,cliprect);
- fillbitmap(bitmap,0,cliprect); /* wrong color? */
+ bitmap_fill(priority_bitmap,cliprect,0);
+ bitmap_fill(bitmap,cliprect,0); /* wrong color? */
/* The "PIV" chip seems to be a renamed TC0100SCN. It has a
@@ -569,8 +569,8 @@ VIDEO_UPDATE( cbombers )
pivlayer[1] = pivlayer[0]^1;
pivlayer[2] = 2;
- fillbitmap(priority_bitmap,0,cliprect);
- fillbitmap(bitmap,0,cliprect); /* wrong color? */
+ bitmap_fill(priority_bitmap,cliprect,0);
+ bitmap_fill(bitmap,cliprect,0); /* wrong color? */
/* The "PIV" chip seems to be a renamed TC0100SCN. It has a
diff --git a/src/mame/video/unico.c b/src/mame/video/unico.c
index d9108821754..52925d9e7af 100644
--- a/src/mame/video/unico.c
+++ b/src/mame/video/unico.c
@@ -358,8 +358,8 @@ if ( input_code_pressed(KEYCODE_Z) || input_code_pressed(KEYCODE_X) )
#endif
/* The background color is the first of the last palette */
- fillbitmap(bitmap,0x1f00,cliprect);
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0x1f00);
+ bitmap_fill(priority_bitmap,cliprect,0);
if (layers_ctrl & 1) tilemap_draw(bitmap,cliprect,tilemap_0,0,1);
if (layers_ctrl & 2) tilemap_draw(bitmap,cliprect,tilemap_1,0,2);
@@ -397,8 +397,8 @@ if ( input_code_pressed(KEYCODE_Z) || input_code_pressed(KEYCODE_X) )
#endif
/* The background color is the first of the last palette */
- fillbitmap(bitmap,0x1f00,cliprect);
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(bitmap,cliprect,0x1f00);
+ bitmap_fill(priority_bitmap,cliprect,0);
if (layers_ctrl & 1) tilemap_draw(bitmap,cliprect,tilemap_0,0,1);
if (layers_ctrl & 2) tilemap_draw(bitmap,cliprect,tilemap_1,0,2);
diff --git a/src/mame/video/vendetta.c b/src/mame/video/vendetta.c
index 81d12d3feb3..c4bdcbddc5a 100644
--- a/src/mame/video/vendetta.c
+++ b/src/mame/video/vendetta.c
@@ -114,7 +114,7 @@ VIDEO_UPDATE( vendetta )
sortlayers(layer,layerpri);
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
tilemap_draw(bitmap,cliprect,K052109_tilemap[layer[0]],TILEMAP_DRAW_OPAQUE,1);
tilemap_draw(bitmap,cliprect,K052109_tilemap[layer[1]],0,2);
tilemap_draw(bitmap,cliprect,K052109_tilemap[layer[2]],0,4);
diff --git a/src/mame/video/volfied.c b/src/mame/video/volfied.c
index 202e7954413..0f450111952 100644
--- a/src/mame/video/volfied.c
+++ b/src/mame/video/volfied.c
@@ -126,7 +126,7 @@ static void refresh_pixel_layer(running_machine *machine, bitmap_t *bitmap)
VIDEO_UPDATE( volfied )
{
- fillbitmap(priority_bitmap, 0, cliprect);
+ bitmap_fill(priority_bitmap, cliprect, 0);
refresh_pixel_layer(screen->machine, bitmap);
PC090OJ_draw_sprites(screen->machine, bitmap, cliprect, 0);
return 0;
diff --git a/src/mame/video/warriorb.c b/src/mame/video/warriorb.c
index 2de6d413f8c..5aac9e18ecd 100644
--- a/src/mame/video/warriorb.c
+++ b/src/mame/video/warriorb.c
@@ -131,14 +131,14 @@ VIDEO_UPDATE( warriorb )
layer[2] = 2;
/* Clear priority bitmap */
- fillbitmap(priority_bitmap, 0, cliprect);
+ bitmap_fill(priority_bitmap, cliprect, 0);
/* chip 0 does tilemaps on the left, chip 1 does the ones on the right */
// draw bottom layer
nodraw = TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,screen_number,layer[0],TILEMAP_DRAW_OPAQUE,0); /* left */
/* Ensure screen blanked even when bottom layers not drawn due to disable bit */
- if(nodraw) fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ if(nodraw) bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
// draw middle layer
TC0100SCN_tilemap_draw(screen->machine,bitmap,cliprect,screen_number,layer[1],0,1);
diff --git a/src/mame/video/wecleman.c b/src/mame/video/wecleman.c
index 906e0b1932e..7bca2ab7152 100644
--- a/src/mame/video/wecleman.c
+++ b/src/mame/video/wecleman.c
@@ -1084,7 +1084,7 @@ VIDEO_UPDATE ( wecleman )
get_sprite_info(screen->machine);
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
/* Draw the road (lines which have priority 0x02) */
if (video_on) wecleman_draw_road(screen->machine, bitmap, cliprect, 0x02);
@@ -1145,7 +1145,7 @@ VIDEO_UPDATE( hotchase )
get_sprite_info(screen->machine);
- fillbitmap(bitmap, get_black_pen(screen->machine), cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine));
/* Draw the background */
if (video_on) K051316_zoom_draw_0(bitmap,cliprect, 0, 0);
diff --git a/src/mame/video/wgp.c b/src/mame/video/wgp.c
index efec69a5054..d4e12e83aad 100644
--- a/src/mame/video/wgp.c
+++ b/src/mame/video/wgp.c
@@ -691,7 +691,7 @@ VIDEO_UPDATE( wgp )
TC0100SCN_tilemap_update(screen->machine);
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
layer[0] = 0;
layer[1] = 1;
diff --git a/src/mame/video/wiz.c b/src/mame/video/wiz.c
index bad10e5d80c..53a2561037d 100644
--- a/src/mame/video/wiz.c
+++ b/src/mame/video/wiz.c
@@ -226,7 +226,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,
VIDEO_UPDATE( kungfut )
{
- fillbitmap(bitmap,bgpen,cliprect);
+ bitmap_fill(bitmap,cliprect,bgpen);
draw_background(screen->machine, bitmap, cliprect, 2 + char_bank[0] , 0);
draw_foreground(screen->machine, bitmap, cliprect, 0);
draw_sprites(screen->machine, bitmap, cliprect, spriteram_2, 4);
@@ -239,7 +239,7 @@ VIDEO_UPDATE( wiz )
int bank;
const rectangle* visible_area;
- fillbitmap(bitmap,bgpen,cliprect);
+ bitmap_fill(bitmap,cliprect,bgpen);
draw_background(screen->machine, bitmap, cliprect, 2 + ((char_bank[0] << 1) | char_bank[1]), 0);
draw_foreground(screen->machine, bitmap, cliprect, 0);
@@ -255,7 +255,7 @@ VIDEO_UPDATE( wiz )
VIDEO_UPDATE( stinger )
{
- fillbitmap(bitmap,bgpen,cliprect);
+ bitmap_fill(bitmap,cliprect,bgpen);
draw_background(screen->machine, bitmap, cliprect, 2 + char_bank[0], 1);
draw_foreground(screen->machine, bitmap, cliprect, 1);
draw_sprites(screen->machine, bitmap, cliprect, spriteram_2, 4);
diff --git a/src/mame/video/wolfpack.c b/src/mame/video/wolfpack.c
index 8a642dea6c1..31b5cad486e 100644
--- a/src/mame/video/wolfpack.c
+++ b/src/mame/video/wolfpack.c
@@ -276,7 +276,7 @@ VIDEO_UPDATE( wolfpack )
color < 0xb8 ? color + 0x48 : 0xff,
color < 0xb8 ? color + 0x48 : 0xff));
- fillbitmap(bitmap, wolfpack_video_invert, cliprect);
+ bitmap_fill(bitmap, cliprect, wolfpack_video_invert);
for (i = 0; i < 8; i++)
for (j = 0; j < 32; j++)
@@ -313,7 +313,7 @@ VIDEO_EOF( wolfpack )
rect.max_x = helper->width - 1;
rect.max_y = helper->height - 1;
- fillbitmap(helper, 0, &rect);
+ bitmap_fill(helper, &rect, 0);
draw_ship(machine, helper, &rect);
diff --git a/src/mame/video/xexex.c b/src/mame/video/xexex.c
index 55ac1b4ea2b..a75ef019d86 100644
--- a/src/mame/video/xexex.c
+++ b/src/mame/video/xexex.c
@@ -112,7 +112,7 @@ VIDEO_UPDATE( xexex )
K054338_update_all_shadows(screen->machine);
K054338_fill_backcolor(screen->machine, bitmap, 0);
- fillbitmap(priority_bitmap, 0, cliprect);
+ bitmap_fill(priority_bitmap, cliprect, 0);
for (plane=0; plane<4; plane++)
{
diff --git a/src/mame/video/xmen.c b/src/mame/video/xmen.c
index 4d9d1cc7746..422dc5acd90 100644
--- a/src/mame/video/xmen.c
+++ b/src/mame/video/xmen.c
@@ -117,9 +117,9 @@ VIDEO_UPDATE( xmen )
sortlayers(layer,layerpri);
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
/* note the '+1' in the background color!!! */
- fillbitmap(bitmap,16 * bg_colorbase+1,cliprect);
+ bitmap_fill(bitmap,cliprect,16 * bg_colorbase+1);
tilemap_draw(bitmap,cliprect,K052109_tilemap[layer[0]],0,1);
tilemap_draw(bitmap,cliprect,K052109_tilemap[layer[1]],0,2);
tilemap_draw(bitmap,cliprect,K052109_tilemap[layer[2]],0,4);
@@ -243,9 +243,9 @@ VIDEO_EOF( xmen6p )
sortlayers(layer,layerpri);
- fillbitmap(priority_bitmap,0,&cliprect);
+ bitmap_fill(priority_bitmap,&cliprect,0);
/* note the '+1' in the background color!!! */
- fillbitmap(renderbitmap,16 * bg_colorbase+1,&cliprect);
+ bitmap_fill(renderbitmap,&cliprect,16 * bg_colorbase+1);
tilemap_draw(renderbitmap,&cliprect,K052109_tilemap[layer[0]],0,1);
tilemap_draw(renderbitmap,&cliprect,K052109_tilemap[layer[1]],0,2);
tilemap_draw(renderbitmap,&cliprect,K052109_tilemap[layer[2]],0,4);
diff --git a/src/mame/video/ygv608.c b/src/mame/video/ygv608.c
index fb51211a150..4ae0264d12c 100644
--- a/src/mame/video/ygv608.c
+++ b/src/mame/video/ygv608.c
@@ -756,7 +756,7 @@ VIDEO_UPDATE( ygv608 )
// punt if not initialized
if (ygv608.page_x == 0 || ygv608.page_y == 0)
{
- fillbitmap(bitmap, 0, cliprect);
+ bitmap_fill(bitmap, cliprect, 0);
return 0;
}
@@ -809,7 +809,7 @@ VIDEO_UPDATE( ygv608 )
tilemap_set_scroll_cols( tilemap_B, ygv608.page_x );
// now clear the screen in case we change to 1-plane mode
- fillbitmap( work_bitmap, 0, cliprect );
+ bitmap_fill( work_bitmap, cliprect , 0);
// reset resize flag
ygv608.tilemap_resize = 0;
@@ -862,8 +862,8 @@ VIDEO_UPDATE( ygv608 )
if ((ygv608.regs.s.r7 & r7_md) & MD_1PLANE)
{
// If the background tilemap is disabled, we need to clear the bitmap to black
- fillbitmap (work_bitmap,0,cliprect);
-// fillbitmap (work_bitmap,1,visarea);
+ bitmap_fill (work_bitmap,cliprect,0);
+// bitmap_fill (work_bitmap,visarea,1);
}
else
#endif
@@ -900,7 +900,7 @@ VIDEO_UPDATE( ygv608 )
// for some reason we can't use an opaque tilemap_A
// so use a transparent but clear the work bitmap first
// - look at why this is the case?!?
- fillbitmap( work_bitmap,0,visarea );
+ bitmap_fill( work_bitmap,visarea ,0);
if ((ygv608.regs.s.r11 & r11_prm) == PRM_ASBDEX ||
(ygv608.regs.s.r11 & r11_prm) == PRM_ASEBDX )
diff --git a/src/mame/video/yunsun16.c b/src/mame/video/yunsun16.c
index 3c0db3ab159..e90dfc90191 100644
--- a/src/mame/video/yunsun16.c
+++ b/src/mame/video/yunsun16.c
@@ -212,7 +212,7 @@ VIDEO_UPDATE( yunsun16 )
// popmessage("%04X", *yunsun16_priority);
- fillbitmap(priority_bitmap,0,cliprect);
+ bitmap_fill(priority_bitmap,cliprect,0);
if((*yunsun16_priority & 0x0c) == 4)
{
diff --git a/src/mame/video/yunsung8.c b/src/mame/video/yunsung8.c
index 16f33e858f7..68086f727af 100644
--- a/src/mame/video/yunsung8.c
+++ b/src/mame/video/yunsung8.c
@@ -199,7 +199,7 @@ if (input_code_pressed(KEYCODE_Z))
#endif
if (layers_ctrl&1) tilemap_draw(bitmap,cliprect, tilemap_0, 0,0);
- else fillbitmap(bitmap,0,cliprect);
+ else bitmap_fill(bitmap,cliprect,0);
if (layers_ctrl&2) tilemap_draw(bitmap,cliprect, tilemap_1, 0,0);
return 0;
diff --git a/src/mame/video/zaxxon.c b/src/mame/video/zaxxon.c
index a203d540eca..ccceda5d6d9 100644
--- a/src/mame/video/zaxxon.c
+++ b/src/mame/video/zaxxon.c
@@ -364,7 +364,7 @@ static void draw_background(running_machine *machine, bitmap_t *bitmap, const re
/* if not enabled, fill the background with black */
else
- fillbitmap(bitmap, get_black_pen(machine), cliprect);
+ bitmap_fill(bitmap, cliprect, get_black_pen(machine));
}
diff --git a/src/osd/windows/drawd3d.c b/src/osd/windows/drawd3d.c
index 25ead086cea..d1574568c73 100644
--- a/src/osd/windows/drawd3d.c
+++ b/src/osd/windows/drawd3d.c
@@ -508,7 +508,7 @@ static int drawd3d_window_init(win_window_info *window)
d3d->vector_bitmap = render_load_png(NULL, "vector.png", NULL, NULL);
if (d3d->vector_bitmap != NULL)
{
- fillbitmap(d3d->vector_bitmap, MAKE_ARGB(0xff,0xff,0xff,0xff), NULL);
+ bitmap_fill(d3d->vector_bitmap, NULL, MAKE_ARGB(0xff,0xff,0xff,0xff));
d3d->vector_bitmap = render_load_png(NULL, "vector.png", d3d->vector_bitmap, NULL);
}