summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatarGravatar Vas Crabb <vas@vastheman.com>2020-03-11 15:47:30 +1100
committerGravatarGravatar Vas Crabb <vas@vastheman.com>2020-03-11 15:47:30 +1100
commit9733f5cf3df1255566dc147540a8d6ceab4adb6d (patch) (github)
tree637f1e69a2b520771888635337ea4e051d7fa797
parente7b33bd5e22adfc7422c969a0a2b6400c6563394 (diff)
downloadmame-9733f5cf3df1255566dc147540a8d6ceab4adb6d.tar.bz2
mame-9733f5cf3df1255566dc147540a8d6ceab4adb6d.zip
tilemap: that macro has contributed nothing but obfuscation since we moved to C++
-rw-r--r--src/devices/machine/tc009xlvc.cpp4
-rw-r--r--src/emu/tilemap.h9
-rw-r--r--src/mame/drivers/1945kiii.cpp2
-rw-r--r--src/mame/drivers/3x3puzzl.cpp6
-rw-r--r--src/mame/drivers/akkaarrh.cpp2
-rw-r--r--src/mame/drivers/albazg.cpp2
-rw-r--r--src/mame/drivers/ambush.cpp6
-rw-r--r--src/mame/drivers/amusco.cpp2
-rw-r--r--src/mame/drivers/avt.cpp2
-rw-r--r--src/mame/drivers/bestleag.cpp6
-rw-r--r--src/mame/drivers/bionicc.cpp6
-rw-r--r--src/mame/drivers/blackt96.cpp2
-rw-r--r--src/mame/drivers/blockade.cpp2
-rw-r--r--src/mame/drivers/bmcpokr.cpp2
-rw-r--r--src/mame/drivers/bnstars.cpp12
-rw-r--r--src/mame/drivers/cabaret.cpp4
-rw-r--r--src/mame/drivers/calorie.cpp4
-rw-r--r--src/mame/drivers/carjmbre.cpp2
-rw-r--r--src/mame/drivers/caswin.cpp2
-rw-r--r--src/mame/drivers/cb2001.cpp6
-rw-r--r--src/mame/drivers/cball.cpp2
-rw-r--r--src/mame/drivers/chanbara.cpp4
-rw-r--r--src/mame/drivers/chance32.cpp4
-rw-r--r--src/mame/drivers/chinsan.cpp2
-rw-r--r--src/mame/drivers/clpoker.cpp4
-rw-r--r--src/mame/drivers/cntsteer.cpp4
-rw-r--r--src/mame/drivers/coinmstr.cpp2
-rw-r--r--src/mame/drivers/cswat.cpp2
-rw-r--r--src/mame/drivers/cultures.cpp6
-rw-r--r--src/mame/drivers/cybertnk.cpp2
-rw-r--r--src/mame/drivers/d9final.cpp2
-rw-r--r--src/mame/drivers/dacholer.cpp4
-rw-r--r--src/mame/drivers/ddayjlc.cpp4
-rw-r--r--src/mame/drivers/ddealer.cpp2
-rw-r--r--src/mame/drivers/dmndrby.cpp2
-rw-r--r--src/mame/drivers/dreamwld.cpp2
-rw-r--r--src/mame/drivers/drtomy.cpp4
-rw-r--r--src/mame/drivers/drw80pkr.cpp2
-rw-r--r--src/mame/drivers/dunhuang.cpp4
-rw-r--r--src/mame/drivers/dynadice.cpp2
-rw-r--r--src/mame/drivers/efdt.cpp4
-rw-r--r--src/mame/drivers/egghunt.cpp2
-rw-r--r--src/mame/drivers/ettrivia.cpp2
-rw-r--r--src/mame/drivers/firefox.cpp2
-rw-r--r--src/mame/drivers/flower.cpp4
-rw-r--r--src/mame/drivers/flyball.cpp2
-rw-r--r--src/mame/drivers/fresh.cpp4
-rw-r--r--src/mame/drivers/funtech.cpp4
-rw-r--r--src/mame/drivers/galaxi.cpp10
-rw-r--r--src/mame/drivers/gluck2.cpp2
-rw-r--r--src/mame/drivers/goldnpkr.cpp6
-rw-r--r--src/mame/drivers/good.cpp4
-rw-r--r--src/mame/drivers/goodejan.cpp8
-rw-r--r--src/mame/drivers/headonb.cpp2
-rw-r--r--src/mame/drivers/hitme.cpp2
-rw-r--r--src/mame/drivers/hvyunit.cpp2
-rw-r--r--src/mame/drivers/i7000.cpp2
-rw-r--r--src/mame/drivers/igs009.cpp18
-rw-r--r--src/mame/drivers/igspoker.cpp4
-rw-r--r--src/mame/drivers/istrebiteli.cpp2
-rw-r--r--src/mame/drivers/jackie.cpp4
-rw-r--r--src/mame/drivers/jalmah.cpp2
-rw-r--r--src/mame/drivers/jclub2.cpp4
-rw-r--r--src/mame/drivers/jokrwild.cpp2
-rw-r--r--src/mame/drivers/jollyjgr.cpp2
-rw-r--r--src/mame/drivers/joystand.cpp4
-rw-r--r--src/mame/drivers/jubilee.cpp2
-rw-r--r--src/mame/drivers/kingdrby.cpp4
-rw-r--r--src/mame/drivers/koftball.cpp4
-rw-r--r--src/mame/drivers/koikoi.cpp2
-rw-r--r--src/mame/drivers/lbeach.cpp4
-rw-r--r--src/mame/drivers/limenko.cpp6
-rw-r--r--src/mame/drivers/looping.cpp2
-rw-r--r--src/mame/drivers/ltcasino.cpp4
-rw-r--r--src/mame/drivers/luckgrln.cpp2
-rw-r--r--src/mame/drivers/m14.cpp2
-rw-r--r--src/mame/drivers/m63.cpp4
-rw-r--r--src/mame/drivers/magic10.cpp6
-rw-r--r--src/mame/drivers/magicfly.cpp4
-rw-r--r--src/mame/drivers/majorpkr.cpp4
-rw-r--r--src/mame/drivers/marinedt.cpp2
-rw-r--r--src/mame/drivers/mastboyo.cpp2
-rw-r--r--src/mame/drivers/mgames.cpp2
-rw-r--r--src/mame/drivers/mgolf.cpp2
-rw-r--r--src/mame/drivers/mil4000.cpp8
-rw-r--r--src/mame/drivers/mogura.cpp2
-rw-r--r--src/mame/drivers/mole.cpp2
-rw-r--r--src/mame/drivers/mpu12wbk.cpp4
-rw-r--r--src/mame/drivers/multfish.cpp4
-rw-r--r--src/mame/drivers/namcos23.cpp2
-rw-r--r--src/mame/drivers/nibble.cpp2
-rw-r--r--src/mame/drivers/nmg5.cpp2
-rw-r--r--src/mame/drivers/nsmpoker.cpp2
-rw-r--r--src/mame/drivers/olibochu.cpp2
-rw-r--r--src/mame/drivers/onetwo.cpp2
-rw-r--r--src/mame/drivers/panicr.cpp6
-rw-r--r--src/mame/drivers/patapata.cpp4
-rw-r--r--src/mame/drivers/peplus.cpp2
-rw-r--r--src/mame/drivers/pipeline.cpp4
-rw-r--r--src/mame/drivers/pkscram.cpp6
-rw-r--r--src/mame/drivers/popobear.cpp8
-rw-r--r--src/mame/drivers/popper.cpp4
-rw-r--r--src/mame/drivers/powerbal.cpp2
-rw-r--r--src/mame/drivers/ppmast93.cpp4
-rw-r--r--src/mame/drivers/pturn.cpp4
-rw-r--r--src/mame/drivers/pzletime.cpp4
-rw-r--r--src/mame/drivers/quickpick5.cpp2
-rw-r--r--src/mame/drivers/quizpun2.cpp4
-rw-r--r--src/mame/drivers/quizshow.cpp2
-rw-r--r--src/mame/drivers/rabbit.cpp4
-rw-r--r--src/mame/drivers/rmhaihai.cpp2
-rw-r--r--src/mame/drivers/safarir.cpp4
-rw-r--r--src/mame/drivers/sanremo.cpp2
-rw-r--r--src/mame/drivers/sbowling.cpp2
-rw-r--r--src/mame/drivers/sbrkout.cpp2
-rw-r--r--src/mame/drivers/seabattl.cpp2
-rw-r--r--src/mame/drivers/seicupbl.cpp8
-rw-r--r--src/mame/drivers/sengokmj.cpp8
-rw-r--r--src/mame/drivers/sfbonus.cpp4
-rw-r--r--src/mame/drivers/silvmil.cpp4
-rw-r--r--src/mame/drivers/skyarmy.cpp2
-rw-r--r--src/mame/drivers/skylncr.cpp10
-rw-r--r--src/mame/drivers/spartanxtec.cpp2
-rw-r--r--src/mame/drivers/spdheat.cpp2
-rw-r--r--src/mame/drivers/spoker.cpp4
-rw-r--r--src/mame/drivers/spool99.cpp2
-rw-r--r--src/mame/drivers/spyhuntertec.cpp4
-rw-r--r--src/mame/drivers/sshot.cpp2
-rw-r--r--src/mame/drivers/statriv2.cpp4
-rw-r--r--src/mame/drivers/stuntair.cpp4
-rw-r--r--src/mame/drivers/subsino.cpp8
-rw-r--r--src/mame/drivers/subsino2.cpp2
-rw-r--r--src/mame/drivers/supduck.cpp6
-rw-r--r--src/mame/drivers/supercrd.cpp2
-rw-r--r--src/mame/drivers/superdq.cpp2
-rw-r--r--src/mame/drivers/superwng.cpp4
-rw-r--r--src/mame/drivers/supracan.cpp6
-rw-r--r--src/mame/drivers/suprgolf.cpp2
-rw-r--r--src/mame/drivers/taitopjc.cpp2
-rw-r--r--src/mame/drivers/tattack.cpp2
-rw-r--r--src/mame/drivers/tmspoker.cpp2
-rw-r--r--src/mame/drivers/toki_ms.cpp6
-rw-r--r--src/mame/drivers/trvmadns.cpp2
-rw-r--r--src/mame/drivers/umipoker.cpp8
-rw-r--r--src/mame/drivers/videopkr.cpp2
-rw-r--r--src/mame/drivers/vlc.cpp2
-rw-r--r--src/mame/drivers/vroulet.cpp2
-rw-r--r--src/mame/drivers/wallc.cpp6
-rw-r--r--src/mame/drivers/warpsped.cpp4
-rw-r--r--src/mame/drivers/wink.cpp2
-rw-r--r--src/mame/drivers/witch.cpp6
-rw-r--r--src/mame/drivers/wyvernf0.cpp4
-rw-r--r--src/mame/drivers/xyonix.cpp2
-rw-r--r--src/mame/drivers/zwackery.cpp4
-rw-r--r--src/mame/machine/megacd.cpp8
-rw-r--r--src/mame/video/1942.cpp4
-rw-r--r--src/mame/video/1943.cpp6
-rw-r--r--src/mame/video/40love.cpp2
-rw-r--r--src/mame/video/4enraya.cpp2
-rw-r--r--src/mame/video/aeroboto.cpp2
-rw-r--r--src/mame/video/aerofgt.cpp8
-rw-r--r--src/mame/video/airbustr.cpp2
-rw-r--r--src/mame/video/airraid_dev.cpp6
-rw-r--r--src/mame/video/alpha68k.cpp2
-rw-r--r--src/mame/video/ampoker2.cpp4
-rw-r--r--src/mame/video/amspdwy.cpp2
-rw-r--r--src/mame/video/angelkds.cpp6
-rw-r--r--src/mame/video/appoooh.cpp4
-rw-r--r--src/mame/video/aquarium.cpp6
-rw-r--r--src/mame/video/aquarius.cpp2
-rw-r--r--src/mame/video/argus.cpp14
-rw-r--r--src/mame/video/arkanoid.cpp2
-rw-r--r--src/mame/video/armedf.cpp8
-rw-r--r--src/mame/video/ashnojoe.cpp12
-rw-r--r--src/mame/video/atarifb.cpp4
-rw-r--r--src/mame/video/atarig1.cpp4
-rw-r--r--src/mame/video/atarig42.cpp4
-rw-r--r--src/mame/video/atarigt.cpp4
-rw-r--r--src/mame/video/atarigx2.cpp4
-rw-r--r--src/mame/video/atarisy1.cpp4
-rw-r--r--src/mame/video/atarisy2.cpp4
-rw-r--r--src/mame/video/atetris.cpp2
-rw-r--r--src/mame/video/badlands.cpp2
-rw-r--r--src/mame/video/bagman.cpp2
-rw-r--r--src/mame/video/bankp.cpp4
-rw-r--r--src/mame/video/baraduke.cpp6
-rw-r--r--src/mame/video/batman.cpp6
-rw-r--r--src/mame/video/battlane.cpp2
-rw-r--r--src/mame/video/battlex.cpp4
-rw-r--r--src/mame/video/bbusters.cpp4
-rw-r--r--src/mame/video/bfm_adr2.cpp4
-rw-r--r--src/mame/video/bigstrkb.cpp6
-rw-r--r--src/mame/video/bking.cpp2
-rw-r--r--src/mame/video/blktiger.cpp4
-rw-r--r--src/mame/video/blmbycar.cpp2
-rw-r--r--src/mame/video/bloodbro.cpp6
-rw-r--r--src/mame/video/blstroid.cpp2
-rw-r--r--src/mame/video/blueprnt.cpp2
-rw-r--r--src/mame/video/bogeyman.cpp4
-rw-r--r--src/mame/video/bombjack.cpp4
-rw-r--r--src/mame/video/bosco.cpp2
-rw-r--r--src/mame/video/brkthru.cpp4
-rw-r--r--src/mame/video/bsktball.cpp2
-rw-r--r--src/mame/video/bwing.cpp6
-rw-r--r--src/mame/video/c45.cpp2
-rw-r--r--src/mame/video/cabal.cpp4
-rw-r--r--src/mame/video/calomega.cpp2
-rw-r--r--src/mame/video/canyon.cpp2
-rw-r--r--src/mame/video/cbasebal.cpp4
-rw-r--r--src/mame/video/cclimber.cpp12
-rw-r--r--src/mame/video/centiped.cpp8
-rw-r--r--src/mame/video/chaknpop.cpp2
-rw-r--r--src/mame/video/champbas.cpp4
-rw-r--r--src/mame/video/cheekyms.cpp2
-rw-r--r--src/mame/video/circus.cpp2
-rw-r--r--src/mame/video/circusc.cpp2
-rw-r--r--src/mame/video/citycon.cpp4
-rw-r--r--src/mame/video/cloak.cpp2
-rw-r--r--src/mame/video/clshroad.cpp8
-rw-r--r--src/mame/video/combatsc.cpp12
-rw-r--r--src/mame/video/commando.cpp4
-rw-r--r--src/mame/video/compgolf.cpp4
-rw-r--r--src/mame/video/contra.cpp6
-rw-r--r--src/mame/video/cop01.cpp4
-rw-r--r--src/mame/video/cps1.cpp10
-rw-r--r--src/mame/video/crbaloon.cpp2
-rw-r--r--src/mame/video/crospang.cpp4
-rw-r--r--src/mame/video/crshrace.cpp4
-rw-r--r--src/mame/video/cyberbal.cpp8
-rw-r--r--src/mame/video/cybstorm.cpp6
-rw-r--r--src/mame/video/darius.cpp2
-rw-r--r--src/mame/video/darkmist.cpp6
-rw-r--r--src/mame/video/dbz.cpp4
-rw-r--r--src/mame/video/dcon.cpp8
-rw-r--r--src/mame/video/dday.cpp8
-rw-r--r--src/mame/video/ddragon.cpp6
-rw-r--r--src/mame/video/ddragon3.cpp6
-rw-r--r--src/mame/video/ddribble.cpp4
-rw-r--r--src/mame/video/deadang.cpp10
-rw-r--r--src/mame/video/dec8.cpp18
-rw-r--r--src/mame/video/decbac06.cpp4
-rw-r--r--src/mame/video/deco16ic.cpp10
-rw-r--r--src/mame/video/decocass.cpp6
-rw-r--r--src/mame/video/deniam.cpp6
-rw-r--r--src/mame/video/digdug.cpp4
-rw-r--r--src/mame/video/divebomb.cpp2
-rw-r--r--src/mame/video/djboy.cpp2
-rw-r--r--src/mame/video/dkong.cpp4
-rw-r--r--src/mame/video/docastle.cpp2
-rw-r--r--src/mame/video/dogfgt.cpp2
-rw-r--r--src/mame/video/dragrace.cpp2
-rw-r--r--src/mame/video/drgnmst.cpp6
-rw-r--r--src/mame/video/drmicro.cpp4
-rw-r--r--src/mame/video/dynduke.cpp6
-rw-r--r--src/mame/video/edevices.cpp8
-rw-r--r--src/mame/video/eprom.cpp6
-rw-r--r--src/mame/video/equites.cpp8
-rw-r--r--src/mame/video/esd16.cpp4
-rw-r--r--src/mame/video/espial.cpp2
-rw-r--r--src/mame/video/exedexes.cpp6
-rw-r--r--src/mame/video/exprraid.cpp4
-rw-r--r--src/mame/video/f1gp.cpp6
-rw-r--r--src/mame/video/fastfred.cpp8
-rw-r--r--src/mame/video/fastlane.cpp4
-rw-r--r--src/mame/video/fcombat.cpp2
-rw-r--r--src/mame/video/finalizr.cpp4
-rw-r--r--src/mame/video/firetrap.cpp4
-rw-r--r--src/mame/video/firetrk.cpp12
-rw-r--r--src/mame/video/fitfight.cpp6
-rw-r--r--src/mame/video/flkatck.cpp4
-rw-r--r--src/mame/video/flstory.cpp6
-rw-r--r--src/mame/video/foodf.cpp2
-rw-r--r--src/mame/video/freekick.cpp2
-rw-r--r--src/mame/video/fromanc2.cpp4
-rw-r--r--src/mame/video/fromance.cpp4
-rw-r--r--src/mame/video/funkybee.cpp2
-rw-r--r--src/mame/video/funworld.cpp2
-rw-r--r--src/mame/video/funybubl.cpp2
-rw-r--r--src/mame/video/fuukifg2.cpp2
-rw-r--r--src/mame/video/fuukifg3.cpp2
-rw-r--r--src/mame/video/gaelco.cpp2
-rw-r--r--src/mame/video/gaelco2.cpp4
-rw-r--r--src/mame/video/gaiden.cpp8
-rw-r--r--src/mame/video/galaga.cpp2
-rw-r--r--src/mame/video/galaxia.cpp4
-rw-r--r--src/mame/video/galaxian.cpp2
-rw-r--r--src/mame/video/galaxold.cpp12
-rw-r--r--src/mame/video/galivan.cpp8
-rw-r--r--src/mame/video/gaplus.cpp2
-rw-r--r--src/mame/video/gatron.cpp2
-rw-r--r--src/mame/video/gauntlet.cpp4
-rw-r--r--src/mame/video/gberet.cpp2
-rw-r--r--src/mame/video/gcpinbal.cpp6
-rw-r--r--src/mame/video/ginganin.cpp6
-rw-r--r--src/mame/video/gladiatr.cpp4
-rw-r--r--src/mame/video/glass.cpp2
-rw-r--r--src/mame/video/gng.cpp4
-rw-r--r--src/mame/video/goal92.cpp6
-rw-r--r--src/mame/video/goindol.cpp4
-rw-r--r--src/mame/video/goldstar.cpp28
-rw-r--r--src/mame/video/gomoku.cpp2
-rw-r--r--src/mame/video/gotcha.cpp2
-rw-r--r--src/mame/video/gottlieb.cpp8
-rw-r--r--src/mame/video/gotya.cpp2
-rw-r--r--src/mame/video/gp9001.cpp2
-rw-r--r--src/mame/video/grchamp.cpp8
-rw-r--r--src/mame/video/gsword.cpp2
-rw-r--r--src/mame/video/gumbo.cpp4
-rw-r--r--src/mame/video/gundealr.cpp4
-rw-r--r--src/mame/video/gunsmoke.cpp4
-rw-r--r--src/mame/video/gyruss.cpp2
-rw-r--r--src/mame/video/hanaawas.cpp2
-rw-r--r--src/mame/video/hcastle.cpp4
-rw-r--r--src/mame/video/hexion.cpp2
-rw-r--r--src/mame/video/higemaru.cpp2
-rw-r--r--src/mame/video/himesiki.cpp2
-rw-r--r--src/mame/video/hng64.cpp14
-rw-r--r--src/mame/video/holeland.cpp4
-rw-r--r--src/mame/video/homedata.cpp14
-rw-r--r--src/mame/video/homerun.cpp2
-rw-r--r--src/mame/video/hyperspt.cpp4
-rw-r--r--src/mame/video/igs017_igs031.cpp4
-rw-r--r--src/mame/video/inufuku.cpp4
-rw-r--r--src/mame/video/iqblock.cpp4
-rw-r--r--src/mame/video/ironhors.cpp4
-rw-r--r--src/mame/video/jack.cpp4
-rw-r--r--src/mame/video/jackal.cpp2
-rw-r--r--src/mame/video/jailbrek.cpp2
-rw-r--r--src/mame/video/k001604.cpp4
-rw-r--r--src/mame/video/k007342.cpp2
-rw-r--r--src/mame/video/k037122.cpp4
-rw-r--r--src/mame/video/k051316.cpp2
-rw-r--r--src/mame/video/k052109.cpp2
-rw-r--r--src/mame/video/k054156_k054157_k056832.cpp2
-rw-r--r--src/mame/video/kaneko_tmap.cpp2
-rw-r--r--src/mame/video/karnov.cpp4
-rw-r--r--src/mame/video/kchamp.cpp2
-rw-r--r--src/mame/video/kickgoal.cpp8
-rw-r--r--src/mame/video/kingobox.cpp6
-rw-r--r--src/mame/video/klax.cpp2
-rw-r--r--src/mame/video/kncljoe.cpp2
-rw-r--r--src/mame/video/konamigx.cpp10
-rw-r--r--src/mame/video/kopunch.cpp4
-rw-r--r--src/mame/video/ksayakyu.cpp4
-rw-r--r--src/mame/video/kyugo.cpp4
-rw-r--r--src/mame/video/labyrunr.cpp4
-rw-r--r--src/mame/video/ladybug.cpp6
-rw-r--r--src/mame/video/ladyfrog.cpp2
-rw-r--r--src/mame/video/lasso.cpp6
-rw-r--r--src/mame/video/lastduel.cpp10
-rw-r--r--src/mame/video/legionna.cpp10
-rw-r--r--src/mame/video/leland.cpp4
-rw-r--r--src/mame/video/lemmings.cpp2
-rw-r--r--src/mame/video/liberate.cpp6
-rw-r--r--src/mame/video/lkage.cpp6
-rw-r--r--src/mame/video/lockon.cpp2
-rw-r--r--src/mame/video/lordgun.cpp2
-rw-r--r--src/mame/video/lucky74.cpp4
-rw-r--r--src/mame/video/lvcards.cpp2
-rw-r--r--src/mame/video/lwings.cpp8
-rw-r--r--src/mame/video/m10.cpp2
-rw-r--r--src/mame/video/m107.cpp2
-rw-r--r--src/mame/video/m52.cpp2
-rw-r--r--src/mame/video/m57.cpp2
-rw-r--r--src/mame/video/m58.cpp2
-rw-r--r--src/mame/video/m62.cpp32
-rw-r--r--src/mame/video/m72.cpp4
-rw-r--r--src/mame/video/m90.cpp2
-rw-r--r--src/mame/video/m92.cpp2
-rw-r--r--src/mame/video/macrossp.cpp8
-rw-r--r--src/mame/video/madalien.cpp6
-rw-r--r--src/mame/video/mainsnk.cpp4
-rw-r--r--src/mame/video/mappy.cpp6
-rw-r--r--src/mame/video/marineb.cpp2
-rw-r--r--src/mame/video/mario.cpp2
-rw-r--r--src/mame/video/markham.cpp2
-rw-r--r--src/mame/video/mb60553.cpp2
-rw-r--r--src/mame/video/mcr.cpp6
-rw-r--r--src/mame/video/mcr3.cpp8
-rw-r--r--src/mame/video/mcr68.cpp2
-rw-r--r--src/mame/video/meadows.cpp2
-rw-r--r--src/mame/video/mermaid.cpp4
-rw-r--r--src/mame/video/metlclsh.cpp4
-rw-r--r--src/mame/video/metro.cpp4
-rw-r--r--src/mame/video/microtan.cpp2
-rw-r--r--src/mame/video/mikie.cpp2
-rw-r--r--src/mame/video/mitchell.cpp2
-rw-r--r--src/mame/video/mjkjidai.cpp2
-rw-r--r--src/mame/video/model3.cpp4
-rw-r--r--src/mame/video/mosaic.cpp4
-rw-r--r--src/mame/video/mrdo.cpp4
-rw-r--r--src/mame/video/mrjong.cpp2
-rw-r--r--src/mame/video/ms1_tmap.cpp4
-rw-r--r--src/mame/video/ms32.cpp8
-rw-r--r--src/mame/video/msisaac.cpp6
-rw-r--r--src/mame/video/mugsmash.cpp4
-rw-r--r--src/mame/video/mustache.cpp2
-rw-r--r--src/mame/video/mystston.cpp4
-rw-r--r--src/mame/video/mystwarr.cpp4
-rw-r--r--src/mame/video/namco_c123tmap.cpp2
-rw-r--r--src/mame/video/namco_c169roz.cpp2
-rw-r--r--src/mame/video/namcona1.cpp8
-rw-r--r--src/mame/video/namcos22.cpp2
-rw-r--r--src/mame/video/namcos2_roz.cpp2
-rw-r--r--src/mame/video/namcos86.cpp2
-rw-r--r--src/mame/video/nemesis.cpp8
-rw-r--r--src/mame/video/news.cpp4
-rw-r--r--src/mame/video/ninjakd2.cpp8
-rw-r--r--src/mame/video/nmk16.cpp10
-rw-r--r--src/mame/video/nova2001.cpp14
-rw-r--r--src/mame/video/nycaptor.cpp2
-rw-r--r--src/mame/video/offtwall.cpp2
-rw-r--r--src/mame/video/ohmygod.cpp2
-rw-r--r--src/mame/video/ojankohs.cpp4
-rw-r--r--src/mame/video/oneshot.cpp6
-rw-r--r--src/mame/video/orbit.cpp2
-rw-r--r--src/mame/video/orca40c.cpp4
-rw-r--r--src/mame/video/pacland.cpp4
-rw-r--r--src/mame/video/pacman.cpp6
-rw-r--r--src/mame/video/pandoras.cpp2
-rw-r--r--src/mame/video/paradise.cpp6
-rw-r--r--src/mame/video/pass.cpp4
-rw-r--r--src/mame/video/pbaction.cpp4
-rw-r--r--src/mame/video/pc080sn.cpp4
-rw-r--r--src/mame/video/pgm.cpp4
-rw-r--r--src/mame/video/pgm2.cpp4
-rw-r--r--src/mame/video/phoenix.cpp4
-rw-r--r--src/mame/video/pingpong.cpp2
-rw-r--r--src/mame/video/pirates.cpp6
-rw-r--r--src/mame/video/pitnrun.cpp4
-rw-r--r--src/mame/video/playch10.cpp2
-rw-r--r--src/mame/video/playmark.cpp18
-rw-r--r--src/mame/video/plygonet.cpp4
-rw-r--r--src/mame/video/pokechmp.cpp2
-rw-r--r--src/mame/video/polepos.cpp4
-rw-r--r--src/mame/video/poolshrk.cpp2
-rw-r--r--src/mame/video/pooyan.cpp2
-rw-r--r--src/mame/video/popeye.cpp2
-rw-r--r--src/mame/video/portrait.cpp2
-rw-r--r--src/mame/video/powerins.cpp4
-rw-r--r--src/mame/video/prehisle.cpp6
-rw-r--r--src/mame/video/psikyo.cpp2
-rw-r--r--src/mame/video/psychic5.cpp4
-rw-r--r--src/mame/video/punchout.cpp14
-rw-r--r--src/mame/video/quizdna.cpp4
-rw-r--r--src/mame/video/quizpani.cpp4
-rw-r--r--src/mame/video/raiden.cpp6
-rw-r--r--src/mame/video/raiden2.cpp8
-rw-r--r--src/mame/video/rallyx.cpp4
-rw-r--r--src/mame/video/realbrk.cpp4
-rw-r--r--src/mame/video/redclash.cpp2
-rw-r--r--src/mame/video/relief.cpp4
-rw-r--r--src/mame/video/renegade.cpp4
-rw-r--r--src/mame/video/retofinv.cpp4
-rw-r--r--src/mame/video/rocnrope.cpp2
-rw-r--r--src/mame/video/rollrace.cpp2
-rw-r--r--src/mame/video/rpunch.cpp4
-rw-r--r--src/mame/video/runaway.cpp4
-rw-r--r--src/mame/video/rungun.cpp4
-rw-r--r--src/mame/video/sauro.cpp4
-rw-r--r--src/mame/video/sbasketb.cpp2
-rw-r--r--src/mame/video/sbugger.cpp2
-rw-r--r--src/mame/video/scotrsht.cpp2
-rw-r--r--src/mame/video/sderby.cpp6
-rw-r--r--src/mame/video/segag80r.cpp4
-rw-r--r--src/mame/video/segaic16.cpp12
-rw-r--r--src/mame/video/segaic24.cpp2
-rw-r--r--src/mame/video/segas32.cpp2
-rw-r--r--src/mame/video/seibuspi.cpp8
-rw-r--r--src/mame/video/seicross.cpp2
-rw-r--r--src/mame/video/senjyo.cpp10
-rw-r--r--src/mame/video/seta.cpp4
-rw-r--r--src/mame/video/sf.cpp6
-rw-r--r--src/mame/video/shadfrce.cpp6
-rw-r--r--src/mame/video/shangkid.cpp4
-rw-r--r--src/mame/video/shaolins.cpp2
-rw-r--r--src/mame/video/shisen.cpp2
-rw-r--r--src/mame/video/shootout.cpp4
-rw-r--r--src/mame/video/shuuz.cpp2
-rw-r--r--src/mame/video/sidearms.cpp6
-rw-r--r--src/mame/video/sidepckt.cpp2
-rw-r--r--src/mame/video/silkroad.cpp2
-rw-r--r--src/mame/video/skullxbo.cpp4
-rw-r--r--src/mame/video/skydiver.cpp2
-rw-r--r--src/mame/video/skykid.cpp4
-rw-r--r--src/mame/video/slapfght.cpp6
-rw-r--r--src/mame/video/snk.cpp20
-rw-r--r--src/mame/video/snk6502.cpp8
-rw-r--r--src/mame/video/snk68.cpp4
-rw-r--r--src/mame/video/snookr10.cpp6
-rw-r--r--src/mame/video/solomon.cpp4
-rw-r--r--src/mame/video/sonson.cpp2
-rw-r--r--src/mame/video/spbactn.cpp6
-rw-r--r--src/mame/video/spdodgeb.cpp2
-rw-r--r--src/mame/video/speedbal.cpp4
-rw-r--r--src/mame/video/speedspn.cpp2
-rw-r--r--src/mame/video/splash.cpp4
-rw-r--r--src/mame/video/sprint2.cpp2
-rw-r--r--src/mame/video/sprint4.cpp4
-rw-r--r--src/mame/video/sprint8.cpp4
-rw-r--r--src/mame/video/srumbler.cpp4
-rw-r--r--src/mame/video/sslam.cpp8
-rw-r--r--src/mame/video/ssozumo.cpp4
-rw-r--r--src/mame/video/ssrj.cpp6
-rw-r--r--src/mame/video/ssv.cpp2
-rw-r--r--src/mame/video/st0020.cpp2
-rw-r--r--src/mame/video/stadhero.cpp2
-rw-r--r--src/mame/video/starshp1.cpp2
-rw-r--r--src/mame/video/stfight_dev.cpp6
-rw-r--r--src/mame/video/sub.cpp2
-rw-r--r--src/mame/video/suna8.cpp2
-rw-r--r--src/mame/video/superqix.cpp4
-rw-r--r--src/mame/video/suprloco.cpp2
-rw-r--r--src/mame/video/suprnova.cpp4
-rw-r--r--src/mame/video/suprridr.cpp4
-rw-r--r--src/mame/video/suprslam.cpp4
-rw-r--r--src/mame/video/system1.cpp2
-rw-r--r--src/mame/video/system16.cpp18
-rw-r--r--src/mame/video/tagteam.cpp2
-rw-r--r--src/mame/video/tail2nos.cpp2
-rw-r--r--src/mame/video/taito_f3.cpp6
-rw-r--r--src/mame/video/taito_l.cpp4
-rw-r--r--src/mame/video/taitojc.cpp2
-rw-r--r--src/mame/video/tank8.cpp2
-rw-r--r--src/mame/video/tankbatt.cpp2
-rw-r--r--src/mame/video/tankbust.cpp4
-rw-r--r--src/mame/video/taotaido.cpp2
-rw-r--r--src/mame/video/targeth.cpp2
-rw-r--r--src/mame/video/tatsumi.cpp6
-rw-r--r--src/mame/video/tbowl.cpp6
-rw-r--r--src/mame/video/tc0080vco.cpp6
-rw-r--r--src/mame/video/tc0100scn.cpp4
-rw-r--r--src/mame/video/tc0180vcu.cpp6
-rw-r--r--src/mame/video/tc0280grd.cpp2
-rw-r--r--src/mame/video/tc0480scp.cpp4
-rw-r--r--src/mame/video/tceptor.cpp6
-rw-r--r--src/mame/video/tecmo.cpp10
-rw-r--r--src/mame/video/tecmo16.cpp6
-rw-r--r--src/mame/video/tecmosys.cpp2
-rw-r--r--src/mame/video/tehkanwc.cpp4
-rw-r--r--src/mame/video/terracre.cpp4
-rw-r--r--src/mame/video/tetrisp2.cpp14
-rw-r--r--src/mame/video/thedeep.cpp2
-rw-r--r--src/mame/video/thepit.cpp2
-rw-r--r--src/mame/video/thoop2.cpp2
-rw-r--r--src/mame/video/thunderj.cpp6
-rw-r--r--src/mame/video/tiamc1.cpp4
-rw-r--r--src/mame/video/tigeroad.cpp4
-rw-r--r--src/mame/video/timelimt.cpp4
-rw-r--r--src/mame/video/timeplt.cpp4
-rw-r--r--src/mame/video/tmap038.cpp2
-rw-r--r--src/mame/video/tmnt.cpp4
-rw-r--r--src/mame/video/toaplan1.cpp2
-rw-r--r--src/mame/video/toaplan2.cpp2
-rw-r--r--src/mame/video/toki.cpp6
-rw-r--r--src/mame/video/toobin.cpp4
-rw-r--r--src/mame/video/tp84.cpp4
-rw-r--r--src/mame/video/trackfld.cpp2
-rw-r--r--src/mame/video/travrusa.cpp2
-rw-r--r--src/mame/video/triplhnt.cpp2
-rw-r--r--src/mame/video/trucocl.cpp2
-rw-r--r--src/mame/video/tryout.cpp4
-rw-r--r--src/mame/video/tsamurai.cpp6
-rw-r--r--src/mame/video/tumbleb.cpp14
-rw-r--r--src/mame/video/tunhunt.cpp2
-rw-r--r--src/mame/video/turbo.cpp2
-rw-r--r--src/mame/video/twin16.cpp6
-rw-r--r--src/mame/video/twincobr.cpp6
-rw-r--r--src/mame/video/ultratnk.cpp4
-rw-r--r--src/mame/video/unico.cpp2
-rw-r--r--src/mame/video/vastar.cpp6
-rw-r--r--src/mame/video/vball.cpp2
-rw-r--r--src/mame/video/videopin.cpp2
-rw-r--r--src/mame/video/vindictr.cpp4
-rw-r--r--src/mame/video/vs920a.cpp2
-rw-r--r--src/mame/video/vulgus.cpp4
-rw-r--r--src/mame/video/warpwarp.cpp6
-rw-r--r--src/mame/video/wc90.cpp10
-rw-r--r--src/mame/video/wc90b.cpp6
-rw-r--r--src/mame/video/wecleman.cpp6
-rw-r--r--src/mame/video/welltris.cpp2
-rw-r--r--src/mame/video/wgp.cpp2
-rw-r--r--src/mame/video/williams.cpp8
-rw-r--r--src/mame/video/wrally.cpp2
-rw-r--r--src/mame/video/wwfsstar.cpp4
-rw-r--r--src/mame/video/x68k.cpp8
-rw-r--r--src/mame/video/xain.cpp4
-rw-r--r--src/mame/video/xevious.cpp4
-rw-r--r--src/mame/video/xorworld.cpp2
-rw-r--r--src/mame/video/xxmissio.cpp4
-rw-r--r--src/mame/video/xybots.cpp4
-rw-r--r--src/mame/video/ygv608.cpp272
-rw-r--r--src/mame/video/yiear.cpp2
-rw-r--r--src/mame/video/yunsun16.cpp2
-rw-r--r--src/mame/video/yunsung8.cpp4
-rw-r--r--src/mame/video/zac2650.cpp2
-rw-r--r--src/mame/video/zaccaria.cpp2
-rw-r--r--src/mame/video/zaxxon.cpp8
-rw-r--r--src/mame/video/zerozone.cpp2
599 files changed, 1399 insertions, 1402 deletions
diff --git a/src/devices/machine/tc009xlvc.cpp b/src/devices/machine/tc009xlvc.cpp
index e48e04fc501..a3553414d88 100644
--- a/src/devices/machine/tc009xlvc.cpp
+++ b/src/devices/machine/tc009xlvc.cpp
@@ -134,7 +134,7 @@ TILE_GET_INFO_MEMBER(tc0091lvc_device::get_tile_info)
| ((m_vregs[(attr & 0xc) >> 2]) << 10);
// | (state->m_horshoes_gfxbank << 12);
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code,
(attr & 0xf0) >> 4,
0);
@@ -146,7 +146,7 @@ TILE_GET_INFO_MEMBER(tc0091lvc_device::get_tx_tile_info)
const u16 code = m_vram[0xa000 + (2 * tile_index)]
| ((attr & 0x07) << 8);
- SET_TILE_INFO_MEMBER(2,
+ tileinfo.set(2,
code,
(attr & 0xf0) >> 4,
0);
diff --git a/src/emu/tilemap.h b/src/emu/tilemap.h
index e9ed1a3b66d..13293a46823 100644
--- a/src/emu/tilemap.h
+++ b/src/emu/tilemap.h
@@ -793,14 +793,11 @@ private:
// function definition for a logical-to-memory mapper
#define TILEMAP_MAPPER_MEMBER(_name) tilemap_memory_index _name(u32 col, u32 row, u32 num_cols, u32 num_rows)
-// useful macro inside of a TILE_GET_INFO callback to set tile information
-#define SET_TILE_INFO_MEMBER(GFX,CODE,COLOR,FLAGS) tileinfo.set(GFX, CODE, COLOR, FLAGS)
-
-// Macros for setting tile attributes in the TILE_GET_INFO callback:
+// Helpers for setting tile attributes in the TILE_GET_INFO callback:
// TILE_FLIP_YX assumes that flipy is in bit 1 and flipx is in bit 0
// TILE_FLIP_XY assumes that flipy is in bit 0 and flipx is in bit 1
-#define TILE_FLIPYX(YX) ((YX) & 3)
-#define TILE_FLIPXY(XY) ((((XY) & 2) >> 1) | (((XY) & 1) << 1))
+template <typename T> constexpr u8 TILE_FLIPYX(T yx) { return u8(yx & 3); }
+template <typename T> constexpr u8 TILE_FLIPXY(T xy) { return u8(((xy & 2) >> 1) | ((xy & 1) << 1)); }
diff --git a/src/mame/drivers/1945kiii.cpp b/src/mame/drivers/1945kiii.cpp
index fe085d4bbb4..b4fd824cbd3 100644
--- a/src/mame/drivers/1945kiii.cpp
+++ b/src/mame/drivers/1945kiii.cpp
@@ -167,7 +167,7 @@ private:
TILE_GET_INFO_MEMBER(k3_state::get_tile_info)
{
int tileno = m_bgram_buffer[tile_index];
- SET_TILE_INFO_MEMBER(1, tileno, 0, 0);
+ tileinfo.set(1, tileno, 0, 0);
}
void k3_state::video_start()
diff --git a/src/mame/drivers/3x3puzzl.cpp b/src/mame/drivers/3x3puzzl.cpp
index d20fdfde634..f236772f3bb 100644
--- a/src/mame/drivers/3x3puzzl.cpp
+++ b/src/mame/drivers/3x3puzzl.cpp
@@ -113,7 +113,7 @@ private:
TILE_GET_INFO_MEMBER(_3x3puzzle_state::get_tile1_info)
{
uint16_t code = m_videoram1_buffer[tile_index];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code,
0,
0);
@@ -122,7 +122,7 @@ TILE_GET_INFO_MEMBER(_3x3puzzle_state::get_tile1_info)
TILE_GET_INFO_MEMBER(_3x3puzzle_state::get_tile2_info)
{
uint16_t code = m_videoram2_buffer[tile_index];
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
code,
1,
0);
@@ -131,7 +131,7 @@ TILE_GET_INFO_MEMBER(_3x3puzzle_state::get_tile2_info)
TILE_GET_INFO_MEMBER(_3x3puzzle_state::get_tile3_info)
{
uint16_t code = m_videoram3_buffer[tile_index];
- SET_TILE_INFO_MEMBER(2,
+ tileinfo.set(2,
code,
2,
0);
diff --git a/src/mame/drivers/akkaarrh.cpp b/src/mame/drivers/akkaarrh.cpp
index 9a7f355f2ff..1a31c52cd66 100644
--- a/src/mame/drivers/akkaarrh.cpp
+++ b/src/mame/drivers/akkaarrh.cpp
@@ -157,7 +157,7 @@ TILE_GET_INFO_MEMBER(akkaarrh_state::get_tile_info)
{
int data = m_videoram[tile_index];
int data2 = m_videoram[tile_index + 0x400];
- SET_TILE_INFO_MEMBER(0, data, data2 & 0xf, TILE_FLIPYX(data2 >> 6));
+ tileinfo.set(0, data, data2 & 0xf, TILE_FLIPYX(data2 >> 6));
}
WRITE8_MEMBER(akkaarrh_state::videoram_w)
diff --git a/src/mame/drivers/albazg.cpp b/src/mame/drivers/albazg.cpp
index dccb8e7a287..98dfb180546 100644
--- a/src/mame/drivers/albazg.cpp
+++ b/src/mame/drivers/albazg.cpp
@@ -103,7 +103,7 @@ TILE_GET_INFO_MEMBER(albazg_state::y_get_bg_tile_info)
int code = m_videoram[tile_index];
int color = m_colorram[tile_index];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code + ((color & 0xf8) << 3),
color & 0x7,
0);
diff --git a/src/mame/drivers/ambush.cpp b/src/mame/drivers/ambush.cpp
index 9f9f02fc119..90bb973b40d 100644
--- a/src/mame/drivers/ambush.cpp
+++ b/src/mame/drivers/ambush.cpp
@@ -638,7 +638,7 @@ TILE_GET_INFO_MEMBER( ambush_state::ambush_char_tile_info )
int color = (m_color_bank << 4) | (attr & 0x0f);
tileinfo.category = BIT(attr, 4);
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
TILE_GET_INFO_MEMBER( ambush_state::mariobl_char_tile_info )
@@ -650,7 +650,7 @@ TILE_GET_INFO_MEMBER( ambush_state::mariobl_char_tile_info )
int code = ((attr & 0x40) << 2) | m_video_ram[tile_index];
int color = ((attr & 0x40) >> 2) | 8 | (m_video_ram[tile_index] >> 5);
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
TILE_GET_INFO_MEMBER( ambush_state::dkong3abl_char_tile_info )
@@ -663,7 +663,7 @@ TILE_GET_INFO_MEMBER( ambush_state::dkong3abl_char_tile_info )
int code = ((attr & 0x40) << 2) | m_video_ram[tile_index];
int color = (BIT(attr, 6) << 5) | (BIT(attr, 6) << 4) | (attr & 0x07);
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
diff --git a/src/mame/drivers/amusco.cpp b/src/mame/drivers/amusco.cpp
index 8579713ff6d..1783a0d7b86 100644
--- a/src/mame/drivers/amusco.cpp
+++ b/src/mame/drivers/amusco.cpp
@@ -181,7 +181,7 @@ TILE_GET_INFO_MEMBER(amusco_state::get_bg_tile_info)
if (BIT(code, 15) && !m_blink_state)
code = 0;
- SET_TILE_INFO_MEMBER(
+ tileinfo.set(
0 /* bank */,
code & 0x3ff,
color,
diff --git a/src/mame/drivers/avt.cpp b/src/mame/drivers/avt.cpp
index 4864c3d7d59..3e5a6de5851 100644
--- a/src/mame/drivers/avt.cpp
+++ b/src/mame/drivers/avt.cpp
@@ -531,7 +531,7 @@ TILE_GET_INFO_MEMBER(avt_state::get_bg_tile_info)
int code = m_videoram[tile_index] | ((attr & 1) << 8);
int color = (attr & 0xf0)>>4;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
diff --git a/src/mame/drivers/bestleag.cpp b/src/mame/drivers/bestleag.cpp
index 01c1e2ce175..76e04e5711b 100644
--- a/src/mame/drivers/bestleag.cpp
+++ b/src/mame/drivers/bestleag.cpp
@@ -88,7 +88,7 @@ TILE_GET_INFO_MEMBER(bestleag_state::get_tx_tile_info)
{
int code = m_txram[tile_index];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
(code & 0x0fff)|0x8000,
(code & 0xf000) >> 12,
0);
@@ -98,7 +98,7 @@ TILE_GET_INFO_MEMBER(bestleag_state::get_bg_tile_info)
{
int code = m_bgram[tile_index];
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
(code & 0x0fff),
(code & 0xf000) >> 12,
0);
@@ -108,7 +108,7 @@ TILE_GET_INFO_MEMBER(bestleag_state::get_fg_tile_info)
{
int code = m_fgram[tile_index];
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
(code & 0x0fff)|0x1000,
((code & 0xf000) >> 12)|0x10,
0);
diff --git a/src/mame/drivers/bionicc.cpp b/src/mame/drivers/bionicc.cpp
index aad9eb30303..ee5eda3e0c4 100644
--- a/src/mame/drivers/bionicc.cpp
+++ b/src/mame/drivers/bionicc.cpp
@@ -455,7 +455,7 @@ TILE_GET_INFO_MEMBER(bionicc_state::get_tx_tile_info)
int attr = m_txvideoram[tile_index + 0x400];
int code = m_txvideoram[tile_index] & 0xff;
- SET_TILE_INFO_MEMBER(0, ((attr & 0xc0) << 2) | code, attr & 0x3f, 0);
+ tileinfo.set(0, ((attr & 0xc0) << 2) | code, attr & 0x3f, 0);
}
TILE_GET_INFO_MEMBER(bionicc_state::get_fg_tile_info)
@@ -483,7 +483,7 @@ TILE_GET_INFO_MEMBER(bionicc_state::get_fg_tile_info)
flag = TILE_FLIPXY((attr & 0xc0) >> 6);
}
- SET_TILE_INFO_MEMBER(2, ((attr & 0x07) << 8) | code, (attr & 0x18) >> 3, flag);
+ tileinfo.set(2, ((attr & 0x07) << 8) | code, (attr & 0x18) >> 3, flag);
}
TILE_GET_INFO_MEMBER(bionicc_state::get_bg_tile_info)
@@ -497,7 +497,7 @@ TILE_GET_INFO_MEMBER(bionicc_state::get_bg_tile_info)
int code = m_bgvideoram[2 * tile_index] & 0xff;
int flag = TILE_FLIPXY((attr & 0xc0) >> 6);
- SET_TILE_INFO_MEMBER(1, ((attr & 0x07) << 8) | code, (attr & 0x38) >> 3, flag);
+ tileinfo.set(1, ((attr & 0x07) << 8) | code, (attr & 0x38) >> 3, flag);
}
diff --git a/src/mame/drivers/blackt96.cpp b/src/mame/drivers/blackt96.cpp
index 212590a0e9e..8107526fe62 100644
--- a/src/mame/drivers/blackt96.cpp
+++ b/src/mame/drivers/blackt96.cpp
@@ -162,7 +162,7 @@ TILE_GET_INFO_MEMBER(blackt96_state::get_tx_tile_info)
uint8_t color = m_tilemapram[tile_index*2+1] & 0x0f;
tile += m_txt_bank * 0x100;
- SET_TILE_INFO_MEMBER(2,
+ tileinfo.set(2,
tile,
color,
0);
diff --git a/src/mame/drivers/blockade.cpp b/src/mame/drivers/blockade.cpp
index 423cff31072..58edc7a839f 100644
--- a/src/mame/drivers/blockade.cpp
+++ b/src/mame/drivers/blockade.cpp
@@ -377,7 +377,7 @@ GFXDECODE_END
TILE_GET_INFO_MEMBER( blockade_state::tile_info )
{
int code = m_videoram[tile_index];
- SET_TILE_INFO_MEMBER(0, code, 0, 0);
+ tileinfo.set(0, code, 0, 0);
}
diff --git a/src/mame/drivers/bmcpokr.cpp b/src/mame/drivers/bmcpokr.cpp
index 3904354c1fe..f7400641ddb 100644
--- a/src/mame/drivers/bmcpokr.cpp
+++ b/src/mame/drivers/bmcpokr.cpp
@@ -121,7 +121,7 @@ template<unsigned N>
TILE_GET_INFO_MEMBER(bmcpokr_state::get_tile_info)
{
uint16_t data = m_videoram[N][tile_index];
- SET_TILE_INFO_MEMBER(0, data, 0, (data & 0x8000) ? TILE_FLIPX : 0);
+ tileinfo.set(0, data, 0, (data & 0x8000) ? TILE_FLIPX : 0);
}
void bmcpokr_state::video_start()
diff --git a/src/mame/drivers/bnstars.cpp b/src/mame/drivers/bnstars.cpp
index 35e67a5e9ed..0dd49ba62ba 100644
--- a/src/mame/drivers/bnstars.cpp
+++ b/src/mame/drivers/bnstars.cpp
@@ -181,7 +181,7 @@ TILE_GET_INFO_MEMBER(bnstars_state::get_ms32_tx0_tile_info)
tileno = m_ms32_tx0_ram[tile_index *2+0] & 0x0000ffff;
colour = m_ms32_tx0_ram[tile_index *2+1] & 0x0000000f;
- SET_TILE_INFO_MEMBER(2,tileno,colour,0);
+ tileinfo.set(2,tileno,colour,0);
}
TILE_GET_INFO_MEMBER(bnstars_state::get_ms32_tx1_tile_info)
@@ -191,7 +191,7 @@ TILE_GET_INFO_MEMBER(bnstars_state::get_ms32_tx1_tile_info)
tileno = m_ms32_tx1_ram[tile_index *2+0] & 0x0000ffff;
colour = m_ms32_tx1_ram[tile_index *2+1] & 0x0000000f;
- SET_TILE_INFO_MEMBER(5,tileno,colour,0);
+ tileinfo.set(5,tileno,colour,0);
}
WRITE16_MEMBER(bnstars_state::ms32_tx0_ram_w)
@@ -215,7 +215,7 @@ TILE_GET_INFO_MEMBER(bnstars_state::get_ms32_bg0_tile_info)
tileno = m_ms32_bg0_ram[tile_index *2+0] & 0x0000ffff;
colour = m_ms32_bg0_ram[tile_index *2+1] & 0x0000000f;
- SET_TILE_INFO_MEMBER(1,tileno,colour,0);
+ tileinfo.set(1,tileno,colour,0);
}
TILE_GET_INFO_MEMBER(bnstars_state::get_ms32_bg1_tile_info)
@@ -225,7 +225,7 @@ TILE_GET_INFO_MEMBER(bnstars_state::get_ms32_bg1_tile_info)
tileno = m_ms32_bg1_ram[tile_index *2+0] & 0x0000ffff;
colour = m_ms32_bg1_ram[tile_index *2+1] & 0x0000000f;
- SET_TILE_INFO_MEMBER(4,tileno,colour,0);
+ tileinfo.set(4,tileno,colour,0);
}
WRITE16_MEMBER(bnstars_state::ms32_bg0_ram_w)
@@ -334,7 +334,7 @@ TILE_GET_INFO_MEMBER(bnstars_state::get_ms32_roz0_tile_info)
tileno = m_ms32_roz0_ram[tile_index *2+0] & 0x0000ffff;
colour = m_ms32_roz0_ram[tile_index *2+1] & 0x0000000f;
- SET_TILE_INFO_MEMBER(0,tileno,colour,0);
+ tileinfo.set(0,tileno,colour,0);
}
TILE_GET_INFO_MEMBER(bnstars_state::get_ms32_roz1_tile_info)
@@ -344,7 +344,7 @@ TILE_GET_INFO_MEMBER(bnstars_state::get_ms32_roz1_tile_info)
tileno = m_ms32_roz1_ram[tile_index *2+0] & 0x0000ffff;
colour = m_ms32_roz1_ram[tile_index *2+1] & 0x0000000f;
- SET_TILE_INFO_MEMBER(3,tileno,colour,0);
+ tileinfo.set(3,tileno,colour,0);
}
WRITE16_MEMBER(bnstars_state::ms32_roz0_ram_w)
diff --git a/src/mame/drivers/cabaret.cpp b/src/mame/drivers/cabaret.cpp
index 126c9a7856c..4b3dbe20342 100644
--- a/src/mame/drivers/cabaret.cpp
+++ b/src/mame/drivers/cabaret.cpp
@@ -108,14 +108,14 @@ WRITE8_MEMBER(cabaret_state::bg_tile_w)
TILE_GET_INFO_MEMBER(cabaret_state::get_bg_tile_info)
{
int code = m_bg_tile_ram[tile_index];
- SET_TILE_INFO_MEMBER(1, code & 0xff, 0, 0);
+ tileinfo.set(1, code & 0xff, 0, 0);
}
TILE_GET_INFO_MEMBER(cabaret_state::get_fg_tile_info)
{
int code = m_fg_tile_ram[tile_index] | (m_fg_color_ram[tile_index] << 8);
int tile = code & 0x1fff;
- SET_TILE_INFO_MEMBER(0, code, tile != 0x1fff ? ((code >> 12) & 0xe) + 1 : 0, 0);
+ tileinfo.set(0, code, tile != 0x1fff ? ((code >> 12) & 0xe) + 1 : 0, 0);
}
WRITE8_MEMBER(cabaret_state::fg_tile_w)
diff --git a/src/mame/drivers/calorie.cpp b/src/mame/drivers/calorie.cpp
index 1f6e0346514..ece27322a36 100644
--- a/src/mame/drivers/calorie.cpp
+++ b/src/mame/drivers/calorie.cpp
@@ -152,7 +152,7 @@ TILE_GET_INFO_MEMBER(calorie_state::get_bg_tile_info)
int color = src[bg_base + tile_index + 0x100] & 0x0f;
int flag = src[bg_base + tile_index + 0x100] & 0x40 ? TILE_FLIPX : 0;
- SET_TILE_INFO_MEMBER(1, code, color, flag);
+ tileinfo.set(1, code, color, flag);
}
TILE_GET_INFO_MEMBER(calorie_state::get_fg_tile_info)
@@ -160,7 +160,7 @@ TILE_GET_INFO_MEMBER(calorie_state::get_fg_tile_info)
int code = ((m_fg_ram[tile_index + 0x400] & 0x30) << 4) | m_fg_ram[tile_index];
int color = m_fg_ram[tile_index + 0x400] & 0x0f;
- SET_TILE_INFO_MEMBER(0, code, color, TILE_FLIPYX((m_fg_ram[tile_index + 0x400] & 0xc0) >> 6));
+ tileinfo.set(0, code, color, TILE_FLIPYX((m_fg_ram[tile_index + 0x400] & 0xc0) >> 6));
}
diff --git a/src/mame/drivers/carjmbre.cpp b/src/mame/drivers/carjmbre.cpp
index 0c7e19c8e9c..dc9df8a0895 100644
--- a/src/mame/drivers/carjmbre.cpp
+++ b/src/mame/drivers/carjmbre.cpp
@@ -164,7 +164,7 @@ TILE_GET_INFO_MEMBER(carjmbre_state::get_tile_info)
{
int attr = m_videoram[tile_index | 0x400];
int code = (m_videoram[tile_index] & 0xff) | (attr << 1 & 0x100);
- SET_TILE_INFO_MEMBER(0, code, attr & 0xf, 0);
+ tileinfo.set(0, code, attr & 0xf, 0);
}
void carjmbre_state::video_start()
diff --git a/src/mame/drivers/caswin.cpp b/src/mame/drivers/caswin.cpp
index 3dbefa88cac..d161ef96880 100644
--- a/src/mame/drivers/caswin.cpp
+++ b/src/mame/drivers/caswin.cpp
@@ -123,7 +123,7 @@ TILE_GET_INFO_MEMBER(caswin_state::get_sc0_tile_info)
int tile = (m_sc0_vram[tile_index] | ((m_sc0_attr[tile_index] & 0x70)<<4)) & 0x7ff;
int colour = m_sc0_attr[tile_index] & 0xf;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
tile,
colour,
0);
diff --git a/src/mame/drivers/cb2001.cpp b/src/mame/drivers/cb2001.cpp
index 48dafe86bd0..f480a445781 100644
--- a/src/mame/drivers/cb2001.cpp
+++ b/src/mame/drivers/cb2001.cpp
@@ -496,7 +496,7 @@ TILE_GET_INFO_MEMBER(cb2001_state::get_cb2001_reel1_tile_info)
int colour = 0;//= (cb2001_out_c&0x7) + 8;
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
code+0x800,
colour,
0);
@@ -513,7 +513,7 @@ TILE_GET_INFO_MEMBER(cb2001_state::get_cb2001_reel2_tile_info)
int colour = 0;//(cb2001_out_c&0x7) + 8;
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
code+0x800,
colour,
0);
@@ -530,7 +530,7 @@ TILE_GET_INFO_MEMBER(cb2001_state::get_cb2001_reel3_tile_info)
code &=0xff;
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
code+0x800,
colour,
0);
diff --git a/src/mame/drivers/cball.cpp b/src/mame/drivers/cball.cpp
index f0c8e1cc731..43b0056e519 100644
--- a/src/mame/drivers/cball.cpp
+++ b/src/mame/drivers/cball.cpp
@@ -69,7 +69,7 @@ TILE_GET_INFO_MEMBER(cball_state::get_tile_info)
{
uint8_t code = m_video_ram[tile_index];
- SET_TILE_INFO_MEMBER(0, code, code >> 7, 0);
+ tileinfo.set(0, code, code >> 7, 0);
}
diff --git a/src/mame/drivers/chanbara.cpp b/src/mame/drivers/chanbara.cpp
index b263d277dd1..6e131a7d82c 100644
--- a/src/mame/drivers/chanbara.cpp
+++ b/src/mame/drivers/chanbara.cpp
@@ -162,7 +162,7 @@ TILE_GET_INFO_MEMBER(chanbara_state::get_bg_tile_info)
int color = (m_colorram[tile_index] >> 1) & 0x1f;
//int flipy = (m_colorram[tile_index]) & 0x01; // not on this layer (although bit is used)
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
TILE_GET_INFO_MEMBER(chanbara_state::get_bg2_tile_info)
@@ -171,7 +171,7 @@ TILE_GET_INFO_MEMBER(chanbara_state::get_bg2_tile_info)
int color = (m_colorram2[tile_index] >> 1) & 0x1f;
int flipy = (m_colorram2[tile_index]) & 0x01;
- SET_TILE_INFO_MEMBER(2, code, color, TILE_FLIPXY(flipy));
+ tileinfo.set(2, code, color, TILE_FLIPXY(flipy));
}
void chanbara_state::video_start()
diff --git a/src/mame/drivers/chance32.cpp b/src/mame/drivers/chance32.cpp
index 33760a6f887..201dab1aa6b 100644
--- a/src/mame/drivers/chance32.cpp
+++ b/src/mame/drivers/chance32.cpp
@@ -89,7 +89,7 @@ TILE_GET_INFO_MEMBER(chance32_state::get_fg_tile_info)
{
int code = (m_fgram[tile_index * 2 + 1] << 8) | m_fgram[tile_index * 2];
int flip = (~code >> 12)&1;
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
code & 0x0fff,
code >> 13,
TILE_FLIPYX(flip<<1)|flip);
@@ -99,7 +99,7 @@ TILE_GET_INFO_MEMBER(chance32_state::get_bg_tile_info)
{
int code = (m_bgram[tile_index * 2 +1] << 8) | m_bgram[tile_index * 2];
int flip = (~code >> 12)&1;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code & 0x0fff,
code >> 13,
TILE_FLIPYX(flip<<1|flip));
diff --git a/src/mame/drivers/chinsan.cpp b/src/mame/drivers/chinsan.cpp
index 3c659aa1e8e..9bfb918125e 100644
--- a/src/mame/drivers/chinsan.cpp
+++ b/src/mame/drivers/chinsan.cpp
@@ -392,7 +392,7 @@ TILE_GET_INFO_MEMBER( chinsan_state::tile_info )
// -----210 unknown
uint8_t color = m_color_ram[tile_index] >> 3;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
diff --git a/src/mame/drivers/clpoker.cpp b/src/mame/drivers/clpoker.cpp
index d2c34eee812..f5a06a5a97f 100644
--- a/src/mame/drivers/clpoker.cpp
+++ b/src/mame/drivers/clpoker.cpp
@@ -203,13 +203,13 @@ INPUT_PORTS_END
TILE_GET_INFO_MEMBER(clpoker_state::get_bg_tile_info)
{
u16 tileno = (m_videoram[tile_index] << 8) | m_videoram[tile_index + 0x0800];
- SET_TILE_INFO_MEMBER(0, tileno, 0, 0);
+ tileinfo.set(0, tileno, 0, 0);
}
TILE_GET_INFO_MEMBER(clpoker_state::get_fg_tile_info)
{
u16 tileno = (m_videoram[tile_index + 0x1000] << 8) | m_videoram[tile_index + 0x1800];
- SET_TILE_INFO_MEMBER(0, tileno, 0, 0);
+ tileinfo.set(0, tileno, 0, 0);
}
WRITE8_MEMBER(clpoker_state::videoram_w)
diff --git a/src/mame/drivers/cntsteer.cpp b/src/mame/drivers/cntsteer.cpp
index 7865876e996..ca2f7f3bd89 100644
--- a/src/mame/drivers/cntsteer.cpp
+++ b/src/mame/drivers/cntsteer.cpp
@@ -184,7 +184,7 @@ TILE_GET_INFO_MEMBER(cntsteer_state::get_bg_tile_info)
{
int code = m_videoram2[tile_index];
- SET_TILE_INFO_MEMBER(2, code + m_bg_bank, m_bg_color_bank, 0);
+ tileinfo.set(2, code + m_bg_bank, m_bg_color_bank, 0);
}
TILE_GET_INFO_MEMBER(cntsteer_state::get_fg_tile_info)
@@ -194,7 +194,7 @@ TILE_GET_INFO_MEMBER(cntsteer_state::get_fg_tile_info)
code |= (attr & 0x01) << 8;
- SET_TILE_INFO_MEMBER(0, code, 0x30 + ((attr & 0x78) >> 3), 0);
+ tileinfo.set(0, code, 0x30 + ((attr & 0x78) >> 3), 0);
}
VIDEO_START_MEMBER(cntsteer_state,cntsteer)
diff --git a/src/mame/drivers/coinmstr.cpp b/src/mame/drivers/coinmstr.cpp
index 3e5bf6a5685..15b9fdaaed9 100644
--- a/src/mame/drivers/coinmstr.cpp
+++ b/src/mame/drivers/coinmstr.cpp
@@ -1241,7 +1241,7 @@ TILE_GET_INFO_MEMBER(coinmstr_state::get_bg_tile_info)
tile |= (m_attr_ram3[tile_index + 0x0240] & 0x03) << (6+4);
- SET_TILE_INFO_MEMBER(0, tile, color, 0);
+ tileinfo.set(0, tile, color, 0);
}
void coinmstr_state::video_start()
diff --git a/src/mame/drivers/cswat.cpp b/src/mame/drivers/cswat.cpp
index 0b68aeeb176..87c6e616ed5 100644
--- a/src/mame/drivers/cswat.cpp
+++ b/src/mame/drivers/cswat.cpp
@@ -93,7 +93,7 @@ TILE_GET_INFO_MEMBER(cswat_state::get_tile_info)
int code = m_videoram[tile_index] | (attr << 8 & 0x300);
int flags = TILE_FLIPYX(attr >> 2);
- SET_TILE_INFO_MEMBER(0, code, color, flags);
+ tileinfo.set(0, code, color, flags);
}
void cswat_state::video_start()
diff --git a/src/mame/drivers/cultures.cpp b/src/mame/drivers/cultures.cpp
index c388d96a098..58c15bf3dd4 100644
--- a/src/mame/drivers/cultures.cpp
+++ b/src/mame/drivers/cultures.cpp
@@ -92,19 +92,19 @@ public:
TILE_GET_INFO_MEMBER(cultures_state::get_bg1_tile_info)
{
int const code = m_bg1_rom[0x200000/2 + m_bg1_bank * 0x80000/2 + tile_index];
- SET_TILE_INFO_MEMBER(1, code, code >> 12, 0);
+ tileinfo.set(1, code, code >> 12, 0);
}
TILE_GET_INFO_MEMBER(cultures_state::get_bg2_tile_info)
{
int const code = m_bg2_rom[0x200000/2 + m_bg2_bank * 0x80000/2 + tile_index];
- SET_TILE_INFO_MEMBER(2, code, code >> 12, 0);
+ tileinfo.set(2, code, code >> 12, 0);
}
TILE_GET_INFO_MEMBER(cultures_state::get_bg0_tile_info)
{
int const code = m_bg0_videoram[tile_index * 2] + (m_bg0_videoram[tile_index * 2 + 1] << 8);
- SET_TILE_INFO_MEMBER(0, code, code >> 12, 0);
+ tileinfo.set(0, code, code >> 12, 0);
}
void cultures_state::video_start()
diff --git a/src/mame/drivers/cybertnk.cpp b/src/mame/drivers/cybertnk.cpp
index f244ad4da8f..6097e3d6764 100644
--- a/src/mame/drivers/cybertnk.cpp
+++ b/src/mame/drivers/cybertnk.cpp
@@ -267,7 +267,7 @@ TILE_GET_INFO_MEMBER(cybertnk_state::get_tile_info)
int pal = (code & 0xe000) >> 13;
pal |=(code & 0x1c00) >> 7;
- SET_TILE_INFO_MEMBER(Layer,
+ tileinfo.set(Layer,
code & 0x1fff,
pal,
0);
diff --git a/src/mame/drivers/d9final.cpp b/src/mame/drivers/d9final.cpp
index adcb78987ab..c372d277afd 100644
--- a/src/mame/drivers/d9final.cpp
+++ b/src/mame/drivers/d9final.cpp
@@ -82,7 +82,7 @@ TILE_GET_INFO_MEMBER(d9final_state::get_sc0_tile_info)
int tile = ((m_hi_vram[tile_index] & 0x3f)<<8) | m_lo_vram[tile_index];
int color = m_cram[tile_index] & 0x3f;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
tile,
color,
0);
diff --git a/src/mame/drivers/dacholer.cpp b/src/mame/drivers/dacholer.cpp
index 28fc721569a..dff1188f134 100644
--- a/src/mame/drivers/dacholer.cpp
+++ b/src/mame/drivers/dacholer.cpp
@@ -128,12 +128,12 @@ private:
TILE_GET_INFO_MEMBER(dacholer_state::get_bg_tile_info)
{
- SET_TILE_INFO_MEMBER(1, m_bgvideoram[tile_index] + m_bg_bank * 0x100, 0, 0);
+ tileinfo.set(1, m_bgvideoram[tile_index] + m_bg_bank * 0x100, 0, 0);
}
TILE_GET_INFO_MEMBER(dacholer_state::get_fg_tile_info)
{
- SET_TILE_INFO_MEMBER(0, m_fgvideoram[tile_index], 0, 0);
+ tileinfo.set(0, m_fgvideoram[tile_index], 0, 0);
}
void dacholer_state::video_start()
diff --git a/src/mame/drivers/ddayjlc.cpp b/src/mame/drivers/ddayjlc.cpp
index 37903e032fa..c8deb7a14c0 100644
--- a/src/mame/drivers/ddayjlc.cpp
+++ b/src/mame/drivers/ddayjlc.cpp
@@ -163,14 +163,14 @@ TILE_GET_INFO_MEMBER(ddayjlc_state::get_tile_info_bg)
color |= (attr & 0x40) >> 3;
tileinfo.category = BIT(attr,7);
- SET_TILE_INFO_MEMBER(2, code, color, 0);
+ tileinfo.set(2, code, color, 0);
}
TILE_GET_INFO_MEMBER(ddayjlc_state::get_tile_info_fg)
{
int code = m_videoram[tile_index] + (m_char_bank << 8);
- SET_TILE_INFO_MEMBER(1, code, 0, 0);
+ tileinfo.set(1, code, 0, 0);
}
void ddayjlc_state::video_start()
diff --git a/src/mame/drivers/ddealer.cpp b/src/mame/drivers/ddealer.cpp
index 7a64cffe3a8..ca53d1e6fc6 100644
--- a/src/mame/drivers/ddealer.cpp
+++ b/src/mame/drivers/ddealer.cpp
@@ -196,7 +196,7 @@ WRITE16_MEMBER(ddealer_state::flipscreen_w)
TILE_GET_INFO_MEMBER(ddealer_state::get_back_tile_info)
{
int code = m_back_vram[tile_index];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code & 0xfff,
code >> 12,
0);
diff --git a/src/mame/drivers/dmndrby.cpp b/src/mame/drivers/dmndrby.cpp
index 93be2638d18..f86eae03466 100644
--- a/src/mame/drivers/dmndrby.cpp
+++ b/src/mame/drivers/dmndrby.cpp
@@ -362,7 +362,7 @@ TILE_GET_INFO_MEMBER(dmndrby_state::get_dmndrby_tile_info)
int flipx = (attr&0x40)>>6;
- SET_TILE_INFO_MEMBER(2,
+ tileinfo.set(2,
code,
col,
TILE_FLIPYX(flipx) );
diff --git a/src/mame/drivers/dreamwld.cpp b/src/mame/drivers/dreamwld.cpp
index c0468850dc6..a844f46acbd 100644
--- a/src/mame/drivers/dreamwld.cpp
+++ b/src/mame/drivers/dreamwld.cpp
@@ -277,7 +277,7 @@ TILE_GET_INFO_MEMBER(dreamwld_state::get_tile_info)
{
const u16 tileno = m_vram[Layer][tile_index];
const u16 colour = tileno >> 13;
- SET_TILE_INFO_MEMBER(1, (tileno & 0x1fff) | (m_tilebank[Layer] << 13), (Layer * 0x40) + colour, 0);
+ tileinfo.set(1, (tileno & 0x1fff) | (m_tilebank[Layer] << 13), (Layer * 0x40) + colour, 0);
}
diff --git a/src/mame/drivers/drtomy.cpp b/src/mame/drivers/drtomy.cpp
index 8815d96aee1..d5c6f0cb7dc 100644
--- a/src/mame/drivers/drtomy.cpp
+++ b/src/mame/drivers/drtomy.cpp
@@ -68,7 +68,7 @@ TILE_GET_INFO_MEMBER(drtomy_state::get_tile_info_fg)
{
int code = m_videoram_fg[tile_index] & 0xfff;
int color = (m_videoram_fg[tile_index] & 0xf000) >> 12;
- SET_TILE_INFO_MEMBER(2, code, color, 0);
+ tileinfo.set(2, code, color, 0);
}
@@ -76,7 +76,7 @@ TILE_GET_INFO_MEMBER(drtomy_state::get_tile_info_bg)
{
int code = m_videoram_bg[tile_index] & 0xfff;
int color = (m_videoram_bg[tile_index] & 0xf000) >> 12;
- SET_TILE_INFO_MEMBER(1, code, color, 0);
+ tileinfo.set(1, code, color, 0);
}
diff --git a/src/mame/drivers/drw80pkr.cpp b/src/mame/drivers/drw80pkr.cpp
index a56563a1b45..9e8a6c75899 100644
--- a/src/mame/drivers/drw80pkr.cpp
+++ b/src/mame/drivers/drw80pkr.cpp
@@ -333,7 +333,7 @@ TILE_GET_INFO_MEMBER(drw80pkr_state::get_bg_tile_info)
int color = m_color_ram[tile_index];
int code = m_video_ram[tile_index];
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
void drw80pkr_state::video_start()
diff --git a/src/mame/drivers/dunhuang.cpp b/src/mame/drivers/dunhuang.cpp
index 4ec6c63c861..dc487f2307f 100644
--- a/src/mame/drivers/dunhuang.cpp
+++ b/src/mame/drivers/dunhuang.cpp
@@ -166,13 +166,13 @@ TILE_GET_INFO_MEMBER(dunhuang_state::get_tile_info)
{
uint16_t code = m_videoram[tile_index];
uint8_t color = m_colorram[tile_index] & 0x0f;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
TILE_GET_INFO_MEMBER(dunhuang_state::get_tile_info2)
{
uint16_t code = m_videoram2[tile_index];
uint8_t color = m_colorram2[tile_index] & 0x0f;
- SET_TILE_INFO_MEMBER(1, code, color, 0);
+ tileinfo.set(1, code, color, 0);
}
void dunhuang_state::video_start()
diff --git a/src/mame/drivers/dynadice.cpp b/src/mame/drivers/dynadice.cpp
index 2018f35472f..70d7264b3e2 100644
--- a/src/mame/drivers/dynadice.cpp
+++ b/src/mame/drivers/dynadice.cpp
@@ -231,7 +231,7 @@ GFXDECODE_END
TILE_GET_INFO_MEMBER(dynadice_state::get_tile_info)
{
int code = m_videoram[tile_index];
- SET_TILE_INFO_MEMBER(1, code, 0, 0);
+ tileinfo.set(1, code, 0, 0);
}
void dynadice_state::video_start()
diff --git a/src/mame/drivers/efdt.cpp b/src/mame/drivers/efdt.cpp
index ad981cc4cda..18a17bfd03b 100644
--- a/src/mame/drivers/efdt.cpp
+++ b/src/mame/drivers/efdt.cpp
@@ -207,7 +207,7 @@ TILE_GET_INFO_MEMBER(efdt_state::get_tile_info_0)
//int code = data + (xtra << 8);
int code = data + m_tilebank;
- SET_TILE_INFO_MEMBER(0, code, pal, 0);
+ tileinfo.set(0, code, pal, 0);
}
TILE_GET_INFO_MEMBER(efdt_state::get_tile_info_1)
@@ -216,7 +216,7 @@ TILE_GET_INFO_MEMBER(efdt_state::get_tile_info_1)
int code = data;
- SET_TILE_INFO_MEMBER(1, code, 0x1c, 0);
+ tileinfo.set(1, code, 0x1c, 0);
}
void efdt_state::video_start()
diff --git a/src/mame/drivers/egghunt.cpp b/src/mame/drivers/egghunt.cpp
index 0362bf2f5b1..657b5ca51dc 100644
--- a/src/mame/drivers/egghunt.cpp
+++ b/src/mame/drivers/egghunt.cpp
@@ -162,7 +162,7 @@ TILE_GET_INFO_MEMBER(egghunt_state::get_bg_tile_info)
// code += 0;
}
- SET_TILE_INFO_MEMBER(0, code, colour, 0);
+ tileinfo.set(0, code, colour, 0);
}
READ8_MEMBER(egghunt_state::egghunt_bgram_r)
diff --git a/src/mame/drivers/ettrivia.cpp b/src/mame/drivers/ettrivia.cpp
index 3935e438c7a..147c03bbb9b 100644
--- a/src/mame/drivers/ettrivia.cpp
+++ b/src/mame/drivers/ettrivia.cpp
@@ -227,7 +227,7 @@ void ettrivia_state::get_tile_info(tile_data &tileinfo, int tile_index, uint8_t
code += m_gfx_bank * 0x100;
- SET_TILE_INFO_MEMBER(gfx_code,code,color,0);
+ tileinfo.set(gfx_code,code,color,0);
}
TILE_GET_INFO_MEMBER(ettrivia_state::get_tile_info_bg)
diff --git a/src/mame/drivers/firefox.cpp b/src/mame/drivers/firefox.cpp
index 5cef1cb90c1..10332c3008a 100644
--- a/src/mame/drivers/firefox.cpp
+++ b/src/mame/drivers/firefox.cpp
@@ -235,7 +235,7 @@ WRITE8_MEMBER(firefox_state::firefox_disc_data_w)
TILE_GET_INFO_MEMBER(firefox_state::bgtile_get_info)
{
- SET_TILE_INFO_MEMBER(0, m_tileram[tile_index], 0, 0);
+ tileinfo.set(0, m_tileram[tile_index], 0, 0);
}
diff --git a/src/mame/drivers/flower.cpp b/src/mame/drivers/flower.cpp
index 405c3f15730..87ba97a729b 100644
--- a/src/mame/drivers/flower.cpp
+++ b/src/mame/drivers/flower.cpp
@@ -164,7 +164,7 @@ TILE_GET_INFO_MEMBER(flower_state::get_bg_tile_info)
int code = m_bgvram[tile_index];
int color = (m_bgvram[tile_index+0x100] & 0xf0) >> 4;
- SET_TILE_INFO_MEMBER(1, code, color, 0);
+ tileinfo.set(1, code, color, 0);
}
TILE_GET_INFO_MEMBER(flower_state::get_fg_tile_info)
@@ -172,7 +172,7 @@ TILE_GET_INFO_MEMBER(flower_state::get_fg_tile_info)
int code = m_fgvram[tile_index];
int color = (m_fgvram[tile_index+0x100] & 0xf0) >> 4;
- SET_TILE_INFO_MEMBER(1, code, color, 0);
+ tileinfo.set(1, code, color, 0);
}
void flower_state::video_start()
diff --git a/src/mame/drivers/flyball.cpp b/src/mame/drivers/flyball.cpp
index 9e4dda6ba15..d0039a7c80d 100644
--- a/src/mame/drivers/flyball.cpp
+++ b/src/mame/drivers/flyball.cpp
@@ -135,7 +135,7 @@ TILE_GET_INFO_MEMBER(flyball_state::get_tile_info)
if ((flags & TILE_FLIPX) && (flags & TILE_FLIPY))
code += 64;
- SET_TILE_INFO_MEMBER(0, code, 0, flags);
+ tileinfo.set(0, code, 0, flags);
}
diff --git a/src/mame/drivers/fresh.cpp b/src/mame/drivers/fresh.cpp
index bded8f6855b..7fa2c630b00 100644
--- a/src/mame/drivers/fresh.cpp
+++ b/src/mame/drivers/fresh.cpp
@@ -116,7 +116,7 @@ TILE_GET_INFO_MEMBER(fresh_state::get_fresh_bg_tile_info)
int tileno, pal;
tileno = m_bg_videoram[tile_index];
pal = m_attr_videoram[tile_index];
- SET_TILE_INFO_MEMBER(1, tileno, pal, 0);
+ tileinfo.set(1, tileno, pal, 0);
}
@@ -138,7 +138,7 @@ TILE_GET_INFO_MEMBER(fresh_state::get_fresh_bg_2_tile_info)
int tileno, pal;
tileno = m_bg_2_videoram[tile_index];
pal = m_attr_2_videoram[tile_index];
- SET_TILE_INFO_MEMBER(0, tileno, pal, 0);
+ tileinfo.set(0, tileno, pal, 0);
}
diff --git a/src/mame/drivers/funtech.cpp b/src/mame/drivers/funtech.cpp
index 06b94be2839..c2ecd4811bf 100644
--- a/src/mame/drivers/funtech.cpp
+++ b/src/mame/drivers/funtech.cpp
@@ -102,7 +102,7 @@ TILE_GET_INFO_MEMBER(fun_tech_corp_state::get_fg_tile_info)
if (m_vreg&1) code |= 0x1000;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code,
attr>>4,
0);
@@ -115,7 +115,7 @@ TILE_GET_INFO_MEMBER(fun_tech_corp_state::get_reel_tile_info)
if (m_vreg & 0x4) code |= 0x100;
if (m_vreg & 0x8) code |= 0x200;
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
code,
0,
0);
diff --git a/src/mame/drivers/galaxi.cpp b/src/mame/drivers/galaxi.cpp
index 1bb2be6ed22..13c2bbdae48 100644
--- a/src/mame/drivers/galaxi.cpp
+++ b/src/mame/drivers/galaxi.cpp
@@ -139,31 +139,31 @@ private:
TILE_GET_INFO_MEMBER(galaxi_state::get_bg1_tile_info)
{
uint16_t code = m_bg1_ram[tile_index];
- SET_TILE_INFO_MEMBER(0, code, 0x10 + (code >> 12), 0);
+ tileinfo.set(0, code, 0x10 + (code >> 12), 0);
}
TILE_GET_INFO_MEMBER(galaxi_state::get_bg2_tile_info)
{
uint16_t code = m_bg2_ram[tile_index];
- SET_TILE_INFO_MEMBER(0, code, 0x10 + (code >> 12), 0);
+ tileinfo.set(0, code, 0x10 + (code >> 12), 0);
}
TILE_GET_INFO_MEMBER(galaxi_state::get_bg3_tile_info)
{
uint16_t code = m_bg3_ram[tile_index];
- SET_TILE_INFO_MEMBER(0, code, (code >> 12), 0);
+ tileinfo.set(0, code, (code >> 12), 0);
}
TILE_GET_INFO_MEMBER(galaxi_state::get_bg4_tile_info)
{
uint16_t code = m_bg4_ram[tile_index];
- SET_TILE_INFO_MEMBER(0, code, (code >> 12), 0);
+ tileinfo.set(0, code, (code >> 12), 0);
}
TILE_GET_INFO_MEMBER(galaxi_state::get_fg_tile_info)
{
uint16_t code = m_fg_ram[tile_index];
- SET_TILE_INFO_MEMBER(1, code, 0x20 + (code >> 12), 0);
+ tileinfo.set(1, code, 0x20 + (code >> 12), 0);
}
WRITE16_MEMBER(galaxi_state::bg1_w)
diff --git a/src/mame/drivers/gluck2.cpp b/src/mame/drivers/gluck2.cpp
index 24e49608c8c..3d6c9e387b2 100644
--- a/src/mame/drivers/gluck2.cpp
+++ b/src/mame/drivers/gluck2.cpp
@@ -270,7 +270,7 @@ TILE_GET_INFO_MEMBER(gluck2_state::get_tile_info)
int bank = ((attr & 0xc0) >> 5 ) + ((attr & 0x02) >> 1 ); /* bits 1-6-7 handle the gfx banks */
int color = (attr & 0x3c) >> 2; /* bits 2-3-4-5 handle the color */
- SET_TILE_INFO_MEMBER(bank, code, color, 0);
+ tileinfo.set(bank, code, color, 0);
}
diff --git a/src/mame/drivers/goldnpkr.cpp b/src/mame/drivers/goldnpkr.cpp
index 5a9516ca64b..29040e3793e 100644
--- a/src/mame/drivers/goldnpkr.cpp
+++ b/src/mame/drivers/goldnpkr.cpp
@@ -1495,7 +1495,7 @@ TILE_GET_INFO_MEMBER(goldnpkr_state::get_bg_tile_info)
int bank = (attr & 0x02) >> 1; /* bit 1 switch the gfx banks */
int color = (attr & 0x3c) >> 2; /* bits 2-3-4-5 for color */
- SET_TILE_INFO_MEMBER(bank, code, color, 0);
+ tileinfo.set(bank, code, color, 0);
}
TILE_GET_INFO_MEMBER(goldnpkr_state::wcrdxtnd_get_bg_tile_info)
@@ -1513,7 +1513,7 @@ TILE_GET_INFO_MEMBER(goldnpkr_state::wcrdxtnd_get_bg_tile_info)
int bank = (attr & 0x03) + ((attr & 0xc0) >> 4); /* bits 0, 1, 6 & 7 switch the gfx banks */
int color = (attr & 0x3c) >> 2; /* bits 2-3-4-5 for color */
- SET_TILE_INFO_MEMBER(bank, code, color, 0);
+ tileinfo.set(bank, code, color, 0);
}
TILE_GET_INFO_MEMBER(goldnpkr_state::super21p_get_bg_tile_info)
@@ -1531,7 +1531,7 @@ TILE_GET_INFO_MEMBER(goldnpkr_state::super21p_get_bg_tile_info)
int bank = (attr & 0x03); // bits 0-1, switch the gfx banks
int color = (attr & 0x70) >> 3; // bits 4-5-6 for color, shifted x2 to match the color groups used.
- SET_TILE_INFO_MEMBER(bank, code, color, 0);
+ tileinfo.set(bank, code, color, 0);
/*
Color codes GFX bank 0 (chars)
diff --git a/src/mame/drivers/good.cpp b/src/mame/drivers/good.cpp
index c0be11a803e..7c71fdd1a05 100644
--- a/src/mame/drivers/good.cpp
+++ b/src/mame/drivers/good.cpp
@@ -87,7 +87,7 @@ TILE_GET_INFO_MEMBER(good_state::get_fg_tile_info)
{
int tileno = m_fg_tilemapram[tile_index * 2];
int attr = m_fg_tilemapram[tile_index * 2 + 1] & 0xf;
- SET_TILE_INFO_MEMBER(0, tileno, attr, 0);
+ tileinfo.set(0, tileno, attr, 0);
}
WRITE16_MEMBER(good_state::bg_tilemapram_w)
@@ -100,7 +100,7 @@ TILE_GET_INFO_MEMBER(good_state::get_bg_tile_info)
{
int tileno = m_bg_tilemapram[tile_index * 2];
int attr = m_bg_tilemapram[tile_index * 2 + 1] & 0xf;
- SET_TILE_INFO_MEMBER(1, tileno, attr, 0);
+ tileinfo.set(1, tileno, attr, 0);
}
diff --git a/src/mame/drivers/goodejan.cpp b/src/mame/drivers/goodejan.cpp
index 5b30a8a5670..5eb4809cdc0 100644
--- a/src/mame/drivers/goodejan.cpp
+++ b/src/mame/drivers/goodejan.cpp
@@ -247,28 +247,28 @@ TILE_GET_INFO_MEMBER( goodejan_state::seibucrtc_sc0_tile_info )
int tile = m_sc0_vram[tile_index] & 0xfff;
int color = (m_sc0_vram[tile_index] >> 12) & 0x0f;
tile+=(m_seibucrtc_sc0bank<<12);
- SET_TILE_INFO_MEMBER(1, tile, color, 0);
+ tileinfo.set(1, tile, color, 0);
}
TILE_GET_INFO_MEMBER( goodejan_state::seibucrtc_sc2_tile_info )
{
int tile = m_sc2_vram[tile_index] & 0xfff;
int color = (m_sc2_vram[tile_index] >> 12) & 0x0f;
- SET_TILE_INFO_MEMBER(2, tile, color, 0);
+ tileinfo.set(2, tile, color, 0);
}
TILE_GET_INFO_MEMBER( goodejan_state::seibucrtc_sc1_tile_info )
{
int tile = m_sc1_vram[tile_index] & 0xfff;
int color = (m_sc1_vram[tile_index] >> 12) & 0x0f;
- SET_TILE_INFO_MEMBER(3, tile, color, 0);
+ tileinfo.set(3, tile, color, 0);
}
TILE_GET_INFO_MEMBER( goodejan_state::seibucrtc_sc3_tile_info )
{
int tile = m_sc3_vram[tile_index] & 0xfff;
int color = (m_sc3_vram[tile_index] >> 12) & 0x0f;
- SET_TILE_INFO_MEMBER(4, tile, color, 0);
+ tileinfo.set(4, tile, color, 0);
}
void goodejan_state::draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect,int pri)
diff --git a/src/mame/drivers/headonb.cpp b/src/mame/drivers/headonb.cpp
index b13b9da1c66..445850f3405 100644
--- a/src/mame/drivers/headonb.cpp
+++ b/src/mame/drivers/headonb.cpp
@@ -76,7 +76,7 @@ private:
TILE_GET_INFO_MEMBER(headonb_state::get_tile_info)
{
uint8_t code = m_video_ram[tile_index];
- SET_TILE_INFO_MEMBER(0, code, 0, 0);
+ tileinfo.set(0, code, 0, 0);
}
void headonb_state::video_start()
diff --git a/src/mame/drivers/hitme.cpp b/src/mame/drivers/hitme.cpp
index 993d0fc625c..95c4d58252b 100644
--- a/src/mame/drivers/hitme.cpp
+++ b/src/mame/drivers/hitme.cpp
@@ -39,7 +39,7 @@ TILE_GET_INFO_MEMBER(hitme_state::get_hitme_tile_info)
{
/* the code is the low 6 bits */
uint8_t code = m_videoram[tile_index] & 0x3f;
- SET_TILE_INFO_MEMBER(0, code, 0, 0);
+ tileinfo.set(0, code, 0, 0);
}
diff --git a/src/mame/drivers/hvyunit.cpp b/src/mame/drivers/hvyunit.cpp
index 9451326330a..9afb165aeb8 100644
--- a/src/mame/drivers/hvyunit.cpp
+++ b/src/mame/drivers/hvyunit.cpp
@@ -202,7 +202,7 @@ TILE_GET_INFO_MEMBER(hvyunit_state::get_bg_tile_info)
int code = m_videoram[tile_index] + ((attr & 0x0f) << 8);
int color = (attr >> 4);
- SET_TILE_INFO_MEMBER(1, code, color, 0);
+ tileinfo.set(1, code, color, 0);
}
void hvyunit_state::video_start()
diff --git a/src/mame/drivers/i7000.cpp b/src/mame/drivers/i7000.cpp
index cbcec9c34a4..90da718a50e 100644
--- a/src/mame/drivers/i7000.cpp
+++ b/src/mame/drivers/i7000.cpp
@@ -321,7 +321,7 @@ GFXDECODE_END
TILE_GET_INFO_MEMBER(i7000_state::get_bg_tile_info)
{
- SET_TILE_INFO_MEMBER(0, /*code:*/ m_videoram[tile_index], /*color:*/ 0, 0);
+ tileinfo.set(0, /*code:*/ m_videoram[tile_index], /*color:*/ 0, 0);
}
void i7000_state::video_start()
diff --git a/src/mame/drivers/igs009.cpp b/src/mame/drivers/igs009.cpp
index 0d6ac64a551..97eff43ff7f 100644
--- a/src/mame/drivers/igs009.cpp
+++ b/src/mame/drivers/igs009.cpp
@@ -152,7 +152,7 @@ TILE_GET_INFO_MEMBER(igs009_state::get_jingbell_reel1_tile_info)
{
int code = m_reel1_ram[tile_index];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
(code)+(((tile_index+1)&0x3)*0x100),
(code & 0x80) ? 0xc : 0,
0);
@@ -163,7 +163,7 @@ TILE_GET_INFO_MEMBER(igs009_state::get_gp98_reel1_tile_info)
{
int code = m_reel1_ram[tile_index];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
(code*4)+(tile_index&0x3),
0,
0);
@@ -180,7 +180,7 @@ TILE_GET_INFO_MEMBER(igs009_state::get_jingbell_reel2_tile_info)
{
int code = m_reel2_ram[tile_index];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
(code)+(((tile_index+1)&0x3)*0x100),
(code & 0x80) ? 0xc : 0,
0);
@@ -190,7 +190,7 @@ TILE_GET_INFO_MEMBER(igs009_state::get_gp98_reel2_tile_info)
{
int code = m_reel2_ram[tile_index];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
(code*4)+(tile_index&0x3),
0,
0);
@@ -208,7 +208,7 @@ TILE_GET_INFO_MEMBER(igs009_state::get_jingbell_reel3_tile_info)
{
int code = m_reel3_ram[tile_index];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
(code)+(((tile_index+1)&0x3)*0x100),
(code & 0x80) ? 0xc : 0,
0);
@@ -218,7 +218,7 @@ TILE_GET_INFO_MEMBER(igs009_state::get_gp98_reel3_tile_info)
{
int code = m_reel3_ram[tile_index];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
(code*4)+(tile_index&0x3),
0,
0);
@@ -236,7 +236,7 @@ TILE_GET_INFO_MEMBER(igs009_state::get_jingbell_reel4_tile_info)
{
int code = m_reel4_ram[tile_index];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
(code)+(((tile_index+1)&0x3)*0x100),
(code & 0x80) ? 0xc : 0,
0);
@@ -246,7 +246,7 @@ TILE_GET_INFO_MEMBER(igs009_state::get_gp98_reel4_tile_info)
{
int code = m_reel4_ram[tile_index];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
(code*4)+(tile_index&0x3),
0,
0);
@@ -264,7 +264,7 @@ WRITE8_MEMBER(igs009_state::bg_scroll_w)
TILE_GET_INFO_MEMBER(igs009_state::get_fg_tile_info)
{
int code = m_fg_tile_ram[tile_index] | (m_fg_color_ram[tile_index] << 8);
- SET_TILE_INFO_MEMBER(1, code, (4*(code >> 14)+3), 0);
+ tileinfo.set(1, code, (4*(code >> 14)+3), 0);
}
WRITE8_MEMBER(igs009_state::fg_tile_w)
diff --git a/src/mame/drivers/igspoker.cpp b/src/mame/drivers/igspoker.cpp
index 6d16a897b6f..495f6d22a15 100644
--- a/src/mame/drivers/igspoker.cpp
+++ b/src/mame/drivers/igspoker.cpp
@@ -213,14 +213,14 @@ WRITE8_MEMBER(igspoker_state::igs_irqack_w)
TILE_GET_INFO_MEMBER(igspoker_state::get_bg_tile_info)
{
int code = m_bg_tile_ram[tile_index];
- SET_TILE_INFO_MEMBER(1 + (tile_index & 3), code, 0, 0);
+ tileinfo.set(1 + (tile_index & 3), code, 0, 0);
}
TILE_GET_INFO_MEMBER(igspoker_state::get_fg_tile_info)
{
int code = m_fg_tile_ram[tile_index] | (m_fg_color_ram[tile_index] << 8);
int tile = code & 0x1fff;
- SET_TILE_INFO_MEMBER(0, code, tile != 0x1fff ? ((code >> 12) & 0xe) + 1 : 0, 0);
+ tileinfo.set(0, code, tile != 0x1fff ? ((code >> 12) & 0xe) + 1 : 0, 0);
}
WRITE8_MEMBER(igspoker_state::bg_tile_w)
diff --git a/src/mame/drivers/istrebiteli.cpp b/src/mame/drivers/istrebiteli.cpp
index 2fe3a802067..573f71bf168 100644
--- a/src/mame/drivers/istrebiteli.cpp
+++ b/src/mame/drivers/istrebiteli.cpp
@@ -237,7 +237,7 @@ void istrebiteli_state::motogonki_palette(palette_device &palette) const
TILE_GET_INFO_MEMBER(istrebiteli_state::get_tile_info)
{
- SET_TILE_INFO_MEMBER(0, m_tileram[tile_index] & 0x1f, 0, 0);
+ tileinfo.set(0, m_tileram[tile_index] & 0x1f, 0, 0);
}
void istrebiteli_state::init_istreb()
diff --git a/src/mame/drivers/jackie.cpp b/src/mame/drivers/jackie.cpp
index ac6495c2519..a3bef6e870f 100644
--- a/src/mame/drivers/jackie.cpp
+++ b/src/mame/drivers/jackie.cpp
@@ -134,7 +134,7 @@ TILE_GET_INFO_MEMBER(jackie_state::get_fg_tile_info)
{
int code = m_fg_tile_ram[tile_index] | (m_fg_color_ram[tile_index] << 8);
int tile = code & 0x1fff;
- SET_TILE_INFO_MEMBER(0, code, tile != 0x1fff ? ((code >> 12) & 0xe) + 1 : 0, 0);
+ tileinfo.set(0, code, tile != 0x1fff ? ((code >> 12) & 0xe) + 1 : 0, 0);
}
WRITE8_MEMBER(jackie_state::fg_tile_w)
@@ -160,7 +160,7 @@ template<uint8_t Which>
TILE_GET_INFO_MEMBER(jackie_state::get_reel_tile_info)
{
int code = m_reel_ram[Which][tile_index];
- SET_TILE_INFO_MEMBER(1, code, 0, 0);
+ tileinfo.set(1, code, 0, 0);
}
void jackie_state::video_start()
diff --git a/src/mame/drivers/jalmah.cpp b/src/mame/drivers/jalmah.cpp
index 4b152be2824..52efc7aed82 100644
--- a/src/mame/drivers/jalmah.cpp
+++ b/src/mame/drivers/jalmah.cpp
@@ -281,7 +281,7 @@ TILE_GET_INFO_MEMBER(urashima_state::get_tile_info_urashima)
uint16_t tile = code & 0xfff;
int region = (TileChip == 0) ? m_tile_bank : 3;
- SET_TILE_INFO_MEMBER(region,
+ tileinfo.set(region,
tile,
code >> 12,
0);
diff --git a/src/mame/drivers/jclub2.cpp b/src/mame/drivers/jclub2.cpp
index 94468ef42fc..693c188c140 100644
--- a/src/mame/drivers/jclub2.cpp
+++ b/src/mame/drivers/jclub2.cpp
@@ -343,14 +343,14 @@ TILE_GET_INFO_MEMBER(darkhors_state::get_tile_info_0)
{
uint16_t tile = m_tmapram[tile_index] >> 16;
uint16_t color = m_tmapram[tile_index] & 0xffff;
- SET_TILE_INFO_MEMBER(0, tile/2, (color & 0x200) ? (color & 0x1ff) : ((color & 0x0ff) * 4) , 0);
+ tileinfo.set(0, tile/2, (color & 0x200) ? (color & 0x1ff) : ((color & 0x0ff) * 4) , 0);
}
TILE_GET_INFO_MEMBER(darkhors_state::get_tile_info_1)
{
uint16_t tile = m_tmapram2[tile_index] >> 16;
uint16_t color = m_tmapram2[tile_index] & 0xffff;
- SET_TILE_INFO_MEMBER(0, tile/2, (color & 0x200) ? (color & 0x1ff) : ((color & 0x0ff) * 4) , 0);
+ tileinfo.set(0, tile/2, (color & 0x200) ? (color & 0x1ff) : ((color & 0x0ff) * 4) , 0);
}
WRITE32_MEMBER(darkhors_state::tmapram_w)
diff --git a/src/mame/drivers/jokrwild.cpp b/src/mame/drivers/jokrwild.cpp
index 69886589d94..ecaa25fd033 100644
--- a/src/mame/drivers/jokrwild.cpp
+++ b/src/mame/drivers/jokrwild.cpp
@@ -147,7 +147,7 @@ TILE_GET_INFO_MEMBER(jokrwild_state::get_bg_tile_info)
int code = m_videoram[tile_index] | ((attr & 0xc0) << 2);
int color = (attr & 0x0f);
- SET_TILE_INFO_MEMBER(0, code , color , 0);
+ tileinfo.set(0, code , color , 0);
}
void jokrwild_state::video_start()
diff --git a/src/mame/drivers/jollyjgr.cpp b/src/mame/drivers/jollyjgr.cpp
index 0ec83f5abde..6c9f96c556a 100644
--- a/src/mame/drivers/jollyjgr.cpp
+++ b/src/mame/drivers/jollyjgr.cpp
@@ -486,7 +486,7 @@ TILE_GET_INFO_MEMBER(jollyjgr_state::get_bg_tile_info)
{
int color = m_colorram[((tile_index & 0x1f) << 1) | 1] & 7;
int region = (m_tilemap_bank & 0x20) ? 2 : 0;
- SET_TILE_INFO_MEMBER(region, m_videoram[tile_index], color, 0);
+ tileinfo.set(region, m_videoram[tile_index], color, 0);
}
void jollyjgr_state::video_start()
diff --git a/src/mame/drivers/joystand.cpp b/src/mame/drivers/joystand.cpp
index ff55bed33c2..832a9a86674 100644
--- a/src/mame/drivers/joystand.cpp
+++ b/src/mame/drivers/joystand.cpp
@@ -222,13 +222,13 @@ const rgb_t joystand_state::BG15_TRANSPARENT = 0x99999999;
TILE_GET_INFO_MEMBER(joystand_state::get_bg1_tile_info)
{
uint32_t code = (m_bg1_ram[tile_index * 2 + 0] << 16) | m_bg1_ram[tile_index * 2 + 1];
- SET_TILE_INFO_MEMBER(0, code & 0x00ffffff, code >> 24, 0);
+ tileinfo.set(0, code & 0x00ffffff, code >> 24, 0);
}
TILE_GET_INFO_MEMBER(joystand_state::get_bg2_tile_info)
{
uint32_t code = (m_bg2_ram[tile_index * 2 + 0] << 16) | m_bg2_ram[tile_index * 2 + 1];
- SET_TILE_INFO_MEMBER(0, code & 0x00ffffff, code >> 24, 0);
+ tileinfo.set(0, code & 0x00ffffff, code >> 24, 0);
}
WRITE16_MEMBER(joystand_state::bg1_w)
diff --git a/src/mame/drivers/jubilee.cpp b/src/mame/drivers/jubilee.cpp
index 9fb8ce5b444..3c5f1c6b6ad 100644
--- a/src/mame/drivers/jubilee.cpp
+++ b/src/mame/drivers/jubilee.cpp
@@ -275,7 +275,7 @@ TILE_GET_INFO_MEMBER(jubilee_state::get_bg_tile_info)
int bank = (attr & 0x03);
int color = 0; /* fixed colors: one rom for each R, G and B. */
- SET_TILE_INFO_MEMBER(bank, code, color, 0);
+ tileinfo.set(bank, code, color, 0);
}
diff --git a/src/mame/drivers/kingdrby.cpp b/src/mame/drivers/kingdrby.cpp
index e6039a808e6..38c69aaabfa 100644
--- a/src/mame/drivers/kingdrby.cpp
+++ b/src/mame/drivers/kingdrby.cpp
@@ -187,7 +187,7 @@ TILE_GET_INFO_MEMBER(kingdrby_state::get_sc0_tile_info)
tile&=0x1ff;
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
tile,
color|0x40,
0);
@@ -203,7 +203,7 @@ TILE_GET_INFO_MEMBER(kingdrby_state::get_sc1_tile_info)
//0x13
//
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
tile,
color|0x40,
0);
diff --git a/src/mame/drivers/koftball.cpp b/src/mame/drivers/koftball.cpp
index a474c144ff5..3486e053513 100644
--- a/src/mame/drivers/koftball.cpp
+++ b/src/mame/drivers/koftball.cpp
@@ -88,7 +88,7 @@ private:
TILE_GET_INFO_MEMBER(koftball_state::get_t1_tile_info)
{
int data = m_bmc_1_videoram[tile_index];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
data,
0,
0);
@@ -97,7 +97,7 @@ TILE_GET_INFO_MEMBER(koftball_state::get_t1_tile_info)
TILE_GET_INFO_MEMBER(koftball_state::get_t2_tile_info)
{
int data = m_bmc_2_videoram[tile_index];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
data,
0,
0);
diff --git a/src/mame/drivers/koikoi.cpp b/src/mame/drivers/koikoi.cpp
index 93cf170274b..5f815f53fcb 100644
--- a/src/mame/drivers/koikoi.cpp
+++ b/src/mame/drivers/koikoi.cpp
@@ -105,7 +105,7 @@ TILE_GET_INFO_MEMBER(koikoi_state::get_tile_info)
int color = (m_videoram[tile_index + 0x400] & 0x1f);
int flip = (m_videoram[tile_index + 0x400] & 0x80) ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0;
- SET_TILE_INFO_MEMBER(0, code, color, flip);
+ tileinfo.set(0, code, color, flip);
}
void koikoi_state::koikoi_palette(palette_device &palette) const
diff --git a/src/mame/drivers/lbeach.cpp b/src/mame/drivers/lbeach.cpp
index 7c5f07971b0..59c3b69451a 100644
--- a/src/mame/drivers/lbeach.cpp
+++ b/src/mame/drivers/lbeach.cpp
@@ -130,14 +130,14 @@ TILE_GET_INFO_MEMBER(lbeach_state::get_bg_tile_info)
// d6,d7: color
uint8_t code = m_bg_vram[tile_index];
- SET_TILE_INFO_MEMBER(1, code & 0x1f, code >> 6 & 3, 0);
+ tileinfo.set(1, code & 0x1f, code >> 6 & 3, 0);
}
TILE_GET_INFO_MEMBER(lbeach_state::get_fg_tile_info)
{
uint8_t code = m_fg_vram[tile_index];
- SET_TILE_INFO_MEMBER(0, code, 0, 0);
+ tileinfo.set(0, code, 0, 0);
}
void lbeach_state::video_start()
diff --git a/src/mame/drivers/limenko.cpp b/src/mame/drivers/limenko.cpp
index 2ee82ecd573..04209cc46ab 100644
--- a/src/mame/drivers/limenko.cpp
+++ b/src/mame/drivers/limenko.cpp
@@ -310,21 +310,21 @@ TILE_GET_INFO_MEMBER(limenko_state::get_bg_tile_info)
{
const u32 tile = m_bg_videoram[tile_index] & 0x7ffff;
const u32 color = (m_bg_videoram[tile_index]>>28) & 0xf;
- SET_TILE_INFO_MEMBER(0, tile, color, 0);
+ tileinfo.set(0, tile, color, 0);
}
TILE_GET_INFO_MEMBER(limenko_state::get_md_tile_info)
{
const u32 tile = m_md_videoram[tile_index] & 0x7ffff;
const u32 color = (m_md_videoram[tile_index]>>28) & 0xf;
- SET_TILE_INFO_MEMBER(0, tile, color, 0);
+ tileinfo.set(0, tile, color, 0);
}
TILE_GET_INFO_MEMBER(limenko_state::get_fg_tile_info)
{
const u32 tile = m_fg_videoram[tile_index] & 0x7ffff;
const u32 color = (m_fg_videoram[tile_index]>>28) & 0xf;
- SET_TILE_INFO_MEMBER(0, tile, color, 0);
+ tileinfo.set(0, tile, color, 0);
}
void limenko_state::draw_single_sprite(bitmap_ind16 &dest_bmp,const rectangle &clip,u8 width, u8 height,
diff --git a/src/mame/drivers/looping.cpp b/src/mame/drivers/looping.cpp
index bace0c114fd..e31ae3bb74a 100644
--- a/src/mame/drivers/looping.cpp
+++ b/src/mame/drivers/looping.cpp
@@ -246,7 +246,7 @@ TILE_GET_INFO_MEMBER(looping_state::get_tile_info)
{
int tile_number = m_videoram[tile_index];
int color = m_colorram[(tile_index & 0x1f) * 2 + 1] & 0x07;
- SET_TILE_INFO_MEMBER(0, tile_number, color, 0);
+ tileinfo.set(0, tile_number, color, 0);
}
diff --git a/src/mame/drivers/ltcasino.cpp b/src/mame/drivers/ltcasino.cpp
index 039fa48ed1c..d9496cc7b99 100644
--- a/src/mame/drivers/ltcasino.cpp
+++ b/src/mame/drivers/ltcasino.cpp
@@ -375,7 +375,7 @@ TILE_GET_INFO_MEMBER(ltcasino_state::ltcasino_tile_info)
code |= BIT(attr, 7) << 8;
- SET_TILE_INFO_MEMBER(0, code, 0, 0);
+ tileinfo.set(0, code, 0, 0);
}
TILE_GET_INFO_MEMBER(ltcasino_state::ltcasin2_tile_info)
@@ -386,7 +386,7 @@ TILE_GET_INFO_MEMBER(ltcasino_state::ltcasin2_tile_info)
code |= BIT(attr, 7) << 8;
- SET_TILE_INFO_MEMBER(0, code, ((attr & 0x70) >> 1) | (attr & 7), 0);
+ tileinfo.set(0, code, ((attr & 0x70) >> 1) | (attr & 7), 0);
}
uint32_t ltcasino_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
diff --git a/src/mame/drivers/luckgrln.cpp b/src/mame/drivers/luckgrln.cpp
index 2484e6b733a..2edba51ec1b 100644
--- a/src/mame/drivers/luckgrln.cpp
+++ b/src/mame/drivers/luckgrln.cpp
@@ -179,7 +179,7 @@ TILE_GET_INFO_MEMBER(luckgrln_state::get_reel_tile_info)
code |= (attr & 0xe0)<<3;
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
code,
col,
0);
diff --git a/src/mame/drivers/m14.cpp b/src/mame/drivers/m14.cpp
index 56a1c2fb054..484c4931a1d 100644
--- a/src/mame/drivers/m14.cpp
+++ b/src/mame/drivers/m14.cpp
@@ -146,7 +146,7 @@ TILE_GET_INFO_MEMBER(m14_state::m14_get_tile_info)
/* colorram & 0xf0 used but unknown purpose*/
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code,
color,
0);
diff --git a/src/mame/drivers/m63.cpp b/src/mame/drivers/m63.cpp
index 252597a4f5a..dc5d4934e96 100644
--- a/src/mame/drivers/m63.cpp
+++ b/src/mame/drivers/m63.cpp
@@ -323,14 +323,14 @@ TILE_GET_INFO_MEMBER(m63_state::get_bg_tile_info)
int code = m_videoram[tile_index] | ((attr & 0x30) << 4);
int color = (attr & 0x0f) + (m_pal_bank << 4);
- SET_TILE_INFO_MEMBER(1, code, color, 0);
+ tileinfo.set(1, code, color, 0);
}
TILE_GET_INFO_MEMBER(m63_state::get_fg_tile_info)
{
int code = m_videoram2[tile_index];
- SET_TILE_INFO_MEMBER(0, code, 0, m_fg_flag);
+ tileinfo.set(0, code, 0, m_fg_flag);
}
VIDEO_START_MEMBER(m63_state,m63)
diff --git a/src/mame/drivers/magic10.cpp b/src/mame/drivers/magic10.cpp
index 13cf7246d43..786737e224b 100644
--- a/src/mame/drivers/magic10.cpp
+++ b/src/mame/drivers/magic10.cpp
@@ -229,7 +229,7 @@ WRITE16_MEMBER(magic10_state::layer2_videoram_w)
TILE_GET_INFO_MEMBER(magic10_state::get_layer0_tile_info)
{
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
m_layer0_videoram[tile_index * 2],
m_layer0_videoram[tile_index * 2 + 1] & 0x0f,
TILE_FLIPYX((m_layer0_videoram[tile_index * 2 + 1] & 0xc0) >> 6));
@@ -237,7 +237,7 @@ TILE_GET_INFO_MEMBER(magic10_state::get_layer0_tile_info)
TILE_GET_INFO_MEMBER(magic10_state::get_layer1_tile_info)
{
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
m_layer1_videoram[tile_index * 2],
m_layer1_videoram[tile_index * 2 + 1] & 0x0f,
TILE_FLIPYX((m_layer1_videoram[tile_index * 2 + 1] & 0xc0) >> 6));
@@ -245,7 +245,7 @@ TILE_GET_INFO_MEMBER(magic10_state::get_layer1_tile_info)
TILE_GET_INFO_MEMBER(magic10_state::get_layer2_tile_info)
{
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
m_layer2_videoram[tile_index * 2],
m_layer2_videoram[tile_index * 2 + 1] & 0x0f,0);
}
diff --git a/src/mame/drivers/magicfly.cpp b/src/mame/drivers/magicfly.cpp
index 6d46a08e875..88537d9e1c6 100644
--- a/src/mame/drivers/magicfly.cpp
+++ b/src/mame/drivers/magicfly.cpp
@@ -537,7 +537,7 @@ TILE_GET_INFO_MEMBER(magicfly_state::get_magicfly_tile_info)
m_colorram[0] = m_colorram[0] | ((m_colorram[0] & 0x08) << 4); /* only for 1st offset */
//m_colorram[tile_index] = attr | ((attr & 0x08) << 4); /* for the whole color RAM */
- SET_TILE_INFO_MEMBER(bank, code, color, 0);
+ tileinfo.set(bank, code, color, 0);
}
void magicfly_state::video_start()
@@ -568,7 +568,7 @@ TILE_GET_INFO_MEMBER(magicfly_state::get_7mezzo_tile_info)
m_colorram[0] = m_colorram[0] | ((m_colorram[0] & 0x04) << 5); /* only for 1st offset */
//m_colorram[tile_index] = attr | ((attr & 0x04) << 5); /* for the whole color RAM */
- SET_TILE_INFO_MEMBER(bank, code, color, 0);
+ tileinfo.set(bank, code, color, 0);
}
VIDEO_START_MEMBER(magicfly_state, 7mezzo)
diff --git a/src/mame/drivers/majorpkr.cpp b/src/mame/drivers/majorpkr.cpp
index a5e39d4bd91..02cc039e3ef 100644
--- a/src/mame/drivers/majorpkr.cpp
+++ b/src/mame/drivers/majorpkr.cpp
@@ -538,7 +538,7 @@ TILE_GET_INFO_MEMBER(majorpkr_state::bg_get_tile_info)
{
int code = m_bg_vram[2 * tile_index] + (m_bg_vram[2 * tile_index + 1] << 8);
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
(code & 0x1fff),
code >> 13,
0);
@@ -548,7 +548,7 @@ TILE_GET_INFO_MEMBER(majorpkr_state::fg_get_tile_info)
{
int code = m_fg_vram[2 * tile_index] + (m_fg_vram[2 * tile_index + 1] << 8);
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
(code & 0x07ff),
code >> 13,
(code & (1 << 12)) ? (TILE_FLIPX|TILE_FLIPY) : 0);
diff --git a/src/mame/drivers/marinedt.cpp b/src/mame/drivers/marinedt.cpp
index 28ba37f3524..bb84d450df4 100644
--- a/src/mame/drivers/marinedt.cpp
+++ b/src/mame/drivers/marinedt.cpp
@@ -182,7 +182,7 @@ TILE_GET_INFO_MEMBER(marinedt_state::get_tile_info)
{
int code = m_vram[tile_index];
- SET_TILE_INFO_MEMBER(0, code, 0, 0);
+ tileinfo.set(0, code, 0, 0);
}
// initialize sea bitmap gradient
diff --git a/src/mame/drivers/mastboyo.cpp b/src/mame/drivers/mastboyo.cpp
index 6e92db86a6f..4e8a52df6fb 100644
--- a/src/mame/drivers/mastboyo.cpp
+++ b/src/mame/drivers/mastboyo.cpp
@@ -66,7 +66,7 @@ TILE_GET_INFO_MEMBER(mastboyo_state::get_fg_tile_info)
{
int code = m_fgram[tile_index];
int attr = m_fgram2[tile_index];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code,
attr & 0x0f,
0);
diff --git a/src/mame/drivers/mgames.cpp b/src/mame/drivers/mgames.cpp
index efe910721a1..1709d2a290c 100644
--- a/src/mame/drivers/mgames.cpp
+++ b/src/mame/drivers/mgames.cpp
@@ -273,7 +273,7 @@ TILE_GET_INFO_MEMBER( mgames_state::tile_info )
uint8_t code = m_video[tile_index];
uint8_t color = m_video[tile_index + 0x400] & 0x3f;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
void mgames_state::machine_start()
diff --git a/src/mame/drivers/mgolf.cpp b/src/mame/drivers/mgolf.cpp
index 192022be98f..a9c88125cae 100644
--- a/src/mame/drivers/mgolf.cpp
+++ b/src/mame/drivers/mgolf.cpp
@@ -80,7 +80,7 @@ TILE_GET_INFO_MEMBER(mgolf_state::get_tile_info)
{
uint8_t code = m_video_ram[tile_index];
- SET_TILE_INFO_MEMBER(0, code, code >> 7, 0);
+ tileinfo.set(0, code, code >> 7, 0);
}
diff --git a/src/mame/drivers/mil4000.cpp b/src/mame/drivers/mil4000.cpp
index 220f47e8bbf..dae480b375d 100644
--- a/src/mame/drivers/mil4000.cpp
+++ b/src/mame/drivers/mil4000.cpp
@@ -193,7 +193,7 @@ TILE_GET_INFO_MEMBER(mil4000_state::get_sc0_tile_info)
int tile = data >> 14;
int color = (m_sc0_vram[tile_index*2+1] & 0x1f)+0;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
tile,
color,
0);
@@ -205,7 +205,7 @@ TILE_GET_INFO_MEMBER(mil4000_state::get_sc1_tile_info)
int tile = data >> 14;
int color = (m_sc1_vram[tile_index*2+1] & 0x1f)+0x10;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
tile,
color,
0);
@@ -217,7 +217,7 @@ TILE_GET_INFO_MEMBER(mil4000_state::get_sc2_tile_info)
int tile = data >> 14;
int color = (m_sc2_vram[tile_index*2+1] & 0x1f)+0x20;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
tile,
color,
0);
@@ -229,7 +229,7 @@ TILE_GET_INFO_MEMBER(mil4000_state::get_sc3_tile_info)
int tile = data >> 14;
int color = (m_sc3_vram[tile_index*2+1] & 0x1f)+0x30;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
tile,
color,
0);
diff --git a/src/mame/drivers/mogura.cpp b/src/mame/drivers/mogura.cpp
index cf81571882e..d10d0d0f6cf 100644
--- a/src/mame/drivers/mogura.cpp
+++ b/src/mame/drivers/mogura.cpp
@@ -87,7 +87,7 @@ TILE_GET_INFO_MEMBER(mogura_state::get_mogura_tile_info)
int code = m_tileram[tile_index];
int attr = m_tileram[tile_index + 0x800];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code,
(attr >> 1) & 7,
0);
diff --git a/src/mame/drivers/mole.cpp b/src/mame/drivers/mole.cpp
index 7726f679f21..e83603e650e 100644
--- a/src/mame/drivers/mole.cpp
+++ b/src/mame/drivers/mole.cpp
@@ -104,7 +104,7 @@ TILE_GET_INFO_MEMBER(mole_state::get_bg_tile_info)
{
uint16_t code = m_tileram[tile_index];
- SET_TILE_INFO_MEMBER((code & 0x200) ? 1 : 0, code & 0x1ff, 0, 0);
+ tileinfo.set((code & 0x200) ? 1 : 0, code & 0x1ff, 0, 0);
}
void mole_state::video_start()
diff --git a/src/mame/drivers/mpu12wbk.cpp b/src/mame/drivers/mpu12wbk.cpp
index 30ffdd1875b..d282a89100d 100644
--- a/src/mame/drivers/mpu12wbk.cpp
+++ b/src/mame/drivers/mpu12wbk.cpp
@@ -283,8 +283,8 @@ TILE_GET_INFO_MEMBER(mpu12wbk_state::get_bg_tile_info)
// int code = m_videoram[tile_index] | ((attr & 0xc0) << 2);
// int color = (attr & 0x0f);
-// SET_TILE_INFO_MEMBER(0, code, color, 0);
- SET_TILE_INFO_MEMBER(0, 0 ,0 ,0);
+// tileinfo.set(0, code, color, 0);
+ tileinfo.set(0, 0 ,0 ,0);
}
diff --git a/src/mame/drivers/multfish.cpp b/src/mame/drivers/multfish.cpp
index 943a0e83b44..b75b4994ac4 100644
--- a/src/mame/drivers/multfish.cpp
+++ b/src/mame/drivers/multfish.cpp
@@ -194,7 +194,7 @@ TILE_GET_INFO_MEMBER(igrosoft_gamble_state::get_igrosoft_gamble_tile_info)
tileinfo.category = (attr&0x100)>>8;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code&0x1fff,
attr&0x7,
0);
@@ -204,7 +204,7 @@ TILE_GET_INFO_MEMBER(igrosoft_gamble_state::get_igrosoft_gamble_reel_tile_info)
{
int code = m_vid[tile_index*2+0x2000] | (m_vid[tile_index*2+0x2001] << 8);
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
(code&0x1fff)+0x2000,
(code>>14)+0x8,
0);
diff --git a/src/mame/drivers/namcos23.cpp b/src/mame/drivers/namcos23.cpp
index ffe7a124c4d..c5bef6464ec 100644
--- a/src/mame/drivers/namcos23.cpp
+++ b/src/mame/drivers/namcos23.cpp
@@ -2391,7 +2391,7 @@ TILE_GET_INFO_MEMBER(namcos23_state::TextTilemapGetInfo)
* ----.xx--.----.---- flip
* ----.--xx.xxxx.xxxx code
*/
- SET_TILE_INFO_MEMBER(0, data&0x03ff, data>>12, TILE_FLIPYX((data&0x0c00)>>10));
+ tileinfo.set(0, data&0x03ff, data>>12, TILE_FLIPYX((data&0x0c00)>>10));
}
WRITE32_MEMBER(namcos23_state::textram_w)
diff --git a/src/mame/drivers/nibble.cpp b/src/mame/drivers/nibble.cpp
index 72f3d6e9d45..f9b41fa9fd0 100644
--- a/src/mame/drivers/nibble.cpp
+++ b/src/mame/drivers/nibble.cpp
@@ -118,7 +118,7 @@ TILE_GET_INFO_MEMBER(nibble_state::get_bg_tile_info)
*/
uint8_t code = m_videoram[tile_index];
- SET_TILE_INFO_MEMBER(0 /* bank */, code, 0 /* color */, 0);
+ tileinfo.set(0 /* bank */, code, 0 /* color */, 0);
}
void nibble_state::video_start()
diff --git a/src/mame/drivers/nmg5.cpp b/src/mame/drivers/nmg5.cpp
index 71d8f5c2ab4..a8eed2679c1 100644
--- a/src/mame/drivers/nmg5.cpp
+++ b/src/mame/drivers/nmg5.cpp
@@ -857,7 +857,7 @@ static INPUT_PORTS_START( wondstck )
INPUT_PORTS_END
template<int Layer>
-TILE_GET_INFO_MEMBER(nmg5_state::get_tile_info){ SET_TILE_INFO_MEMBER(0, m_vram[Layer][tile_index] | (m_gfx_bank << 16), Layer ^ 1, 0);}
+TILE_GET_INFO_MEMBER(nmg5_state::get_tile_info){ tileinfo.set(0, m_vram[Layer][tile_index] | (m_gfx_bank << 16), Layer ^ 1, 0);}
void nmg5_state::video_start()
{
diff --git a/src/mame/drivers/nsmpoker.cpp b/src/mame/drivers/nsmpoker.cpp
index 672119d153e..f61076423c9 100644
--- a/src/mame/drivers/nsmpoker.cpp
+++ b/src/mame/drivers/nsmpoker.cpp
@@ -136,7 +136,7 @@ TILE_GET_INFO_MEMBER(nsmpoker_state::get_bg_tile_info)
// int bank = (attr & 0x08) >> 3;
// int color = (attr & 0x03);
- SET_TILE_INFO_MEMBER(0 /* bank */, code, 0 /* color */, 0);
+ tileinfo.set(0 /* bank */, code, 0 /* color */, 0);
}
diff --git a/src/mame/drivers/olibochu.cpp b/src/mame/drivers/olibochu.cpp
index a2e433d9f69..306f93ad202 100644
--- a/src/mame/drivers/olibochu.cpp
+++ b/src/mame/drivers/olibochu.cpp
@@ -179,7 +179,7 @@ TILE_GET_INFO_MEMBER(olibochu_state::get_bg_tile_info)
int color = (attr & 0x1f) + 0x20;
int flags = ((attr & 0x40) ? TILE_FLIPX : 0) | ((attr & 0x80) ? TILE_FLIPY : 0);
- SET_TILE_INFO_MEMBER(0, code, color, flags);
+ tileinfo.set(0, code, color, flags);
}
void olibochu_state::video_start()
diff --git a/src/mame/drivers/onetwo.cpp b/src/mame/drivers/onetwo.cpp
index 6cba8e87ac0..40f4b87e5ac 100644
--- a/src/mame/drivers/onetwo.cpp
+++ b/src/mame/drivers/onetwo.cpp
@@ -116,7 +116,7 @@ TILE_GET_INFO_MEMBER(onetwo_state::get_fg_tile_info)
code &= 0x7fff;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
void onetwo_state::video_start()
diff --git a/src/mame/drivers/panicr.cpp b/src/mame/drivers/panicr.cpp
index 6f5ef7547ab..368322756d9 100644
--- a/src/mame/drivers/panicr.cpp
+++ b/src/mame/drivers/panicr.cpp
@@ -196,7 +196,7 @@ TILE_GET_INFO_MEMBER(panicr_state::get_bgtile_info)
code=memregion("user1")->base()[tile_index];
attr=memregion("user2")->base()[tile_index];
code+=((attr&7)<<8);
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
code,
(attr & 0xf0) >> 4,
0);
@@ -211,7 +211,7 @@ TILE_GET_INFO_MEMBER(panicr_state::get_infotile_info_2)
code=memregion("user1")->base()[tile_index];
attr=memregion("user2")->base()[tile_index];
code+=((attr&7)<<8);
- SET_TILE_INFO_MEMBER(3,
+ tileinfo.set(3,
code,
0,
0);
@@ -228,7 +228,7 @@ TILE_GET_INFO_MEMBER(panicr_state::get_txttile_info)
tileinfo.group = color;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code + ((attr & 8) << 5),
color,
0);
diff --git a/src/mame/drivers/patapata.cpp b/src/mame/drivers/patapata.cpp
index f34c14f778e..edb5c740e70 100644
--- a/src/mame/drivers/patapata.cpp
+++ b/src/mame/drivers/patapata.cpp
@@ -85,7 +85,7 @@ TILE_GET_INFO_MEMBER(patapata_state::get_bg_tile_info)
{
int tileno = m_bg_videoram[tile_index];
int pal = tileno>>12;
- SET_TILE_INFO_MEMBER(0, tileno&0x1fff, pal, 0);
+ tileinfo.set(0, tileno&0x1fff, pal, 0);
}
WRITE16_MEMBER(patapata_state::fg_videoram_w)
@@ -106,7 +106,7 @@ TILE_GET_INFO_MEMBER(patapata_state::get_fg_tile_info)
int tileno = m_fg_videoram[tile_index];
int pal = tileno>>12;
- SET_TILE_INFO_MEMBER(1, (tileno&0x0fff)+(bank*0x1000), pal, 0);
+ tileinfo.set(1, (tileno&0x0fff)+(bank*0x1000), pal, 0);
}
TILEMAP_MAPPER_MEMBER(patapata_state::pagescan)
diff --git a/src/mame/drivers/peplus.cpp b/src/mame/drivers/peplus.cpp
index 9bc07343e82..df2a9dbc75d 100644
--- a/src/mame/drivers/peplus.cpp
+++ b/src/mame/drivers/peplus.cpp
@@ -952,7 +952,7 @@ TILE_GET_INFO_MEMBER(peplus_state::get_bg_tile_info)
color += 0x10;
}
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
void peplus_state::video_start()
diff --git a/src/mame/drivers/pipeline.cpp b/src/mame/drivers/pipeline.cpp
index 65d76e11623..9bee07159fe 100644
--- a/src/mame/drivers/pipeline.cpp
+++ b/src/mame/drivers/pipeline.cpp
@@ -148,14 +148,14 @@ void pipeline_state::machine_start()
TILE_GET_INFO_MEMBER(pipeline_state::get_tile_info)
{
int code = m_vram2[tile_index] + m_vram2[tile_index + 0x800] * 256;
- SET_TILE_INFO_MEMBER(0, code, 0, 0);
+ tileinfo.set(0, code, 0, 0);
}
TILE_GET_INFO_MEMBER(pipeline_state::get_tile_info2)
{
int code = m_vram1[tile_index] + ((m_vram1[tile_index + 0x800] >> 4)) * 256;
int color = ((m_vram1[tile_index + 0x800]) & 0xf);
- SET_TILE_INFO_MEMBER(1, code, color, 0);
+ tileinfo.set(1, code, color, 0);
}
void pipeline_state::video_start()
diff --git a/src/mame/drivers/pkscram.cpp b/src/mame/drivers/pkscram.cpp
index e0c5c816893..a6b289f64b5 100644
--- a/src/mame/drivers/pkscram.cpp
+++ b/src/mame/drivers/pkscram.cpp
@@ -224,7 +224,7 @@ TILE_GET_INFO_MEMBER(pkscram_state::get_bg_tile_info)
int const tile = m_bgtilemap_ram[tile_index*2];
int const color = m_bgtilemap_ram[tile_index*2 + 1] & 0x7f;
- SET_TILE_INFO_MEMBER(0, tile, color, 0);
+ tileinfo.set(0, tile, color, 0);
}
TILE_GET_INFO_MEMBER(pkscram_state::get_md_tile_info)
@@ -232,7 +232,7 @@ TILE_GET_INFO_MEMBER(pkscram_state::get_md_tile_info)
int const tile = m_mdtilemap_ram[tile_index*2];
int const color = m_mdtilemap_ram[tile_index*2 + 1] & 0x7f;
- SET_TILE_INFO_MEMBER(0, tile, color, 0);
+ tileinfo.set(0, tile, color, 0);
}
TILE_GET_INFO_MEMBER(pkscram_state::get_fg_tile_info)
@@ -240,7 +240,7 @@ TILE_GET_INFO_MEMBER(pkscram_state::get_fg_tile_info)
int const tile = m_fgtilemap_ram[tile_index*2];
int const color = m_fgtilemap_ram[tile_index*2 + 1] & 0x7f;
- SET_TILE_INFO_MEMBER(0, tile, color, 0);
+ tileinfo.set(0, tile, color, 0);
}
TIMER_DEVICE_CALLBACK_MEMBER(pkscram_state::scanline_callback)
diff --git a/src/mame/drivers/popobear.cpp b/src/mame/drivers/popobear.cpp
index 91ed2e63851..e4b3fde8ee2 100644
--- a/src/mame/drivers/popobear.cpp
+++ b/src/mame/drivers/popobear.cpp
@@ -187,7 +187,7 @@ TILE_GET_INFO_MEMBER(popobear_state::get_bg0_tile_info)
int base = m_tilemap_base[0];
int tileno = m_vram[base/2 + tile_index];
int flipyx = (tileno>>14);
- SET_TILE_INFO_MEMBER(0, tileno&0x3fff, 0, TILE_FLIPYX(flipyx));
+ tileinfo.set(0, tileno&0x3fff, 0, TILE_FLIPYX(flipyx));
}
TILE_GET_INFO_MEMBER(popobear_state::get_bg1_tile_info)
@@ -195,7 +195,7 @@ TILE_GET_INFO_MEMBER(popobear_state::get_bg1_tile_info)
int base = m_tilemap_base[1];
int tileno = m_vram[base/2 + tile_index];
int flipyx = (tileno>>14);
- SET_TILE_INFO_MEMBER(0, tileno&0x3fff, 0, TILE_FLIPYX(flipyx));
+ tileinfo.set(0, tileno&0x3fff, 0, TILE_FLIPYX(flipyx));
}
TILE_GET_INFO_MEMBER(popobear_state::get_bg2_tile_info)
@@ -203,7 +203,7 @@ TILE_GET_INFO_MEMBER(popobear_state::get_bg2_tile_info)
int base = m_tilemap_base[2];
int tileno = m_vram[base/2 + tile_index];
int flipyx = (tileno>>14);
- SET_TILE_INFO_MEMBER(0, tileno&0x3fff, 0, TILE_FLIPYX(flipyx));
+ tileinfo.set(0, tileno&0x3fff, 0, TILE_FLIPYX(flipyx));
}
TILE_GET_INFO_MEMBER(popobear_state::get_bg3_tile_info)
@@ -211,7 +211,7 @@ TILE_GET_INFO_MEMBER(popobear_state::get_bg3_tile_info)
int base = m_tilemap_base[3];
int tileno = m_vram[base/2 + tile_index];
int flipyx = (tileno>>14);
- SET_TILE_INFO_MEMBER(0, tileno&0x3fff, 0, TILE_FLIPYX(flipyx));
+ tileinfo.set(0, tileno&0x3fff, 0, TILE_FLIPYX(flipyx));
}
diff --git a/src/mame/drivers/popper.cpp b/src/mame/drivers/popper.cpp
index afcd98b76a1..805fece7654 100644
--- a/src/mame/drivers/popper.cpp
+++ b/src/mame/drivers/popper.cpp
@@ -437,7 +437,7 @@ TILE_GET_INFO_MEMBER( popper_state::layer0_tile_info )
// high priority only applies if a color is set
tileinfo.category = BIT(attr, 7) && (attr & 0x70);
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
TILE_GET_INFO_MEMBER( popper_state::layer1_tile_info )
@@ -448,7 +448,7 @@ TILE_GET_INFO_MEMBER( popper_state::layer1_tile_info )
tileinfo.category = BIT(attr, 7);
- SET_TILE_INFO_MEMBER(1, code, color, 0);
+ tileinfo.set(1, code, color, 0);
}
diff --git a/src/mame/drivers/powerbal.cpp b/src/mame/drivers/powerbal.cpp
index 76f6ed54349..6cf549cefdb 100644
--- a/src/mame/drivers/powerbal.cpp
+++ b/src/mame/drivers/powerbal.cpp
@@ -527,7 +527,7 @@ TILE_GET_INFO_MEMBER(powerbal_state::powerbal_get_bg_tile_info)
if (m_videoram1[tile_index] & 0x800)
code |= 0x8000;
- SET_TILE_INFO_MEMBER(1, code, colr >> 12, 0);
+ tileinfo.set(1, code, colr >> 12, 0);
}
void powerbal_state::draw_sprites_powerbal(bitmap_ind16 &bitmap, const rectangle &cliprect )
diff --git a/src/mame/drivers/ppmast93.cpp b/src/mame/drivers/ppmast93.cpp
index 4a6337f9aad..193afd3c79f 100644
--- a/src/mame/drivers/ppmast93.cpp
+++ b/src/mame/drivers/ppmast93.cpp
@@ -344,7 +344,7 @@ GFXDECODE_END
TILE_GET_INFO_MEMBER(ppmast93_state::get_bg_tile_info)
{
int code = (m_bgram[tile_index*2+1] << 8) | m_bgram[tile_index*2];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code & 0x0fff,
(code & 0xf000) >> 12,
0);
@@ -353,7 +353,7 @@ TILE_GET_INFO_MEMBER(ppmast93_state::get_bg_tile_info)
TILE_GET_INFO_MEMBER(ppmast93_state::get_fg_tile_info)
{
int code = (m_fgram[tile_index*2+1] << 8) | m_fgram[tile_index*2];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
(code & 0x0fff)+0x1000,
(code & 0xf000) >> 12,
0);
diff --git a/src/mame/drivers/pturn.cpp b/src/mame/drivers/pturn.cpp
index 8a0bba0c0b0..055d18cd63b 100644
--- a/src/mame/drivers/pturn.cpp
+++ b/src/mame/drivers/pturn.cpp
@@ -171,7 +171,7 @@ TILE_GET_INFO_MEMBER(pturn_state::get_tile_info)
tileno=tile_lookup[tileno>>4]|(tileno&0xf)|(m_fgbank<<8);
- SET_TILE_INFO_MEMBER(0,tileno,m_fgpalette,0);
+ tileinfo.set(0,tileno,m_fgpalette,0);
}
@@ -184,7 +184,7 @@ TILE_GET_INFO_MEMBER(pturn_state::get_bg_tile_info)
{
palno=25;
}
- SET_TILE_INFO_MEMBER(1,tileno+m_bgbank*256,palno,0);
+ tileinfo.set(1,tileno+m_bgbank*256,palno,0);
}
void pturn_state::video_start()
diff --git a/src/mame/drivers/pzletime.cpp b/src/mame/drivers/pzletime.cpp
index ea765fc4425..d2ae841e67f 100644
--- a/src/mame/drivers/pzletime.cpp
+++ b/src/mame/drivers/pzletime.cpp
@@ -92,7 +92,7 @@ TILE_GET_INFO_MEMBER(pzletime_state::get_mid_tile_info)
int tileno = m_mid_videoram[tile_index] & 0x0fff;
int colour = m_mid_videoram[tile_index] & 0xf000;
colour = colour >> 12;
- SET_TILE_INFO_MEMBER(2, tileno, colour, 0);
+ tileinfo.set(2, tileno, colour, 0);
}
TILE_GET_INFO_MEMBER(pzletime_state::get_txt_tile_info)
@@ -101,7 +101,7 @@ TILE_GET_INFO_MEMBER(pzletime_state::get_txt_tile_info)
int colour = m_txt_videoram[tile_index] & 0xf000;
colour = colour >> 12;
- SET_TILE_INFO_MEMBER(0, tileno, colour, 0);
+ tileinfo.set(0, tileno, colour, 0);
tileinfo.category = BIT(colour, 3);
}
diff --git a/src/mame/drivers/quickpick5.cpp b/src/mame/drivers/quickpick5.cpp
index 82ec34b6c85..2919d4106fe 100644
--- a/src/mame/drivers/quickpick5.cpp
+++ b/src/mame/drivers/quickpick5.cpp
@@ -217,7 +217,7 @@ TILE_GET_INFO_MEMBER(quickpick5_state::ttl_get_tile_info)
attr >>= 3;
attr &= ~1;
- SET_TILE_INFO_MEMBER(m_ttl_gfx_index, code, attr, 0);
+ tileinfo.set(m_ttl_gfx_index, code, attr, 0);
}
uint32_t quickpick5_state::screen_update_quickpick5(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
diff --git a/src/mame/drivers/quizpun2.cpp b/src/mame/drivers/quizpun2.cpp
index 84dd912350e..a427aba3a8a 100644
--- a/src/mame/drivers/quizpun2.cpp
+++ b/src/mame/drivers/quizpun2.cpp
@@ -187,14 +187,14 @@ private:
TILE_GET_INFO_MEMBER(quizpun2_state::get_bg_tile_info)
{
uint16_t code = m_bg_ram[ tile_index * 2 ] + m_bg_ram[ tile_index * 2 + 1 ] * 256;
- SET_TILE_INFO_MEMBER(0, code, code >> 12, TILE_FLIPXY((code & 0x800) >> 11));
+ tileinfo.set(0, code, code >> 12, TILE_FLIPXY((code & 0x800) >> 11));
}
TILE_GET_INFO_MEMBER(quizpun2_state::get_fg_tile_info)
{
uint16_t code = m_fg_ram[ tile_index * 4 ]/* + m_fg_ram[ tile_index * 4 + 1 ] * 256*/;
uint8_t color = m_fg_ram[ tile_index * 4 + 2 ];
- SET_TILE_INFO_MEMBER(1, code, color / 2, 0);
+ tileinfo.set(1, code, color / 2, 0);
}
WRITE8_MEMBER(quizpun2_state::bg_ram_w)
diff --git a/src/mame/drivers/quizshow.cpp b/src/mame/drivers/quizshow.cpp
index 334ff573035..8677ab0c9f4 100644
--- a/src/mame/drivers/quizshow.cpp
+++ b/src/mame/drivers/quizshow.cpp
@@ -124,7 +124,7 @@ TILE_GET_INFO_MEMBER(quizshow_state::get_tile_info)
// d6: blink, d7: invert
uint8_t const color = (code & (m_blink_state | 0x80)) >> 6;
- SET_TILE_INFO_MEMBER(0, code & 0x3f, color, 0);
+ tileinfo.set(0, code & 0x3f, color, 0);
}
void quizshow_state::video_start()
diff --git a/src/mame/drivers/rabbit.cpp b/src/mame/drivers/rabbit.cpp
index 2f7f1731633..4601713bcb1 100644
--- a/src/mame/drivers/rabbit.cpp
+++ b/src/mame/drivers/rabbit.cpp
@@ -227,7 +227,7 @@ void rabbit_state::get_tilemap_info(tile_data &tileinfo, int tile_index, int whi
colour &= 0x0f;
colour += 0x20;
tileinfo.group = 1;
- SET_TILE_INFO_MEMBER(6+tilesize,tileno,colour,TILE_FLIPXY(flipxy));
+ tileinfo.set(6+tilesize,tileno,colour,TILE_FLIPXY(flipxy));
}
else
{
@@ -235,7 +235,7 @@ void rabbit_state::get_tilemap_info(tile_data &tileinfo, int tile_index, int whi
if (cmask) colour&=0x3f; // see health bars
colour += 0x200;
tileinfo.group = 0;
- SET_TILE_INFO_MEMBER(4+tilesize,tileno,colour,TILE_FLIPXY(flipxy));
+ tileinfo.set(4+tilesize,tileno,colour,TILE_FLIPXY(flipxy));
}
}
diff --git a/src/mame/drivers/rmhaihai.cpp b/src/mame/drivers/rmhaihai.cpp
index 7d3a612bc7b..95d1a2605c2 100644
--- a/src/mame/drivers/rmhaihai.cpp
+++ b/src/mame/drivers/rmhaihai.cpp
@@ -127,7 +127,7 @@ TILE_GET_INFO_MEMBER(rmhaihai_state::get_bg_tile_info)
int code = m_videoram[tile_index] + (m_gfxbank << 12) + ((attr & 0x07) << 8) + ((attr & 0x80) << 4);
int color = (m_gfxbank << 5) + (attr >> 3);
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
void rmhaihai_state::video_start()
diff --git a/src/mame/drivers/safarir.cpp b/src/mame/drivers/safarir.cpp
index 4d3a199fa41..0fcc1072188 100644
--- a/src/mame/drivers/safarir.cpp
+++ b/src/mame/drivers/safarir.cpp
@@ -184,7 +184,7 @@ TILE_GET_INFO_MEMBER(safarir_state::get_bg_tile_info)
color |= (tile_index & 0xc0) ? 1 : 0;
}
- SET_TILE_INFO_MEMBER(0, code & 0x7f, color, 0);
+ tileinfo.set(0, code & 0x7f, color, 0);
}
@@ -201,7 +201,7 @@ TILE_GET_INFO_MEMBER(safarir_state::get_fg_tile_info)
flags = ((tile_index & 0x1f) >= 0x03) ? 0 : TILE_FORCE_LAYER0;
- SET_TILE_INFO_MEMBER(1, code & 0x7f, color, flags);
+ tileinfo.set(1, code & 0x7f, color, flags);
}
diff --git a/src/mame/drivers/sanremo.cpp b/src/mame/drivers/sanremo.cpp
index 91c46478352..3c78bc8fc47 100644
--- a/src/mame/drivers/sanremo.cpp
+++ b/src/mame/drivers/sanremo.cpp
@@ -164,7 +164,7 @@ TILE_GET_INFO_MEMBER(sanremo_state::get_tile_info)
int code = m_videoram[tile_index];
int bank = m_attrram[tile_index];
- SET_TILE_INFO_MEMBER(0, code + bank * 256, 0, 0);
+ tileinfo.set(0, code + bank * 256, 0, 0);
}
void sanremo_state::video_start()
diff --git a/src/mame/drivers/sbowling.cpp b/src/mame/drivers/sbowling.cpp
index e6132f6dedb..0745992f1e7 100644
--- a/src/mame/drivers/sbowling.cpp
+++ b/src/mame/drivers/sbowling.cpp
@@ -105,7 +105,7 @@ TILE_GET_INFO_MEMBER(sbowling_state::get_tile_info)
uint8_t *rom = memregion("user1")->base();
int tileno = rom[tile_index + m_bgmap * 1024];
- SET_TILE_INFO_MEMBER(0, tileno, 0, 0);
+ tileinfo.set(0, tileno, 0, 0);
}
static void plot_pixel_sbw(bitmap_ind16 *tmpbitmap, int x, int y, int col, int flip)
diff --git a/src/mame/drivers/sbrkout.cpp b/src/mame/drivers/sbrkout.cpp
index 10866b3b54c..70097c02778 100644
--- a/src/mame/drivers/sbrkout.cpp
+++ b/src/mame/drivers/sbrkout.cpp
@@ -333,7 +333,7 @@ READ8_MEMBER(sbrkout_state::sync2_r)
TILE_GET_INFO_MEMBER(sbrkout_state::get_bg_tile_info)
{
int code = (m_videoram[tile_index] & 0x80) ? m_videoram[tile_index] : 0;
- SET_TILE_INFO_MEMBER(0, code, 0, 0);
+ tileinfo.set(0, code, 0, 0);
}
diff --git a/src/mame/drivers/seabattl.cpp b/src/mame/drivers/seabattl.cpp
index 8e7153a30d0..a16c2fa0e20 100644
--- a/src/mame/drivers/seabattl.cpp
+++ b/src/mame/drivers/seabattl.cpp
@@ -143,7 +143,7 @@ TILE_GET_INFO_MEMBER(seabattl_state::get_bg_tile_info)
int code = m_videoram[tile_index];
int color = m_colorram[tile_index];
- SET_TILE_INFO_MEMBER(1, code, (color & 0x7), 0);
+ tileinfo.set(1, code, (color & 0x7), 0);
}
WRITE8_MEMBER(seabattl_state::seabattl_videoram_w)
diff --git a/src/mame/drivers/seicupbl.cpp b/src/mame/drivers/seicupbl.cpp
index 1e0ea9b02db..6cbf8f40b1c 100644
--- a/src/mame/drivers/seicupbl.cpp
+++ b/src/mame/drivers/seicupbl.cpp
@@ -105,7 +105,7 @@ TILE_GET_INFO_MEMBER(seicupbl_state::get_sc0_tileinfo)
tile &= 0xfff;
//tile |= m_back_gfx_bank; /* Heatbrl uses banking */
- SET_TILE_INFO_MEMBER(1,tile,color,0);
+ tileinfo.set(1,tile,color,0);
}
TILE_GET_INFO_MEMBER(seicupbl_state::get_sc1_tileinfo)
@@ -118,7 +118,7 @@ TILE_GET_INFO_MEMBER(seicupbl_state::get_sc1_tileinfo)
tile |= 0x1000;
color += 0x10;
- SET_TILE_INFO_MEMBER(1,tile,color,0);
+ tileinfo.set(1,tile,color,0);
}
TILE_GET_INFO_MEMBER(seicupbl_state::get_sc2_tileinfo)
@@ -128,7 +128,7 @@ TILE_GET_INFO_MEMBER(seicupbl_state::get_sc2_tileinfo)
tile &= 0xfff;
- SET_TILE_INFO_MEMBER(4,tile,color,0);
+ tileinfo.set(4,tile,color,0);
}
TILE_GET_INFO_MEMBER(seicupbl_state::get_sc3_tileinfo)
@@ -138,7 +138,7 @@ TILE_GET_INFO_MEMBER(seicupbl_state::get_sc3_tileinfo)
tile &= 0xfff;
- SET_TILE_INFO_MEMBER(0,tile,color,0);
+ tileinfo.set(0,tile,color,0);
}
void seicupbl_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap,const rectangle &cliprect)
diff --git a/src/mame/drivers/sengokmj.cpp b/src/mame/drivers/sengokmj.cpp
index 7928c68fc2a..09d289e5006 100644
--- a/src/mame/drivers/sengokmj.cpp
+++ b/src/mame/drivers/sengokmj.cpp
@@ -242,28 +242,28 @@ TILE_GET_INFO_MEMBER( sengokmj_state::seibucrtc_sc0_tile_info )
int tile = m_sc0_vram[tile_index] & 0xfff;
int color = (m_sc0_vram[tile_index] >> 12) & 0x0f;
// tile+=(m_seibucrtc_sc0bank<<12);
- SET_TILE_INFO_MEMBER(1, tile, color, 0);
+ tileinfo.set(1, tile, color, 0);
}
TILE_GET_INFO_MEMBER( sengokmj_state::seibucrtc_sc2_tile_info )
{
int tile = m_sc2_vram[tile_index] & 0xfff;
int color = (m_sc2_vram[tile_index] >> 12) & 0x0f;
- SET_TILE_INFO_MEMBER(2, tile, color, 0);
+ tileinfo.set(2, tile, color, 0);
}
TILE_GET_INFO_MEMBER( sengokmj_state::seibucrtc_sc1_tile_info )
{
int tile = m_sc1_vram[tile_index] & 0xfff;
int color = (m_sc1_vram[tile_index] >> 12) & 0x0f;
- SET_TILE_INFO_MEMBER(3, tile, color, 0);
+ tileinfo.set(3, tile, color, 0);
}
TILE_GET_INFO_MEMBER( sengokmj_state::seibucrtc_sc3_tile_info )
{
int tile = m_sc3_vram[tile_index] & 0xfff;
int color = (m_sc3_vram[tile_index] >> 12) & 0x0f;
- SET_TILE_INFO_MEMBER(4, tile, color, 0);
+ tileinfo.set(4, tile, color, 0);
}
void sengokmj_state::draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect,int pri)
diff --git a/src/mame/drivers/sfbonus.cpp b/src/mame/drivers/sfbonus.cpp
index 0bdd46d5dd2..58f9ab53440 100644
--- a/src/mame/drivers/sfbonus.cpp
+++ b/src/mame/drivers/sfbonus.cpp
@@ -804,7 +804,7 @@ TILE_GET_INFO_MEMBER(sfbonus_state::get_tile_info)
int flipx = (m_tilemap_ram[(tile_index*2)+1] & 0x80)>>7;
int flipy = (m_tilemap_ram[(tile_index*2)+1] & 0x40)>>5;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code,
0,
TILE_FLIPYX(flipx | flipy));
@@ -819,7 +819,7 @@ TILE_GET_INFO_MEMBER(sfbonus_state::get_reel_tile_info)
int priority = (m_reel_ram[Reel][(tile_index*2)+1] & 0x40)>>6;
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
code,
priority, // colour abused as priority
TILE_FLIPYX(flipx | flipy));
diff --git a/src/mame/drivers/silvmil.cpp b/src/mame/drivers/silvmil.cpp
index 98ce29ba074..ea83e4b8e0c 100644
--- a/src/mame/drivers/silvmil.cpp
+++ b/src/mame/drivers/silvmil.cpp
@@ -148,7 +148,7 @@ TILE_GET_INFO_MEMBER(silvmil_state::get_bg_tile_info)
int color = (data >> 12) & 0x0f;
int bank = m_tilebank[(data & 0xc00) >> 10] * 0x400;
- SET_TILE_INFO_MEMBER(1, tile + bank, color + 0x20, 0);
+ tileinfo.set(1, tile + bank, color + 0x20, 0);
}
TILE_GET_INFO_MEMBER(silvmil_state::get_fg_tile_info)
@@ -158,7 +158,7 @@ TILE_GET_INFO_MEMBER(silvmil_state::get_fg_tile_info)
int color = (data >> 12) & 0x0f;
int bank = m_tilebank[(data & 0xc00) >> 10] * 0x400;
- SET_TILE_INFO_MEMBER(1, tile + bank, color + 0x10, 0);
+ tileinfo.set(1, tile + bank, color + 0x10, 0);
}
TILEMAP_MAPPER_MEMBER(silvmil_state::scan_rows)
diff --git a/src/mame/drivers/skyarmy.cpp b/src/mame/drivers/skyarmy.cpp
index 4f9adfc6bbb..eceb8c637fc 100644
--- a/src/mame/drivers/skyarmy.cpp
+++ b/src/mame/drivers/skyarmy.cpp
@@ -105,7 +105,7 @@ TILE_GET_INFO_MEMBER(skyarmy_state::get_tile_info)
int code = m_videoram[tile_index];
int attr = bitswap<3>(m_colorram[tile_index], 0, 1, 2);
- SET_TILE_INFO_MEMBER(0, code, attr, 0);
+ tileinfo.set(0, code, attr, 0);
}
WRITE8_MEMBER(skyarmy_state::videoram_w)
diff --git a/src/mame/drivers/skylncr.cpp b/src/mame/drivers/skylncr.cpp
index 2216d43ab39..c4084ff52a7 100644
--- a/src/mame/drivers/skylncr.cpp
+++ b/src/mame/drivers/skylncr.cpp
@@ -261,35 +261,35 @@ TILE_GET_INFO_MEMBER(skylncr_state::get_tile_info)
{
uint16_t code = m_videoram[ tile_index ] + (m_colorram[ tile_index ] << 8);
int pal = (code & 0x8000) >> 15;
- SET_TILE_INFO_MEMBER(0, code, pal^1, TILE_FLIPYX( 0 ));
+ tileinfo.set(0, code, pal^1, TILE_FLIPYX( 0 ));
}
TILE_GET_INFO_MEMBER(skylncr_state::get_reel_1_tile_info)
{
uint16_t code = m_reeltiles_1_ram[ tile_index ] + (m_reeltileshigh_1_ram[ tile_index ] << 8);
int pal = (code & 0x8000) >> 15;
- SET_TILE_INFO_MEMBER(1, code&0x7fff, pal^1, TILE_FLIPYX( 0 ));
+ tileinfo.set(1, code&0x7fff, pal^1, TILE_FLIPYX( 0 ));
}
TILE_GET_INFO_MEMBER(skylncr_state::get_reel_2_tile_info)
{
uint16_t code = m_reeltiles_2_ram[ tile_index ] + (m_reeltileshigh_2_ram[ tile_index ] << 8);
int pal = (code & 0x8000) >> 15;
- SET_TILE_INFO_MEMBER(1, code, pal^1, TILE_FLIPYX( 0 ));
+ tileinfo.set(1, code, pal^1, TILE_FLIPYX( 0 ));
}
TILE_GET_INFO_MEMBER(skylncr_state::get_reel_3_tile_info)
{
uint16_t code = m_reeltiles_3_ram[ tile_index ] + (m_reeltileshigh_3_ram[ tile_index ] << 8);
int pal = (code & 0x8000) >> 15;
- SET_TILE_INFO_MEMBER(1, code, pal^1, TILE_FLIPYX( 0 ));
+ tileinfo.set(1, code, pal^1, TILE_FLIPYX( 0 ));
}
TILE_GET_INFO_MEMBER(skylncr_state::get_reel_4_tile_info)
{
uint16_t code = m_reeltiles_4_ram[ tile_index ] + (m_reeltileshigh_4_ram[ tile_index ] << 8);
int pal = (code & 0x8000) >> 15;
- SET_TILE_INFO_MEMBER(1, code, pal^1, TILE_FLIPYX( 0 ));
+ tileinfo.set(1, code, pal^1, TILE_FLIPYX( 0 ));
}
diff --git a/src/mame/drivers/spartanxtec.cpp b/src/mame/drivers/spartanxtec.cpp
index 5855b4d86eb..2e50602ac4b 100644
--- a/src/mame/drivers/spartanxtec.cpp
+++ b/src/mame/drivers/spartanxtec.cpp
@@ -102,7 +102,7 @@ TILE_GET_INFO_MEMBER(spartanxtec_state::get_kungfum_bg_tile_info)
{
flags |= TILE_FLIPX;
}
- SET_TILE_INFO_MEMBER(0, code | ((color & 0xc0)<< 2), color & 0x1f, flags);
+ tileinfo.set(0, code | ((color & 0xc0)<< 2), color & 0x1f, flags);
/* is the following right? */
if ((tile_index / 64) < 6 || ((color & 0x1f) >> 1) > 0x0c)
diff --git a/src/mame/drivers/spdheat.cpp b/src/mame/drivers/spdheat.cpp
index a35433d2de1..ed893f5d927 100644
--- a/src/mame/drivers/spdheat.cpp
+++ b/src/mame/drivers/spdheat.cpp
@@ -85,7 +85,7 @@ TILE_GET_INFO_MEMBER(spdheat_state::get_fg_tile_info)
uint16_t data = m_fg_ram[screen][tile_index];
uint16_t code = data & 0x07ff;
uint16_t color = (data & 0x3800) >> 12;
- SET_TILE_INFO_MEMBER(0, code, color, TILE_FLIPYX((data & 0xc000) >> 14));
+ tileinfo.set(0, code, color, TILE_FLIPYX((data & 0xc000) >> 14));
}
diff --git a/src/mame/drivers/spoker.cpp b/src/mame/drivers/spoker.cpp
index 463fef68d24..b16e6e69bec 100644
--- a/src/mame/drivers/spoker.cpp
+++ b/src/mame/drivers/spoker.cpp
@@ -128,13 +128,13 @@ WRITE8_MEMBER(spoker_state::bg_tile_w)
TILE_GET_INFO_MEMBER(spoker_state::get_bg_tile_info)
{
int code = m_bg_tile_ram[tile_index];
- SET_TILE_INFO_MEMBER(1 + (tile_index & 3), code & 0xff, 0, 0);
+ tileinfo.set(1 + (tile_index & 3), code & 0xff, 0, 0);
}
TILE_GET_INFO_MEMBER(spoker_state::get_fg_tile_info)
{
int code = m_fg_tile_ram[tile_index] | (m_fg_color_ram[tile_index] << 8);
- SET_TILE_INFO_MEMBER(0, code, (4*(code >> 14)+3), 0);
+ tileinfo.set(0, code, (4*(code >> 14)+3), 0);
}
WRITE8_MEMBER(spoker_state::fg_tile_w)
diff --git a/src/mame/drivers/spool99.cpp b/src/mame/drivers/spool99.cpp
index c1ebdc6c3c3..36019975cfb 100644
--- a/src/mame/drivers/spool99.cpp
+++ b/src/mame/drivers/spool99.cpp
@@ -154,7 +154,7 @@ TILE_GET_INFO_MEMBER(spool99_state::get_tile_info)
int code = ((m_vram[tile_index*2+1]<<8) | (m_vram[tile_index*2+0]));
int color = m_cram[tile_index*2+0];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code & 0x3fff,
color & 0x1f,
0);
diff --git a/src/mame/drivers/spyhuntertec.cpp b/src/mame/drivers/spyhuntertec.cpp
index f13f8ba2fa1..9ada096231b 100644
--- a/src/mame/drivers/spyhuntertec.cpp
+++ b/src/mame/drivers/spyhuntertec.cpp
@@ -228,13 +228,13 @@ TILE_GET_INFO_MEMBER(spyhuntertec_state::spyhunt_get_bg_tile_info)
uint8_t *videoram = m_videoram;
int data = videoram[tile_index];
int code = (data & 0x3f) | ((data >> 1) & 0x40);
- SET_TILE_INFO_MEMBER(0, code, 0, (data & 0x40) ? TILE_FLIPY : 0);
+ tileinfo.set(0, code, 0, (data & 0x40) ? TILE_FLIPY : 0);
}
TILE_GET_INFO_MEMBER(spyhuntertec_state::spyhunt_get_alpha_tile_info)
{
- SET_TILE_INFO_MEMBER(2, m_spyhunt_alpharam[tile_index], 0, 0);
+ tileinfo.set(2, m_spyhunt_alpharam[tile_index], 0, 0);
}
diff --git a/src/mame/drivers/sshot.cpp b/src/mame/drivers/sshot.cpp
index 2facbbdaf4a..a89b15239a6 100644
--- a/src/mame/drivers/sshot.cpp
+++ b/src/mame/drivers/sshot.cpp
@@ -207,7 +207,7 @@ private:
TILE_GET_INFO_MEMBER(supershot_state::get_supershot_text_tile_info)
{
uint8_t code = m_videoram[tile_index];
- SET_TILE_INFO_MEMBER(0, code, 0, 0);
+ tileinfo.set(0, code, 0, 0);
}
void supershot_state::video_start()
diff --git a/src/mame/drivers/statriv2.cpp b/src/mame/drivers/statriv2.cpp
index a7edc0ff4a4..93180735078 100644
--- a/src/mame/drivers/statriv2.cpp
+++ b/src/mame/drivers/statriv2.cpp
@@ -157,7 +157,7 @@ TILE_GET_INFO_MEMBER(statriv2_state::horizontal_tile_info)
int code = m_videoram[0x400 + tile_index];
int attr = m_videoram[tile_index] & 0x3f;
- SET_TILE_INFO_MEMBER(0, code, attr, 0);
+ tileinfo.set(0, code, attr, 0);
}
TILE_GET_INFO_MEMBER(statriv2_state::vertical_tile_info)
@@ -165,7 +165,7 @@ TILE_GET_INFO_MEMBER(statriv2_state::vertical_tile_info)
int code = m_videoram[0x400 + tile_index];
int attr = m_videoram[tile_index] & 0x3f;
- SET_TILE_INFO_MEMBER(0, ((code & 0x7f) << 1) | ((code & 0x80) >> 7), attr, 0);
+ tileinfo.set(0, ((code & 0x7f) << 1) | ((code & 0x80) >> 7), attr, 0);
}
diff --git a/src/mame/drivers/stuntair.cpp b/src/mame/drivers/stuntair.cpp
index 18b6dd82451..39913af6bcb 100644
--- a/src/mame/drivers/stuntair.cpp
+++ b/src/mame/drivers/stuntair.cpp
@@ -192,7 +192,7 @@ TILE_GET_INFO_MEMBER(stuntair_state::get_stuntair_fg_tile_info)
// where does the FG palette come from? it's a 1bpp layer..
- SET_TILE_INFO_MEMBER(0, tileno & 0x7f, 0, opaque ? TILE_FORCE_LAYER0 : TILE_FORCE_LAYER1);
+ tileinfo.set(0, tileno & 0x7f, 0, opaque ? TILE_FORCE_LAYER0 : TILE_FORCE_LAYER1);
}
TILE_GET_INFO_MEMBER(stuntair_state::get_stuntair_bg_tile_info)
@@ -201,7 +201,7 @@ TILE_GET_INFO_MEMBER(stuntair_state::get_stuntair_bg_tile_info)
tileno |= (m_bgattrram[tile_index] & 0x08)<<5;
int colour = (m_bgattrram[tile_index] & 0x07);
- SET_TILE_INFO_MEMBER(1, tileno, colour, 0);
+ tileinfo.set(1, tileno, colour, 0);
}
diff --git a/src/mame/drivers/subsino.cpp b/src/mame/drivers/subsino.cpp
index 331eb20bde6..d7bdb71a56a 100644
--- a/src/mame/drivers/subsino.cpp
+++ b/src/mame/drivers/subsino.cpp
@@ -387,14 +387,14 @@ TILE_GET_INFO_MEMBER(subsino_state::get_tile_info)
uint16_t color = (code >> 8) & 0x0f;
code = ((code & 0xf000) >> 4) + ((code & 0xff) >> 0);
code += m_tiles_offset;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
TILE_GET_INFO_MEMBER(subsino_state::get_stbsub_tile_info)
{
uint16_t code = m_videoram[ tile_index ] + (m_colorram[ tile_index ] << 8);
code&= 0x3fff;
- SET_TILE_INFO_MEMBER(0, code, 0, 0);
+ tileinfo.set(0, code, 0, 0);
}
@@ -419,7 +419,7 @@ TILE_GET_INFO_MEMBER(subsino_state::get_reel_tile_info)
int code = m_reel_ram[Reel][tile_index];
int colour = (m_out_c&0x7) + 8;
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
code,
colour,
0);
@@ -431,7 +431,7 @@ TILE_GET_INFO_MEMBER(subsino_state::get_stbsub_reel_tile_info)
int code = m_reel_ram[Reel][tile_index];
int attr = m_reel_attr[Reel][tile_index];
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
code | (attr << 8),
0,
0);
diff --git a/src/mame/drivers/subsino2.cpp b/src/mame/drivers/subsino2.cpp
index 157115e6178..206c9b3ab94 100644
--- a/src/mame/drivers/subsino2.cpp
+++ b/src/mame/drivers/subsino2.cpp
@@ -263,7 +263,7 @@ inline void subsino2_state::ss9601_get_tile_info(layer_t *l, tile_data &tileinfo
case TILE_8x32: addr = tile_index & (~0x180); offs = (tile_index/0x80) & 3; break;
case TILE_64x32: addr = tile_index & (~0x187); offs = ((tile_index/0x80) & 3) + (tile_index & 7) * 4; break;
}
- SET_TILE_INFO_MEMBER(0, l->videoram[addr] + offs, 0, 0);
+ tileinfo.set(0, l->videoram[addr] + offs, 0, 0);
}
// Layer 0
diff --git a/src/mame/drivers/supduck.cpp b/src/mame/drivers/supduck.cpp
index 0c7a5416c83..b8498633555 100644
--- a/src/mame/drivers/supduck.cpp
+++ b/src/mame/drivers/supduck.cpp
@@ -175,7 +175,7 @@ TILE_GET_INFO_MEMBER(supduck_state::get_text_tile_info) // same as tigeroad.c
int color = attr & 0x0f;
int flags = (attr & 0x10) ? TILE_FLIPY : 0;
- SET_TILE_INFO_MEMBER(0, code, color, flags);
+ tileinfo.set(0, code, color, flags);
}
TILE_GET_INFO_MEMBER(supduck_state::get_fore_tile_info)
@@ -191,7 +191,7 @@ TILE_GET_INFO_MEMBER(supduck_state::get_fore_tile_info)
flags |=(data & 0x1000) ? TILE_FLIPY : 0;
- SET_TILE_INFO_MEMBER(1, code, color, flags);
+ tileinfo.set(1, code, color, flags);
}
TILE_GET_INFO_MEMBER(supduck_state::get_back_tile_info)
@@ -207,7 +207,7 @@ TILE_GET_INFO_MEMBER(supduck_state::get_back_tile_info)
int flags = (data & 0x2000) ? TILE_FLIPX : 0;
flags |=(data & 0x1000) ? TILE_FLIPY : 0;
- SET_TILE_INFO_MEMBER(2, code, color, flags);
+ tileinfo.set(2, code, color, flags);
}
diff --git a/src/mame/drivers/supercrd.cpp b/src/mame/drivers/supercrd.cpp
index cd275e71201..9acbc2a9a57 100644
--- a/src/mame/drivers/supercrd.cpp
+++ b/src/mame/drivers/supercrd.cpp
@@ -274,7 +274,7 @@ TILE_GET_INFO_MEMBER(supercrd_state::get_bg_tile_info)
int code = attr & 0xfff;
int color = m_colorram[offs] >> 4; // 4 bits for color.
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
diff --git a/src/mame/drivers/superdq.cpp b/src/mame/drivers/superdq.cpp
index fda97f7601a..744ca2295c4 100644
--- a/src/mame/drivers/superdq.cpp
+++ b/src/mame/drivers/superdq.cpp
@@ -80,7 +80,7 @@ TILE_GET_INFO_MEMBER(superdq_state::get_tile_info)
{
int tile = m_videoram[tile_index];
- SET_TILE_INFO_MEMBER(0, tile, m_color_bank, 0);
+ tileinfo.set(0, tile, m_color_bank, 0);
}
void superdq_state::video_start()
diff --git a/src/mame/drivers/superwng.cpp b/src/mame/drivers/superwng.cpp
index f72da263467..c15fd99a512 100644
--- a/src/mame/drivers/superwng.cpp
+++ b/src/mame/drivers/superwng.cpp
@@ -130,7 +130,7 @@ TILE_GET_INFO_MEMBER(superwng_state::get_bg_tile_info)
int flipx=(attr&0x80) ? TILE_FLIPX : 0;
int flipy=(attr&0x80) ? TILE_FLIPY : 0;
- SET_TILE_INFO_MEMBER(0, code, attr & 0xf, flipx|flipy);
+ tileinfo.set(0, code, attr & 0xf, flipx|flipy);
}
TILE_GET_INFO_MEMBER(superwng_state::get_fg_tile_info)
@@ -145,7 +145,7 @@ TILE_GET_INFO_MEMBER(superwng_state::get_fg_tile_info)
int flipx=(attr&0x80) ? TILE_FLIPX : 0;
int flipy=(attr&0x80) ? TILE_FLIPY : 0;
- SET_TILE_INFO_MEMBER(0, code, attr & 0xf, flipx|flipy);
+ tileinfo.set(0, code, attr & 0xf, flipx|flipy);
}
void superwng_state::video_start()
diff --git a/src/mame/drivers/supracan.cpp b/src/mame/drivers/supracan.cpp
index 16665d42813..2527c17866f 100644
--- a/src/mame/drivers/supracan.cpp
+++ b/src/mame/drivers/supracan.cpp
@@ -353,7 +353,7 @@ void supracan_state::get_tilemap_info_common(int layer, tile_data &tileinfo, int
int flipxy = (supracan_vram[count] & 0x0c00) >> 10;
int palette = ((supracan_vram[count] & 0xf000) >> 12) + palette_bank;
- SET_TILE_INFO_MEMBER(region, tile, palette, TILE_FLIPXY(flipxy));
+ tileinfo.set(region, tile, palette, TILE_FLIPXY(flipxy));
}
// I wonder how different this really is.. my guess, not at all.
@@ -381,7 +381,7 @@ void supracan_state::get_roz_tilemap_info(int layer, tile_data &tileinfo, int co
if (count & 0x20) tile ^= 1;
tile |= (count & 0xc0) >> 2;
- SET_TILE_INFO_MEMBER(region, tile, 0, 0);
+ tileinfo.set(region, tile, 0, 0);
return;
}
@@ -404,7 +404,7 @@ void supracan_state::get_roz_tilemap_info(int layer, tile_data &tileinfo, int co
int flipxy = (supracan_vram[count] & 0x0c00) >> 10;
int palette = ((supracan_vram[count] & 0xf000) >> 12) + palette_bank;
- SET_TILE_INFO_MEMBER(region, tile, palette, TILE_FLIPXY(flipxy));
+ tileinfo.set(region, tile, palette, TILE_FLIPXY(flipxy));
}
diff --git a/src/mame/drivers/suprgolf.cpp b/src/mame/drivers/suprgolf.cpp
index 1f04a90fcbe..9f8f3c19f02 100644
--- a/src/mame/drivers/suprgolf.cpp
+++ b/src/mame/drivers/suprgolf.cpp
@@ -106,7 +106,7 @@ TILE_GET_INFO_MEMBER(suprgolf_state::get_tile_info)
int code = m_videoram[tile_index*2]+256*(m_videoram[tile_index*2+1]);
int color = m_videoram[tile_index*2+0x800] & 0x7f;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code,
color,
0);
diff --git a/src/mame/drivers/taitopjc.cpp b/src/mame/drivers/taitopjc.cpp
index e7606b904e0..c1d5586d5b9 100644
--- a/src/mame/drivers/taitopjc.cpp
+++ b/src/mame/drivers/taitopjc.cpp
@@ -213,7 +213,7 @@ TILE_GET_INFO_MEMBER(taitopjc_state::tile_get_info)
int tile = (val & 0xfff);
int flags = 0;
- SET_TILE_INFO_MEMBER(0, tile, color, flags);
+ tileinfo.set(0, tile, color, flags);
}
TILEMAP_MAPPER_MEMBER(taitopjc_state::tile_scan_layer0)
diff --git a/src/mame/drivers/tattack.cpp b/src/mame/drivers/tattack.cpp
index 8c82d792e3e..19ef5a6ba35 100644
--- a/src/mame/drivers/tattack.cpp
+++ b/src/mame/drivers/tattack.cpp
@@ -124,7 +124,7 @@ TILE_GET_INFO_MEMBER(tattack_state::get_tile_info)
color >>= 1;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code,
color,
0);
diff --git a/src/mame/drivers/tmspoker.cpp b/src/mame/drivers/tmspoker.cpp
index e5bf27eda93..861b5d2fdba 100644
--- a/src/mame/drivers/tmspoker.cpp
+++ b/src/mame/drivers/tmspoker.cpp
@@ -281,7 +281,7 @@ TILE_GET_INFO_MEMBER(tmspoker_state::get_bg_tile_info)
*/
int code = m_videoram[tile_index];
- SET_TILE_INFO_MEMBER(0 /* bank */, code, 0 /* color */, 0);
+ tileinfo.set(0 /* bank */, code, 0 /* color */, 0);
}
void tmspoker_state::video_start()
diff --git a/src/mame/drivers/toki_ms.cpp b/src/mame/drivers/toki_ms.cpp
index a242dba8cd6..22ea0e26dc8 100644
--- a/src/mame/drivers/toki_ms.cpp
+++ b/src/mame/drivers/toki_ms.cpp
@@ -341,7 +341,7 @@ TILE_GET_INFO_MEMBER(toki_ms_state::get_tile_info)
u16 code = (m_vram[tile_index] & 0xfff) | 0x1000;
u8 color = (m_vram[tile_index] >> 12);
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
TILE_GET_INFO_MEMBER(toki_ms_state::get_bk1_info)
@@ -351,7 +351,7 @@ TILE_GET_INFO_MEMBER(toki_ms_state::get_bk1_info)
tile &= 0xfff;
- SET_TILE_INFO_MEMBER(2,
+ tileinfo.set(2,
tile,
color,
0);
@@ -364,7 +364,7 @@ TILE_GET_INFO_MEMBER(toki_ms_state::get_bk2_info)
tile &= 0xfff;
- SET_TILE_INFO_MEMBER(3,
+ tileinfo.set(3,
tile,
color,
0);
diff --git a/src/mame/drivers/trvmadns.cpp b/src/mame/drivers/trvmadns.cpp
index 3c589e711e5..4bc3caa2a05 100644
--- a/src/mame/drivers/trvmadns.cpp
+++ b/src/mame/drivers/trvmadns.cpp
@@ -271,7 +271,7 @@ TILE_GET_INFO_MEMBER(trvmadns_state::tile_info)
uint8_t color = (attr >> 3) & 0x0f;
uint8_t flags = TILE_FLIPXY((attr >> 1) & 0x03);
- SET_TILE_INFO_MEMBER(0, tile, color, flags);
+ tileinfo.set(0, tile, color, flags);
}
diff --git a/src/mame/drivers/umipoker.cpp b/src/mame/drivers/umipoker.cpp
index 9d7b3d4f0b8..96bd58b8fb3 100644
--- a/src/mame/drivers/umipoker.cpp
+++ b/src/mame/drivers/umipoker.cpp
@@ -118,7 +118,7 @@ TILE_GET_INFO_MEMBER(umipoker_state::get_tile_info_0)
int tile = m_vram_0[tile_index*2+0];
int color = m_vram_0[tile_index*2+1] & 0x3f;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
tile,
color,
0);
@@ -129,7 +129,7 @@ TILE_GET_INFO_MEMBER(umipoker_state::get_tile_info_1)
int tile = m_vram_1[tile_index*2+0];
int color = m_vram_1[tile_index*2+1] & 0x3f;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
tile,
color,
0);
@@ -140,7 +140,7 @@ TILE_GET_INFO_MEMBER(umipoker_state::get_tile_info_2)
int tile = m_vram_2[tile_index*2+0];
int color = m_vram_2[tile_index*2+1] & 0x3f;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
tile,
color,
0);
@@ -151,7 +151,7 @@ TILE_GET_INFO_MEMBER(umipoker_state::get_tile_info_3)
int tile = m_vram_3[tile_index*2+0];
int color = m_vram_3[tile_index*2+1] & 0x3f;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
tile,
color,
0);
diff --git a/src/mame/drivers/videopkr.cpp b/src/mame/drivers/videopkr.cpp
index 155a68df638..ebc407d5905 100644
--- a/src/mame/drivers/videopkr.cpp
+++ b/src/mame/drivers/videopkr.cpp
@@ -522,7 +522,7 @@ TILE_GET_INFO_MEMBER(videopkr_state::get_bg_tile_info)
int attr = m_color_ram[offs] + ioport("IN2")->read(); /* Color Switch Action */
int code = m_video_ram[offs];
int color = attr;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
diff --git a/src/mame/drivers/vlc.cpp b/src/mame/drivers/vlc.cpp
index b6bbcf516c5..68445951dd4 100644
--- a/src/mame/drivers/vlc.cpp
+++ b/src/mame/drivers/vlc.cpp
@@ -292,7 +292,7 @@ TILE_GET_INFO_MEMBER( nevada_state::get_bg_tile_info )
//int bank = (attr & 0x02) >> 1;
//int color = (attr & 0x3c) >> 2;
- SET_TILE_INFO_MEMBER(0, code, 0, 0);
+ tileinfo.set(0, code, 0, 0);
}
diff --git a/src/mame/drivers/vroulet.cpp b/src/mame/drivers/vroulet.cpp
index 99d3a8c4545..64af809e247 100644
--- a/src/mame/drivers/vroulet.cpp
+++ b/src/mame/drivers/vroulet.cpp
@@ -132,7 +132,7 @@ TILE_GET_INFO_MEMBER(vroulet_state::get_bg_tile_info)
int code = m_videoram[tile_index] + ((attr & 0xc0) << 2);
int color = attr & 0x1f;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
void vroulet_state::video_start()
diff --git a/src/mame/drivers/wallc.cpp b/src/mame/drivers/wallc.cpp
index 037305b5696..b2b98ca0d59 100644
--- a/src/mame/drivers/wallc.cpp
+++ b/src/mame/drivers/wallc.cpp
@@ -222,7 +222,7 @@ WRITE8_MEMBER(wallc_state::videoram_w)
TILE_GET_INFO_MEMBER(wallc_state::get_bg_tile_info)
{
- SET_TILE_INFO_MEMBER(0, m_videoram[tile_index] | 0x100, 1, 0);
+ tileinfo.set(0, m_videoram[tile_index] | 0x100, 1, 0);
}
TILE_GET_INFO_MEMBER(wallc_state::get_bg_tile_info_unkitpkr)
@@ -233,12 +233,12 @@ TILE_GET_INFO_MEMBER(wallc_state::get_bg_tile_info_unkitpkr)
if (m_bookkeeping_mode || (tile_index & 0x1f) < 0x08 || (tile_index & 0x1f) >= 0x10)
code |= 0x100;
- SET_TILE_INFO_MEMBER(0, code, 1, 0);
+ tileinfo.set(0, code, 1, 0);
}
TILE_GET_INFO_MEMBER(wallc_state::get_bg_tile_info_sidampkr)
{
- SET_TILE_INFO_MEMBER(0, m_videoram[tile_index] | 0x100, 0, 0);
+ tileinfo.set(0, m_videoram[tile_index] | 0x100, 0, 0);
}
void wallc_state::video_start()
diff --git a/src/mame/drivers/warpsped.cpp b/src/mame/drivers/warpsped.cpp
index 4c85336e7fc..36416f9d642 100644
--- a/src/mame/drivers/warpsped.cpp
+++ b/src/mame/drivers/warpsped.cpp
@@ -138,7 +138,7 @@ WRITE8_MEMBER(warpspeed_state::hardware_w)
TILE_GET_INFO_MEMBER(warpspeed_state::get_text_tile_info)
{
uint8_t code = m_videoram[tile_index] & 0x3f;
- SET_TILE_INFO_MEMBER(0, code, 0, 0);
+ tileinfo.set(0, code, 0, 0);
}
TILE_GET_INFO_MEMBER(warpspeed_state::get_starfield_tile_info)
@@ -148,7 +148,7 @@ TILE_GET_INFO_MEMBER(warpspeed_state::get_starfield_tile_info)
{
code = memregion("starfield")->base()[tile_index >> 1] & 0x3f;
}
- SET_TILE_INFO_MEMBER(1, code, 0, 0);
+ tileinfo.set(1, code, 0, 0);
}
WRITE8_MEMBER(warpspeed_state::vidram_w)
diff --git a/src/mame/drivers/wink.cpp b/src/mame/drivers/wink.cpp
index 4071356f3af..65a2080f504 100644
--- a/src/mame/drivers/wink.cpp
+++ b/src/mame/drivers/wink.cpp
@@ -93,7 +93,7 @@ TILE_GET_INFO_MEMBER(wink_state::get_bg_tile_info)
code |= 0x100;
}
- SET_TILE_INFO_MEMBER(0, code, 0, 0);
+ tileinfo.set(0, code, 0, 0);
}
void wink_state::video_start()
diff --git a/src/mame/drivers/witch.cpp b/src/mame/drivers/witch.cpp
index 5d7478d21f8..5c9759cdf12 100644
--- a/src/mame/drivers/witch.cpp
+++ b/src/mame/drivers/witch.cpp
@@ -231,7 +231,7 @@ TILE_GET_INFO_MEMBER(witch_state::get_gfx0_tile_info)
code=code | ((color & 0xe0) << 3);
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
code, //tiles beyond 0x7ff only for sprites?
color & 0x0f,
0);
@@ -244,7 +244,7 @@ TILE_GET_INFO_MEMBER(witch_state::get_gfx1_tile_info)
int code = m_gfx1_vram[tile_index];
int color = m_gfx1_cram[tile_index];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code | ((color & 0xf0) << 4),
(color>>0) & 0x0f,
0);
@@ -255,7 +255,7 @@ TILE_GET_INFO_MEMBER(keirinou_state::get_keirinou_gfx1_tile_info)
int code = m_gfx1_vram[tile_index];
int color = m_gfx1_cram[tile_index];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code | ((color & 0xc0) << 2) | (m_bg_bank << 10),
(color>>0) & 0xf,
0);
diff --git a/src/mame/drivers/wyvernf0.cpp b/src/mame/drivers/wyvernf0.cpp
index 772ad7fccbb..61c52b01ed9 100644
--- a/src/mame/drivers/wyvernf0.cpp
+++ b/src/mame/drivers/wyvernf0.cpp
@@ -150,7 +150,7 @@ TILE_GET_INFO_MEMBER(wyvernf0_state::get_bg_tile_info)
int code = m_bgram[offs] + (m_bgram[offs+1] << 8);
int color = 0 + ((code & 0x3000) >> 12);
- SET_TILE_INFO_MEMBER(1, code, color, TILE_FLIPXY(code >> 14));
+ tileinfo.set(1, code, color, TILE_FLIPXY(code >> 14));
}
TILE_GET_INFO_MEMBER(wyvernf0_state::get_fg_tile_info)
{
@@ -158,7 +158,7 @@ TILE_GET_INFO_MEMBER(wyvernf0_state::get_fg_tile_info)
int code = m_fgram[offs] + (m_fgram[offs+1] << 8);
int color = 8 + ((code & 0x3000) >> 12);
- SET_TILE_INFO_MEMBER(1, code, color, TILE_FLIPXY(code >> 14));
+ tileinfo.set(1, code, color, TILE_FLIPXY(code >> 14));
}
void wyvernf0_state::video_start()
diff --git a/src/mame/drivers/xyonix.cpp b/src/mame/drivers/xyonix.cpp
index 8302ab4684f..4f6e70ef612 100644
--- a/src/mame/drivers/xyonix.cpp
+++ b/src/mame/drivers/xyonix.cpp
@@ -157,7 +157,7 @@ TILE_GET_INFO_MEMBER(xyonix_state::get_tile_info)
tileno = (m_vidram[tile_index+1] << 0) | ((attr & 0x0f) << 8);
- SET_TILE_INFO_MEMBER(0,tileno,attr >> 4,0);
+ tileinfo.set(0,tileno,attr >> 4,0);
}
WRITE8_MEMBER(xyonix_state::vidram_w)
diff --git a/src/mame/drivers/zwackery.cpp b/src/mame/drivers/zwackery.cpp
index 7b15b6e1dc4..0cc45413b6d 100644
--- a/src/mame/drivers/zwackery.cpp
+++ b/src/mame/drivers/zwackery.cpp
@@ -365,14 +365,14 @@ TILE_GET_INFO_MEMBER( zwackery_state::get_bg_tile_info )
{
uint16_t data = m_videoram[tile_index];
int color = (data >> 13) & 7;
- SET_TILE_INFO_MEMBER(0, data & 0x3ff, color, TILE_FLIPYX(data >> 11));
+ tileinfo.set(0, data & 0x3ff, color, TILE_FLIPYX(data >> 11));
}
TILE_GET_INFO_MEMBER( zwackery_state::get_fg_tile_info )
{
uint16_t data = m_videoram[tile_index];
int color = (data >> 13) & 7;
- SET_TILE_INFO_MEMBER(2, data & 0x3ff, color, TILE_FLIPYX(data >> 11));
+ tileinfo.set(2, data & 0x3ff, color, TILE_FLIPYX(data >> 11));
tileinfo.category = (color != 0);
}
diff --git a/src/mame/machine/megacd.cpp b/src/mame/machine/megacd.cpp
index 8663d430914..5d7a7f35e83 100644
--- a/src/mame/machine/megacd.cpp
+++ b/src/mame/machine/megacd.cpp
@@ -1041,14 +1041,14 @@ TILE_GET_INFO_MEMBER( sega_segacd_device::get_stampmap_16x16_1x1_tile_info )
{
int tile_region, tileno;
SCD_GET_TILE_INFO_16x16_1x1(tile_region,tileno,(int)tile_index);
- SET_TILE_INFO_MEMBER(tile_region, tileno, 0, 0);
+ tileinfo.set(tile_region, tileno, 0, 0);
}
TILE_GET_INFO_MEMBER( sega_segacd_device::get_stampmap_32x32_1x1_tile_info )
{
int tile_region, tileno;
SCD_GET_TILE_INFO_32x32_1x1(tile_region,tileno,(int)tile_index);
- SET_TILE_INFO_MEMBER(tile_region, tileno, 0, 0);
+ tileinfo.set(tile_region, tileno, 0, 0);
}
@@ -1056,14 +1056,14 @@ TILE_GET_INFO_MEMBER( sega_segacd_device::get_stampmap_16x16_16x16_tile_info )
{
int tile_region, tileno;
SCD_GET_TILE_INFO_16x16_16x16(tile_region,tileno,(int)tile_index);
- SET_TILE_INFO_MEMBER(tile_region, tileno, 0, 0);
+ tileinfo.set(tile_region, tileno, 0, 0);
}
TILE_GET_INFO_MEMBER( sega_segacd_device::get_stampmap_32x32_16x16_tile_info )
{
int tile_region, tileno;
SCD_GET_TILE_INFO_32x32_16x16(tile_region,tileno,(int)tile_index);
- SET_TILE_INFO_MEMBER(tile_region, tileno, 0, 0);
+ tileinfo.set(tile_region, tileno, 0, 0);
}
// non-tilemap functions to get a pixel from a 'tilemap' based on the above, but looking up each pixel, as to avoid the heavy cache bitmap
diff --git a/src/mame/video/1942.cpp b/src/mame/video/1942.cpp
index 361badaad01..3df34a30375 100644
--- a/src/mame/video/1942.cpp
+++ b/src/mame/video/1942.cpp
@@ -105,7 +105,7 @@ TILE_GET_INFO_MEMBER(_1942_state::get_fg_tile_info)
{
int code = m_fg_videoram[tile_index];
int color = m_fg_videoram[tile_index + 0x400];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code + ((color & 0x80) << 1),
color & 0x3f,
0);
@@ -117,7 +117,7 @@ TILE_GET_INFO_MEMBER(_1942_state::get_bg_tile_info)
int code = m_bg_videoram[tile_index];
int color = m_bg_videoram[tile_index + 0x10];
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
code + ((color & 0x80) << 1),
(color & 0x1f) + (0x20 * m_palette_bank),
TILE_FLIPYX((color & 0x60) >> 5));
diff --git a/src/mame/video/1943.cpp b/src/mame/video/1943.cpp
index 21f428e6583..545cb91a6da 100644
--- a/src/mame/video/1943.cpp
+++ b/src/mame/video/1943.cpp
@@ -169,7 +169,7 @@ TILE_GET_INFO_MEMBER(_1943_state::get_bg2_tile_info)
const u32 color = (attr & 0x3c) >> 2;
const int flags = TILE_FLIPYX((attr & 0xc0) >> 6);
- SET_TILE_INFO_MEMBER(2, code, color, flags);
+ tileinfo.set(2, code, color, flags);
}
TILE_GET_INFO_MEMBER(_1943_state::get_bg_tile_info)
@@ -181,7 +181,7 @@ TILE_GET_INFO_MEMBER(_1943_state::get_bg_tile_info)
const int flags = TILE_FLIPYX((attr & 0xc0) >> 6);
tileinfo.group = color;
- SET_TILE_INFO_MEMBER(1, code, color, flags);
+ tileinfo.set(1, code, color, flags);
}
TILE_GET_INFO_MEMBER(_1943_state::get_fg_tile_info)
@@ -190,7 +190,7 @@ TILE_GET_INFO_MEMBER(_1943_state::get_fg_tile_info)
const u32 code = m_videoram[tile_index] + ((attr & 0xe0) << 3);
const u32 color = attr & 0x1f;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
void _1943_state::video_start()
diff --git a/src/mame/video/40love.cpp b/src/mame/video/40love.cpp
index 3e62220c8d3..28bab412594 100644
--- a/src/mame/video/40love.cpp
+++ b/src/mame/video/40love.cpp
@@ -36,7 +36,7 @@ TILE_GET_INFO_MEMBER(fortyl_state::get_bg_tile_info)
code = (code & 0x3f) | tile_l_bank | 0x100;
code |= tile_h_bank;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code,
(tile_attrib & 0x07) | ((m_color_bank == true) ? 0x20 : 0),
0);
diff --git a/src/mame/video/4enraya.cpp b/src/mame/video/4enraya.cpp
index 3d82b8862dd..2af9b56bd1c 100644
--- a/src/mame/video/4enraya.cpp
+++ b/src/mame/video/4enraya.cpp
@@ -21,7 +21,7 @@ WRITE8_MEMBER(_4enraya_state::fenraya_videoram_w)
TILE_GET_INFO_MEMBER(_4enraya_state::get_tile_info)
{
int code = m_videoram[tile_index * 2] + (m_videoram[tile_index * 2 + 1] << 8);
- SET_TILE_INFO_MEMBER(0, code, 0, 0);
+ tileinfo.set(0, code, 0, 0);
}
void _4enraya_state::video_start()
diff --git a/src/mame/video/aeroboto.cpp b/src/mame/video/aeroboto.cpp
index 9f663dcca0d..8392d6239b1 100644
--- a/src/mame/video/aeroboto.cpp
+++ b/src/mame/video/aeroboto.cpp
@@ -26,7 +26,7 @@
TILE_GET_INFO_MEMBER(aeroboto_state::get_tile_info)
{
uint8_t code = m_videoram[tile_index];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code + (m_charbank << 8),
m_tilecolor[code],
(m_tilecolor[code] >= 0x33) ? 0 : TILE_FORCE_LAYER0);
diff --git a/src/mame/video/aerofgt.cpp b/src/mame/video/aerofgt.cpp
index fd8496923bc..673cd21bd8a 100644
--- a/src/mame/video/aerofgt.cpp
+++ b/src/mame/video/aerofgt.cpp
@@ -14,7 +14,7 @@ TILE_GET_INFO_MEMBER(aerofgt_state::get_pspikes_tile_info)
{
uint16_t code = m_vram[0][tile_index];
int bank = (code & 0x1000) >> 12;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
(code & 0x0fff) | (m_gfxbank[bank] << 12),
((code & 0xe000) >> 13) + 8 * m_charpalettebank,
0);
@@ -25,7 +25,7 @@ template<int Layer>
TILE_GET_INFO_MEMBER(aerofgt_state::karatblz_tile_info)
{
uint16_t code = m_vram[Layer][tile_index];
- SET_TILE_INFO_MEMBER(Layer,
+ tileinfo.set(Layer,
(code & 0x1fff) | (m_gfxbank[Layer] << 13),
(code & 0xe000) >> 13,
0);
@@ -35,7 +35,7 @@ template<int Layer>
TILE_GET_INFO_MEMBER(aerofgt_state::spinlbrk_tile_info)
{
uint16_t code = m_vram[Layer][tile_index];
- SET_TILE_INFO_MEMBER(Layer,
+ tileinfo.set(Layer,
(code & 0x0fff) | (m_gfxbank[Layer] << 12),
(code & 0xf000) >> 12,
0);
@@ -46,7 +46,7 @@ TILE_GET_INFO_MEMBER(aerofgt_state::get_tile_info)
{
uint16_t code = m_vram[Layer][tile_index];
int bank = (Layer << 2) | (code & 0x1800) >> 11;
- SET_TILE_INFO_MEMBER(Layer,
+ tileinfo.set(Layer,
(code & 0x07ff) | (m_gfxbank[bank] << 11),
(code & 0xe000) >> 13,
0);
diff --git a/src/mame/video/airbustr.cpp b/src/mame/video/airbustr.cpp
index 2b79c4d4505..1cfc52505ea 100644
--- a/src/mame/video/airbustr.cpp
+++ b/src/mame/video/airbustr.cpp
@@ -74,7 +74,7 @@ TILE_GET_INFO_MEMBER(airbustr_state::get_tile_info)
int code = m_videoram[Layer][tile_index] + ((attr & 0x0f) << 8);
int color = (attr >> 4) + ((Layer ^ 1) << 4);
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
void airbustr_state::video_start()
diff --git a/src/mame/video/airraid_dev.cpp b/src/mame/video/airraid_dev.cpp
index 8e92c27f10e..3c869215a8b 100644
--- a/src/mame/video/airraid_dev.cpp
+++ b/src/mame/video/airraid_dev.cpp
@@ -118,7 +118,7 @@ TILE_GET_INFO_MEMBER(airraid_video_device::get_bg_tile_info)
tile |= (attr & 0x70) << 4;
- SET_TILE_INFO_MEMBER(2,
+ tileinfo.set(2,
tile,
attr&0xf,
0);
@@ -131,7 +131,7 @@ TILE_GET_INFO_MEMBER(airraid_video_device::get_fg_tile_info)
tile |= (attr & 0x70) << 4;
- SET_TILE_INFO_MEMBER(3,
+ tileinfo.set(3,
tile,
attr&0xf,
0);
@@ -143,7 +143,7 @@ TILE_GET_INFO_MEMBER(airraid_video_device::get_cstx_tile_info)
int attr = (m_txram[tile_index*2+1]);
int color = attr & 0xf;
- SET_TILE_INFO_MEMBER(0, (code << 1) | ((attr & 0x20) >> 5), color, 0);
+ tileinfo.set(0, (code << 1) | ((attr & 0x20) >> 5), color, 0);
}
diff --git a/src/mame/video/alpha68k.cpp b/src/mame/video/alpha68k.cpp
index ca5199ff9c6..26c0405b34b 100644
--- a/src/mame/video/alpha68k.cpp
+++ b/src/mame/video/alpha68k.cpp
@@ -57,7 +57,7 @@ TILE_GET_INFO_MEMBER(alpha68k_II_state::get_tile_info)
const u8 color = attr & 0x0f;
const bool opaque = BIT(attr, 4);
- SET_TILE_INFO_MEMBER(0, tile | (m_bank_base << 8), color, opaque ? TILE_FORCE_LAYER0 : 0);
+ tileinfo.set(0, tile | (m_bank_base << 8), color, opaque ? TILE_FORCE_LAYER0 : 0);
}
void alpha68k_II_state::videoram_w(offs_t offset, u16 data)
diff --git a/src/mame/video/ampoker2.cpp b/src/mame/video/ampoker2.cpp
index 88f9cb606b5..7a91aa49eac 100644
--- a/src/mame/video/ampoker2.cpp
+++ b/src/mame/video/ampoker2.cpp
@@ -132,7 +132,7 @@ TILE_GET_INFO_MEMBER(ampoker2_state::get_bg_tile_info)
code = code + (256 * (color & 0x03)); /* code = color.bit1 + color.bit0 + code */
color = color >> 1; /* color = color - bit0 (bit1..bit7) */
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
TILE_GET_INFO_MEMBER(ampoker2_state::s2k_get_bg_tile_info)
@@ -144,7 +144,7 @@ TILE_GET_INFO_MEMBER(ampoker2_state::s2k_get_bg_tile_info)
code = code + (256 * (color & 0x0f)); /* the game uses 2 extra bits */
color = color >> 1;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
void ampoker2_state::video_start()
diff --git a/src/mame/video/amspdwy.cpp b/src/mame/video/amspdwy.cpp
index 49aa683ac50..4b3f56f3063 100644
--- a/src/mame/video/amspdwy.cpp
+++ b/src/mame/video/amspdwy.cpp
@@ -41,7 +41,7 @@ TILE_GET_INFO_MEMBER(amspdwy_state::get_tile_info)
{
uint8_t code = m_videoram[tile_index];
uint8_t color = m_colorram[tile_index];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code + ((color & 0x18)<<5),
color & 0x07,
0);
diff --git a/src/mame/video/angelkds.cpp b/src/mame/video/angelkds.cpp
index 31e58854505..95bf08aa7e7 100644
--- a/src/mame/video/angelkds.cpp
+++ b/src/mame/video/angelkds.cpp
@@ -22,7 +22,7 @@ TILE_GET_INFO_MEMBER(angelkds_state::get_tx_tile_info)
int tileno;
tileno = m_txvideoram[tile_index] + (m_txbank * 0x100);
- SET_TILE_INFO_MEMBER(0, tileno, 0, 0);
+ tileinfo.set(0, tileno, 0, 0);
}
WRITE8_MEMBER(angelkds_state::angelkds_txvideoram_w)
@@ -51,7 +51,7 @@ TILE_GET_INFO_MEMBER(angelkds_state::get_bgtop_tile_info)
tileno = m_bgtopvideoram[tile_index];
tileno += m_bgtopbank * 0x100 ;
- SET_TILE_INFO_MEMBER(1, tileno, 0, 0);
+ tileinfo.set(1, tileno, 0, 0);
}
WRITE8_MEMBER(angelkds_state::angelkds_bgtopvideoram_w)
@@ -85,7 +85,7 @@ TILE_GET_INFO_MEMBER(angelkds_state::get_bgbot_tile_info)
tileno = m_bgbotvideoram[tile_index];
tileno += m_bgbotbank * 0x100 ;
- SET_TILE_INFO_MEMBER(2, tileno, 1, 0);
+ tileinfo.set(2, tileno, 1, 0);
}
WRITE8_MEMBER(angelkds_state::angelkds_bgbotvideoram_w)
diff --git a/src/mame/video/appoooh.cpp b/src/mame/video/appoooh.cpp
index f0e344d0dfa..655f2e25aad 100644
--- a/src/mame/video/appoooh.cpp
+++ b/src/mame/video/appoooh.cpp
@@ -98,7 +98,7 @@ TILE_GET_INFO_MEMBER(appoooh_state::get_fg_tile_info)
{
int code = m_fg_videoram[tile_index] + 256 * ((m_fg_colorram[tile_index] >> 5) & 7);
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code,
m_fg_colorram[tile_index] & 0x0f,
(m_fg_colorram[tile_index] & 0x10 ) ? TILEMAP_FLIPX : 0
@@ -109,7 +109,7 @@ TILE_GET_INFO_MEMBER(appoooh_state::get_bg_tile_info)
{
int code = m_bg_videoram[tile_index] + 256 * ((m_bg_colorram[tile_index] >> 5) & 7);
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
code,
m_bg_colorram[tile_index] & 0x0f,
(m_bg_colorram[tile_index] & 0x10 ) ? TILEMAP_FLIPX : 0
diff --git a/src/mame/video/aquarium.cpp b/src/mame/video/aquarium.cpp
index 733163d0584..f8daef4bc4f 100644
--- a/src/mame/video/aquarium.cpp
+++ b/src/mame/video/aquarium.cpp
@@ -11,7 +11,7 @@ TILE_GET_INFO_MEMBER(aquarium_state::get_txt_tile_info)
{
const u32 tileno = (m_txt_videoram[tile_index] & 0x0fff);
const u32 colour = (m_txt_videoram[tile_index] & 0xf000) >> 12;
- SET_TILE_INFO_MEMBER(0, tileno, colour, 0);
+ tileinfo.set(0, tileno, colour, 0);
tileinfo.category = (m_txt_videoram[tile_index] & 0x8000) >> 15;
}
@@ -29,7 +29,7 @@ TILE_GET_INFO_MEMBER(aquarium_state::get_mid_tile_info)
const u32 colour = (m_mid_videoram[tile_index * 2 + 1] & 0x001f);
const int flag = TILE_FLIPYX((m_mid_videoram[tile_index * 2 + 1] & 0x300) >> 8);
- SET_TILE_INFO_MEMBER(1, tileno, colour, flag);
+ tileinfo.set(1, tileno, colour, flag);
tileinfo.category = (m_mid_videoram[tile_index * 2 + 1] & 0x20) >> 5;
}
@@ -47,7 +47,7 @@ TILE_GET_INFO_MEMBER(aquarium_state::get_bak_tile_info)
const u32 colour = (m_bak_videoram[tile_index * 2 + 1] & 0x001f);
const int flag = TILE_FLIPYX((m_bak_videoram[tile_index * 2 + 1] & 0x300) >> 8);
- SET_TILE_INFO_MEMBER(2, tileno, colour, flag);
+ tileinfo.set(2, tileno, colour, flag);
tileinfo.category = (m_bak_videoram[tile_index * 2 + 1] & 0x20) >> 5;
}
diff --git a/src/mame/video/aquarius.cpp b/src/mame/video/aquarius.cpp
index 68d825b144a..67b6a99bb2d 100644
--- a/src/mame/video/aquarius.cpp
+++ b/src/mame/video/aquarius.cpp
@@ -62,7 +62,7 @@ TILE_GET_INFO_MEMBER(aquarius_state::aquarius_gettileinfo)
int color = m_colorram[tile_index];
int flags = 0;
- SET_TILE_INFO_MEMBER(bank, code, color, flags);
+ tileinfo.set(bank, code, color, flags);
}
void aquarius_state::video_start()
diff --git a/src/mame/video/argus.cpp b/src/mame/video/argus.cpp
index f08b4b25683..023c5f2bf8b 100644
--- a/src/mame/video/argus.cpp
+++ b/src/mame/video/argus.cpp
@@ -131,7 +131,7 @@ TILE_GET_INFO_MEMBER(argus_common_state::get_tx_tile_info)
u8 lo = m_txram[tile_index];
u8 hi = m_txram[tile_index + 1];
- SET_TILE_INFO_MEMBER(Gfx,
+ tileinfo.set(Gfx,
((hi & 0xc0) << 2) | lo,
hi & 0x0f,
TILE_FLIPYX((hi & 0x30) >> 4));
@@ -148,7 +148,7 @@ TILE_GET_INFO_MEMBER(argus_state::get_bg0_tile_info)
u8 lo = m_vrom[1][tile_index];
u8 hi = m_vrom[1][tile_index | 1];
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
((hi & 0xc0) << 2) | lo,
hi & 0x0f,
TILE_FLIPYX((hi & 0x30) >> 4));
@@ -161,7 +161,7 @@ TILE_GET_INFO_MEMBER(argus_state::get_bg1_tile_info)
u8 lo = m_bg1ram[tile_index];
u8 hi = m_bg1ram[tile_index + 1];
- SET_TILE_INFO_MEMBER(2,
+ tileinfo.set(2,
lo,
hi & 0x0f,
TILE_FLIPYX((hi & 0x30) >> 4));
@@ -174,7 +174,7 @@ TILE_GET_INFO_MEMBER(valtric_state::get_bg_tile_info)
u8 lo = m_bg1ram[tile_index];
u8 hi = m_bg1ram[tile_index + 1];
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
((hi & 0xc0) << 2) | ((hi & 0x20) << 5) | lo,
hi & 0x0f,
0);
@@ -187,7 +187,7 @@ TILE_GET_INFO_MEMBER(butasan_state::get_tx_tile_info)
u8 lo = m_butasan_txram[tile_index];
u8 hi = m_butasan_txram[tile_index + 1];
- SET_TILE_INFO_MEMBER(3,
+ tileinfo.set(3,
((hi & 0xc0) << 2) | lo,
hi & 0x0f,
TILE_FLIPYX((hi & 0x30) >> 4));
@@ -200,7 +200,7 @@ TILE_GET_INFO_MEMBER(butasan_state::get_bg0_tile_info)
u8 lo = m_butasan_bg0ram[tile_index];
u8 hi = m_butasan_bg0ram[tile_index + 1];
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
((hi & 0xc0) << 2) | lo,
hi & 0x0f,
TILE_FLIPYX((hi & 0x30) >> 4));
@@ -210,7 +210,7 @@ TILE_GET_INFO_MEMBER(butasan_state::get_bg1_tile_info)
{
int const tile = m_butasan_bg1ram[tile_index] | ((m_butasan_bg1_status & 2) << 7);
- SET_TILE_INFO_MEMBER(2,
+ tileinfo.set(2,
tile,
(tile & 0x80) >> 7,
0);
diff --git a/src/mame/video/arkanoid.cpp b/src/mame/video/arkanoid.cpp
index e1d6a7af08c..1dea7095915 100644
--- a/src/mame/video/arkanoid.cpp
+++ b/src/mame/video/arkanoid.cpp
@@ -164,7 +164,7 @@ TILE_GET_INFO_MEMBER(arkanoid_state::get_bg_tile_info)
int code = m_videoram[offs + 1] + ((m_videoram[offs] & 0x07) << 8) + 2048 * m_gfxbank;
int color = ((m_videoram[offs] & 0xf8) >> 3) + 32 * m_palettebank;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
void arkanoid_state::video_start()
diff --git a/src/mame/video/armedf.cpp b/src/mame/video/armedf.cpp
index 72f6662209c..513e60d9c30 100644
--- a/src/mame/video/armedf.cpp
+++ b/src/mame/video/armedf.cpp
@@ -53,7 +53,7 @@ TILE_GET_INFO_MEMBER(armedf_state::get_nb1414m4_tx_tile_info)
/* bit 3 controls priority, (0) nb1414m4 has priority over all the other video layers */
tileinfo.category = (attributes & 0x8) >> 3;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
tile_number + 256 * (attributes & 0x3),
attributes >> 4,
0);
@@ -78,7 +78,7 @@ TILE_GET_INFO_MEMBER(armedf_state::get_armedf_tx_tile_info)
/* bit 3 controls priority, (0) nb1414m4 has priority over all the other video layers */
tileinfo.category = (attributes & 0x8) >> 3;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
tile_number + 256 * (attributes & 0x3),
attributes >> 4,
0);
@@ -88,7 +88,7 @@ TILE_GET_INFO_MEMBER(armedf_state::get_armedf_tx_tile_info)
TILE_GET_INFO_MEMBER(armedf_state::get_fg_tile_info)
{
const u16 data = m_fg_videoram[tile_index];
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
data&0x7ff,
data>>11,
0);
@@ -98,7 +98,7 @@ TILE_GET_INFO_MEMBER(armedf_state::get_fg_tile_info)
TILE_GET_INFO_MEMBER(armedf_state::get_bg_tile_info)
{
const u16 data = m_bg_videoram[tile_index];
- SET_TILE_INFO_MEMBER(2,
+ tileinfo.set(2,
data & 0x3ff,
data >> 11,
0);
diff --git a/src/mame/video/ashnojoe.cpp b/src/mame/video/ashnojoe.cpp
index a2367c07dc0..756adff5e23 100644
--- a/src/mame/video/ashnojoe.cpp
+++ b/src/mame/video/ashnojoe.cpp
@@ -15,7 +15,7 @@ TILE_GET_INFO_MEMBER(ashnojoe_state::get_tile_info_highest)
{
int code = m_tileram[0][tile_index];
- SET_TILE_INFO_MEMBER(2,
+ tileinfo.set(2,
code & 0xfff,
((code >> 12) & 0x0f),
0);
@@ -26,7 +26,7 @@ TILE_GET_INFO_MEMBER(ashnojoe_state::get_tile_info_midlow)
int code = m_tileram[1][tile_index * 2];
int attr = m_tileram[1][tile_index * 2 + 1];
- SET_TILE_INFO_MEMBER(4,
+ tileinfo.set(4,
(code & 0x7fff),
((attr >> 8) & 0x1f) + 0x40,
0);
@@ -36,7 +36,7 @@ TILE_GET_INFO_MEMBER(ashnojoe_state::get_tile_info_high)
{
int code = m_tileram[2][tile_index];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code & 0xfff,
((code >> 12) & 0x0f) + 0x10,
0);
@@ -46,7 +46,7 @@ TILE_GET_INFO_MEMBER(ashnojoe_state::get_tile_info_low)
{
int code = m_tileram[3][tile_index];
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
code & 0xfff,
((code >> 12) & 0x0f) + 0x60,
0);
@@ -57,7 +57,7 @@ TILE_GET_INFO_MEMBER(ashnojoe_state::get_tile_info_midhigh)
int code = m_tileram[4][tile_index * 2];
int attr = m_tileram[4][tile_index * 2 + 1];
- SET_TILE_INFO_MEMBER(4,
+ tileinfo.set(4,
(code & 0x7fff),
((attr >> 8) & 0x1f) + 0x20,
0);
@@ -69,7 +69,7 @@ TILE_GET_INFO_MEMBER(ashnojoe_state::get_tile_info_lowest)
int code = m_tileram[5 + buffer][tile_index * 2];
int attr = m_tileram[5 + buffer][tile_index * 2 + 1];
- SET_TILE_INFO_MEMBER(3,
+ tileinfo.set(3,
(code & 0x1fff),
((attr >> 8) & 0x1f) + 0x70,
0);
diff --git a/src/mame/video/atarifb.cpp b/src/mame/video/atarifb.cpp
index 3c68cb2fd2d..136efd8ef10 100644
--- a/src/mame/video/atarifb.cpp
+++ b/src/mame/video/atarifb.cpp
@@ -25,7 +25,7 @@ void atarifb_state::get_tile_info_common( tile_data &tileinfo, tilemap_memory_in
if (disable)
code = 0; /* I *know* this is a space */
- SET_TILE_INFO_MEMBER(0, code, 0, (flip ? TILE_FLIPX | TILE_FLIPY : 0));
+ tileinfo.set(0, code, 0, (flip ? TILE_FLIPX | TILE_FLIPY : 0));
}
@@ -46,7 +46,7 @@ TILE_GET_INFO_MEMBER(atarifb_state::field_get_tile_info)
int code = m_field_videoram[tile_index] & 0x3f;
int flipyx = m_field_videoram[tile_index] >> 6;
- SET_TILE_INFO_MEMBER(1, code, 0, TILE_FLIPYX(flipyx));
+ tileinfo.set(1, code, 0, TILE_FLIPYX(flipyx));
}
diff --git a/src/mame/video/atarig1.cpp b/src/mame/video/atarig1.cpp
index 7f769a77a4e..86874d0648e 100644
--- a/src/mame/video/atarig1.cpp
+++ b/src/mame/video/atarig1.cpp
@@ -24,7 +24,7 @@ TILE_GET_INFO_MEMBER(atarig1_state::get_alpha_tile_info)
int code = data & 0xfff;
int color = (data >> 12) & 0x0f;
int opaque = data & 0x8000;
- SET_TILE_INFO_MEMBER(1, code, color, opaque ? TILE_FORCE_LAYER0 : 0);
+ tileinfo.set(1, code, color, opaque ? TILE_FORCE_LAYER0 : 0);
}
@@ -33,7 +33,7 @@ TILE_GET_INFO_MEMBER(atarig1_state::get_playfield_tile_info)
uint16_t data = m_playfield_tilemap->basemem_read(tile_index);
int code = (m_playfield_tile_bank << 12) | (data & 0xfff);
int color = (data >> 12) & 7;
- SET_TILE_INFO_MEMBER(0, code, color, (data >> 15) & 1);
+ tileinfo.set(0, code, color, (data >> 15) & 1);
}
diff --git a/src/mame/video/atarig42.cpp b/src/mame/video/atarig42.cpp
index aa427b3d088..bf971e011af 100644
--- a/src/mame/video/atarig42.cpp
+++ b/src/mame/video/atarig42.cpp
@@ -39,7 +39,7 @@ TILE_GET_INFO_MEMBER(atarig42_state::get_alpha_tile_info)
int code = data & 0xfff;
int color = (data >> 12) & 0x0f;
int opaque = data & 0x8000;
- SET_TILE_INFO_MEMBER(1, code, color, opaque ? TILE_FORCE_LAYER0 : 0);
+ tileinfo.set(1, code, color, opaque ? TILE_FORCE_LAYER0 : 0);
}
@@ -48,7 +48,7 @@ TILE_GET_INFO_MEMBER(atarig42_state::get_playfield_tile_info)
uint16_t data = m_playfield_tilemap->basemem_read(tile_index);
int code = (m_playfield_tile_bank << 12) | (data & 0xfff);
int color = (m_playfield_base >> 5) + ((m_playfield_color_bank << 3) & 0x18) + ((data >> 12) & 7);
- SET_TILE_INFO_MEMBER(0, code, color, (data >> 15) & 1);
+ tileinfo.set(0, code, color, (data >> 15) & 1);
tileinfo.category = (m_playfield_color_bank >> 2) & 7;
}
diff --git a/src/mame/video/atarigt.cpp b/src/mame/video/atarigt.cpp
index 67563b639c5..387793779ca 100644
--- a/src/mame/video/atarigt.cpp
+++ b/src/mame/video/atarigt.cpp
@@ -49,7 +49,7 @@ TILE_GET_INFO_MEMBER(atarigt_state::get_alpha_tile_info)
uint16_t data = m_alpha_tilemap->basemem_read(tile_index);
int code = data & 0xfff;
int color = (data >> 12) & 0x0f;
- SET_TILE_INFO_MEMBER(1, code, color, 0);
+ tileinfo.set(1, code, color, 0);
}
@@ -58,7 +58,7 @@ TILE_GET_INFO_MEMBER(atarigt_state::get_playfield_tile_info)
uint16_t data = m_playfield_tilemap->basemem_read(tile_index);
int code = (m_playfield_tile_bank << 12) | (data & 0xfff);
int color = (data >> 12) & 7;
- SET_TILE_INFO_MEMBER(0, code, color, (data >> 15) & 1);
+ tileinfo.set(0, code, color, (data >> 15) & 1);
}
diff --git a/src/mame/video/atarigx2.cpp b/src/mame/video/atarigx2.cpp
index 8d0b98235b0..6378bc5c32b 100644
--- a/src/mame/video/atarigx2.cpp
+++ b/src/mame/video/atarigx2.cpp
@@ -39,7 +39,7 @@ TILE_GET_INFO_MEMBER(atarigx2_state::get_alpha_tile_info)
int code = data & 0xfff;
int color = (data >> 12) & 0x0f;
int opaque = data & 0x8000;
- SET_TILE_INFO_MEMBER(1, code, color, opaque ? TILE_FORCE_LAYER0 : 0);
+ tileinfo.set(1, code, color, opaque ? TILE_FORCE_LAYER0 : 0);
}
@@ -48,7 +48,7 @@ TILE_GET_INFO_MEMBER(atarigx2_state::get_playfield_tile_info)
uint16_t data = m_playfield_tilemap->basemem_read(tile_index);
int code = (m_playfield_tile_bank << 12) | (data & 0xfff);
int color = (m_playfield_base >> 5) + ((m_playfield_color_bank << 3) & 0x18) + ((data >> 12) & 7);
- SET_TILE_INFO_MEMBER(0, code, color, (data >> 15) & 1);
+ tileinfo.set(0, code, color, (data >> 15) & 1);
tileinfo.category = (m_playfield_color_bank >> 2) & 7;
}
diff --git a/src/mame/video/atarisy1.cpp b/src/mame/video/atarisy1.cpp
index bdbbc1d35ed..9f6dd777bab 100644
--- a/src/mame/video/atarisy1.cpp
+++ b/src/mame/video/atarisy1.cpp
@@ -87,7 +87,7 @@ TILE_GET_INFO_MEMBER(atarisy1_state::get_alpha_tile_info)
int code = data & 0x3ff;
int color = (data >> 10) & 0x07;
int opaque = data & 0x2000;
- SET_TILE_INFO_MEMBER(0, code, color, opaque ? TILE_FORCE_LAYER0 : 0);
+ tileinfo.set(0, code, color, opaque ? TILE_FORCE_LAYER0 : 0);
}
@@ -98,7 +98,7 @@ TILE_GET_INFO_MEMBER(atarisy1_state::get_playfield_tile_info)
int gfxindex = (lookup >> 8) & 15;
int code = ((lookup & 0xff) << 8) | (data & 0xff);
int color = 0x20 + (((lookup >> 12) & 15) << m_bank_color_shift[gfxindex]);
- SET_TILE_INFO_MEMBER(gfxindex, code, color, (data >> 15) & 1);
+ tileinfo.set(gfxindex, code, color, (data >> 15) & 1);
}
diff --git a/src/mame/video/atarisy2.cpp b/src/mame/video/atarisy2.cpp
index 2f8d509b756..25461544f2f 100644
--- a/src/mame/video/atarisy2.cpp
+++ b/src/mame/video/atarisy2.cpp
@@ -23,7 +23,7 @@ TILE_GET_INFO_MEMBER(atarisy2_state::get_alpha_tile_info)
uint16_t data = m_alpha_tilemap->basemem_read(tile_index);
int code = data & 0x3ff;
int color = (data >> 13) & 0x07;
- SET_TILE_INFO_MEMBER(2, code, color, 0);
+ tileinfo.set(2, code, color, 0);
}
@@ -32,7 +32,7 @@ TILE_GET_INFO_MEMBER(atarisy2_state::get_playfield_tile_info)
uint16_t data = m_playfield_tilemap->basemem_read(tile_index);
int code = (m_playfield_tile_bank[(data >> 10) & 1] << 10) | (data & 0x3ff);
int color = (data >> 11) & 7;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
tileinfo.category = (~data >> 14) & 3;
}
diff --git a/src/mame/video/atetris.cpp b/src/mame/video/atetris.cpp
index 448dd71110d..cddad9368eb 100644
--- a/src/mame/video/atetris.cpp
+++ b/src/mame/video/atetris.cpp
@@ -22,7 +22,7 @@ TILE_GET_INFO_MEMBER(atetris_state::get_tile_info)
int code = videoram[tile_index * 2] | ((videoram[tile_index * 2 + 1] & 7) << 8);
int color = (videoram[tile_index * 2 + 1] & 0xf0) >> 4;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
diff --git a/src/mame/video/badlands.cpp b/src/mame/video/badlands.cpp
index beab5dd320f..067e716ef00 100644
--- a/src/mame/video/badlands.cpp
+++ b/src/mame/video/badlands.cpp
@@ -23,7 +23,7 @@ TILE_GET_INFO_MEMBER(badlands_state::get_playfield_tile_info)
uint16_t data = m_playfield_tilemap->basemem_read(tile_index);
int code = (data & 0x1fff) + ((data & 0x1000) ? (m_playfield_tile_bank << 12) : 0);
int color = (data >> 13) & 0x07;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
diff --git a/src/mame/video/bagman.cpp b/src/mame/video/bagman.cpp
index ec93795a4bc..43a137f592f 100644
--- a/src/mame/video/bagman.cpp
+++ b/src/mame/video/bagman.cpp
@@ -102,7 +102,7 @@ TILE_GET_INFO_MEMBER(bagman_state::get_bg_tile_info)
int code = m_videoram[tile_index] + 8 * (m_colorram[tile_index] & 0x20);
int color = m_colorram[tile_index] & 0x0f;
- SET_TILE_INFO_MEMBER(gfxbank, code, color, 0);
+ tileinfo.set(gfxbank, code, color, 0);
}
void bagman_state::video_start()
diff --git a/src/mame/video/bankp.cpp b/src/mame/video/bankp.cpp
index 44540c0dc5f..1843de485b2 100644
--- a/src/mame/video/bankp.cpp
+++ b/src/mame/video/bankp.cpp
@@ -131,7 +131,7 @@ TILE_GET_INFO_MEMBER(bankp_state::get_bg_tile_info)
int color = m_colorram2[tile_index] >> 4;
int flags = (m_colorram2[tile_index] & 0x08) ? TILE_FLIPX : 0;
- SET_TILE_INFO_MEMBER(1, code, color, flags);
+ tileinfo.set(1, code, color, flags);
tileinfo.group = color;
}
@@ -141,7 +141,7 @@ TILE_GET_INFO_MEMBER(bankp_state::get_fg_tile_info)
int color = m_colorram[tile_index] >> 3;
int flags = (m_colorram[tile_index] & 0x04) ? TILE_FLIPX : 0;
- SET_TILE_INFO_MEMBER(0, code, color, flags);
+ tileinfo.set(0, code, color, flags);
tileinfo.group = color;
}
diff --git a/src/mame/video/baraduke.cpp b/src/mame/video/baraduke.cpp
index 6ebc7730183..44811a156ec 100644
--- a/src/mame/video/baraduke.cpp
+++ b/src/mame/video/baraduke.cpp
@@ -76,7 +76,7 @@ TILEMAP_MAPPER_MEMBER(baraduke_state::tx_tilemap_scan)
TILE_GET_INFO_MEMBER(baraduke_state::tx_get_tile_info)
{
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
m_textram[tile_index],
(m_textram[tile_index+0x400] << 2) & 0x1ff,
0);
@@ -87,7 +87,7 @@ TILE_GET_INFO_MEMBER(baraduke_state::get_tile_info0)
int code = m_videoram[2*tile_index];
int attr = m_videoram[2*tile_index + 1];
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
code + ((attr & 0x03) << 8),
attr,
0);
@@ -98,7 +98,7 @@ TILE_GET_INFO_MEMBER(baraduke_state::get_tile_info1)
int code = m_videoram[0x1000 + 2*tile_index];
int attr = m_videoram[0x1000 + 2*tile_index + 1];
- SET_TILE_INFO_MEMBER(2,
+ tileinfo.set(2,
code + ((attr & 0x03) << 8),
attr,
0);
diff --git a/src/mame/video/batman.cpp b/src/mame/video/batman.cpp
index 1b0d8632864..eb5b4c27f25 100644
--- a/src/mame/video/batman.cpp
+++ b/src/mame/video/batman.cpp
@@ -23,7 +23,7 @@ TILE_GET_INFO_MEMBER(batman_state::get_alpha_tile_info)
int code = ((data & 0x400) ? (m_alpha_tile_bank * 0x400) : 0) + (data & 0x3ff);
int color = (data >> 11) & 0x0f;
int opaque = data & 0x8000;
- SET_TILE_INFO_MEMBER(2, code, color, opaque ? TILE_FORCE_LAYER0 : 0);
+ tileinfo.set(2, code, color, opaque ? TILE_FORCE_LAYER0 : 0);
}
@@ -33,7 +33,7 @@ TILE_GET_INFO_MEMBER(batman_state::get_playfield_tile_info)
uint16_t data2 = m_vad->playfield().extmem_read(tile_index) & 0xff;
int code = data1 & 0x7fff;
int color = 0x10 + (data2 & 0x0f);
- SET_TILE_INFO_MEMBER(0, code, color, (data1 >> 15) & 1);
+ tileinfo.set(0, code, color, (data1 >> 15) & 1);
tileinfo.category = (data2 >> 4) & 3;
}
@@ -44,7 +44,7 @@ TILE_GET_INFO_MEMBER(batman_state::get_playfield2_tile_info)
uint16_t data2 = m_vad->playfield2().extmem_read(tile_index) >> 8;
int code = data1 & 0x7fff;
int color = data2 & 0x0f;
- SET_TILE_INFO_MEMBER(0, code, color, (data1 >> 15) & 1);
+ tileinfo.set(0, code, color, (data1 >> 15) & 1);
tileinfo.category = (data2 >> 4) & 3;
}
diff --git a/src/mame/video/battlane.cpp b/src/mame/video/battlane.cpp
index 0ef5a52ff9a..bf4c28736e6 100644
--- a/src/mame/video/battlane.cpp
+++ b/src/mame/video/battlane.cpp
@@ -101,7 +101,7 @@ TILE_GET_INFO_MEMBER(battlane_state::get_tile_info_bg)
int gfxn = (attr & 0x01) + 1;
int color = (attr >> 1) & 0x03;
- SET_TILE_INFO_MEMBER(gfxn, code, color, 0);
+ tileinfo.set(gfxn, code, color, 0);
}
TILEMAP_MAPPER_MEMBER(battlane_state::battlane_tilemap_scan_rows_2x2)
diff --git a/src/mame/video/battlex.cpp b/src/mame/video/battlex.cpp
index 218d3163fb4..15508121688 100644
--- a/src/mame/video/battlex.cpp
+++ b/src/mame/video/battlex.cpp
@@ -58,7 +58,7 @@ TILE_GET_INFO_MEMBER(battlex_state::get_bg_tile_info)
int tile = m_videoram[tile_index * 2] | (((m_videoram[tile_index * 2 + 1] & 0x01)) << 8);
int color = (m_videoram[tile_index * 2 + 1] & 0x0e) >> 1; // high bits unused
- SET_TILE_INFO_MEMBER(0, tile, color, 0);
+ tileinfo.set(0, tile, color, 0);
}
TILE_GET_INFO_MEMBER(battlex_state::get_dodgeman_bg_tile_info)
@@ -66,7 +66,7 @@ TILE_GET_INFO_MEMBER(battlex_state::get_dodgeman_bg_tile_info)
int tile = m_videoram[tile_index * 2] | (((m_videoram[tile_index * 2 + 1] & 0x03)) << 8);
int color = (m_videoram[tile_index * 2 + 1] & 0x0c) >> 2; // high bits unused
- SET_TILE_INFO_MEMBER(0, tile, color, 0);
+ tileinfo.set(0, tile, color, 0);
}
void battlex_state::video_start()
diff --git a/src/mame/video/bbusters.cpp b/src/mame/video/bbusters.cpp
index 5d106814605..283a8c293a9 100644
--- a/src/mame/video/bbusters.cpp
+++ b/src/mame/video/bbusters.cpp
@@ -30,7 +30,7 @@ TILE_GET_INFO_MEMBER(bbusters_state_base::get_tile_info)
{
uint16_t tile = m_videoram[tile_index];
- SET_TILE_INFO_MEMBER(0,tile&0xfff,tile>>12,0);
+ tileinfo.set(0,tile&0xfff,tile>>12,0);
}
template<int Layer, int Gfx>
@@ -38,7 +38,7 @@ TILE_GET_INFO_MEMBER(bbusters_state_base::get_pf_tile_info)
{
uint16_t tile = m_pf_data[Layer][tile_index];
- SET_TILE_INFO_MEMBER(Gfx,tile&0xfff,tile>>12,0);
+ tileinfo.set(Gfx,tile&0xfff,tile>>12,0);
}
WRITE16_MEMBER(bbusters_state_base::video_w)
diff --git a/src/mame/video/bfm_adr2.cpp b/src/mame/video/bfm_adr2.cpp
index d660183ec96..5f90ffb5888 100644
--- a/src/mame/video/bfm_adr2.cpp
+++ b/src/mame/video/bfm_adr2.cpp
@@ -167,7 +167,7 @@ TILE_GET_INFO_MEMBER( bfm_adder2_device::get_tile0_info )
flags = ((data & 0x4000)?TILE_FLIPY:0) |
((data & 0x2000)?TILE_FLIPX:0);
- SET_TILE_INFO_MEMBER(0, code, color, flags);
+ tileinfo.set(0, code, color, flags);
}
///////////////////////////////////////////////////////////////////////////
@@ -190,7 +190,7 @@ TILE_GET_INFO_MEMBER( bfm_adder2_device::get_tile1_info )
flags = ((data & 0x4000)?TILE_FLIPY:0) |
((data & 0x2000)?TILE_FLIPX:0);
- SET_TILE_INFO_MEMBER(0, code, color, flags);
+ tileinfo.set(0, code, color, flags);
}
// video initialisation ///////////////////////////////////////////////////
diff --git a/src/mame/video/bigstrkb.cpp b/src/mame/video/bigstrkb.cpp
index b98d4729387..8ae3ca8f3b9 100644
--- a/src/mame/video/bigstrkb.cpp
+++ b/src/mame/video/bigstrkb.cpp
@@ -67,7 +67,7 @@ TILE_GET_INFO_MEMBER(bigstrkb_state::get_tile_info)
tileno = m_videoram[tile_index] & 0x0fff;
col= m_videoram[tile_index] & 0xf000;
- SET_TILE_INFO_MEMBER(0,tileno,col>>12,0);
+ tileinfo.set(0,tileno,col>>12,0);
}
WRITE16_MEMBER(bigstrkb_state::videoram_w)
@@ -83,7 +83,7 @@ TILE_GET_INFO_MEMBER(bigstrkb_state::get_tile2_info)
tileno = m_videoram2[tile_index] & 0x0fff;
col= m_videoram2[tile_index] & 0xf000;
- SET_TILE_INFO_MEMBER(1,tileno,col>>12,0);
+ tileinfo.set(1,tileno,col>>12,0);
}
WRITE16_MEMBER(bigstrkb_state::videoram2_w)
@@ -100,7 +100,7 @@ TILE_GET_INFO_MEMBER(bigstrkb_state::get_tile3_info)
tileno = m_videoram3[tile_index] & 0x0fff;
col= m_videoram3[tile_index] & 0xf000;
- SET_TILE_INFO_MEMBER(1,tileno+0x2000,(col>>12)+(0x100/16),0);
+ tileinfo.set(1,tileno+0x2000,(col>>12)+(0x100/16),0);
}
WRITE16_MEMBER(bigstrkb_state::videoram3_w)
diff --git a/src/mame/video/bking.cpp b/src/mame/video/bking.cpp
index 52e020d0d4c..ebdddca5d88 100644
--- a/src/mame/video/bking.cpp
+++ b/src/mame/video/bking.cpp
@@ -209,7 +209,7 @@ TILE_GET_INFO_MEMBER(bking_state::get_tile_info)
if (code1 & 4) flags |= TILE_FLIPX;
if (code1 & 8) flags |= TILE_FLIPY;
- SET_TILE_INFO_MEMBER(0, code0 + 256 * code1, m_palette_bank, flags);
+ tileinfo.set(0, code0 + 256 * code1, m_palette_bank, flags);
}
diff --git a/src/mame/video/blktiger.cpp b/src/mame/video/blktiger.cpp
index 316ac2343c8..115fa5a944b 100644
--- a/src/mame/video/blktiger.cpp
+++ b/src/mame/video/blktiger.cpp
@@ -39,7 +39,7 @@ TILE_GET_INFO_MEMBER(blktiger_state::get_bg_tile_info)
};
uint8_t attr = m_scroll_ram[2 * tile_index + 1];
int color = (attr & 0x78) >> 3;
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
m_scroll_ram[2 * tile_index] + ((attr & 0x07) << 8),
color,
(attr & 0x80) ? TILE_FLIPX : 0);
@@ -49,7 +49,7 @@ TILE_GET_INFO_MEMBER(blktiger_state::get_bg_tile_info)
TILE_GET_INFO_MEMBER(blktiger_state::get_tx_tile_info)
{
uint8_t attr = m_txvideoram[tile_index + 0x400];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
m_txvideoram[tile_index] + ((attr & 0xe0) << 3),
attr & 0x1f,
0);
diff --git a/src/mame/video/blmbycar.cpp b/src/mame/video/blmbycar.cpp
index 0c0c4577ef5..fd56b17c866 100644
--- a/src/mame/video/blmbycar.cpp
+++ b/src/mame/video/blmbycar.cpp
@@ -59,7 +59,7 @@ TILE_GET_INFO_MEMBER(blmbycar_state::get_tile_info)
{
uint16_t code = m_vram[Layer][tile_index * 2 + 0];
uint16_t attr = m_vram[Layer][tile_index * 2 + 1];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code,
attr & 0x1f,
TILE_FLIPYX((attr >> 6) & 3));
diff --git a/src/mame/video/bloodbro.cpp b/src/mame/video/bloodbro.cpp
index f08d881f5ff..c4cb61f5571 100644
--- a/src/mame/video/bloodbro.cpp
+++ b/src/mame/video/bloodbro.cpp
@@ -24,7 +24,7 @@
TILE_GET_INFO_MEMBER(bloodbro_state::get_bg_tile_info)
{
int code = m_bgvideoram[tile_index];
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
code & 0xfff,
(code >> 12),
0);
@@ -33,7 +33,7 @@ TILE_GET_INFO_MEMBER(bloodbro_state::get_bg_tile_info)
TILE_GET_INFO_MEMBER(bloodbro_state::get_fg_tile_info)
{
int code = m_fgvideoram[tile_index];
- SET_TILE_INFO_MEMBER(2,
+ tileinfo.set(2,
(code & 0xfff)+0x1000,
(code >> 12),
0);
@@ -42,7 +42,7 @@ TILE_GET_INFO_MEMBER(bloodbro_state::get_fg_tile_info)
TILE_GET_INFO_MEMBER(bloodbro_state::get_tx_tile_info)
{
int code = m_txvideoram[tile_index];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code & 0xfff,
code >> 12,
0);
diff --git a/src/mame/video/blstroid.cpp b/src/mame/video/blstroid.cpp
index 3eb2ef5bde1..3be7deda4b9 100644
--- a/src/mame/video/blstroid.cpp
+++ b/src/mame/video/blstroid.cpp
@@ -24,7 +24,7 @@ TILE_GET_INFO_MEMBER(blstroid_state::get_playfield_tile_info)
uint16_t data = m_playfield_tilemap->basemem_read(tile_index);
int code = data & 0x1fff;
int color = (data >> 13) & 0x07;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
diff --git a/src/mame/video/blueprnt.cpp b/src/mame/video/blueprnt.cpp
index 7005cb5c1f5..d7c7cf8d098 100644
--- a/src/mame/video/blueprnt.cpp
+++ b/src/mame/video/blueprnt.cpp
@@ -108,7 +108,7 @@ TILE_GET_INFO_MEMBER(blueprnt_state::get_bg_tile_info)
tileinfo.category = (attr & 0x80) ? 1 : 0;
if (bank) code += m_gfx_bank * 0x100;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
diff --git a/src/mame/video/bogeyman.cpp b/src/mame/video/bogeyman.cpp
index 8405ae6b06b..5575d481042 100644
--- a/src/mame/video/bogeyman.cpp
+++ b/src/mame/video/bogeyman.cpp
@@ -67,7 +67,7 @@ TILE_GET_INFO_MEMBER(bogeyman_state::get_bg_tile_info)
int code = m_videoram[tile_index] & 0x7f;
int color = (attr >> 1) & 0x07;
- SET_TILE_INFO_MEMBER(gfxbank, code, color, 0);
+ tileinfo.set(gfxbank, code, color, 0);
}
TILE_GET_INFO_MEMBER(bogeyman_state::get_fg_tile_info)
@@ -77,7 +77,7 @@ TILE_GET_INFO_MEMBER(bogeyman_state::get_fg_tile_info)
int gfxbank = tile / 0x200;
int code = tile & 0x1ff;
- SET_TILE_INFO_MEMBER(gfxbank, code, m_colbank, 0);
+ tileinfo.set(gfxbank, code, m_colbank, 0);
}
void bogeyman_state::video_start()
diff --git a/src/mame/video/bombjack.cpp b/src/mame/video/bombjack.cpp
index eef0d90eac9..116bd7e3216 100644
--- a/src/mame/video/bombjack.cpp
+++ b/src/mame/video/bombjack.cpp
@@ -51,7 +51,7 @@ TILE_GET_INFO_MEMBER(bombjack_state::get_bg_tile_info)
int color = attr & 0x0f;
int flags = (attr & 0x80) ? TILE_FLIPY : 0;
- SET_TILE_INFO_MEMBER(1, code, color, flags);
+ tileinfo.set(1, code, color, flags);
}
TILE_GET_INFO_MEMBER(bombjack_state::get_fg_tile_info)
@@ -59,7 +59,7 @@ TILE_GET_INFO_MEMBER(bombjack_state::get_fg_tile_info)
int code = m_videoram[tile_index] + 16 * (m_colorram[tile_index] & 0x10);
int color = m_colorram[tile_index] & 0x0f;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
void bombjack_state::video_start()
diff --git a/src/mame/video/bosco.cpp b/src/mame/video/bosco.cpp
index a84bd544200..66abbd42dc0 100644
--- a/src/mame/video/bosco.cpp
+++ b/src/mame/video/bosco.cpp
@@ -91,7 +91,7 @@ inline void bosco_state::get_tile_info_bosco(tile_data &tileinfo,int tile_index,
uint8_t attr = m_videoram[ram_offs + tile_index + 0x800];
tileinfo.category = (attr & 0x20) >> 5;
tileinfo.group = attr & 0x3f;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
m_videoram[ram_offs + tile_index],
attr & 0x3f,
TILE_FLIPYX(attr >> 6) ^ TILE_FLIPX);
diff --git a/src/mame/video/brkthru.cpp b/src/mame/video/brkthru.cpp
index 825616d5f53..0de0d9dfce6 100644
--- a/src/mame/video/brkthru.cpp
+++ b/src/mame/video/brkthru.cpp
@@ -84,7 +84,7 @@ TILE_GET_INFO_MEMBER(brkthru_state::get_bg_tile_info)
int region = 1 + (code >> 7);
int colour = m_bgbasecolor + ((m_videoram[tile_index * 2 + 1] & 0x04) >> 2);
- SET_TILE_INFO_MEMBER(region, code & 0x7f, colour,0);
+ tileinfo.set(region, code & 0x7f, colour,0);
}
WRITE8_MEMBER(brkthru_state::brkthru_bgram_w)
@@ -97,7 +97,7 @@ WRITE8_MEMBER(brkthru_state::brkthru_bgram_w)
TILE_GET_INFO_MEMBER(brkthru_state::get_fg_tile_info)
{
uint8_t code = m_fg_videoram[tile_index];
- SET_TILE_INFO_MEMBER(0, code, 0, 0);
+ tileinfo.set(0, code, 0, 0);
}
WRITE8_MEMBER(brkthru_state::brkthru_fgram_w)
diff --git a/src/mame/video/bsktball.cpp b/src/mame/video/bsktball.cpp
index 49f1e6a5285..e9449d3a91d 100644
--- a/src/mame/video/bsktball.cpp
+++ b/src/mame/video/bsktball.cpp
@@ -23,7 +23,7 @@ TILE_GET_INFO_MEMBER(bsktball_state::get_bg_tile_info)
int color = (attr & 0x40) >> 6;
int flags = (attr & 0x80) ? TILE_FLIPX : 0;
- SET_TILE_INFO_MEMBER(0, code, color, flags);
+ tileinfo.set(0, code, color, flags);
}
void bsktball_state::video_start()
diff --git a/src/mame/video/bwing.cpp b/src/mame/video/bwing.cpp
index 77648217931..3c30e6b7459 100644
--- a/src/mame/video/bwing.cpp
+++ b/src/mame/video/bwing.cpp
@@ -102,17 +102,17 @@ WRITE8_MEMBER(bwing_state::paletteram_w)
TILE_GET_INFO_MEMBER(bwing_state::get_fgtileinfo)
{
- SET_TILE_INFO_MEMBER(2, m_fgscrollram[tile_index] & 0x7f, m_fgscrollram[tile_index] >> 7, 0);
+ tileinfo.set(2, m_fgscrollram[tile_index] & 0x7f, m_fgscrollram[tile_index] >> 7, 0);
}
TILE_GET_INFO_MEMBER(bwing_state::get_bgtileinfo)
{
- SET_TILE_INFO_MEMBER(3, m_bgscrollram[tile_index] & 0x7f, m_bgscrollram[tile_index] >> 7, 0);
+ tileinfo.set(3, m_bgscrollram[tile_index] & 0x7f, m_bgscrollram[tile_index] >> 7, 0);
}
TILE_GET_INFO_MEMBER(bwing_state::get_charinfo)
{
- SET_TILE_INFO_MEMBER(0, m_videoram[tile_index], 0, 0);
+ tileinfo.set(0, m_videoram[tile_index], 0, 0);
}
TILEMAP_MAPPER_MEMBER(bwing_state::scan_cols)
diff --git a/src/mame/video/c45.cpp b/src/mame/video/c45.cpp
index 19946abdeee..2491cff651f 100644
--- a/src/mame/video/c45.cpp
+++ b/src/mame/video/c45.cpp
@@ -263,5 +263,5 @@ TILE_GET_INFO_MEMBER( namco_c45_road_device::get_road_info )
uint16_t data = m_tmapram[tile_index];
int tile = data & 0x3ff;
int color = data >> 10;
- SET_TILE_INFO_MEMBER(0, tile, color, 0);
+ tileinfo.set(0, tile, color, 0);
}
diff --git a/src/mame/video/cabal.cpp b/src/mame/video/cabal.cpp
index 3dc32c9263a..bc013275509 100644
--- a/src/mame/video/cabal.cpp
+++ b/src/mame/video/cabal.cpp
@@ -18,7 +18,7 @@ TILE_GET_INFO_MEMBER(cabal_state::get_back_tile_info)
tile &= 0xfff;
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
tile,
color,
0);
@@ -31,7 +31,7 @@ TILE_GET_INFO_MEMBER(cabal_state::get_text_tile_info)
tile &= 0x3ff;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
tile,
color,
0);
diff --git a/src/mame/video/calomega.cpp b/src/mame/video/calomega.cpp
index 7e23c2bb555..34be7e21893 100644
--- a/src/mame/video/calomega.cpp
+++ b/src/mame/video/calomega.cpp
@@ -44,7 +44,7 @@ TILE_GET_INFO_MEMBER(calomega_state::get_bg_tile_info)
int bank = (attr & 0x02) >> 1; /* bit 1 switch the gfx banks */
int color = (attr & 0x3c) >> 2; /* bits 2-3-4-5 for color */
- SET_TILE_INFO_MEMBER(bank, code, color, 0);
+ tileinfo.set(bank, code, color, 0);
}
void calomega_state::video_start()
diff --git a/src/mame/video/canyon.cpp b/src/mame/video/canyon.cpp
index c25ec2f709c..7e22b311ebe 100644
--- a/src/mame/video/canyon.cpp
+++ b/src/mame/video/canyon.cpp
@@ -21,7 +21,7 @@ TILE_GET_INFO_MEMBER(canyon_state::get_bg_tile_info)
{
uint8_t code = m_videoram[tile_index];
- SET_TILE_INFO_MEMBER(0, code & 0x3f, code >> 7, 0);
+ tileinfo.set(0, code & 0x3f, code >> 7, 0);
}
diff --git a/src/mame/video/cbasebal.cpp b/src/mame/video/cbasebal.cpp
index 71805e4c938..aa370ac3de7 100644
--- a/src/mame/video/cbasebal.cpp
+++ b/src/mame/video/cbasebal.cpp
@@ -13,7 +13,7 @@
TILE_GET_INFO_MEMBER(cbasebal_state::get_bg_tile_info)
{
uint8_t attr = m_scrollram[2 * tile_index + 1];
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
m_scrollram[2 * tile_index] + ((attr & 0x07) << 8) + 0x800 * m_tilebank,
(attr & 0xf0) >> 4,
(attr & 0x08) ? TILE_FLIPX : 0);
@@ -22,7 +22,7 @@ TILE_GET_INFO_MEMBER(cbasebal_state::get_bg_tile_info)
TILE_GET_INFO_MEMBER(cbasebal_state::get_fg_tile_info)
{
uint8_t attr = m_textram[tile_index + 0x800];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
m_textram[tile_index] + ((attr & 0xf0) << 4),
attr & 0x07,
(attr & 0x08) ? TILE_FLIPX : 0);
diff --git a/src/mame/video/cclimber.cpp b/src/mame/video/cclimber.cpp
index a7d0d320a78..e68dafd6574 100644
--- a/src/mame/video/cclimber.cpp
+++ b/src/mame/video/cclimber.cpp
@@ -366,7 +366,7 @@ TILE_GET_INFO_MEMBER(cclimber_state::cclimber_get_pf_tile_info)
color = m_colorram[tile_index] & 0x0f;
- SET_TILE_INFO_MEMBER(0, code, color, flags);
+ tileinfo.set(0, code, color, flags);
}
@@ -383,7 +383,7 @@ TILE_GET_INFO_MEMBER(cclimber_state::swimmer_get_pf_tile_info)
code = ((m_colorram[tile_index] & 0x10) << 4) | m_videoram[tile_index];
color = (m_swimmer_palettebank << 4) | (m_colorram[tile_index] & 0x0f);
- SET_TILE_INFO_MEMBER(0, code, color, flags);
+ tileinfo.set(0, code, color, flags);
}
@@ -395,7 +395,7 @@ TILE_GET_INFO_MEMBER(cclimber_state::toprollr_get_pf_tile_info)
code = ((attr & 0x30) << 4) | m_videoram[tile_index];
color = attr & 0x0f;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
@@ -412,7 +412,7 @@ TILE_GET_INFO_MEMBER(cclimber_state::cclimber_get_bs_tile_info)
code = ((m_bigsprite_control[1] & 0x08) << 5) | m_bigsprite_videoram[tile_index];
color = m_bigsprite_control[1] & 0x07;
- SET_TILE_INFO_MEMBER(2, code, color, 0);
+ tileinfo.set(2, code, color, 0);
}
@@ -429,7 +429,7 @@ TILE_GET_INFO_MEMBER(cclimber_state::toprollr_get_bs_tile_info)
code = ((m_bigsprite_control[1] & 0x18) << 5) | m_bigsprite_videoram[tile_index];
color = m_bigsprite_control[1] & 0x07;
- SET_TILE_INFO_MEMBER(2, code, color, 0);
+ tileinfo.set(2, code, color, 0);
}
@@ -438,7 +438,7 @@ TILE_GET_INFO_MEMBER(cclimber_state::toproller_get_bg_tile_info)
int code = ((m_toprollr_bg_coloram[tile_index] & 0x40) << 2) | m_toprollr_bg_videoram[tile_index];
int color = m_toprollr_bg_coloram[tile_index] & 0x0f;
- SET_TILE_INFO_MEMBER(3, code, color, TILE_FLIPX);
+ tileinfo.set(3, code, color, TILE_FLIPX);
}
diff --git a/src/mame/video/centiped.cpp b/src/mame/video/centiped.cpp
index c7d1991ea76..afd67bf8fcd 100644
--- a/src/mame/video/centiped.cpp
+++ b/src/mame/video/centiped.cpp
@@ -21,7 +21,7 @@ TILE_GET_INFO_MEMBER(centiped_state::centiped_get_tile_info)
uint8_t *videoram = m_videoram;
int data = videoram[tile_index];
- SET_TILE_INFO_MEMBER(0, (data & 0x3f) + 0x40, 0, TILE_FLIPYX(data >> 6));
+ tileinfo.set(0, (data & 0x3f) + 0x40, 0, TILE_FLIPYX(data >> 6));
}
@@ -31,7 +31,7 @@ TILE_GET_INFO_MEMBER(centiped_state::warlords_get_tile_info)
int data = videoram[tile_index];
int color = ((tile_index & 0x10) >> 4) | ((tile_index & 0x200) >> 8) | (m_flipscreen >> 5);
- SET_TILE_INFO_MEMBER(0, data & 0x3f, color, TILE_FLIPYX(data >> 6));
+ tileinfo.set(0, data & 0x3f, color, TILE_FLIPYX(data >> 6));
}
@@ -44,7 +44,7 @@ TILE_GET_INFO_MEMBER(centiped_state::milliped_get_tile_info)
/* Flip both x and y if flipscreen is non-zero */
int flip_tiles = (m_flipscreen) ? 0x03 : 0;
- SET_TILE_INFO_MEMBER(0, (data & 0x3f) + 0x40 + (bank * 0x80), color, TILE_FLIPYX(flip_tiles));
+ tileinfo.set(0, (data & 0x3f) + 0x40 + (bank * 0x80), color, TILE_FLIPYX(flip_tiles));
}
@@ -54,7 +54,7 @@ TILE_GET_INFO_MEMBER(centiped_state::bullsdrt_get_tile_info)
int data = videoram[tile_index];
int bank = m_bullsdrt_tiles_bankram[tile_index & 0x1f] & 0x0f;
- SET_TILE_INFO_MEMBER(0, (data & 0x3f) + 0x40 * bank, 0, TILE_FLIPYX(data >> 6));
+ tileinfo.set(0, (data & 0x3f) + 0x40 * bank, 0, TILE_FLIPYX(data >> 6));
}
diff --git a/src/mame/video/chaknpop.cpp b/src/mame/video/chaknpop.cpp
index bd2b1b07e90..83c7826674c 100644
--- a/src/mame/video/chaknpop.cpp
+++ b/src/mame/video/chaknpop.cpp
@@ -137,7 +137,7 @@ TILE_GET_INFO_MEMBER(chaknpop_state::get_tx_tile_info)
tile |= tile_h_bank;
- SET_TILE_INFO_MEMBER(1, tile, color, 0);
+ tileinfo.set(1, tile, color, 0);
}
diff --git a/src/mame/video/champbas.cpp b/src/mame/video/champbas.cpp
index 4a2b577c0d6..21d1963200a 100644
--- a/src/mame/video/champbas.cpp
+++ b/src/mame/video/champbas.cpp
@@ -138,7 +138,7 @@ TILE_GET_INFO_MEMBER(champbas_state::champbas_get_bg_tile_info)
int const code = m_vram[tile_index] | (m_gfx_bank << 8);
int const color = (m_vram[tile_index + 0x400] & 0x1f) | 0x20;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
TILE_GET_INFO_MEMBER(exctsccr_state::exctsccr_get_bg_tile_info)
@@ -146,7 +146,7 @@ TILE_GET_INFO_MEMBER(exctsccr_state::exctsccr_get_bg_tile_info)
int const code = m_vram[tile_index] | (m_gfx_bank << 8);
int const color = m_vram[tile_index + 0x400] & 0x0f;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
diff --git a/src/mame/video/cheekyms.cpp b/src/mame/video/cheekyms.cpp
index 4d984f15a87..a35f1c399e0 100644
--- a/src/mame/video/cheekyms.cpp
+++ b/src/mame/video/cheekyms.cpp
@@ -94,7 +94,7 @@ TILE_GET_INFO_MEMBER(cheekyms_state::get_tile_info)
color = palette | (x >> 1);
}
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
void cheekyms_state::video_start()
diff --git a/src/mame/video/circus.cpp b/src/mame/video/circus.cpp
index 3708e1b964a..366470bf735 100644
--- a/src/mame/video/circus.cpp
+++ b/src/mame/video/circus.cpp
@@ -33,7 +33,7 @@ TILE_GET_INFO_MEMBER(circus_state::get_bg_tile_info)
{
int code = m_videoram[tile_index];
- SET_TILE_INFO_MEMBER(0, code, 0, 0);
+ tileinfo.set(0, code, 0, 0);
}
void circus_state::video_start()
diff --git a/src/mame/video/circusc.cpp b/src/mame/video/circusc.cpp
index ab44ec4aff2..da91cbea072 100644
--- a/src/mame/video/circusc.cpp
+++ b/src/mame/video/circusc.cpp
@@ -101,7 +101,7 @@ TILE_GET_INFO_MEMBER(circusc_state::get_tile_info)
uint8_t const attr = m_colorram[tile_index];
tileinfo.category = BIT(attr, 4);
- SET_TILE_INFO_MEMBER(
+ tileinfo.set(
0,
m_videoram[tile_index] + ((attr & 0x20) << 3),
attr & 0x0f,
diff --git a/src/mame/video/citycon.cpp b/src/mame/video/citycon.cpp
index 51594ad7fbc..da4f67d466e 100644
--- a/src/mame/video/citycon.cpp
+++ b/src/mame/video/citycon.cpp
@@ -26,7 +26,7 @@ TILEMAP_MAPPER_MEMBER(citycon_state::citycon_scan)
TILE_GET_INFO_MEMBER(citycon_state::get_fg_tile_info)
{
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
m_videoram[tile_index],
(tile_index & 0x03e0) >> 5, /* color depends on scanline only */
0);
@@ -36,7 +36,7 @@ TILE_GET_INFO_MEMBER(citycon_state::get_bg_tile_info)
{
uint8_t *rom = memregion("gfx4")->base();
int code = rom[0x1000 * m_bg_image + tile_index];
- SET_TILE_INFO_MEMBER(3 + m_bg_image,
+ tileinfo.set(3 + m_bg_image,
code,
rom[0xc000 + 0x100 * m_bg_image + code],
0);
diff --git a/src/mame/video/cloak.cpp b/src/mame/video/cloak.cpp
index d07397fe1cc..a793c375c44 100644
--- a/src/mame/video/cloak.cpp
+++ b/src/mame/video/cloak.cpp
@@ -156,7 +156,7 @@ TILE_GET_INFO_MEMBER(cloak_state::get_bg_tile_info)
uint8_t *videoram = m_videoram;
int code = videoram[tile_index];
- SET_TILE_INFO_MEMBER(0, code, 0, 0);
+ tileinfo.set(0, code, 0, 0);
}
void cloak_state::video_start()
diff --git a/src/mame/video/clshroad.cpp b/src/mame/video/clshroad.cpp
index 6c0c459f59a..822f871a012 100644
--- a/src/mame/video/clshroad.cpp
+++ b/src/mame/video/clshroad.cpp
@@ -109,7 +109,7 @@ TILE_GET_INFO_MEMBER(clshroad_state::get_tile_info_0a)
tile_index = (tile_index & 0x1f) + (tile_index & ~0x1f)*2;
code = m_vram_0[ tile_index * 2 + 0x40 ];
// color = m_vram_0[ tile_index * 2 + 0x41 ];
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
code,
0,
0);
@@ -121,7 +121,7 @@ TILE_GET_INFO_MEMBER(clshroad_state::get_tile_info_0b)
tile_index = (tile_index & 0x1f) + (tile_index & ~0x1f)*2;
code = m_vram_0[ tile_index * 2 + 0x00 ];
// color = m_vram_0[ tile_index * 2 + 0x01 ];
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
code,
0,
0);
@@ -176,7 +176,7 @@ TILE_GET_INFO_MEMBER(clshroad_state::get_tile_info_fb1)
uint8_t code = m_vram_1[ tile_index + 0x000 ];
uint8_t color = m_vram_1[ tile_index + 0x400 ] & 0x3f;
tileinfo.group = color;
- SET_TILE_INFO_MEMBER(2,
+ tileinfo.set(2,
code,
color,
0);
@@ -186,7 +186,7 @@ TILE_GET_INFO_MEMBER(clshroad_state::get_tile_info_1)
{
uint8_t code = m_vram_1[ tile_index + 0x000 ];
uint8_t color = m_vram_1[ tile_index + 0x400 ];
- SET_TILE_INFO_MEMBER(2,
+ tileinfo.set(2,
code + ((color & 0xf0)<<4),
color & 0x0f,
0);
diff --git a/src/mame/video/combatsc.cpp b/src/mame/video/combatsc.cpp
index a18d116916c..c1d99708eec 100644
--- a/src/mame/video/combatsc.cpp
+++ b/src/mame/video/combatsc.cpp
@@ -115,7 +115,7 @@ TILE_GET_INFO_MEMBER(combatsc_state::get_tile_info0)
number = m_page[0][tile_index + 0x400] + 256 * bank;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
number,
color,
0);
@@ -148,7 +148,7 @@ TILE_GET_INFO_MEMBER(combatsc_state::get_tile_info1)
number = m_page[1][tile_index + 0x400] + 256 * bank;
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
number,
color,
0);
@@ -161,7 +161,7 @@ TILE_GET_INFO_MEMBER(combatsc_state::get_text_info)
int number = m_page[0][tile_index + 0xc00];
int color = 16 + (attributes & 0x0f);
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
number,
color,
0);
@@ -193,7 +193,7 @@ TILE_GET_INFO_MEMBER(combatsc_state::get_tile_info0_bootleg)
color = pal*16;// + (attributes & 0x0f);
number = m_page[0][tile_index + 0x400] + 256 * bank;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
number,
color,
0);
@@ -224,7 +224,7 @@ TILE_GET_INFO_MEMBER(combatsc_state::get_tile_info1_bootleg)
color = pal * 16;// + (attributes & 0x0f);
number = m_page[1][tile_index + 0x400] + 256 * bank;
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
number,
color,
0);
@@ -236,7 +236,7 @@ TILE_GET_INFO_MEMBER(combatsc_state::get_text_info_bootleg)
int number = m_page[0][tile_index + 0xc00];
int color = 16;// + (attributes & 0x0f);
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
number,
color,
0);
diff --git a/src/mame/video/commando.cpp b/src/mame/video/commando.cpp
index 59cfac0bba2..c9d8d53a510 100644
--- a/src/mame/video/commando.cpp
+++ b/src/mame/video/commando.cpp
@@ -68,7 +68,7 @@ TILE_GET_INFO_MEMBER(commando_state::get_bg_tile_info)
int color = attr & 0x0f;
int flags = TILE_FLIPYX((attr & 0x30) >> 4);
- SET_TILE_INFO_MEMBER(1, code, color, flags);
+ tileinfo.set(1, code, color, flags);
}
TILE_GET_INFO_MEMBER(commando_state::get_fg_tile_info)
@@ -78,7 +78,7 @@ TILE_GET_INFO_MEMBER(commando_state::get_fg_tile_info)
int color = attr & 0x0f;
int flags = TILE_FLIPYX((attr & 0x30) >> 4);
- SET_TILE_INFO_MEMBER(0, code, color, flags);
+ tileinfo.set(0, code, color, flags);
}
void commando_state::video_start()
diff --git a/src/mame/video/compgolf.cpp b/src/mame/video/compgolf.cpp
index aca51e9f67e..e29aab20ab2 100644
--- a/src/mame/video/compgolf.cpp
+++ b/src/mame/video/compgolf.cpp
@@ -50,7 +50,7 @@ WRITE8_MEMBER(compgolf_state::compgolf_back_w)
TILE_GET_INFO_MEMBER(compgolf_state::get_text_info)
{
tile_index <<= 1;
- SET_TILE_INFO_MEMBER(2, m_videoram[tile_index + 1] | (m_videoram[tile_index] << 8), m_videoram[tile_index] >> 2, 0);
+ tileinfo.set(2, m_videoram[tile_index + 1] | (m_videoram[tile_index] << 8), m_videoram[tile_index] >> 2, 0);
}
TILEMAP_MAPPER_MEMBER(compgolf_state::back_scan)
@@ -65,7 +65,7 @@ TILE_GET_INFO_MEMBER(compgolf_state::get_back_info)
int code = m_bg_ram[tile_index * 2 + 1] + ((attr & 1) << 8);
int color = (attr & 0x3e) >> 1;
- SET_TILE_INFO_MEMBER(1, code, color, 0);
+ tileinfo.set(1, code, color, 0);
}
void compgolf_state::video_start()
diff --git a/src/mame/video/contra.cpp b/src/mame/video/contra.cpp
index 5d3fc19c191..b8cc350b9ab 100644
--- a/src/mame/video/contra.cpp
+++ b/src/mame/video/contra.cpp
@@ -75,7 +75,7 @@ TILE_GET_INFO_MEMBER(contra_state::get_fg_tile_info)
bank = (bank & ~(mask << 1)) | ((ctrl_4 & mask) << 1);
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
m_fg_vram[tile_index] + bank * 256,
((ctrl_6 & 0x30) * 2 + 16) + (attr & 7),
0);
@@ -103,7 +103,7 @@ TILE_GET_INFO_MEMBER(contra_state::get_bg_tile_info)
// 2009-12 FP: TO BE VERIFIED - old code used ctrl4 from chip 0?!?
bank = (bank & ~(mask << 1)) | ((ctrl_4 & mask) << 1);
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
m_bg_vram[tile_index] + bank * 256,
((ctrl_6 & 0x30) * 2 + 16) + (attr & 7),
0);
@@ -124,7 +124,7 @@ TILE_GET_INFO_MEMBER(contra_state::get_tx_tile_info)
((attr >> (bit2 )) & 0x08) |
((attr >> (bit3 - 1)) & 0x10);
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
m_tx_vram[tile_index] + bank * 256,
((ctrl_6 & 0x30) * 2 + 16) + (attr & 7),
0);
diff --git a/src/mame/video/cop01.cpp b/src/mame/video/cop01.cpp
index d6cfd73b368..363585d2469 100644
--- a/src/mame/video/cop01.cpp
+++ b/src/mame/video/cop01.cpp
@@ -77,14 +77,14 @@ TILE_GET_INFO_MEMBER(cop01_state::get_bg_tile_info)
if (attr & 0x10)
pri = 0;
- SET_TILE_INFO_MEMBER(1, tile + ((attr & 0x03) << 8), (attr & 0x1c) >> 2, 0);
+ tileinfo.set(1, tile + ((attr & 0x03) << 8), (attr & 0x1c) >> 2, 0);
tileinfo.group = pri;
}
TILE_GET_INFO_MEMBER(cop01_state::get_fg_tile_info)
{
int tile = m_fgvideoram[tile_index];
- SET_TILE_INFO_MEMBER(0, tile, 0, 0);
+ tileinfo.set(0, tile, 0, 0);
}
diff --git a/src/mame/video/cps1.cpp b/src/mame/video/cps1.cpp
index ec672063d97..fc438ea482e 100644
--- a/src/mame/video/cps1.cpp
+++ b/src/mame/video/cps1.cpp
@@ -2194,14 +2194,14 @@ TILE_GET_INFO_MEMBER(cps_state::get_tile0_info)
should alternate between the left and right side of the 16x16 tiles */
gfxset = (tile_index & 0x20) >> 5;
- SET_TILE_INFO_MEMBER(gfxset,
+ tileinfo.set(gfxset,
code,
(attr & 0x1f) + 0x20,
TILE_FLIPYX((attr & 0x60) >> 5));
tileinfo.group = (attr & 0x0180) >> 7;
// for out of range tiles, switch to fully transparent data
- // (but still call SET_TILE_INFO_MEMBER, otherwise problems might occur on boot e.g. unsquad)
+ // (but still call tileinfo.set, otherwise problems might occur on boot e.g. unsquad)
if (code == -1)
tileinfo.pen_data = m_empty_tile;
}
@@ -2213,7 +2213,7 @@ TILE_GET_INFO_MEMBER(cps_state::get_tile1_info)
code = gfxrom_bank_mapper(GFXTYPE_SCROLL2, code);
- SET_TILE_INFO_MEMBER(2,
+ tileinfo.set(2,
code,
(attr & 0x1f) + 0x40,
TILE_FLIPYX((attr & 0x60) >> 5));
@@ -2231,14 +2231,14 @@ TILE_GET_INFO_MEMBER(cps_state::get_tile2_info)
code = gfxrom_bank_mapper(GFXTYPE_SCROLL3, code);
- SET_TILE_INFO_MEMBER(3,
+ tileinfo.set(3,
code,
(attr & 0x1f) + 0x60,
TILE_FLIPYX((attr & 0x60) >> 5));
tileinfo.group = (attr & 0x0180) >> 7;
// for out of range tiles, switch to fully transparent data
- // (but still call SET_TILE_INFO_MEMBER, otherwise problems might occur on boot e.g. unsquad)
+ // (but still call tileinfo.set, otherwise problems might occur on boot e.g. unsquad)
if (code == -1)
tileinfo.pen_data = m_empty_tile;
}
diff --git a/src/mame/video/crbaloon.cpp b/src/mame/video/crbaloon.cpp
index 1078215e3bb..ee9cfcfce84 100644
--- a/src/mame/video/crbaloon.cpp
+++ b/src/mame/video/crbaloon.cpp
@@ -58,7 +58,7 @@ TILE_GET_INFO_MEMBER(crbaloon_state::get_bg_tile_info)
int code = m_videoram[tile_index];
int color = m_colorram[tile_index] & 0x0f;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
void crbaloon_state::video_start()
diff --git a/src/mame/video/crospang.cpp b/src/mame/video/crospang.cpp
index cbb8c71ba6a..57284f44a7c 100644
--- a/src/mame/video/crospang.cpp
+++ b/src/mame/video/crospang.cpp
@@ -109,7 +109,7 @@ TILE_GET_INFO_MEMBER(crospang_state::get_bg_tile_info)
tile = tile + (m_tilebank[tilebank] << 10);
int color = (data >> 12) & 0x0f;
- SET_TILE_INFO_MEMBER(1, tile, color + 0x20, 0);
+ tileinfo.set(1, tile, color + 0x20, 0);
}
TILE_GET_INFO_MEMBER(crospang_state::get_fg_tile_info)
@@ -120,7 +120,7 @@ TILE_GET_INFO_MEMBER(crospang_state::get_fg_tile_info)
tile = tile + (m_tilebank[tilebank] << 10);
int color = (data >> 12) & 0x0f;
- SET_TILE_INFO_MEMBER(1, tile, color + 0x10, 0);
+ tileinfo.set(1, tile, color + 0x10, 0);
}
diff --git a/src/mame/video/crshrace.cpp b/src/mame/video/crshrace.cpp
index 4a7a55a390d..cd635d387d8 100644
--- a/src/mame/video/crshrace.cpp
+++ b/src/mame/video/crshrace.cpp
@@ -15,14 +15,14 @@ TILE_GET_INFO_MEMBER(crshrace_state::get_tile_info1)
{
int code = m_videoram1[tile_index];
- SET_TILE_INFO_MEMBER(1, (code & 0xfff) + (m_roz_bank << 12), code >> 12, 0);
+ tileinfo.set(1, (code & 0xfff) + (m_roz_bank << 12), code >> 12, 0);
}
TILE_GET_INFO_MEMBER(crshrace_state::get_tile_info2)
{
int code = m_videoram2[tile_index];
- SET_TILE_INFO_MEMBER(0, code, 0, 0);
+ tileinfo.set(0, code, 0, 0);
}
diff --git a/src/mame/video/cyberbal.cpp b/src/mame/video/cyberbal.cpp
index 04150cfc178..1314c32f032 100644
--- a/src/mame/video/cyberbal.cpp
+++ b/src/mame/video/cyberbal.cpp
@@ -26,7 +26,7 @@ TILE_GET_INFO_MEMBER(cyberbal_base_state::get_alpha_tile_info)
uint16_t data = m_alpha->basemem_read(tile_index);
int code = data & 0xfff;
int color = (data >> 12) & 0x07;
- SET_TILE_INFO_MEMBER(2, code, color, (data >> 15) & 1);
+ tileinfo.set(2, code, color, (data >> 15) & 1);
}
@@ -35,7 +35,7 @@ TILE_GET_INFO_MEMBER(cyberbal_state::get_alpha2_tile_info)
uint16_t data = m_alpha2->basemem_read(tile_index);
int code = data & 0xfff;
int color = (data >> 12) & 0x07;
- SET_TILE_INFO_MEMBER(2, code, color, (data >> 15) & 1);
+ tileinfo.set(2, code, color, (data >> 15) & 1);
}
@@ -44,7 +44,7 @@ TILE_GET_INFO_MEMBER(cyberbal_base_state::get_playfield_tile_info)
uint16_t data = m_playfield->basemem_read(tile_index);
int code = data & 0x1fff;
int color = (data >> 11) & 0x0f;
- SET_TILE_INFO_MEMBER(0, code, color, (data >> 15) & 1);
+ tileinfo.set(0, code, color, (data >> 15) & 1);
}
@@ -53,7 +53,7 @@ TILE_GET_INFO_MEMBER(cyberbal_state::get_playfield2_tile_info)
uint16_t data = m_playfield2->basemem_read(tile_index);
int code = data & 0x1fff;
int color = (data >> 11) & 0x0f;
- SET_TILE_INFO_MEMBER(0, code, color, (data >> 15) & 1);
+ tileinfo.set(0, code, color, (data >> 15) & 1);
}
diff --git a/src/mame/video/cybstorm.cpp b/src/mame/video/cybstorm.cpp
index ba8b8358965..70c071be563 100644
--- a/src/mame/video/cybstorm.cpp
+++ b/src/mame/video/cybstorm.cpp
@@ -23,7 +23,7 @@ TILE_GET_INFO_MEMBER(cybstorm_state::get_alpha_tile_info)
int code = ((data & 0x400) ? (m_alpha_tile_bank * 0x400) : 0) + (data & 0x3ff);
int color = (data >> 11) & 0x0f;
int opaque = data & 0x8000;
- SET_TILE_INFO_MEMBER(2, code, color, opaque ? TILEMAP_PIXEL_LAYER0 : 0);
+ tileinfo.set(2, code, color, opaque ? TILEMAP_PIXEL_LAYER0 : 0);
}
@@ -33,7 +33,7 @@ TILE_GET_INFO_MEMBER(cybstorm_state::get_playfield_tile_info)
uint16_t data2 = m_vad->playfield().extmem_read(tile_index) & 0xff;
int code = data1;
int color = 8 + (data2 & 0x07);
- SET_TILE_INFO_MEMBER(0, code, color, data2 & 0x80 ? TILE_FLIPX : 0);
+ tileinfo.set(0, code, color, data2 & 0x80 ? TILE_FLIPX : 0);
tileinfo.category = (data2 >> 4) & 3;
}
@@ -44,7 +44,7 @@ TILE_GET_INFO_MEMBER(cybstorm_state::get_playfield2_tile_info)
uint16_t data2 = m_vad->playfield2().extmem_read(tile_index) >> 8;
int code = data1;
int color = data2 & 0x07;
- SET_TILE_INFO_MEMBER(0, code, color, data2 & 0x80 ? TILE_FLIPX : 0);
+ tileinfo.set(0, code, color, data2 & 0x80 ? TILE_FLIPX : 0);
tileinfo.category = (data2 >> 4) & 3;
}
diff --git a/src/mame/video/darius.cpp b/src/mame/video/darius.cpp
index bf05c3785bd..0f701df8ae7 100644
--- a/src/mame/video/darius.cpp
+++ b/src/mame/video/darius.cpp
@@ -11,7 +11,7 @@ TILE_GET_INFO_MEMBER(darius_state::get_fg_tile_info)
u16 code = (m_fg_ram[tile_index + 0x2000] & 0x7ff);
u16 attr = m_fg_ram[tile_index];
- SET_TILE_INFO_MEMBER(2,
+ tileinfo.set(2,
code,
(attr & 0x7f),
TILE_FLIPYX((attr & 0xc000) >> 14));
diff --git a/src/mame/video/darkmist.cpp b/src/mame/video/darkmist.cpp
index 27ff732ab22..c4b707b9aa5 100644
--- a/src/mame/video/darkmist.cpp
+++ b/src/mame/video/darkmist.cpp
@@ -23,7 +23,7 @@ TILE_GET_INFO_MEMBER(darkmist_state::get_bgtile_info)
code+=(attr&3)<<8;
pal=(attr>>4) & 0xf;
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
code,
pal,
0);
@@ -39,7 +39,7 @@ TILE_GET_INFO_MEMBER(darkmist_state::get_fgtile_info)
code+=(attr&3)<<8;
pal=(attr>>4) & 0xf;
- SET_TILE_INFO_MEMBER(2,
+ tileinfo.set(2,
code,
pal,
0);
@@ -55,7 +55,7 @@ TILE_GET_INFO_MEMBER(darkmist_state::get_txttile_info)
code+=(attr&1)<<8;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code,
pal & 0xf,
0);
diff --git a/src/mame/video/dbz.cpp b/src/mame/video/dbz.cpp
index 5da4d15e005..5e2b5a088f2 100644
--- a/src/mame/video/dbz.cpp
+++ b/src/mame/video/dbz.cpp
@@ -51,7 +51,7 @@ TILE_GET_INFO_MEMBER(dbz_state::get_dbz_bg2_tile_info)
colour = (m_bg2_videoram[tile_index * 2] & 0x000f);
flag = (m_bg2_videoram[tile_index * 2] & 0x0080) ? TILE_FLIPX : 0;
- SET_TILE_INFO_MEMBER(0, tileno, colour + (m_layer_colorbase[5] << 1), flag);
+ tileinfo.set(0, tileno, colour + (m_layer_colorbase[5] << 1), flag);
}
WRITE16_MEMBER(dbz_state::dbz_bg1_videoram_w)
@@ -68,7 +68,7 @@ TILE_GET_INFO_MEMBER(dbz_state::get_dbz_bg1_tile_info)
colour = (m_bg1_videoram[tile_index * 2] & 0x000f);
flag = (m_bg1_videoram[tile_index * 2] & 0x0080) ? TILE_FLIPX : 0;
- SET_TILE_INFO_MEMBER(1, tileno, colour + (m_layer_colorbase[4] << 1), flag);
+ tileinfo.set(1, tileno, colour + (m_layer_colorbase[4] << 1), flag);
}
void dbz_state::video_start()
diff --git a/src/mame/video/dcon.cpp b/src/mame/video/dcon.cpp
index e54683dcbab..2f331396755 100644
--- a/src/mame/video/dcon.cpp
+++ b/src/mame/video/dcon.cpp
@@ -52,7 +52,7 @@ TILE_GET_INFO_MEMBER(dcon_state::get_back_tile_info)
tile&=0xfff;
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
tile,
color,
0);
@@ -65,7 +65,7 @@ TILE_GET_INFO_MEMBER(dcon_state::get_fore_tile_info)
tile&=0xfff;
- SET_TILE_INFO_MEMBER(2,
+ tileinfo.set(2,
tile,
color,
0);
@@ -78,7 +78,7 @@ TILE_GET_INFO_MEMBER(dcon_state::get_mid_tile_info)
tile&=0xfff;
- SET_TILE_INFO_MEMBER(3,
+ tileinfo.set(3,
tile|m_gfx_bank_select,
color,
0);
@@ -91,7 +91,7 @@ TILE_GET_INFO_MEMBER(dcon_state::get_text_tile_info)
tile&=0xfff;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
tile,
color,
0);
diff --git a/src/mame/video/dday.cpp b/src/mame/video/dday.cpp
index 5aae1f36528..89f1872f6a5 100644
--- a/src/mame/video/dday.cpp
+++ b/src/mame/video/dday.cpp
@@ -152,7 +152,7 @@ TILE_GET_INFO_MEMBER(dday_state::get_bg_tile_info)
int code;
code = m_bgvideoram[tile_index];
- SET_TILE_INFO_MEMBER(0, code, code >> 5, 0);
+ tileinfo.set(0, code, code >> 5, 0);
}
TILE_GET_INFO_MEMBER(dday_state::get_fg_tile_info)
@@ -161,7 +161,7 @@ TILE_GET_INFO_MEMBER(dday_state::get_fg_tile_info)
flipx = m_colorram[tile_index & 0x03e0] & 0x01;
code = m_fgvideoram[flipx ? tile_index ^ 0x1f : tile_index];
- SET_TILE_INFO_MEMBER(2, code, code >> 5, flipx ? TILE_FLIPX : 0);
+ tileinfo.set(2, code, code >> 5, flipx ? TILE_FLIPX : 0);
}
TILE_GET_INFO_MEMBER(dday_state::get_text_tile_info)
@@ -169,7 +169,7 @@ TILE_GET_INFO_MEMBER(dday_state::get_text_tile_info)
int code;
code = m_textvideoram[tile_index];
- SET_TILE_INFO_MEMBER(1, code, code >> 5, 0);
+ tileinfo.set(1, code, code >> 5, 0);
}
TILE_GET_INFO_MEMBER(dday_state::get_sl_tile_info)
@@ -191,7 +191,7 @@ TILE_GET_INFO_MEMBER(dday_state::get_sl_tile_info)
/* no mirroring, draw dark spot */
code = 1;
- SET_TILE_INFO_MEMBER(3, code & 0x3f, 0, flipx ? TILE_FLIPX : 0);
+ tileinfo.set(3, code & 0x3f, 0, flipx ? TILE_FLIPX : 0);
}
diff --git a/src/mame/video/ddragon.cpp b/src/mame/video/ddragon.cpp
index 2fa8820c8cf..cafdc0160af 100644
--- a/src/mame/video/ddragon.cpp
+++ b/src/mame/video/ddragon.cpp
@@ -62,7 +62,7 @@ TILE_GET_INFO_MEMBER(ddragon_state::get_bg_tile_info)
{
tile_index <<= 1;
uint8_t attr = m_bgvideoram[tile_index];
- SET_TILE_INFO_MEMBER(2,
+ tileinfo.set(2,
m_bgvideoram[tile_index | 1] | ((attr & 0x07) << 8),
(attr >> 3) & 0x07,
TILE_FLIPYX((attr & 0xc0) >> 6));
@@ -72,7 +72,7 @@ TILE_GET_INFO_MEMBER(ddragon_state::get_fg_tile_info)
{
tile_index <<= 1;
uint8_t attr = m_fgvideoram[tile_index];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
m_fgvideoram[tile_index | 1] | ((attr & 0x07) << 8),
attr >> 5,
0);
@@ -82,7 +82,7 @@ TILE_GET_INFO_MEMBER(ddragon_state::get_fg_16color_tile_info)
{
tile_index <<= 1;
uint8_t attr = m_fgvideoram[tile_index];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
m_fgvideoram[tile_index | 1] | ((attr & 0x0f) << 8),
attr >> 4,
0);
diff --git a/src/mame/video/ddragon3.cpp b/src/mame/video/ddragon3.cpp
index 3acdd768cd2..c74ae9574d9 100644
--- a/src/mame/video/ddragon3.cpp
+++ b/src/mame/video/ddragon3.cpp
@@ -50,7 +50,7 @@ TILE_GET_INFO_MEMBER(ddragon3_state::get_bg_tile_info)
int code = (attr & 0x0fff) | ((m_bg_tilebase & 0x01) << 12);
int color = ((attr & 0xf000) >> 12);
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
@@ -76,7 +76,7 @@ TILE_GET_INFO_MEMBER(ddragon3_state::get_fg_tile_info)
tilebase = &m_fg_videoram[tile_index*2];
tileno = (tilebase[1] & 0x1fff);
colbank = (tilebase[0] & 0x000f);
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
tileno,
colbank,
TILE_FLIPYX((tilebase[0] & 0x00c0) >> 6));
@@ -104,7 +104,7 @@ TILE_GET_INFO_MEMBER(wwfwfest_state::get_fg0_tile_info)
tilebase = &m_fg0_videoram[tile_index*2];
tileno = (tilebase[0] & 0x00ff) | ((tilebase[1] & 0x000f) << 8);
colbank = (tilebase[1] & 0x00f0) >> 4;
- SET_TILE_INFO_MEMBER(3,
+ tileinfo.set(3,
tileno,
colbank,
0);
diff --git a/src/mame/video/ddribble.cpp b/src/mame/video/ddribble.cpp
index f047708884e..b265ba83f7e 100644
--- a/src/mame/video/ddribble.cpp
+++ b/src/mame/video/ddribble.cpp
@@ -80,7 +80,7 @@ TILE_GET_INFO_MEMBER(ddribble_state::get_fg_tile_info)
{
uint8_t attr = m_fg_videoram[tile_index];
int num = m_fg_videoram[tile_index + 0x400] + ((attr & 0xc0) << 2) + ((attr & 0x20) << 5) + ((m_charbank[0] & 2) << 10);
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
num,
0,
TILE_FLIPYX((attr & 0x30) >> 4));
@@ -90,7 +90,7 @@ TILE_GET_INFO_MEMBER(ddribble_state::get_bg_tile_info)
{
uint8_t attr = m_bg_videoram[tile_index];
int num = m_bg_videoram[tile_index + 0x400] + ((attr & 0xc0) << 2) + ((attr & 0x20) << 5) + (m_charbank[1] << 11);
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
num,
0,
TILE_FLIPYX((attr & 0x30) >> 4));
diff --git a/src/mame/video/deadang.cpp b/src/mame/video/deadang.cpp
index 1db2c115185..1864dad1500 100644
--- a/src/mame/video/deadang.cpp
+++ b/src/mame/video/deadang.cpp
@@ -49,14 +49,14 @@ TILE_GET_INFO_MEMBER(deadang_state::get_pf3_tile_info)
{
const uint16_t *bgMap = (const uint16_t *)memregion("gfx6")->base();
int code= bgMap[tile_index];
- SET_TILE_INFO_MEMBER(4,code&0x7ff,code>>12,0);
+ tileinfo.set(4,code&0x7ff,code>>12,0);
}
TILE_GET_INFO_MEMBER(deadang_state::get_pf2_tile_info)
{
const uint16_t *bgMap = (const uint16_t *)memregion("gfx7")->base();
int code= bgMap[tile_index];
- SET_TILE_INFO_MEMBER(3,code&0x7ff,code>>12,0);
+ tileinfo.set(3,code&0x7ff,code>>12,0);
}
TILE_GET_INFO_MEMBER(deadang_state::get_pf1_tile_info)
@@ -65,7 +65,7 @@ TILE_GET_INFO_MEMBER(deadang_state::get_pf1_tile_info)
int color=tile >> 12;
tile=tile&0xfff;
- SET_TILE_INFO_MEMBER(2,tile+m_tilebank*0x1000,color,0);
+ tileinfo.set(2,tile+m_tilebank*0x1000,color,0);
}
TILE_GET_INFO_MEMBER(deadang_state::get_text_tile_info)
@@ -73,7 +73,7 @@ TILE_GET_INFO_MEMBER(deadang_state::get_text_tile_info)
int tile=(m_videoram[tile_index] & 0xff) | ((m_videoram[tile_index] >> 6) & 0x300);
int color=(m_videoram[tile_index] >> 8)&0xf;
- SET_TILE_INFO_MEMBER(0,tile,color,0);
+ tileinfo.set(0,tile,color,0);
}
void deadang_state::video_start()
@@ -103,7 +103,7 @@ TILE_GET_INFO_MEMBER(popnrun_state::get_popnrun_text_tile_info)
if(attr & 0x40)
tile |= 1;
- SET_TILE_INFO_MEMBER(0,tile,color,0);
+ tileinfo.set(0,tile,color,0);
}
void popnrun_state::video_start()
diff --git a/src/mame/video/dec8.cpp b/src/mame/video/dec8.cpp
index 7fc3ce72562..ec62520a1d6 100644
--- a/src/mame/video/dec8.cpp
+++ b/src/mame/video/dec8.cpp
@@ -240,7 +240,7 @@ TILE_GET_INFO_MEMBER(dec8_state::get_cobracom_fix_tile_info)
int tile = m_videoram[offs + 1] + (m_videoram[offs] << 8);
int color = (tile & 0xe000) >> 13;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
tile & 0xfff,
color,
0);
@@ -274,7 +274,7 @@ TILE_GET_INFO_MEMBER(dec8_state::get_ghostb_fix_tile_info)
int tile = m_videoram[offs + 1] + (m_videoram[offs] << 8);
int color = (tile & 0xc00) >> 10;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
tile & 0x3ff,
color,
0);
@@ -316,7 +316,7 @@ TILE_GET_INFO_MEMBER(dec8_state::get_oscar_fix_tile_info)
int tile = m_videoram[offs + 1] + (m_videoram[offs] << 8);
int color = (tile & 0xf000) >> 14;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
tile&0xfff,
color,
0);
@@ -377,7 +377,7 @@ TILE_GET_INFO_MEMBER(dec8_state::get_lastmisn_tile_info)
else
tileinfo.category = 0;
- SET_TILE_INFO_MEMBER(2,
+ tileinfo.set(2,
tile & 0xfff,
color,
0);
@@ -389,7 +389,7 @@ TILE_GET_INFO_MEMBER(dec8_state::get_lastmisn_fix_tile_info)
int tile = m_videoram[offs + 1] + (m_videoram[offs] << 8);
int color = (tile & 0xc000) >> 14;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
tile&0xfff,
color,
0);
@@ -437,7 +437,7 @@ TILE_GET_INFO_MEMBER(dec8_state::get_srdarwin_fix_tile_info)
tileinfo.category = 0;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
tile,
color,
0);
@@ -452,7 +452,7 @@ TILE_GET_INFO_MEMBER(dec8_state::get_srdarwin_tile_info)
tile = tile & 0x3ff;
bank = (tile / 0x100) + 2;
- SET_TILE_INFO_MEMBER(bank,
+ tileinfo.set(bank,
tile,
color,
0);
@@ -511,7 +511,7 @@ TILE_GET_INFO_MEMBER(dec8_state::get_gondo_fix_tile_info)
int tile = m_videoram[offs + 1] + (m_videoram[offs] << 8);
int color = (tile & 0x7000) >> 12;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
tile&0xfff,
color,
0);
@@ -528,7 +528,7 @@ TILE_GET_INFO_MEMBER(dec8_state::get_gondo_tile_info)
else
tileinfo.category = 0;
- SET_TILE_INFO_MEMBER(2,
+ tileinfo.set(2,
tile&0xfff,
color,
0);
diff --git a/src/mame/video/decbac06.cpp b/src/mame/video/decbac06.cpp
index dd432a65d17..c575ba10bda 100644
--- a/src/mame/video/decbac06.cpp
+++ b/src/mame/video/decbac06.cpp
@@ -200,7 +200,7 @@ TILE_GET_INFO_MEMBER(deco_bac06_device::get_pf8x8_tile_info)
int tile = m_pf_data[tile_index];
int colourpri = (tile >> 12);
int flags = (m_pf_control_0[0] & 2) ? 0 : TILE_FLIPX;
- SET_TILE_INFO_MEMBER(m_tile_region_8,tile & 0xfff,0,flags);
+ tileinfo.set(m_tile_region_8,tile & 0xfff,0,flags);
tileinfo.category = colourpri;
}
@@ -210,7 +210,7 @@ TILE_GET_INFO_MEMBER(deco_bac06_device::get_pf16x16_tile_info)
int tile = m_pf_data[tile_index];
int colourpri = (tile >> 12);
int flags = (BIT(m_pf_control_0[0], 1) ^ m_thedeep_kludge) ? 0 : TILE_FLIPX;
- SET_TILE_INFO_MEMBER(m_tile_region_16,tile & 0xfff,0,flags);
+ tileinfo.set(m_tile_region_16,tile & 0xfff,0,flags);
tileinfo.category = colourpri;
}
diff --git a/src/mame/video/deco16ic.cpp b/src/mame/video/deco16ic.cpp
index 62663a68e3d..26413167c0f 100644
--- a/src/mame/video/deco16ic.cpp
+++ b/src/mame/video/deco16ic.cpp
@@ -312,7 +312,7 @@ TILE_GET_INFO_MEMBER(deco16ic_device::get_pf2_tile_info)
}
}
- SET_TILE_INFO_MEMBER(m_pf12_16x16_gfx_bank,
+ tileinfo.set(m_pf12_16x16_gfx_bank,
(tile & 0xfff) | m_pf2_bank,
(colour & m_pf2_colourmask) + m_pf2_colour_bank,
flags);
@@ -343,14 +343,14 @@ TILE_GET_INFO_MEMBER(deco16ic_device::get_pf1_tile_info)
// Captain America operates this chip in 8bpp mode.
// In 8bpp mode you appear to only get 1 layer, not 2, but you also
// have an extra 2 tile bits, and 2 less colour bits.
- SET_TILE_INFO_MEMBER(m_pf12_16x16_gfx_bank,
+ tileinfo.set(m_pf12_16x16_gfx_bank,
(tile & 0x3fff) | m_pf1_bank,
((colour & m_pf1_colourmask) + m_pf1_colour_bank)>>2,
flags);
}
else
{
- SET_TILE_INFO_MEMBER(m_pf12_16x16_gfx_bank,
+ tileinfo.set(m_pf12_16x16_gfx_bank,
(tile & 0xfff) | m_pf1_bank,
(colour & m_pf1_colourmask) + m_pf1_colour_bank,
flags);
@@ -377,7 +377,7 @@ TILE_GET_INFO_MEMBER(deco16ic_device::get_pf2_tile_info_b)
}
}
- SET_TILE_INFO_MEMBER(m_pf12_8x8_gfx_bank,
+ tileinfo.set(m_pf12_8x8_gfx_bank,
(tile & 0xfff) | m_pf2_bank,
(colour & m_pf2_colourmask) + m_pf2_colour_bank,
flags);
@@ -403,7 +403,7 @@ TILE_GET_INFO_MEMBER(deco16ic_device::get_pf1_tile_info_b)
}
}
- SET_TILE_INFO_MEMBER(m_pf12_8x8_gfx_bank,
+ tileinfo.set(m_pf12_8x8_gfx_bank,
(tile & 0xfff) | m_pf1_bank,
(colour & m_pf1_colourmask) + m_pf1_colour_bank,
flags);
diff --git a/src/mame/video/decocass.cpp b/src/mame/video/decocass.cpp
index fc4004b873a..476603d7e10 100644
--- a/src/mame/video/decocass.cpp
+++ b/src/mame/video/decocass.cpp
@@ -200,7 +200,7 @@ TILEMAP_MAPPER_MEMBER(decocass_state::bgvideoram_scan_cols )
TILE_GET_INFO_MEMBER(decocass_state::get_bg_l_tile_info)
{
int color = (m_color_center_bot >> 7) & 1;
- SET_TILE_INFO_MEMBER(2,
+ tileinfo.set(2,
m_bgvideoram[tile_index] >> 4,
color * 4 + 1,
0);
@@ -211,7 +211,7 @@ TILE_GET_INFO_MEMBER(decocass_state::get_bg_l_tile_info)
TILE_GET_INFO_MEMBER(decocass_state::get_bg_r_tile_info )
{
int color = (m_color_center_bot >> 7) & 1;
- SET_TILE_INFO_MEMBER(2,
+ tileinfo.set(2,
m_bgvideoram[tile_index] >> 4,
color * 4 + 1,
TILE_FLIPY);
@@ -223,7 +223,7 @@ TILE_GET_INFO_MEMBER(decocass_state::get_fg_tile_info )
{
uint8_t code = m_fgvideoram[tile_index];
uint8_t attr = m_colorram[tile_index];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
256 * (attr & 3) + code,
BIT(m_color_center_bot, 0),
0);
diff --git a/src/mame/video/deniam.cpp b/src/mame/video/deniam.cpp
index ebd3b5a9d6c..439c15026ae 100644
--- a/src/mame/video/deniam.cpp
+++ b/src/mame/video/deniam.cpp
@@ -62,7 +62,7 @@ TILE_GET_INFO_MEMBER(deniam_state::get_bg_tile_info)
{
const int page = tile_index >> 11;
u16 attr = m_videoram[m_bg_page[page] * 0x0800 + (tile_index & 0x7ff)];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
attr,
(attr & 0x1fc0) >> 6,
0);
@@ -72,7 +72,7 @@ TILE_GET_INFO_MEMBER(deniam_state::get_fg_tile_info)
{
const int page = tile_index >> 11;
u16 attr = m_videoram[m_fg_page[page] * 0x0800 + (tile_index & 0x7ff)];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
attr,
(attr & 0x1fc0) >> 6,
0);
@@ -81,7 +81,7 @@ TILE_GET_INFO_MEMBER(deniam_state::get_fg_tile_info)
TILE_GET_INFO_MEMBER(deniam_state::get_tx_tile_info)
{
u16 attr = m_textram[tile_index];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
attr & 0xf1ff,
(attr & 0x0e00) >> 9,
0);
diff --git a/src/mame/video/digdug.cpp b/src/mame/video/digdug.cpp
index 026bdafe5eb..a5d6d538a28 100644
--- a/src/mame/video/digdug.cpp
+++ b/src/mame/video/digdug.cpp
@@ -99,7 +99,7 @@ TILE_GET_INFO_MEMBER(digdug_state::bg_get_tile_info)
tilemap RAM, therefore allowing to pick some bits of the color code from
the top 4 bits of alpha code. This feature is not used by Dig Dug. */
int color = m_bg_disable ? 0xf : (code >> 4);
- SET_TILE_INFO_MEMBER(2,
+ tileinfo.set(2,
code,
color | m_bg_color_bank,
0);
@@ -125,7 +125,7 @@ TILE_GET_INFO_MEMBER(digdug_state::tx_get_tile_info)
timing signals, while x flip is done by selecting the 2nd character set.
We reproduce this here, but since the tilemap system automatically flips
characters when screen is flipped, we have to flip them back. */
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
(code & 0x7f) | (flip_screen() ? 0x80 : 0),
color,
flip_screen() ? TILE_FLIPX : 0);
diff --git a/src/mame/video/divebomb.cpp b/src/mame/video/divebomb.cpp
index d3b3c55ec52..62d0098e6de 100644
--- a/src/mame/video/divebomb.cpp
+++ b/src/mame/video/divebomb.cpp
@@ -26,7 +26,7 @@ TILE_GET_INFO_MEMBER(divebomb_state::get_fg_tile_info)
code |= (attr & 0x3) << 8;
- SET_TILE_INFO_MEMBER(0, code, colour, 0);
+ tileinfo.set(0, code, colour, 0);
}
diff --git a/src/mame/video/djboy.cpp b/src/mame/video/djboy.cpp
index d323d02f3ec..83f83b13da9 100644
--- a/src/mame/video/djboy.cpp
+++ b/src/mame/video/djboy.cpp
@@ -28,7 +28,7 @@ TILE_GET_INFO_MEMBER(djboy_state::get_bg_tile_info)
if (color & 8)
code |= 0x1000;
- SET_TILE_INFO_MEMBER(1, code, color, 0); /* no flip */
+ tileinfo.set(1, code, color, 0); /* no flip */
}
WRITE8_MEMBER(djboy_state::djboy_videoram_w)
diff --git a/src/mame/video/dkong.cpp b/src/mame/video/dkong.cpp
index c765b35b1c6..798a89ea6e9 100644
--- a/src/mame/video/dkong.cpp
+++ b/src/mame/video/dkong.cpp
@@ -435,7 +435,7 @@ TILE_GET_INFO_MEMBER(dkong_state::dkong_bg_tile_info)
int code = m_video_ram[tile_index] + 256 * m_gfx_bank;
int color = (m_color_codes[tile_index % 32 + 32 * (tile_index / 32 / 4)] & 0x0f) + 0x10 * m_palette_bank;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
TILE_GET_INFO_MEMBER(dkong_state::radarscp1_bg_tile_info)
@@ -444,7 +444,7 @@ TILE_GET_INFO_MEMBER(dkong_state::radarscp1_bg_tile_info)
int color = (m_color_codes[tile_index % 32] & 0x0f);
color = color | (m_palette_bank<<4);
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
/***************************************************************************
diff --git a/src/mame/video/docastle.cpp b/src/mame/video/docastle.cpp
index f00a3c3adc9..a1a46497e8a 100644
--- a/src/mame/video/docastle.cpp
+++ b/src/mame/video/docastle.cpp
@@ -99,7 +99,7 @@ TILE_GET_INFO_MEMBER(docastle_state::get_tile_info)
int code = m_videoram[tile_index] + 8 * (m_colorram[tile_index] & 0x20);
int color = m_colorram[tile_index] & 0x1f;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
void docastle_state::video_start_common( uint32_t tile_transmask )
diff --git a/src/mame/video/dogfgt.cpp b/src/mame/video/dogfgt.cpp
index 5035f64bf78..3d60cfa028c 100644
--- a/src/mame/video/dogfgt.cpp
+++ b/src/mame/video/dogfgt.cpp
@@ -53,7 +53,7 @@ void dogfgt_state::dogfgt_palette(palette_device &palette) const
TILE_GET_INFO_MEMBER(dogfgt_state::get_tile_info)
{
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
m_bgvideoram[tile_index],
m_bgvideoram[tile_index + 0x400] & 0x03,
0);
diff --git a/src/mame/video/dragrace.cpp b/src/mame/video/dragrace.cpp
index e17f7b28d0d..84f02b0edcc 100644
--- a/src/mame/video/dragrace.cpp
+++ b/src/mame/video/dragrace.cpp
@@ -37,7 +37,7 @@ TILE_GET_INFO_MEMBER(dragrace_state::get_tile_info)
break;
}
- SET_TILE_INFO_MEMBER(((code & 0xA0) == 0x80) ? 1 : 0, num, col, 0);
+ tileinfo.set(((code & 0xA0) == 0x80) ? 1 : 0, num, col, 0);
}
diff --git a/src/mame/video/drgnmst.cpp b/src/mame/video/drgnmst.cpp
index bc7f785647f..ff40909892f 100644
--- a/src/mame/video/drgnmst.cpp
+++ b/src/mame/video/drgnmst.cpp
@@ -33,7 +33,7 @@ TILE_GET_INFO_MEMBER(drgnmst_state::get_fg_tile_info)
flipyx = (m_fg_videoram[tile_index * 2 + 1] & 0x60)>>5;
tileno |= (BIT(tile_index, 5)) << 15; // 8x8 tile bank seems like cps1
- SET_TILE_INFO_MEMBER(1, tileno, colour, TILE_FLIPYX(flipyx));
+ tileinfo.set(1, tileno, colour, TILE_FLIPYX(flipyx));
}
WRITE16_MEMBER(drgnmst_state::fg_videoram_w)
@@ -49,7 +49,7 @@ TILE_GET_INFO_MEMBER(drgnmst_state::get_bg_tile_info)
colour = m_bg_videoram[tile_index * 2 + 1] & 0x1f;
flipyx = (m_bg_videoram[tile_index * 2 + 1] & 0x60) >> 5;
- SET_TILE_INFO_MEMBER(3, tileno, colour, TILE_FLIPYX(flipyx));
+ tileinfo.set(3, tileno, colour, TILE_FLIPYX(flipyx));
}
WRITE16_MEMBER(drgnmst_state::bg_videoram_w)
@@ -65,7 +65,7 @@ TILE_GET_INFO_MEMBER(drgnmst_state::get_md_tile_info)
colour = m_md_videoram[tile_index * 2 + 1] & 0x1f;
flipyx = (m_md_videoram[tile_index * 2 + 1] & 0x60) >> 5;
- SET_TILE_INFO_MEMBER(2, tileno, colour, TILE_FLIPYX(flipyx));
+ tileinfo.set(2, tileno, colour, TILE_FLIPYX(flipyx));
}
WRITE16_MEMBER(drgnmst_state::md_videoram_w)
diff --git a/src/mame/video/drmicro.cpp b/src/mame/video/drmicro.cpp
index 7e430fab461..99157b19c61 100644
--- a/src/mame/video/drmicro.cpp
+++ b/src/mame/video/drmicro.cpp
@@ -39,7 +39,7 @@ TILE_GET_INFO_MEMBER(drmicro_state::get_bg1_tile_info)
flags = ((col & 0x20) ? TILEMAP_FLIPY : 0) | ((col & 0x10) ? TILEMAP_FLIPX : 0);
col &= 0x0f;
- SET_TILE_INFO_MEMBER(0, code, col, flags);
+ tileinfo.set(0, code, col, flags);
}
TILE_GET_INFO_MEMBER(drmicro_state::get_bg2_tile_info)
@@ -53,7 +53,7 @@ TILE_GET_INFO_MEMBER(drmicro_state::get_bg2_tile_info)
flags = ((col & 0x20) ? TILEMAP_FLIPY : 0) | ((col & 0x10) ? TILEMAP_FLIPX : 0);
col &= 0x0f;
- SET_TILE_INFO_MEMBER(1, code, col, flags);
+ tileinfo.set(1, code, col, flags);
}
/****************************************************************************/
diff --git a/src/mame/video/dynduke.cpp b/src/mame/video/dynduke.cpp
index 616c7b70b06..300a26a5254 100644
--- a/src/mame/video/dynduke.cpp
+++ b/src/mame/video/dynduke.cpp
@@ -32,7 +32,7 @@ TILE_GET_INFO_MEMBER(dynduke_state::get_bg_tile_info)
tile=tile&0xfff;
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
tile+m_back_bankbase,
color,
0);
@@ -45,7 +45,7 @@ TILE_GET_INFO_MEMBER(dynduke_state::get_fg_tile_info)
tile=tile&0xfff;
- SET_TILE_INFO_MEMBER(2,
+ tileinfo.set(2,
tile+m_fore_bankbase,
color,
0);
@@ -58,7 +58,7 @@ TILE_GET_INFO_MEMBER(dynduke_state::get_tx_tile_info)
tile = (tile & 0xff) | ((tile & 0xc000) >> 6);
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
tile,
color,
0);
diff --git a/src/mame/video/edevices.cpp b/src/mame/video/edevices.cpp
index dcb2ab2974a..37aac32effe 100644
--- a/src/mame/video/edevices.cpp
+++ b/src/mame/video/edevices.cpp
@@ -140,7 +140,7 @@ TILE_GET_INFO_MEMBER(edevices_device::get_bg_tile_info)
int tileno = m_bg_videoram[tile_index] & 0x1fff;
int colour = (m_bg_videoram[tile_index] & 0xe000) >> 13;
- SET_TILE_INFO_MEMBER(4, tileno, colour, 0);
+ tileinfo.set(4, tileno, colour, 0);
}
TILE_GET_INFO_MEMBER(edevices_device::get_mlow_tile_info)
@@ -148,7 +148,7 @@ TILE_GET_INFO_MEMBER(edevices_device::get_mlow_tile_info)
int tileno = m_mlow_videoram[tile_index] & 0x1fff;
int colour = (m_mlow_videoram[tile_index] & 0xe000) >> 13;
- SET_TILE_INFO_MEMBER(3, tileno, colour, 0);
+ tileinfo.set(3, tileno, colour, 0);
}
TILE_GET_INFO_MEMBER(edevices_device::get_mhigh_tile_info)
@@ -156,7 +156,7 @@ TILE_GET_INFO_MEMBER(edevices_device::get_mhigh_tile_info)
int tileno = m_mhigh_videoram[tile_index] & 0x1fff;
int colour = (m_mhigh_videoram[tile_index] & 0xe000) >> 13;
- SET_TILE_INFO_MEMBER(2, tileno, colour, 0);
+ tileinfo.set(2, tileno, colour, 0);
}
TILE_GET_INFO_MEMBER(edevices_device::get_tx_tile_info)
@@ -164,7 +164,7 @@ TILE_GET_INFO_MEMBER(edevices_device::get_tx_tile_info)
int tileno = m_tx_videoram[tile_index] & 0x1fff;
int colour = (m_tx_videoram[tile_index] & 0xe000) >> 13;
- SET_TILE_INFO_MEMBER(1, tileno, colour, 0);
+ tileinfo.set(1, tileno, colour, 0);
}
diff --git a/src/mame/video/eprom.cpp b/src/mame/video/eprom.cpp
index 3975aef10e2..be2aacc6a03 100644
--- a/src/mame/video/eprom.cpp
+++ b/src/mame/video/eprom.cpp
@@ -57,7 +57,7 @@ TILE_GET_INFO_MEMBER(eprom_state::get_alpha_tile_info)
int code = data & 0x3ff;
int color = ((data >> 10) & 0x0f) | ((data >> 9) & 0x20);
int opaque = data & 0x8000;
- SET_TILE_INFO_MEMBER(1, code, color, opaque ? TILE_FORCE_LAYER0 : 0);
+ tileinfo.set(1, code, color, opaque ? TILE_FORCE_LAYER0 : 0);
}
@@ -67,7 +67,7 @@ TILE_GET_INFO_MEMBER(eprom_state::get_playfield_tile_info)
uint16_t data2 = m_playfield_tilemap->extmem_read(tile_index) >> 8;
int code = data1 & 0x7fff;
int color = 0x10 + (data2 & 0x0f);
- SET_TILE_INFO_MEMBER(0, code, color, (data1 >> 15) & 1);
+ tileinfo.set(0, code, color, (data1 >> 15) & 1);
}
@@ -77,7 +77,7 @@ TILE_GET_INFO_MEMBER(eprom_state::guts_get_playfield_tile_info)
uint16_t data2 = m_playfield_tilemap->extmem_read(tile_index) >> 8;
int code = data1 & 0x7fff;
int color = 0x10 + (data2 & 0x0f);
- SET_TILE_INFO_MEMBER(2, code, color, (data1 >> 15) & 1);
+ tileinfo.set(2, code, color, (data1 >> 15) & 1);
}
diff --git a/src/mame/video/equites.cpp b/src/mame/video/equites.cpp
index e474e9ba071..e14c89ea534 100644
--- a/src/mame/video/equites.cpp
+++ b/src/mame/video/equites.cpp
@@ -71,7 +71,7 @@ TILE_GET_INFO_MEMBER(equites_state::equites_fg_info)
int tile = m_fg_videoram[2 * tile_index];
int color = m_fg_videoram[2 * tile_index + 1] & 0x1f;
- SET_TILE_INFO_MEMBER(0, tile, color, 0);
+ tileinfo.set(0, tile, color, 0);
if (color & 0x10)
tileinfo.flags |= TILE_FORCE_LAYER0;
}
@@ -81,7 +81,7 @@ TILE_GET_INFO_MEMBER(splndrbt_state::splndrbt_fg_info)
int tile = m_fg_videoram[2 * tile_index] + (m_fg_char_bank << 8);
int color = m_fg_videoram[2 * tile_index + 1] & 0x3f;
- SET_TILE_INFO_MEMBER(0, tile, color, 0);
+ tileinfo.set(0, tile, color, 0);
if (color & 0x10)
tileinfo.flags |= TILE_FORCE_LAYER0;
}
@@ -93,7 +93,7 @@ TILE_GET_INFO_MEMBER(equites_state::equites_bg_info)
int color = (data & 0xf000) >> 12;
int fxy = (data & 0x0600) >> 9;
- SET_TILE_INFO_MEMBER(1, tile, color, TILE_FLIPXY(fxy));
+ tileinfo.set(1, tile, color, TILE_FLIPXY(fxy));
}
TILE_GET_INFO_MEMBER(splndrbt_state::splndrbt_bg_info)
@@ -103,7 +103,7 @@ TILE_GET_INFO_MEMBER(splndrbt_state::splndrbt_bg_info)
int color = (data & 0xf800) >> 11;
int fxy = (data & 0x0600) >> 9;
- SET_TILE_INFO_MEMBER(1, tile, color, TILE_FLIPXY(fxy));
+ tileinfo.set(1, tile, color, TILE_FLIPXY(fxy));
tileinfo.group = color;
}
diff --git a/src/mame/video/esd16.cpp b/src/mame/video/esd16.cpp
index 519c66af28f..77db92df0eb 100644
--- a/src/mame/video/esd16.cpp
+++ b/src/mame/video/esd16.cpp
@@ -57,7 +57,7 @@ template<unsigned Layer>
TILE_GET_INFO_MEMBER(esd16_state::get_tile_info)
{
const u16 code = m_vram[Layer][tile_index];
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
code,
m_tilemap_color[Layer],
0);
@@ -67,7 +67,7 @@ template<unsigned Layer>
TILE_GET_INFO_MEMBER(esd16_state::get_tile_info_16x16)
{
const u16 code = m_vram[Layer][tile_index];
- SET_TILE_INFO_MEMBER(2,
+ tileinfo.set(2,
code,
m_tilemap_color[Layer],
0);
diff --git a/src/mame/video/espial.cpp b/src/mame/video/espial.cpp
index 7ca9fda3761..b40f577c6e1 100644
--- a/src/mame/video/espial.cpp
+++ b/src/mame/video/espial.cpp
@@ -72,7 +72,7 @@ TILE_GET_INFO_MEMBER(espial_state::get_tile_info)
uint8_t code = m_videoram[tile_index];
uint8_t col = m_colorram[tile_index];
uint8_t attr = m_attributeram[tile_index];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code | ((attr & 0x03) << 8),
col & 0x3f,
TILE_FLIPYX(attr >> 2));
diff --git a/src/mame/video/exedexes.cpp b/src/mame/video/exedexes.cpp
index b52ab5fb96f..7a782a63f19 100644
--- a/src/mame/video/exedexes.cpp
+++ b/src/mame/video/exedexes.cpp
@@ -124,14 +124,14 @@ TILE_GET_INFO_MEMBER(exedexes_state::get_bg_tile_info)
const u8 color = m_tilerom[tile_index + (8 * 8)];
const int flags = ((attr & 0x40) ? TILE_FLIPX : 0) | ((attr & 0x80) ? TILE_FLIPY : 0);
- SET_TILE_INFO_MEMBER(1, code, color, flags);
+ tileinfo.set(1, code, color, flags);
}
TILE_GET_INFO_MEMBER(exedexes_state::get_fg_tile_info)
{
const u8 code = m_tilerom[tile_index];
- SET_TILE_INFO_MEMBER(2, code, 0, 0);
+ tileinfo.set(2, code, 0, 0);
}
TILE_GET_INFO_MEMBER(exedexes_state::get_tx_tile_info)
@@ -141,7 +141,7 @@ TILE_GET_INFO_MEMBER(exedexes_state::get_tx_tile_info)
tileinfo.group = color;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
TILEMAP_MAPPER_MEMBER(exedexes_state::bg_tilemap_scan)
diff --git a/src/mame/video/exprraid.cpp b/src/mame/video/exprraid.cpp
index 8c812a01a3d..d833ef70c0f 100644
--- a/src/mame/video/exprraid.cpp
+++ b/src/mame/video/exprraid.cpp
@@ -68,7 +68,7 @@ TILE_GET_INFO_MEMBER(exprraid_state::get_bg_tile_info)
tileinfo.category = ((attr & 0x80) ? 1 : 0);
- SET_TILE_INFO_MEMBER(bank, code, color, flags);
+ tileinfo.set(bank, code, color, flags);
}
TILE_GET_INFO_MEMBER(exprraid_state::get_fg_tile_info)
@@ -77,7 +77,7 @@ TILE_GET_INFO_MEMBER(exprraid_state::get_fg_tile_info)
int code = m_videoram[tile_index] + ((attr & 0x07) << 8);
int color = (attr & 0x10) >> 4;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
void exprraid_state::video_start()
diff --git a/src/mame/video/f1gp.cpp b/src/mame/video/f1gp.cpp
index 86b4e354724..f3326f006c3 100644
--- a/src/mame/video/f1gp.cpp
+++ b/src/mame/video/f1gp.cpp
@@ -16,21 +16,21 @@ TILE_GET_INFO_MEMBER(f1gp_state::get_fg_tile_info)
{
int code = m_fgvideoram[tile_index];
- SET_TILE_INFO_MEMBER(0, code & 0x7fff, 0, (code & 0x8000) ? TILE_FLIPY : 0);
+ tileinfo.set(0, code & 0x7fff, 0, (code & 0x8000) ? TILE_FLIPY : 0);
}
TILE_GET_INFO_MEMBER(f1gp_state::get_roz_tile_info)
{
int code = m_rozvideoram[tile_index];
- SET_TILE_INFO_MEMBER(3, code & 0x7ff, code >> 12, 0);
+ tileinfo.set(3, code & 0x7ff, code >> 12, 0);
}
TILE_GET_INFO_MEMBER(f1gp2_state::get_roz_tile_info)
{
int code = m_rozvideoram[tile_index];
- SET_TILE_INFO_MEMBER(2, (code & 0x7ff) + (m_roz_bank << 11), code >> 12, 0);
+ tileinfo.set(2, (code & 0x7ff) + (m_roz_bank << 11), code >> 12, 0);
}
diff --git a/src/mame/video/fastfred.cpp b/src/mame/video/fastfred.cpp
index a2e365fede6..fe6380cba50 100644
--- a/src/mame/video/fastfred.cpp
+++ b/src/mame/video/fastfred.cpp
@@ -84,7 +84,7 @@ TILE_GET_INFO_MEMBER(fastfred_state::get_tile_info)
uint16_t code = m_charbank | m_videoram[tile_index];
uint8_t color = m_colorbank | (m_attributesram[2 * x + 1] & 0x07);
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
@@ -294,18 +294,18 @@ TILE_GET_INFO_MEMBER(fastfred_state::imago_get_tile_info_bg)
uint16_t code = m_charbank * 0x100 + m_videoram[tile_index];
uint8_t color = m_colorbank | (m_attributesram[2 * x + 1] & 0x07);
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
TILE_GET_INFO_MEMBER(fastfred_state::imago_get_tile_info_fg)
{
int code = m_imago_fg_videoram[tile_index];
- SET_TILE_INFO_MEMBER(2, code, 2, 0);
+ tileinfo.set(2, code, 2, 0);
}
TILE_GET_INFO_MEMBER(fastfred_state::imago_get_tile_info_web)
{
- SET_TILE_INFO_MEMBER(3, tile_index & 0x1ff, 0, 0);
+ tileinfo.set(3, tile_index & 0x1ff, 0, 0);
}
WRITE8_MEMBER(fastfred_state::imago_fg_videoram_w )
diff --git a/src/mame/video/fastlane.cpp b/src/mame/video/fastlane.cpp
index f67762b8276..dbe15fbb32a 100644
--- a/src/mame/video/fastlane.cpp
+++ b/src/mame/video/fastlane.cpp
@@ -46,7 +46,7 @@ TILE_GET_INFO_MEMBER(fastlane_state::get_tile_info0)
bank = (bank & ~(mask << 1)) | ((ctrl_4 & mask) << 1);
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code+bank*256,
1 + 64 * (attr & 0x0f),
0);
@@ -73,7 +73,7 @@ TILE_GET_INFO_MEMBER(fastlane_state::get_tile_info1)
bank = (bank & ~(mask << 1)) | ((ctrl_4 & mask) << 1);
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code+bank*256,
0 + 64 * (attr & 0x0f),
0);
diff --git a/src/mame/video/fcombat.cpp b/src/mame/video/fcombat.cpp
index ada01a16a16..0fbe6315485 100644
--- a/src/mame/video/fcombat.cpp
+++ b/src/mame/video/fcombat.cpp
@@ -18,7 +18,7 @@ TILE_GET_INFO_MEMBER(fcombat_state::get_bg_tile_info)
tileno = m_bgdata_rom[tile_index];
palno = 0x18; //m_user2_region[tile_index] >> 3;
- SET_TILE_INFO_MEMBER(2, tileno, palno, 0);
+ tileinfo.set(2, tileno, palno, 0);
}
diff --git a/src/mame/video/finalizr.cpp b/src/mame/video/finalizr.cpp
index 1e74a663a84..a8578034156 100644
--- a/src/mame/video/finalizr.cpp
+++ b/src/mame/video/finalizr.cpp
@@ -99,7 +99,7 @@ TILE_GET_INFO_MEMBER(finalizr_state::get_bg_tile_info)
int color = attr & 0x0f;
int flags = TILE_FLIPYX((attr & 0x30) >> 4);
- SET_TILE_INFO_MEMBER(0, code, color, flags);
+ tileinfo.set(0, code, color, flags);
}
TILE_GET_INFO_MEMBER(finalizr_state::get_fg_tile_info)
@@ -109,7 +109,7 @@ TILE_GET_INFO_MEMBER(finalizr_state::get_fg_tile_info)
int color = attr & 0x0f;
int flags = TILE_FLIPYX((attr & 0x30) >> 4);
- SET_TILE_INFO_MEMBER(0, code, color, flags);
+ tileinfo.set(0, code, color, flags);
}
void finalizr_state::video_start()
diff --git a/src/mame/video/firetrap.cpp b/src/mame/video/firetrap.cpp
index 3a99cf61b4e..29b2b445d9d 100644
--- a/src/mame/video/firetrap.cpp
+++ b/src/mame/video/firetrap.cpp
@@ -87,7 +87,7 @@ TILE_GET_INFO_MEMBER(firetrap_state::get_fg_tile_info)
{
int code = m_fgvideoram[tile_index];
int color = m_fgvideoram[tile_index + 0x400];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code | ((color & 0x01) << 8),
color >> 4,
0);
@@ -97,7 +97,7 @@ inline void firetrap_state::get_bg_tile_info(tile_data &tileinfo, int tile_index
{
int code = bgvideoram[tile_index];
int color = bgvideoram[tile_index + 0x100];
- SET_TILE_INFO_MEMBER(gfx_region,
+ tileinfo.set(gfx_region,
code + ((color & 0x03) << 8),
(color & 0x30) >> 4,
TILE_FLIPXY((color & 0x0c) >> 2));
diff --git a/src/mame/video/firetrk.cpp b/src/mame/video/firetrk.cpp
index ed1808f375a..935cc97ed66 100644
--- a/src/mame/video/firetrk.cpp
+++ b/src/mame/video/firetrk.cpp
@@ -121,7 +121,7 @@ TILE_GET_INFO_MEMBER(firetrk_state::firetrk_get_tile_info1)
if (m_flash)
color = color | 0x04;
- SET_TILE_INFO_MEMBER(1, code, color, 0);
+ tileinfo.set(1, code, color, 0);
}
@@ -136,7 +136,7 @@ TILE_GET_INFO_MEMBER(firetrk_state::superbug_get_tile_info1)
if (m_flash)
color = color | 0x04;
- SET_TILE_INFO_MEMBER(1, code, color, 0);
+ tileinfo.set(1, code, color, 0);
}
@@ -148,7 +148,7 @@ TILE_GET_INFO_MEMBER(firetrk_state::montecar_get_tile_info1)
if (m_flash)
color = color | 0x04;
- SET_TILE_INFO_MEMBER(1, code, color, 0);
+ tileinfo.set(1, code, color, 0);
}
@@ -164,7 +164,7 @@ TILE_GET_INFO_MEMBER(firetrk_state::firetrk_get_tile_info2)
if ((code & 0x3c) == 0x0c)
color = 2; /* palette 0, 2 */
- SET_TILE_INFO_MEMBER(2, code, color, 0);
+ tileinfo.set(2, code, color, 0);
}
@@ -180,7 +180,7 @@ TILE_GET_INFO_MEMBER(firetrk_state::superbug_get_tile_info2)
if ((code & 0x38) == 0x00)
color = 2; /* palette 0, 2 */
- SET_TILE_INFO_MEMBER(2, code, color, 0);
+ tileinfo.set(2, code, color, 0);
}
@@ -202,7 +202,7 @@ TILE_GET_INFO_MEMBER(firetrk_state::montecar_get_tile_info2)
if ((code & 0x30) == 0x30)
color = 0; /* palette 0, 0 */
- SET_TILE_INFO_MEMBER(2, code & 0x3f, color, 0);
+ tileinfo.set(2, code & 0x3f, color, 0);
}
diff --git a/src/mame/video/fitfight.cpp b/src/mame/video/fitfight.cpp
index edad1d5396f..8701507bec2 100644
--- a/src/mame/video/fitfight.cpp
+++ b/src/mame/video/fitfight.cpp
@@ -49,7 +49,7 @@ TILE_GET_INFO_MEMBER(fitfight_state::get_fof_bak_tile_info)
int xflip = (m_fof_bak_tileram[tile_index * 2] & 0x0020) >> 5;
xflip ^= 1;
- SET_TILE_INFO_MEMBER(2, code, colr, TILE_FLIPYX(xflip));
+ tileinfo.set(2, code, colr, TILE_FLIPYX(xflip));
}
WRITE16_MEMBER(fitfight_state::fof_bak_tileram_w)
@@ -66,7 +66,7 @@ TILE_GET_INFO_MEMBER(fitfight_state::get_fof_mid_tile_info)
int xflip = (m_fof_mid_tileram[tile_index * 2] & 0x0020) >> 5;
xflip ^= 1;
- SET_TILE_INFO_MEMBER(1, code, colr, TILE_FLIPYX(xflip));
+ tileinfo.set(1, code, colr, TILE_FLIPYX(xflip));
}
WRITE16_MEMBER(fitfight_state::fof_mid_tileram_w)
@@ -82,7 +82,7 @@ TILE_GET_INFO_MEMBER(fitfight_state::get_fof_txt_tile_info)
int xflip = (m_fof_txt_tileram[tile_index * 2] & 0x0020) >> 5;
xflip ^= 1;
- SET_TILE_INFO_MEMBER(0, code, colr, TILE_FLIPYX(xflip));
+ tileinfo.set(0, code, colr, TILE_FLIPYX(xflip));
}
WRITE16_MEMBER(fitfight_state::fof_txt_tileram_w)
diff --git a/src/mame/video/flkatck.cpp b/src/mame/video/flkatck.cpp
index 49bb7374b74..06e213881b4 100644
--- a/src/mame/video/flkatck.cpp
+++ b/src/mame/video/flkatck.cpp
@@ -43,7 +43,7 @@ TILE_GET_INFO_MEMBER(flkatck_state::get_tile_info_A)
bank = 0; /* this allows the game to print text
in all banks selected by the k007121 */
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code + 256*bank,
(attr & 0x0f) + 16,
(attr & 0x20) ? TILE_FLIPY : 0);
@@ -54,7 +54,7 @@ TILE_GET_INFO_MEMBER(flkatck_state::get_tile_info_B)
int attr = m_vram[tile_index + 0x800];
int code = m_vram[tile_index + 0xc00];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code,
(attr & 0x0f) + 16,
0);
diff --git a/src/mame/video/flstory.cpp b/src/mame/video/flstory.cpp
index 18424efd135..de6b1b5dce2 100644
--- a/src/mame/video/flstory.cpp
+++ b/src/mame/video/flstory.cpp
@@ -19,7 +19,7 @@ TILE_GET_INFO_MEMBER(flstory_state::get_tile_info)
int flags = TILE_FLIPYX((attr & 0x18) >> 3);
tileinfo.category = (attr & 0x20) >> 5;
tileinfo.group = (attr & 0x20) >> 5;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
tile_number,
attr & 0x0f,
flags);
@@ -32,7 +32,7 @@ TILE_GET_INFO_MEMBER(flstory_state::victnine_get_tile_info)
int tile_number = ((attr & 0x38) << 5) + code;
int flags = ((attr & 0x40) ? TILE_FLIPX : 0) | ((attr & 0x80) ? TILE_FLIPY : 0);
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
tile_number,
attr & 0x07,
flags);
@@ -47,7 +47,7 @@ TILE_GET_INFO_MEMBER(flstory_state::get_rumba_tile_info)
tileinfo.category = (attr & 0x20) >> 5;
tileinfo.group = (attr & 0x20) >> 5;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
tile_number,
col,
0);
diff --git a/src/mame/video/foodf.cpp b/src/mame/video/foodf.cpp
index 92ab95dc0ff..f16a1f449be 100644
--- a/src/mame/video/foodf.cpp
+++ b/src/mame/video/foodf.cpp
@@ -22,7 +22,7 @@ TILE_GET_INFO_MEMBER(foodf_state::get_playfield_tile_info)
uint16_t data = m_playfield_tilemap->basemem_read(tile_index);
int code = (data & 0xff) | ((data >> 7) & 0x100);
int color = (data >> 8) & 0x3f;
- SET_TILE_INFO_MEMBER(0, code, color, m_playfield_flip ? (TILE_FLIPX | TILE_FLIPY) : 0);
+ tileinfo.set(0, code, color, m_playfield_flip ? (TILE_FLIPX | TILE_FLIPY) : 0);
}
diff --git a/src/mame/video/freekick.cpp b/src/mame/video/freekick.cpp
index b579cf016da..d3ee648a18c 100644
--- a/src/mame/video/freekick.cpp
+++ b/src/mame/video/freekick.cpp
@@ -12,7 +12,7 @@ TILE_GET_INFO_MEMBER(freekick_state::get_freek_tile_info)
tileno = m_videoram[tile_index] + ((m_videoram[tile_index + 0x400] & 0xe0) << 3);
palno = m_videoram[tile_index + 0x400] & 0x1f;
- SET_TILE_INFO_MEMBER(0, tileno, palno, 0);
+ tileinfo.set(0, tileno, palno, 0);
}
diff --git a/src/mame/video/fromanc2.cpp b/src/mame/video/fromanc2.cpp
index 3d1b0cd0aa6..17091fba611 100644
--- a/src/mame/video/fromanc2.cpp
+++ b/src/mame/video/fromanc2.cpp
@@ -23,7 +23,7 @@ TILE_GET_INFO_MEMBER(fromanc2_state::fromanc2_get_tile_info)
int tile = (m_videoram[VRAM][Layer][tile_index] & 0x3fff) | (m_gfxbank[VRAM][Layer] << 14);
int color = (m_videoram[VRAM][Layer][tile_index] & 0xc000) >> 14;
- SET_TILE_INFO_MEMBER(Layer, tile, color, 0);
+ tileinfo.set(Layer, tile, color, 0);
}
template<int VRAM, int Layer>
@@ -31,7 +31,7 @@ TILE_GET_INFO_MEMBER(fromanc2_state::fromancr_get_tile_info)
{
int tile = m_videoram[VRAM][Layer][tile_index] | (m_gfxbank[VRAM][Layer] << 16);
- SET_TILE_INFO_MEMBER(Layer, tile, 0, 0);
+ tileinfo.set(Layer, tile, 0, 0);
}
diff --git a/src/mame/video/fromance.cpp b/src/mame/video/fromance.cpp
index a9e84600c01..9a62d4d4f98 100644
--- a/src/mame/video/fromance.cpp
+++ b/src/mame/video/fromance.cpp
@@ -28,7 +28,7 @@ inline void fromance_state::get_fromance_tile_info( tile_data &tileinfo, int til
m_local_videoram[layer][0x2000 + tile_index];
int color = m_local_videoram[layer][tile_index] & 0x7f;
- SET_TILE_INFO_MEMBER(layer, tile, color, 0);
+ tileinfo.set(layer, tile, color, 0);
}
TILE_GET_INFO_MEMBER(fromance_state::get_fromance_bg_tile_info){ get_fromance_tile_info(tileinfo, tile_index, 0); }
@@ -41,7 +41,7 @@ inline void fromance_state::get_nekkyoku_tile_info( tile_data &tileinfo, int til
m_local_videoram[layer][0x1000 + tile_index];
int color = m_local_videoram[layer][tile_index + 0x2000] & 0x3f;
- SET_TILE_INFO_MEMBER(layer, tile, color, 0);
+ tileinfo.set(layer, tile, color, 0);
}
TILE_GET_INFO_MEMBER(fromance_state::get_nekkyoku_bg_tile_info){ get_nekkyoku_tile_info(tileinfo, tile_index, 0); }
diff --git a/src/mame/video/funkybee.cpp b/src/mame/video/funkybee.cpp
index 007a0130578..c391ee186e0 100644
--- a/src/mame/video/funkybee.cpp
+++ b/src/mame/video/funkybee.cpp
@@ -74,7 +74,7 @@ TILE_GET_INFO_MEMBER(funkybee_state::get_bg_tile_info)
int code = m_videoram[tile_index] + ((m_colorram[tile_index] & 0x80) << 1);
int color = m_colorram[tile_index] & 0x03;
- SET_TILE_INFO_MEMBER(m_gfx_bank, code, color, 0);
+ tileinfo.set(m_gfx_bank, code, color, 0);
}
TILEMAP_MAPPER_MEMBER(funkybee_state::funkybee_tilemap_scan)
diff --git a/src/mame/video/funworld.cpp b/src/mame/video/funworld.cpp
index d56b5bae043..48193255cf2 100644
--- a/src/mame/video/funworld.cpp
+++ b/src/mame/video/funworld.cpp
@@ -119,7 +119,7 @@ TILE_GET_INFO_MEMBER(funworld_state::get_bg_tile_info)
int code = attr & 0xfff;
int color = m_colorram[offs] >> 4; // 4 bits for color.
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
diff --git a/src/mame/video/funybubl.cpp b/src/mame/video/funybubl.cpp
index f2116510cea..731b1df7330 100644
--- a/src/mame/video/funybubl.cpp
+++ b/src/mame/video/funybubl.cpp
@@ -24,7 +24,7 @@ WRITE8_MEMBER(funybubl_state::tilemap_w)
TILE_GET_INFO_MEMBER(funybubl_state::get_tile_info)
{
uint16_t const code = m_tilemapram[tile_index << 1] | (m_tilemapram[(tile_index << 1) | 1] << 8);
- SET_TILE_INFO_MEMBER(0, code & 0x7fff, BIT(code, 15), 0);
+ tileinfo.set(0, code & 0x7fff, BIT(code, 15), 0);
}
void funybubl_state::video_start()
diff --git a/src/mame/video/fuukifg2.cpp b/src/mame/video/fuukifg2.cpp
index fc9aeb1c6c3..e8f67e76542 100644
--- a/src/mame/video/fuukifg2.cpp
+++ b/src/mame/video/fuukifg2.cpp
@@ -52,7 +52,7 @@ TILE_GET_INFO_MEMBER(fuuki16_state::get_tile_info)
const int buffer = (Layer < 2) ? 0 : (m_vregs[0x1e / 2] & 0x40) >> 6;
const u16 code = m_vram[Layer|buffer][2 * tile_index + 0];
const u16 attr = m_vram[Layer|buffer][2 * tile_index + 1];
- SET_TILE_INFO_MEMBER(Layer, code, attr & 0x3f, TILE_FLIPYX((attr >> 6) & 3));
+ tileinfo.set(Layer, code, attr & 0x3f, TILE_FLIPYX((attr >> 6) & 3));
}
/***************************************************************************
diff --git a/src/mame/video/fuukifg3.cpp b/src/mame/video/fuukifg3.cpp
index f9a1fe465c7..8ecad90d570 100644
--- a/src/mame/video/fuukifg3.cpp
+++ b/src/mame/video/fuukifg3.cpp
@@ -56,7 +56,7 @@ TILE_GET_INFO_MEMBER(fuuki32_state::get_tile_info)
const int buffer = (Layer < 2) ? 0 : (m_vregs[0x1e / 2] & 0x40) >> 6;
const u16 code = (m_vram[Layer|buffer][tile_index] & 0xffff0000) >> 16;
const u16 attr = (m_vram[Layer|buffer][tile_index] & 0x0000ffff);
- SET_TILE_INFO_MEMBER(Layer, code, (attr & 0x3f) >> ColShift, TILE_FLIPYX(attr >> 6));
+ tileinfo.set(Layer, code, (attr & 0x3f) >> ColShift, TILE_FLIPYX(attr >> 6));
}
/***************************************************************************
diff --git a/src/mame/video/gaelco.cpp b/src/mame/video/gaelco.cpp
index ae62d81f0a2..25ed14e98c2 100644
--- a/src/mame/video/gaelco.cpp
+++ b/src/mame/video/gaelco.cpp
@@ -43,7 +43,7 @@ TILE_GET_INFO_MEMBER(gaelco_state::get_tile_info)
tileinfo.category = (data2 >> 6) & 0x03;
- SET_TILE_INFO_MEMBER(1, 0x4000 + code, data2 & 0x3f, TILE_FLIPYX(data & 0x03));
+ tileinfo.set(1, 0x4000 + code, data2 & 0x3f, TILE_FLIPYX(data & 0x03));
}
/***************************************************************************
diff --git a/src/mame/video/gaelco2.cpp b/src/mame/video/gaelco2.cpp
index 856ce7201c5..e9c0368e8f5 100644
--- a/src/mame/video/gaelco2.cpp
+++ b/src/mame/video/gaelco2.cpp
@@ -111,7 +111,7 @@ TILE_GET_INFO_MEMBER(gaelco2_state::get_tile_info)
const u16 data2 = m_videoram[(((m_vregs[Layer] >> 9) & 0x07) * 0x2000 / 2) + ((tile_index << 1) + 1)];
const u32 code = ((data & 0x07) << 16) | (data2 & 0xffff);
- SET_TILE_INFO_MEMBER(0, code, ((data >> 9) & 0x7f), TILE_FLIPXY((data >> 6) & 0x03));
+ tileinfo.set(0, code, ((data >> 9) & 0x7f), TILE_FLIPXY((data >> 6) & 0x03));
}
@@ -144,7 +144,7 @@ TILE_GET_INFO_MEMBER(gaelco2_state::get_tile_info_dual)
const u16 data2 = m_videoram[(((m_vregs[Layer] >> 9) & 0x07) * 0x2000 / 2) + ((tile_index << 1) + 1)];
const u32 code = ((data & 0x07) << 16) | (data2 & 0xffff);
- SET_TILE_INFO_MEMBER(0, code, (Layer * 0x40) + ((data >> 9) & 0x3f), TILE_FLIPXY((data >> 6) & 0x03));
+ tileinfo.set(0, code, (Layer * 0x40) + ((data >> 9) & 0x3f), TILE_FLIPXY((data >> 6) & 0x03));
}
diff --git a/src/mame/video/gaiden.cpp b/src/mame/video/gaiden.cpp
index 4deea34fe06..ebf2250899e 100644
--- a/src/mame/video/gaiden.cpp
+++ b/src/mame/video/gaiden.cpp
@@ -19,7 +19,7 @@ TILE_GET_INFO_MEMBER(gaiden_state::get_bg_tile_info)
{
uint16_t *videoram1 = &m_videoram[2][0x0800];
uint16_t *videoram2 = m_videoram[2];
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
videoram1[tile_index] & 0x0fff,
(videoram2[tile_index] & 0xf0) >> 4,
0);
@@ -29,7 +29,7 @@ TILE_GET_INFO_MEMBER(gaiden_state::get_fg_tile_info)
{
uint16_t *videoram1 = &m_videoram[1][0x0800];
uint16_t *videoram2 = m_videoram[1];
- SET_TILE_INFO_MEMBER(2,
+ tileinfo.set(2,
videoram1[tile_index] & 0x0fff,
(videoram2[tile_index] & 0xf0) >> 4,
0);
@@ -46,7 +46,7 @@ TILE_GET_INFO_MEMBER(gaiden_state::get_fg_tile_info_raiga)
if ((videoram2[tile_index] & 0x08))
colour += 0x10;
- SET_TILE_INFO_MEMBER(2,
+ tileinfo.set(2,
videoram1[tile_index] & 0x0fff,
colour,
0);
@@ -56,7 +56,7 @@ TILE_GET_INFO_MEMBER(gaiden_state::get_tx_tile_info)
{
uint16_t *videoram1 = &m_videoram[0][0x0400];
uint16_t *videoram2 = m_videoram[0];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
videoram1[tile_index] & 0x07ff,
(videoram2[tile_index] & 0xf0) >> 4,
0);
diff --git a/src/mame/video/galaga.cpp b/src/mame/video/galaga.cpp
index edfa4499b31..6558fd62b3a 100644
--- a/src/mame/video/galaga.cpp
+++ b/src/mame/video/galaga.cpp
@@ -121,7 +121,7 @@ TILE_GET_INFO_MEMBER(galaga_state::get_tile_info)
We reproduce this here, but since the tilemap system automatically flips
characters when screen is flipped, we have to flip them back. */
int color = m_videoram[tile_index + 0x400] & 0x3f;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
(m_videoram[tile_index] & 0x7f) | (flip_screen() ? 0x80 : 0) | (m_galaga_gfxbank << 8),
color,
flip_screen() ? TILE_FLIPX : 0);
diff --git a/src/mame/video/galaxia.cpp b/src/mame/video/galaxia.cpp
index e156580afb2..5a6377f8062 100644
--- a/src/mame/video/galaxia.cpp
+++ b/src/mame/video/galaxia.cpp
@@ -66,7 +66,7 @@ TILE_GET_INFO_MEMBER(galaxia_state::get_galaxia_bg_tile_info)
uint8_t code = m_video_ram[tile_index] & 0x7f; // d7 unused
uint8_t color = m_color_ram[tile_index] & 3; // highest bits unused
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
TILE_GET_INFO_MEMBER(galaxia_state::get_astrowar_bg_tile_info)
@@ -74,7 +74,7 @@ TILE_GET_INFO_MEMBER(galaxia_state::get_astrowar_bg_tile_info)
uint8_t code = m_video_ram[tile_index];
uint8_t color = m_color_ram[tile_index] & 7; // highest bits unused
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
void galaxia_state::init_common()
diff --git a/src/mame/video/galaxian.cpp b/src/mame/video/galaxian.cpp
index d4319477c6b..3d82244725c 100644
--- a/src/mame/video/galaxian.cpp
+++ b/src/mame/video/galaxian.cpp
@@ -483,7 +483,7 @@ TILE_GET_INFO_MEMBER(galaxian_state::bg_get_tile_info)
if (m_extend_tile_info_ptr != nullptr)
(this->*m_extend_tile_info_ptr)(&code, &color, attrib, x);
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
diff --git a/src/mame/video/galaxold.cpp b/src/mame/video/galaxold.cpp
index c9c9676330e..0d24aa04ebe 100644
--- a/src/mame/video/galaxold.cpp
+++ b/src/mame/video/galaxold.cpp
@@ -602,7 +602,7 @@ TILE_GET_INFO_MEMBER(galaxold_state::drivfrcg_get_tile_info)
code |= (bank << 4);
color |= ((m_attributesram[(x << 1) | 1] & 0x40) >> 3);
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
VIDEO_START_MEMBER(galaxold_state,drivfrcg)
@@ -652,7 +652,7 @@ TILE_GET_INFO_MEMBER(galaxold_state::racknrol_get_tile_info)
code |= (bank << 8);
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
VIDEO_START_MEMBER(galaxold_state,racknrol)
@@ -678,7 +678,7 @@ TILE_GET_INFO_MEMBER(galaxold_state::harem_get_tile_info)
code |= bank * 0x200;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
void galaxold_state::harem_modify_spritecode(uint8_t *spriteram, int *code, int *flipx, int *flipy, int offs)
@@ -732,7 +732,7 @@ TILE_GET_INFO_MEMBER(galaxold_state::dambustr_get_tile_info2)
(this->*m_modify_color)(&color);
}
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
VIDEO_START_MEMBER(galaxold_state,dambustr)
@@ -1578,13 +1578,13 @@ TILE_GET_INFO_MEMBER(galaxold_state::get_tile_info)
(this->*m_modify_color)(&color);
}
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
TILE_GET_INFO_MEMBER(galaxold_state::rockclim_get_tile_info)
{
uint16_t code = m_rockclim_videoram[tile_index];
- SET_TILE_INFO_MEMBER(2, code, 0, 0);
+ tileinfo.set(2, code, 0, 0);
}
void galaxold_state::draw_bullets_common(bitmap_ind16 &bitmap, const rectangle &cliprect)
diff --git a/src/mame/video/galivan.cpp b/src/mame/video/galivan.cpp
index bddac18114f..dbbf035fed7 100644
--- a/src/mame/video/galivan.cpp
+++ b/src/mame/video/galivan.cpp
@@ -162,7 +162,7 @@ TILE_GET_INFO_MEMBER(galivan_state::get_bg_tile_info)
uint8_t *BGROM = memregion("gfx4")->base();
int attr = BGROM[tile_index + 0x4000];
int code = BGROM[tile_index] | ((attr & 0x03) << 8);
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
code,
(attr & 0x78) >> 3, /* seems correct */
0);
@@ -172,7 +172,7 @@ TILE_GET_INFO_MEMBER(galivan_state::get_tx_tile_info)
{
int attr = m_videoram[tile_index + 0x400];
int code = m_videoram[tile_index] | ((attr & 0x01) << 8);
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code,
(attr & 0x78) >> 3, /* seems correct */
0);
@@ -184,7 +184,7 @@ TILE_GET_INFO_MEMBER(galivan_state::ninjemak_get_bg_tile_info)
uint8_t *BGROM = memregion("gfx4")->base();
int attr = BGROM[tile_index + 0x4000];
int code = BGROM[tile_index] | ((attr & 0x03) << 8);
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
code,
((attr & 0x60) >> 3) | ((attr & 0x0c) >> 2), /* seems correct */
0);
@@ -199,7 +199,7 @@ TILE_GET_INFO_MEMBER(galivan_state::ninjemak_get_tx_tile_info)
int attr = m_videoram[index + 0x400];
int code = m_videoram[index] | ((attr & 0x03) << 8);
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code,
(attr & 0x1c) >> 2, /* seems correct ? */
0);
diff --git a/src/mame/video/gaplus.cpp b/src/mame/video/gaplus.cpp
index 6f0c8bbff8b..7affefaed1f 100644
--- a/src/mame/video/gaplus.cpp
+++ b/src/mame/video/gaplus.cpp
@@ -94,7 +94,7 @@ TILE_GET_INFO_MEMBER(gaplus_base_state::get_tile_info)
const uint8_t attr = m_videoram[tile_index + 0x400];
tileinfo.category = (attr & 0x40) >> 6;
tileinfo.group = attr & 0x3f;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
m_videoram[tile_index] + ((attr & 0x80) << 1),
attr & 0x3f,
0);
diff --git a/src/mame/video/gatron.cpp b/src/mame/video/gatron.cpp
index 822627e7287..c3dde5deba1 100644
--- a/src/mame/video/gatron.cpp
+++ b/src/mame/video/gatron.cpp
@@ -40,7 +40,7 @@ TILE_GET_INFO_MEMBER(gatron_state::get_bg_tile_info)
int code = m_videoram[tile_index];
- SET_TILE_INFO_MEMBER(0, code, 0, 0);
+ tileinfo.set(0, code, 0, 0);
}
void gatron_state::video_start()
diff --git a/src/mame/video/gauntlet.cpp b/src/mame/video/gauntlet.cpp
index e43f30c4d0a..1bfce7cbe27 100644
--- a/src/mame/video/gauntlet.cpp
+++ b/src/mame/video/gauntlet.cpp
@@ -25,7 +25,7 @@ TILE_GET_INFO_MEMBER(gauntlet_state::get_alpha_tile_info)
int code = data & 0x3ff;
int color = ((data >> 10) & 0x0f) | ((data >> 9) & 0x20);
int opaque = data & 0x8000;
- SET_TILE_INFO_MEMBER(1, code, color, opaque ? TILE_FORCE_LAYER0 : 0);
+ tileinfo.set(1, code, color, opaque ? TILE_FORCE_LAYER0 : 0);
}
@@ -34,7 +34,7 @@ TILE_GET_INFO_MEMBER(gauntlet_state::get_playfield_tile_info)
uint16_t data = m_playfield_tilemap->basemem_read(tile_index);
int code = ((m_playfield_tile_bank * 0x1000) + (data & 0xfff)) ^ 0x800;
int color = 0x10 + (m_playfield_color_bank * 8) + ((data >> 12) & 7);
- SET_TILE_INFO_MEMBER(0, code, color, (data >> 15) & 1);
+ tileinfo.set(0, code, color, (data >> 15) & 1);
}
diff --git a/src/mame/video/gberet.cpp b/src/mame/video/gberet.cpp
index 9a6f84bfc23..ff46287b7e3 100644
--- a/src/mame/video/gberet.cpp
+++ b/src/mame/video/gberet.cpp
@@ -106,7 +106,7 @@ TILE_GET_INFO_MEMBER(gberet_state::get_bg_tile_info)
tileinfo.group = color;
tileinfo.category = (attr & 0x80) >> 7;
- SET_TILE_INFO_MEMBER(0, code, color, flags);
+ tileinfo.set(0, code, color, flags);
}
VIDEO_START_MEMBER(gberet_state,gberet)
diff --git a/src/mame/video/gcpinbal.cpp b/src/mame/video/gcpinbal.cpp
index f6a87c0901b..4e251129f33 100644
--- a/src/mame/video/gcpinbal.cpp
+++ b/src/mame/video/gcpinbal.cpp
@@ -13,7 +13,7 @@ TILE_GET_INFO_MEMBER(gcpinbal_state::get_bg0_tile_info)
const u16 tile = m_tilemapram[0 + tile_index * 2];
const u16 attr = m_tilemapram[1 + tile_index * 2];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
(tile & 0xfff) + m_bg0_gfxset,
(attr & 0x1f),
TILE_FLIPYX((attr & 0x300) >> 8));
@@ -24,7 +24,7 @@ TILE_GET_INFO_MEMBER(gcpinbal_state::get_bg1_tile_info)
const u16 tile = m_tilemapram[0x800 + tile_index * 2];
const u16 attr = m_tilemapram[0x801 + tile_index * 2];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
(tile & 0xfff) + 0x2000 + m_bg1_gfxset,
(attr & 0x1f) + 0x30,
TILE_FLIPYX((attr & 0x300) >> 8));
@@ -33,7 +33,7 @@ TILE_GET_INFO_MEMBER(gcpinbal_state::get_bg1_tile_info)
TILE_GET_INFO_MEMBER(gcpinbal_state::get_fg_tile_info)
{
const u16 tile = m_tilemapram[0x1000 + tile_index];
- SET_TILE_INFO_MEMBER(1, (tile & 0xfff), (tile >> 12), 0);
+ tileinfo.set(1, (tile & 0xfff), (tile >> 12), 0);
}
void gcpinbal_state::video_start()
diff --git a/src/mame/video/ginganin.cpp b/src/mame/video/ginganin.cpp
index c9b17e491fb..d21c7f054c1 100644
--- a/src/mame/video/ginganin.cpp
+++ b/src/mame/video/ginganin.cpp
@@ -79,7 +79,7 @@ Note: if MAME_DEBUG is defined, pressing Z with:
TILE_GET_INFO_MEMBER(ginganin_state::get_bg_tile_info)
{
const u32 code = m_bgrom[2 * tile_index + 0] * 256 + m_bgrom[2 * tile_index + 1];
- SET_TILE_INFO_MEMBER(BG_GFX,
+ tileinfo.set(BG_GFX,
code,
code >> 12,
0);
@@ -95,7 +95,7 @@ TILE_GET_INFO_MEMBER(ginganin_state::get_bg_tile_info)
TILE_GET_INFO_MEMBER(ginganin_state::get_fg_tile_info)
{
const u16 code = m_fgram[tile_index];
- SET_TILE_INFO_MEMBER(FG_GFX,
+ tileinfo.set(FG_GFX,
code,
code >> 12,
0);
@@ -117,7 +117,7 @@ void ginganin_state::fgram_w(offs_t offset, u16 data, u16 mem_mask)
TILE_GET_INFO_MEMBER(ginganin_state::get_txt_tile_info)
{
const u16 code = m_txtram[tile_index];
- SET_TILE_INFO_MEMBER(TXT_GFX,
+ tileinfo.set(TXT_GFX,
code,
code >> 12,
0);
diff --git a/src/mame/video/gladiatr.cpp b/src/mame/video/gladiatr.cpp
index c977b7f5945..eca90e06551 100644
--- a/src/mame/video/gladiatr.cpp
+++ b/src/mame/video/gladiatr.cpp
@@ -20,7 +20,7 @@ TILE_GET_INFO_MEMBER(gladiatr_state_base::bg_get_tile_info)
{
uint8_t attr = m_colorram[tile_index];
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
m_videoram[tile_index] + ((attr & 0x07) << 8) + (m_bg_tile_bank << 11),
(attr >> 3) ^ 0x1f,
0);
@@ -28,7 +28,7 @@ TILE_GET_INFO_MEMBER(gladiatr_state_base::bg_get_tile_info)
TILE_GET_INFO_MEMBER(gladiatr_state_base::fg_get_tile_info)
{
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
m_textram[tile_index] + (m_fg_tile_bank << 8),
0,
0);
diff --git a/src/mame/video/glass.cpp b/src/mame/video/glass.cpp
index dce9c9079aa..2791001b117 100644
--- a/src/mame/video/glass.cpp
+++ b/src/mame/video/glass.cpp
@@ -40,7 +40,7 @@ TILE_GET_INFO_MEMBER(glass_state::get_tile_info)
int data2 = m_videoram[(Layer * 0x1000 / 2) + (tile_index << 1) + 1];
int code = ((data & 0x03) << 14) | ((data & 0x0fffc) >> 2);
- SET_TILE_INFO_MEMBER(0, code, 0x20 + (data2 & 0x1f), TILE_FLIPYX((data2 & 0xc0) >> 6));
+ tileinfo.set(0, code, 0x20 + (data2 & 0x1f), TILE_FLIPYX((data2 & 0xc0) >> 6));
}
/***************************************************************************
diff --git a/src/mame/video/gng.cpp b/src/mame/video/gng.cpp
index 8fbed82cb64..be9f16d243b 100644
--- a/src/mame/video/gng.cpp
+++ b/src/mame/video/gng.cpp
@@ -21,7 +21,7 @@
TILE_GET_INFO_MEMBER(gng_state::get_fg_tile_info)
{
uint8_t attr = m_fgvideoram[tile_index + 0x400];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
m_fgvideoram[tile_index] + ((attr & 0xc0) << 2),
attr & 0x0f,
TILE_FLIPYX((attr & 0x30) >> 4));
@@ -30,7 +30,7 @@ TILE_GET_INFO_MEMBER(gng_state::get_fg_tile_info)
TILE_GET_INFO_MEMBER(gng_state::get_bg_tile_info)
{
uint8_t attr = m_bgvideoram[tile_index + 0x400];
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
m_bgvideoram[tile_index] + ((attr & 0xc0) << 2),
attr & 0x07,
TILE_FLIPYX((attr & 0x30) >> 4));
diff --git a/src/mame/video/goal92.cpp b/src/mame/video/goal92.cpp
index c7c942411a7..2ef6a9eadf2 100644
--- a/src/mame/video/goal92.cpp
+++ b/src/mame/video/goal92.cpp
@@ -51,7 +51,7 @@ TILE_GET_INFO_MEMBER(goal92_state::get_text_tile_info)
tile |= 0xc000;
- SET_TILE_INFO_MEMBER(1, tile, color, 0);
+ tileinfo.set(1, tile, color, 0);
}
TILE_GET_INFO_MEMBER(goal92_state::get_back_tile_info)
@@ -61,7 +61,7 @@ TILE_GET_INFO_MEMBER(goal92_state::get_back_tile_info)
tile &= 0xfff;
- SET_TILE_INFO_MEMBER(2, tile, color, 0);
+ tileinfo.set(2, tile, color, 0);
}
TILE_GET_INFO_MEMBER(goal92_state::get_fore_tile_info)
@@ -83,7 +83,7 @@ TILE_GET_INFO_MEMBER(goal92_state::get_fore_tile_info)
tile |= 0x2000;
}
- SET_TILE_INFO_MEMBER(region, tile, color, 0);
+ tileinfo.set(region, tile, color, 0);
}
void goal92_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, int pri )
diff --git a/src/mame/video/goindol.cpp b/src/mame/video/goindol.cpp
index 800fa01eaba..c0084af95b8 100644
--- a/src/mame/video/goindol.cpp
+++ b/src/mame/video/goindol.cpp
@@ -21,7 +21,7 @@ TILE_GET_INFO_MEMBER(goindol_state::get_fg_tile_info)
{
int code = m_fg_videoram[2 * tile_index + 1];
int attr = m_fg_videoram[2 * tile_index];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code | ((attr & 0x7) << 8) | (m_char_bank << 11),
(attr & 0xf8) >> 3,
0);
@@ -31,7 +31,7 @@ TILE_GET_INFO_MEMBER(goindol_state::get_bg_tile_info)
{
int code = m_bg_videoram[2 * tile_index + 1];
int attr = m_bg_videoram[2 * tile_index];
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
code | ((attr & 0x7) << 8) | (m_char_bank << 11),
(attr & 0xf8) >> 3,
0);
diff --git a/src/mame/video/goldstar.cpp b/src/mame/video/goldstar.cpp
index e2e9ba3b215..e7a2328d050 100644
--- a/src/mame/video/goldstar.cpp
+++ b/src/mame/video/goldstar.cpp
@@ -39,7 +39,7 @@ TILE_GET_INFO_MEMBER(goldstar_state::get_goldstar_fg_tile_info)
int const code = m_fg_vidram[tile_index];
int const attr = m_fg_atrram[tile_index];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code | (attr & 0xf0) << 4,
attr & 0x0f,
0);
@@ -52,7 +52,7 @@ TILE_GET_INFO_MEMBER(goldstar_state::get_cherrym_fg_tile_info)
int const code = m_fg_vidram[tile_index];
int const attr = m_fg_atrram[tile_index];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code | (attr & 0x0f) << 8,
(attr & 0xf0) >> 4,
0);
@@ -68,7 +68,7 @@ WRITE8_MEMBER(goldstar_state::goldstar_reel1_ram_w)
TILE_GET_INFO_MEMBER(goldstar_state::get_goldstar_reel1_tile_info)
{
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
m_reel1_ram[tile_index],
m_bgcolor,
0);
@@ -83,7 +83,7 @@ WRITE8_MEMBER(goldstar_state::goldstar_reel2_ram_w)
TILE_GET_INFO_MEMBER(goldstar_state::get_goldstar_reel2_tile_info)
{
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
m_reel2_ram[tile_index],
m_bgcolor,
0);
@@ -97,7 +97,7 @@ WRITE8_MEMBER(goldstar_state::goldstar_reel3_ram_w)
TILE_GET_INFO_MEMBER(goldstar_state::get_goldstar_reel3_tile_info)
{
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
m_reel3_ram[tile_index],
m_bgcolor,
0);
@@ -338,7 +338,7 @@ TILE_GET_INFO_MEMBER(wingco_state::get_magical_fg_tile_info)
int const code = m_fg_vidram[tile_index];
int const attr = m_fg_atrram[tile_index];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
(code | (attr & 0xf0)<<4) + (m_tile_bank * 0x1000),
attr & 0x0f,
0);
@@ -548,7 +548,7 @@ TILE_GET_INFO_MEMBER(sanghopm_state::get_fg_tile_info)
int const code = m_fg_vidram[tile_index];
int const attr = m_fg_atrram[tile_index];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code | (attr & 0x0f)<<8,
(attr & 0x70) >> 4,
0);
@@ -559,7 +559,7 @@ TILE_GET_INFO_MEMBER(sanghopm_state::get_bg_tile_info)
int const code = m_bg_vidram[tile_index];
int const attr = m_bg_atrram[tile_index];
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
code | (attr & 0x0f)<<8,
(attr & 0x70) >> 4,
0);
@@ -570,7 +570,7 @@ TILE_GET_INFO_MEMBER(sanghopm_state::get_reel1_tile_info)
int const code = m_reel1_ram[tile_index];
int const attr = m_reel1_attrram[tile_index];
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
code | (attr & 0x0f)<<8,
(attr & 0x70) >> 4,
0);
@@ -581,7 +581,7 @@ TILE_GET_INFO_MEMBER(sanghopm_state::get_reel2_tile_info)
int const code = m_reel2_ram[tile_index];
int const attr = m_reel2_attrram[tile_index];
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
code | (attr & 0x0f)<<8,
(attr & 0x70)>>4,
0);
@@ -592,7 +592,7 @@ TILE_GET_INFO_MEMBER(sanghopm_state::get_reel3_tile_info)
int const code = m_reel3_ram[tile_index];
int const attr = m_reel3_attrram[tile_index];
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
code | (attr & 0x0f)<<8,
(attr & 0x70)>>4,
0);
@@ -675,7 +675,7 @@ TILE_GET_INFO_MEMBER(unkch_state::get_reel1_tile_info)
int const code = m_reel1_ram[tile_index];
int const attr = m_reel1_attrram[tile_index];
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
code | (attr & 0x0f)<<8,
(attr & 0xf0) >> 4,
0);
@@ -686,7 +686,7 @@ TILE_GET_INFO_MEMBER(unkch_state::get_reel2_tile_info)
int const code = m_reel2_ram[tile_index];
int const attr = m_reel2_attrram[tile_index];
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
code | (attr & 0x0f)<<8,
(attr & 0xf0) >> 4,
0);
@@ -697,7 +697,7 @@ TILE_GET_INFO_MEMBER(unkch_state::get_reel3_tile_info)
int const code = m_reel3_ram[tile_index];
int const attr = m_reel3_attrram[tile_index];
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
code | (attr & 0x0f)<<8,
(attr & 0xf0) >> 4,
0);
diff --git a/src/mame/video/gomoku.cpp b/src/mame/video/gomoku.cpp
index a2367262aeb..d9e3c77560b 100644
--- a/src/mame/video/gomoku.cpp
+++ b/src/mame/video/gomoku.cpp
@@ -63,7 +63,7 @@ TILE_GET_INFO_MEMBER(gomoku_state::get_fg_tile_info)
int color = (attr& 0x0f);
int flipyx = (attr & 0xc0) >> 6;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code,
color,
TILE_FLIPYX(flipyx));
diff --git a/src/mame/video/gotcha.cpp b/src/mame/video/gotcha.cpp
index 6493c335ddf..74338adaea8 100644
--- a/src/mame/video/gotcha.cpp
+++ b/src/mame/video/gotcha.cpp
@@ -20,7 +20,7 @@ inline void gotcha_state::get_tile_info( tile_data &tileinfo, int tile_index ,ui
uint16_t data = vram[tile_index];
int code = (data & 0x3ff) | (m_gfxbank[(data & 0x0c00) >> 10] << 10);
- SET_TILE_INFO_MEMBER(0, code, (data >> 12) + color_offs, 0);
+ tileinfo.set(0, code, (data >> 12) + color_offs, 0);
}
TILE_GET_INFO_MEMBER(gotcha_state::fg_get_tile_info)
diff --git a/src/mame/video/gottlieb.cpp b/src/mame/video/gottlieb.cpp
index e79cab815e3..feaf091e264 100644
--- a/src/mame/video/gottlieb.cpp
+++ b/src/mame/video/gottlieb.cpp
@@ -111,18 +111,18 @@ TILE_GET_INFO_MEMBER(gottlieb_state::get_bg_tile_info)
{
int code = m_videoram[tile_index];
if ((code & 0x80) == 0)
- SET_TILE_INFO_MEMBER(m_gfxcharlo, code, 0, 0);
+ tileinfo.set(m_gfxcharlo, code, 0, 0);
else
- SET_TILE_INFO_MEMBER(m_gfxcharhi, code, 0, 0);
+ tileinfo.set(m_gfxcharhi, code, 0, 0);
}
TILE_GET_INFO_MEMBER(gottlieb_state::get_screwloo_bg_tile_info)
{
int code = m_videoram[tile_index];
if ((code & 0xc0) == 0)
- SET_TILE_INFO_MEMBER(m_gfxcharlo, code, 0, 0);
+ tileinfo.set(m_gfxcharlo, code, 0, 0);
else
- SET_TILE_INFO_MEMBER(m_gfxcharhi, code, 0, 0);
+ tileinfo.set(m_gfxcharhi, code, 0, 0);
}
diff --git a/src/mame/video/gotya.cpp b/src/mame/video/gotya.cpp
index f6953cc034a..1645ec1472a 100644
--- a/src/mame/video/gotya.cpp
+++ b/src/mame/video/gotya.cpp
@@ -91,7 +91,7 @@ TILE_GET_INFO_MEMBER(gotya_state::get_bg_tile_info)
int code = m_videoram[tile_index];
int color = m_colorram[tile_index] & 0x0f;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
TILEMAP_MAPPER_MEMBER(gotya_state::tilemap_scan_rows_thehand)
diff --git a/src/mame/video/gp9001.cpp b/src/mame/video/gp9001.cpp
index 338cb6a52ee..77217b96449 100644
--- a/src/mame/video/gp9001.cpp
+++ b/src/mame/video/gp9001.cpp
@@ -238,7 +238,7 @@ TILE_GET_INFO_MEMBER(gp9001vdp_device::get_tile_info)
}
const u32 color = attrib & 0x0fff; // 0x0f00 priority, 0x007f colour
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
tile_number,
color,
0);
diff --git a/src/mame/video/grchamp.cpp b/src/mame/video/grchamp.cpp
index 377a077a9b7..59c036fa410 100644
--- a/src/mame/video/grchamp.cpp
+++ b/src/mame/video/grchamp.cpp
@@ -72,22 +72,22 @@ WRITE8_MEMBER(grchamp_state::right_w)
TILE_GET_INFO_MEMBER(grchamp_state::get_text_tile_info)
{
- SET_TILE_INFO_MEMBER(0, m_videoram[tile_index], 0, 0);
+ tileinfo.set(0, m_videoram[tile_index], 0, 0);
}
TILE_GET_INFO_MEMBER(grchamp_state::get_left_tile_info)
{
- SET_TILE_INFO_MEMBER(1, m_leftram[tile_index], 0, 0);
+ tileinfo.set(1, m_leftram[tile_index], 0, 0);
}
TILE_GET_INFO_MEMBER(grchamp_state::get_right_tile_info)
{
- SET_TILE_INFO_MEMBER(2, m_rightram[tile_index], 0, 0);
+ tileinfo.set(2, m_rightram[tile_index], 0, 0);
}
TILE_GET_INFO_MEMBER(grchamp_state::get_center_tile_info)
{
- SET_TILE_INFO_MEMBER(3, m_centerram[tile_index], 0, 0);
+ tileinfo.set(3, m_centerram[tile_index], 0, 0);
}
TILEMAP_MAPPER_MEMBER(grchamp_state::get_memory_offset)
diff --git a/src/mame/video/gsword.cpp b/src/mame/video/gsword.cpp
index d2967a6f44d..5ca23a91556 100644
--- a/src/mame/video/gsword.cpp
+++ b/src/mame/video/gsword.cpp
@@ -65,7 +65,7 @@ TILE_GET_INFO_MEMBER(gsword_state_base::get_bg_tile_info)
int color = ((code & 0x3c0) >> 6) + 16 * m_charpalbank;
int flags = m_flipscreen ? (TILE_FLIPX | TILE_FLIPY) : 0;
- SET_TILE_INFO_MEMBER(0, code, color, flags);
+ tileinfo.set(0, code, color, flags);
}
void gsword_state_base::video_start()
diff --git a/src/mame/video/gumbo.cpp b/src/mame/video/gumbo.cpp
index 752b1b16258..27b49a60b13 100644
--- a/src/mame/video/gumbo.cpp
+++ b/src/mame/video/gumbo.cpp
@@ -15,7 +15,7 @@ WRITE16_MEMBER(gumbo_state::gumbo_bg_videoram_w)
TILE_GET_INFO_MEMBER(gumbo_state::get_gumbo_bg_tile_info)
{
int tileno = m_bg_videoram[tile_index];
- SET_TILE_INFO_MEMBER(0, tileno, 0, 0);
+ tileinfo.set(0, tileno, 0, 0);
}
@@ -28,7 +28,7 @@ WRITE16_MEMBER(gumbo_state::gumbo_fg_videoram_w)
TILE_GET_INFO_MEMBER(gumbo_state::get_gumbo_fg_tile_info)
{
int tileno = m_fg_videoram[tile_index];
- SET_TILE_INFO_MEMBER(1, tileno, 1, 0);
+ tileinfo.set(1, tileno, 1, 0);
}
diff --git a/src/mame/video/gundealr.cpp b/src/mame/video/gundealr.cpp
index 645a7fe679d..e9ec0002e96 100644
--- a/src/mame/video/gundealr.cpp
+++ b/src/mame/video/gundealr.cpp
@@ -21,7 +21,7 @@
TILE_GET_INFO_MEMBER(gundealr_state::get_bg_tile_info)
{
uint8_t attr = m_bg_videoram[2 * tile_index + 1];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
m_bg_videoram[2 * tile_index] + ((attr & 0x07) << 8),
(attr & 0xf0) >> 4,
0);
@@ -36,7 +36,7 @@ TILEMAP_MAPPER_MEMBER(gundealr_state::pagescan)
TILE_GET_INFO_MEMBER(gundealr_state::get_fg_tile_info)
{
uint8_t attr = m_fg_videoram[2 * tile_index + 1];
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
m_fg_videoram[2 * tile_index] + ((attr & 0x03) << 8),
(attr & 0xf0) >> 4,
0);
diff --git a/src/mame/video/gunsmoke.cpp b/src/mame/video/gunsmoke.cpp
index e5078d0f2d0..d6f6b754265 100644
--- a/src/mame/video/gunsmoke.cpp
+++ b/src/mame/video/gunsmoke.cpp
@@ -109,7 +109,7 @@ TILE_GET_INFO_MEMBER(gunsmoke_state::get_bg_tile_info)
int color = (attr & 0x3c) >> 2;
int flags = TILE_FLIPYX((attr & 0xc0) >> 6);
- SET_TILE_INFO_MEMBER(1, code, color, flags);
+ tileinfo.set(1, code, color, flags);
}
TILE_GET_INFO_MEMBER(gunsmoke_state::get_fg_tile_info)
@@ -120,7 +120,7 @@ TILE_GET_INFO_MEMBER(gunsmoke_state::get_fg_tile_info)
tileinfo.group = color;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
void gunsmoke_state::video_start()
diff --git a/src/mame/video/gyruss.cpp b/src/mame/video/gyruss.cpp
index 772dd91d8a9..4480be184b6 100644
--- a/src/mame/video/gyruss.cpp
+++ b/src/mame/video/gyruss.cpp
@@ -105,7 +105,7 @@ TILE_GET_INFO_MEMBER(gyruss_state::gyruss_get_tile_info)
tileinfo.group = (m_colorram[tile_index] & 0x10) ? 0 : 1;
- SET_TILE_INFO_MEMBER(2, code, color, flags);
+ tileinfo.set(2, code, color, flags);
}
diff --git a/src/mame/video/hanaawas.cpp b/src/mame/video/hanaawas.cpp
index 789c8bf30de..8f2b997b20b 100644
--- a/src/mame/video/hanaawas.cpp
+++ b/src/mame/video/hanaawas.cpp
@@ -93,7 +93,7 @@ TILE_GET_INFO_MEMBER(hanaawas_state::get_bg_tile_info)
int code = m_videoram[tile_index] + ((attr & 0x20) << 3);
int color = m_colorram[tile_index] & 0x1f;
- SET_TILE_INFO_MEMBER(gfxbank, code, color, 0);
+ tileinfo.set(gfxbank, code, color, 0);
}
void hanaawas_state::video_start()
diff --git a/src/mame/video/hcastle.cpp b/src/mame/video/hcastle.cpp
index 2b3b77641f6..0f1f7b4bf0b 100644
--- a/src/mame/video/hcastle.cpp
+++ b/src/mame/video/hcastle.cpp
@@ -66,7 +66,7 @@ TILE_GET_INFO_MEMBER(hcastle_state::get_fg_tile_info)
((attr >> (bit2 )) & 0x08) |
((attr >> (bit3 - 1)) & 0x10);
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
tile + bank * 0x100 + m_pf1_bankbase,
((ctrl_6 & 0x30) * 2 + 16) + color,
0);
@@ -89,7 +89,7 @@ TILE_GET_INFO_MEMBER(hcastle_state::get_bg_tile_info)
((attr >> (bit2 )) & 0x08) |
((attr >> (bit3 - 1)) & 0x10);
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
tile + bank * 0x100 + m_pf2_bankbase,
((ctrl_6 & 0x30) * 2 + 16) + color,
0);
diff --git a/src/mame/video/hexion.cpp b/src/mame/video/hexion.cpp
index cfaefbe9479..1721b58ba9d 100644
--- a/src/mame/video/hexion.cpp
+++ b/src/mame/video/hexion.cpp
@@ -15,7 +15,7 @@
inline void hexion_state::get_tile_info(tile_data &tileinfo,int tile_index,uint8_t *ram)
{
tile_index *= 4;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
ram[tile_index] + ((ram[tile_index+1] & 0x3f) << 8),
ram[tile_index+2] & 0x0f,
0);
diff --git a/src/mame/video/higemaru.cpp b/src/mame/video/higemaru.cpp
index 804fad9d572..e2b73ec5e7c 100644
--- a/src/mame/video/higemaru.cpp
+++ b/src/mame/video/higemaru.cpp
@@ -91,7 +91,7 @@ TILE_GET_INFO_MEMBER(higemaru_state::get_bg_tile_info)
int code = m_videoram[tile_index] + ((m_colorram[tile_index] & 0x80) << 1);
int color = m_colorram[tile_index] & 0x1f;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
void higemaru_state::video_start()
diff --git a/src/mame/video/himesiki.cpp b/src/mame/video/himesiki.cpp
index cae38a0d302..7c7f82125a2 100644
--- a/src/mame/video/himesiki.cpp
+++ b/src/mame/video/himesiki.cpp
@@ -19,7 +19,7 @@ TILE_GET_INFO_MEMBER(himesiki_state::get_bg_tile_info)
code &= 0xfff;
- SET_TILE_INFO_MEMBER(0, code, col, 0);
+ tileinfo.set(0, code, col, 0);
}
void himesiki_state::video_start()
diff --git a/src/mame/video/hng64.cpp b/src/mame/video/hng64.cpp
index a1efe3f845a..40ba7061d6a 100644
--- a/src/mame/video/hng64.cpp
+++ b/src/mame/video/hng64.cpp
@@ -46,22 +46,22 @@ void hng64_state::hng64_mark_tile_dirty( int tilemap, int tile_index )
{ \
if (tilemapinfo&0x400) \
{ \
- SET_TILE_INFO_MEMBER(1,tileno>>1,pal>>4,TILE_FLIPYX(flip)); \
+ tileinfo.set(1,tileno>>1,pal>>4,TILE_FLIPYX(flip)); \
} \
else \
{ \
- SET_TILE_INFO_MEMBER(0,tileno, pal,TILE_FLIPYX(flip)); \
+ tileinfo.set(0,tileno, pal,TILE_FLIPYX(flip)); \
} \
} \
else \
{ \
if (tilemapinfo&0x400) \
{ \
- SET_TILE_INFO_MEMBER(3,tileno>>3,pal>>4,TILE_FLIPYX(flip)); \
+ tileinfo.set(3,tileno>>3,pal>>4,TILE_FLIPYX(flip)); \
} \
else \
{ \
- SET_TILE_INFO_MEMBER(2,tileno>>2, pal,TILE_FLIPYX(flip)); \
+ tileinfo.set(2,tileno>>2, pal,TILE_FLIPYX(flip)); \
} \
} \
}
@@ -230,11 +230,11 @@ static void hng64_configure_blit_parameters(blit_parameters *blit, tilemap_t *tm
#define HNG64_ROZ_PLOT_PIXEL(INPUT_VAL) \
do { \
if (blit->drawformat == HNG64_TILEMAP_NORMAL) \
- *(uint32_t *)dest = clut[INPUT_VAL]; \
+ *(uint32_t *)dest = clut[INPUT_VAL]; \
else if (blit->drawformat == HNG64_TILEMAP_ADDITIVE) \
- *(uint32_t *)dest = add_blend_r32(*(uint32_t *)dest, clut[INPUT_VAL]); \
+ *(uint32_t *)dest = add_blend_r32(*(uint32_t *)dest, clut[INPUT_VAL]); \
else if (blit->drawformat == HNG64_TILEMAP_ALPHA) \
- *(uint32_t *)dest = alpha_blend_r32(*(uint32_t *)dest, clut[INPUT_VAL], alpha); \
+ *(uint32_t *)dest = alpha_blend_r32(*(uint32_t *)dest, clut[INPUT_VAL], alpha); \
} while (0)
void hng64_state::hng64_tilemap_draw_roz_core(screen_device &screen, tilemap_t *tmap, const blit_parameters *blit,
diff --git a/src/mame/video/holeland.cpp b/src/mame/video/holeland.cpp
index aed1f41b496..8ccff599806 100644
--- a/src/mame/video/holeland.cpp
+++ b/src/mame/video/holeland.cpp
@@ -30,7 +30,7 @@ TILE_GET_INFO_MEMBER(holeland_state::holeland_get_tile_info)
int attr = m_colorram[tile_index];
int tile_number = m_videoram[tile_index] | ((attr & 0x03) << 8);
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
tile_number,
m_palette_offset + ((attr >> 4) & 0x0f),
TILE_FLIPYX((attr >> 2) & 0x03));
@@ -42,7 +42,7 @@ TILE_GET_INFO_MEMBER(holeland_state::crzrally_get_tile_info)
int attr = m_colorram[tile_index];
int tile_number = m_videoram[tile_index] | ((attr & 0x03) << 8);
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
tile_number,
m_palette_offset + ((attr >> 4) & 0x0f),
TILE_FLIPYX((attr >> 2) & 0x03));
diff --git a/src/mame/video/homedata.cpp b/src/mame/video/homedata.cpp
index de4fe30f65d..3e8a76f6389 100644
--- a/src/mame/video/homedata.cpp
+++ b/src/mame/video/homedata.cpp
@@ -405,7 +405,7 @@ inline void homedata_state::mrokumei_info0( tile_data &tileinfo, int tile_index,
int code = m_videoram[addr + 1] + ((attr & 0x03) << 8) + (gfxbank << 10);
int color = (attr >> 2) + (gfxbank << 6);
- SET_TILE_INFO_MEMBER(0, code, color, m_flipscreen );
+ tileinfo.set(0, code, color, m_flipscreen );
}
inline void homedata_state::mrokumei_info1( tile_data &tileinfo, int tile_index, int page, int gfxbank )
{
@@ -414,7 +414,7 @@ inline void homedata_state::mrokumei_info1( tile_data &tileinfo, int tile_index,
int code = m_videoram[addr + 1] + ((attr & 0x07) << 8) + (gfxbank << 11);
int color = (attr >> 3) + ((gfxbank & 3) << 6);
- SET_TILE_INFO_MEMBER(1, code, color, m_flipscreen );
+ tileinfo.set(1, code, color, m_flipscreen );
}
TILE_GET_INFO_MEMBER(homedata_state::mrokumei_get_info0_0)
@@ -448,7 +448,7 @@ inline void homedata_state::reikaids_info( tile_data &tileinfo, int tile_index,
if (attr & 0x80) flags ^= TILE_FLIPX;
- SET_TILE_INFO_MEMBER(layer, code, color, flags );
+ tileinfo.set(layer, code, color, flags );
}
/* reikaids_gfx_bank[0]:
@@ -507,7 +507,7 @@ inline void homedata_state::pteacher_info( tile_data &tileinfo, int tile_index,
int code = m_videoram[addr + 1] + ((attr & 0x07) << 8) + (gfxbank << 11);
int color = (attr >> 3) + ((gfxbank & 1) << 5);
- SET_TILE_INFO_MEMBER(layer, code, color, m_flipscreen);
+ tileinfo.set(layer, code, color, m_flipscreen);
}
TILE_GET_INFO_MEMBER(homedata_state::pteacher_get_info0_0)
@@ -538,7 +538,7 @@ inline void homedata_state::lemnangl_info( tile_data &tileinfo, int tile_index,
int code = m_videoram[addr + 1] + ((attr & 0x07) << 8) + (gfxbank << 11);
int color = 16 * (attr >> 3) + gfxbank;
- SET_TILE_INFO_MEMBER(2 * layer + gfxset, code, color, m_flipscreen);
+ tileinfo.set(2 * layer + gfxset, code, color, m_flipscreen);
}
TILE_GET_INFO_MEMBER(homedata_state::lemnangl_get_info0_0)
@@ -570,7 +570,7 @@ inline void homedata_state::mirderby_info0( tile_data &tileinfo, int tile_index,
int code = m_videoram[addr + 1] + ((attr & 0x03) << 8) + 0x400;// + (gfxbank << 10);
int color = (attr >> 2) + (gfxbank << 6);
- SET_TILE_INFO_MEMBER(0, code, color, m_flipscreen );
+ tileinfo.set(0, code, color, m_flipscreen );
}
inline void homedata_state::mirderby_info1( tile_data &tileinfo, int tile_index, int page, int gfxbank )
{
@@ -579,7 +579,7 @@ inline void homedata_state::mirderby_info1( tile_data &tileinfo, int tile_index,
int code = m_videoram[addr + 1] + ((attr & 0x07) << 8) + 0x400;//(gfxbank << 11);
int color = (attr >> 3) + ((gfxbank & 3) << 6);
- SET_TILE_INFO_MEMBER(1, code, color, m_flipscreen );
+ tileinfo.set(1, code, color, m_flipscreen );
}
TILE_GET_INFO_MEMBER(homedata_state::mirderby_get_info0_0)
diff --git a/src/mame/video/homerun.cpp b/src/mame/video/homerun.cpp
index edf49e7d941..cf3cab274c5 100644
--- a/src/mame/video/homerun.cpp
+++ b/src/mame/video/homerun.cpp
@@ -107,7 +107,7 @@ TILE_GET_INFO_MEMBER(homerun_state::get_tile_info)
u32 const tileno = (m_videoram[tile_index]) | ((m_videoram[tile_index | 0x1000] & 0x38) << 5) | ((m_gfx_ctrl & 1) << 11);
u16 const palno = (m_videoram[tile_index | 0x1000] & 0x07);
- SET_TILE_INFO_MEMBER(0, tileno, palno, 0);
+ tileinfo.set(0, tileno, palno, 0);
}
diff --git a/src/mame/video/hyperspt.cpp b/src/mame/video/hyperspt.cpp
index 594545e74c8..19f2ad88e02 100644
--- a/src/mame/video/hyperspt.cpp
+++ b/src/mame/video/hyperspt.cpp
@@ -111,7 +111,7 @@ TILE_GET_INFO_MEMBER(hyperspt_state::get_bg_tile_info)
int color = m_colorram[tile_index] & 0x0f;
int flags = ((m_colorram[tile_index] & 0x10) ? TILE_FLIPX : 0) | ((m_colorram[tile_index] & 0x20) ? TILE_FLIPY : 0);
- SET_TILE_INFO_MEMBER(1, code, color, flags);
+ tileinfo.set(1, code, color, flags);
}
void hyperspt_state::video_start()
@@ -181,7 +181,7 @@ TILE_GET_INFO_MEMBER(hyperspt_state::roadf_get_bg_tile_info)
int color = m_colorram[tile_index] & 0x0f;
int flags = (m_colorram[tile_index] & 0x10) ? TILE_FLIPX : 0;
- SET_TILE_INFO_MEMBER(1, code, color, flags);
+ tileinfo.set(1, code, color, flags);
}
VIDEO_START_MEMBER(hyperspt_state,roadf)
diff --git a/src/mame/video/igs017_igs031.cpp b/src/mame/video/igs017_igs031.cpp
index 77acdbc95ad..9248d9074df 100644
--- a/src/mame/video/igs017_igs031.cpp
+++ b/src/mame/video/igs017_igs031.cpp
@@ -179,13 +179,13 @@ TILE_GET_INFO_MEMBER(igs017_igs031_device::get_fg_tile_info)
{
const u16 code = m_fg_videoram[tile_index * 4 + 0] + (m_fg_videoram[tile_index * 4 + 1] << 8);
const u16 attr = m_fg_videoram[tile_index * 4 + 2] + (m_fg_videoram[tile_index * 4 + 3] << 8);
- SET_TILE_INFO_MEMBER(0, code, COLOR(attr), TILE_FLIPXY(attr >> 5));
+ tileinfo.set(0, code, COLOR(attr), TILE_FLIPXY(attr >> 5));
}
TILE_GET_INFO_MEMBER(igs017_igs031_device::get_bg_tile_info)
{
const u16 code = m_bg_videoram[tile_index * 4 + 0] + (m_bg_videoram[tile_index * 4 + 1] << 8);
const u16 attr = m_bg_videoram[tile_index * 4 + 2] + (m_bg_videoram[tile_index * 4 + 3] << 8);
- SET_TILE_INFO_MEMBER(0, code, COLOR(attr)+8, TILE_FLIPXY(attr >> 5));
+ tileinfo.set(0, code, COLOR(attr)+8, TILE_FLIPXY(attr >> 5));
}
void igs017_igs031_device::fg_w(offs_t offset, u8 data)
diff --git a/src/mame/video/inufuku.cpp b/src/mame/video/inufuku.cpp
index 1d60abfab94..04b137dc41a 100644
--- a/src/mame/video/inufuku.cpp
+++ b/src/mame/video/inufuku.cpp
@@ -66,7 +66,7 @@ WRITE16_MEMBER(inufuku_state::inufuku_scrollreg_w)
TILE_GET_INFO_MEMBER(inufuku_state::get_inufuku_bg_tile_info)
{
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
m_bg_videoram[tile_index],
m_bg_palettebank,
0);
@@ -74,7 +74,7 @@ TILE_GET_INFO_MEMBER(inufuku_state::get_inufuku_bg_tile_info)
TILE_GET_INFO_MEMBER(inufuku_state::get_inufuku_tx_tile_info)
{
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
m_tx_videoram[tile_index],
m_tx_palettebank,
0);
diff --git a/src/mame/video/iqblock.cpp b/src/mame/video/iqblock.cpp
index d2442dbac19..df8422688be 100644
--- a/src/mame/video/iqblock.cpp
+++ b/src/mame/video/iqblock.cpp
@@ -13,7 +13,7 @@
TILE_GET_INFO_MEMBER(iqblock_state::get_bg_tile_info)
{
int code = m_bgvideoram[tile_index] + (m_bgvideoram[tile_index + 0x800] << 8);
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code &(m_video_type ? 0x1fff : 0x3fff),
m_video_type? (2*(code >> 13)+1) : (4*(code >> 14)+3),
0);
@@ -22,7 +22,7 @@ TILE_GET_INFO_MEMBER(iqblock_state::get_bg_tile_info)
TILE_GET_INFO_MEMBER(iqblock_state::get_fg_tile_info)
{
int code = m_fgvideoram[tile_index];
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
code & 0x7f,
(code & 0x80) ? 3 : 0,
0);
diff --git a/src/mame/video/ironhors.cpp b/src/mame/video/ironhors.cpp
index 059a1109e9e..619e557a67e 100644
--- a/src/mame/video/ironhors.cpp
+++ b/src/mame/video/ironhors.cpp
@@ -134,7 +134,7 @@ TILE_GET_INFO_MEMBER(ironhors_state::get_bg_tile_info)
int flags = ((m_colorram[tile_index] & 0x10) ? TILE_FLIPX : 0) |
((m_colorram[tile_index] & 0x20) ? TILE_FLIPY : 0);
- SET_TILE_INFO_MEMBER(0, code, color, flags);
+ tileinfo.set(0, code, color, flags);
}
void ironhors_state::video_start()
@@ -246,7 +246,7 @@ TILE_GET_INFO_MEMBER(ironhors_state::farwest_get_bg_tile_info)
int color = (m_colorram[tile_index] & 0x0f) + 16 * m_palettebank;
int flags = 0;//((m_colorram[tile_index] & 0x10) ? TILE_FLIPX : 0) | ((m_colorram[tile_index] & 0x20) ? TILE_FLIPY : 0);
- SET_TILE_INFO_MEMBER(0, code, color, flags);
+ tileinfo.set(0, code, color, flags);
}
VIDEO_START_MEMBER(ironhors_state,farwest)
diff --git a/src/mame/video/jack.cpp b/src/mame/video/jack.cpp
index c338816be8e..f90276c2513 100644
--- a/src/mame/video/jack.cpp
+++ b/src/mame/video/jack.cpp
@@ -46,7 +46,7 @@ TILE_GET_INFO_MEMBER(jack_state::get_bg_tile_info)
// striv: m_colorram[tile_index] & 0x80 ???
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
TILEMAP_MAPPER_MEMBER(jack_state::tilemap_scan_cols_flipy)
@@ -170,7 +170,7 @@ TILE_GET_INFO_MEMBER(jack_state::joinem_get_bg_tile_info)
int code = m_videoram[tile_index] + ((m_colorram[tile_index] & 0x03) << 8);
int color = (m_colorram[tile_index] & 0x38) >> 3 | m_joinem_palette_bank;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
VIDEO_START_MEMBER(jack_state,joinem)
diff --git a/src/mame/video/jackal.cpp b/src/mame/video/jackal.cpp
index 8d0d45bf070..10a587fdc82 100644
--- a/src/mame/video/jackal.cpp
+++ b/src/mame/video/jackal.cpp
@@ -51,7 +51,7 @@ TILE_GET_INFO_MEMBER(jackal_state::get_bg_tile_info)
int color = 0;//attr & 0x0f;
int flags = ((attr & 0x10) ? TILE_FLIPX : 0) | ((attr & 0x20) ? TILE_FLIPY : 0);
- SET_TILE_INFO_MEMBER(0, code, color, flags);
+ tileinfo.set(0, code, color, flags);
}
void jackal_state::video_start()
diff --git a/src/mame/video/jailbrek.cpp b/src/mame/video/jailbrek.cpp
index 6070c877858..8964f1a91c1 100644
--- a/src/mame/video/jailbrek.cpp
+++ b/src/mame/video/jailbrek.cpp
@@ -51,7 +51,7 @@ TILE_GET_INFO_MEMBER(jailbrek_state::get_bg_tile_info)
int code = m_videoram[tile_index] + ((attr & 0xc0) << 2);
int color = attr & 0x0f;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
void jailbrek_state::video_start()
diff --git a/src/mame/video/k001604.cpp b/src/mame/video/k001604.cpp
index c949edd67f6..8c2a4b853ec 100644
--- a/src/mame/video/k001604.cpp
+++ b/src/mame/video/k001604.cpp
@@ -164,7 +164,7 @@ TILE_GET_INFO_MEMBER(k001604_device::tile_info_layer_8x8)
if (val & 0x800000)
flags |= TILE_FLIPY;
- SET_TILE_INFO_MEMBER(0, tile, color, flags);
+ tileinfo.set(0, tile, color, flags);
}
TILE_GET_INFO_MEMBER(k001604_device::tile_info_layer_roz)
@@ -181,7 +181,7 @@ TILE_GET_INFO_MEMBER(k001604_device::tile_info_layer_roz)
tile += m_roz_size ? 0x800 : 0x2000;
- SET_TILE_INFO_MEMBER(m_roz_size, tile, color, flags);
+ tileinfo.set(m_roz_size, tile, color, flags);
}
diff --git a/src/mame/video/k007342.cpp b/src/mame/video/k007342.cpp
index 0cd29eab5f0..179b2c74c04 100644
--- a/src/mame/video/k007342.cpp
+++ b/src/mame/video/k007342.cpp
@@ -280,7 +280,7 @@ void k007342_device::get_tile_info( tile_data &tileinfo, int tile_index, int lay
m_callback(layer, m_regs[1], &code, &color, &flags);
- SET_TILE_INFO_MEMBER(m_gfxnum,
+ tileinfo.set(m_gfxnum,
code,
color,
flags);
diff --git a/src/mame/video/k037122.cpp b/src/mame/video/k037122.cpp
index 0f90673dbc1..0fe797d9eaa 100644
--- a/src/mame/video/k037122.cpp
+++ b/src/mame/video/k037122.cpp
@@ -93,7 +93,7 @@ TILE_GET_INFO_MEMBER(k037122_device::tile_info_layer0)
if (val & 0x800000)
flags |= TILE_FLIPY;
- SET_TILE_INFO_MEMBER(m_gfx_index, tile, color, flags);
+ tileinfo.set(m_gfx_index, tile, color, flags);
}
TILE_GET_INFO_MEMBER(k037122_device::tile_info_layer1)
@@ -108,7 +108,7 @@ TILE_GET_INFO_MEMBER(k037122_device::tile_info_layer1)
if (val & 0x800000)
flags |= TILE_FLIPY;
- SET_TILE_INFO_MEMBER(m_gfx_index, tile, color, flags);
+ tileinfo.set(m_gfx_index, tile, color, flags);
}
diff --git a/src/mame/video/k051316.cpp b/src/mame/video/k051316.cpp
index 411a7c26c3a..a927bc6c010 100644
--- a/src/mame/video/k051316.cpp
+++ b/src/mame/video/k051316.cpp
@@ -249,7 +249,7 @@ TILE_GET_INFO_MEMBER(k051316_device::get_tile_info)
m_k051316_cb(&code, &color, &flags);
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code,
color,
flags);
diff --git a/src/mame/video/k052109.cpp b/src/mame/video/k052109.cpp
index b4cac11c2b2..24ade46c68f 100644
--- a/src/mame/video/k052109.cpp
+++ b/src/mame/video/k052109.cpp
@@ -709,7 +709,7 @@ void k052109_device::get_tile_info( tile_data &tileinfo, int tile_index, int lay
if (flipy && (m_tileflip_enable & 2))
flags |= TILE_FLIPY;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code,
color,
flags);
diff --git a/src/mame/video/k054156_k054157_k056832.cpp b/src/mame/video/k054156_k054157_k056832.cpp
index b40ebd5aae2..3ccf6c03cd0 100644
--- a/src/mame/video/k054156_k054157_k056832.cpp
+++ b/src/mame/video/k054156_k054157_k056832.cpp
@@ -508,7 +508,7 @@ void k056832_device::get_tile_info( tile_data &tileinfo, int tile_index, int pa
m_k056832_cb(layer, &code, &color, &flags, &priority);
- SET_TILE_INFO_MEMBER(m_gfx_num,
+ tileinfo.set(m_gfx_num,
code,
color,
flags);
diff --git a/src/mame/video/kaneko_tmap.cpp b/src/mame/video/kaneko_tmap.cpp
index 49679049bb0..a81b349c9b3 100644
--- a/src/mame/video/kaneko_tmap.cpp
+++ b/src/mame/video/kaneko_tmap.cpp
@@ -129,7 +129,7 @@ TILE_GET_INFO_MEMBER(kaneko_view2_tilemap_device::get_tile_info)
if (!m_view2_cb.isnull())
m_view2_cb(Layer, &code);
- SET_TILE_INFO_MEMBER(0, code, (attr >> 2) & 0x3f, TILE_FLIPXY(attr & 3));
+ tileinfo.set(0, code, (attr >> 2) & 0x3f, TILE_FLIPXY(attr & 3));
tileinfo.category = (attr >> 8) & 7;
}
diff --git a/src/mame/video/karnov.cpp b/src/mame/video/karnov.cpp
index 353ce1c4809..ce267b1bfbb 100644
--- a/src/mame/video/karnov.cpp
+++ b/src/mame/video/karnov.cpp
@@ -32,7 +32,7 @@ uint32_t karnov_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap
TILE_GET_INFO_MEMBER(karnov_state::get_fix_tile_info)
{
int tile = m_videoram[tile_index];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
tile & 0xfff,
tile >> 14,
0);
@@ -41,7 +41,7 @@ TILE_GET_INFO_MEMBER(karnov_state::get_fix_tile_info)
TILE_GET_INFO_MEMBER(karnov_state::get_bg_tile_info)
{
int tile = m_pf_data[tile_index];
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
tile & 0x7ff,
tile >> 12,
0);
diff --git a/src/mame/video/kchamp.cpp b/src/mame/video/kchamp.cpp
index ea81463be36..11b39e43de2 100644
--- a/src/mame/video/kchamp.cpp
+++ b/src/mame/video/kchamp.cpp
@@ -47,7 +47,7 @@ TILE_GET_INFO_MEMBER(kchamp_state::get_bg_tile_info)
int code = m_videoram[tile_index] + ((m_colorram[tile_index] & 7) << 8);
int color = (m_colorram[tile_index] >> 3) & 0x1f;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
void kchamp_state::video_start()
diff --git a/src/mame/video/kickgoal.cpp b/src/mame/video/kickgoal.cpp
index e538a93fdd8..5b09a0da2e1 100644
--- a/src/mame/video/kickgoal.cpp
+++ b/src/mame/video/kickgoal.cpp
@@ -30,7 +30,7 @@ TILE_GET_INFO_MEMBER(kickgoal_state::get_kickgoal_fg_tile_info)
u16 const tileno = m_fgram[tile_index * 2] & 0x0fff;
u16 const color = m_fgram[tile_index * 2 + 1] & 0x000f;
- SET_TILE_INFO_MEMBER(BIT(tile_index, 5) ? 3 : 0, tileno + m_fg_base, color + 0x00, 0); // similar 8x8 gfx behavior as CPS1
+ tileinfo.set(BIT(tile_index, 5) ? 3 : 0, tileno + m_fg_base, color + 0x00, 0); // similar 8x8 gfx behavior as CPS1
}
TILE_GET_INFO_MEMBER(kickgoal_state::get_actionhw_fg_tile_info)
@@ -38,7 +38,7 @@ TILE_GET_INFO_MEMBER(kickgoal_state::get_actionhw_fg_tile_info)
u16 const tileno = m_fgram[tile_index * 2] & 0x0fff;
u16 const color = m_fgram[tile_index * 2 + 1] & 0x000f;
- SET_TILE_INFO_MEMBER(0, tileno + m_fg_base, color + 0x00, 0);
+ tileinfo.set(0, tileno + m_fg_base, color + 0x00, 0);
}
/* BG */
@@ -49,7 +49,7 @@ TILE_GET_INFO_MEMBER(kickgoal_state::get_bg_tile_info)
bool const flipx = m_bgram[tile_index * 2 + 1] & 0x0020;
bool const flipy = m_bgram[tile_index * 2 + 1] & 0x0040;
- SET_TILE_INFO_MEMBER(1, tileno + m_bg_base, color + 0x10, (flipx ? TILE_FLIPX : 0) | (flipy ? TILE_FLIPY : 0));
+ tileinfo.set(1, tileno + m_bg_base, color + 0x10, (flipx ? TILE_FLIPX : 0) | (flipy ? TILE_FLIPY : 0));
}
/* BG 2 */
@@ -60,7 +60,7 @@ TILE_GET_INFO_MEMBER(kickgoal_state::get_bg2_tile_info)
bool const flipx = m_bg2ram[tile_index * 2 + 1] & 0x0020;
bool const flipy = m_bg2ram[tile_index * 2 + 1] & 0x0040;
- SET_TILE_INFO_MEMBER(m_bg2_region, tileno + m_bg2_base, color + 0x20, (flipx ? TILE_FLIPX : 0) | (flipy ? TILE_FLIPY : 0));
+ tileinfo.set(m_bg2_region, tileno + m_bg2_base, color + 0x20, (flipx ? TILE_FLIPX : 0) | (flipy ? TILE_FLIPY : 0));
}
diff --git a/src/mame/video/kingobox.cpp b/src/mame/video/kingobox.cpp
index 0669cb9127f..9803d3d3a7d 100644
--- a/src/mame/video/kingobox.cpp
+++ b/src/mame/video/kingobox.cpp
@@ -180,7 +180,7 @@ TILE_GET_INFO_MEMBER(kingofb_state::get_bg_tile_info)
int code = (tile_index / 16) ? m_videoram[tile_index] + ((attr & 0x03) << 8) : 0;
int color = ((attr & 0x70) >> 4) + 8 * m_palette_bank;
- SET_TILE_INFO_MEMBER(bank, code, color, 0);
+ tileinfo.set(bank, code, color, 0);
}
TILE_GET_INFO_MEMBER(kingofb_state::get_fg_tile_info)
@@ -190,7 +190,7 @@ TILE_GET_INFO_MEMBER(kingofb_state::get_fg_tile_info)
int code = m_videoram2[tile_index] + ((attr & 0x01) << 8);
int color = (attr & 0x38) >> 3;
- SET_TILE_INFO_MEMBER(bank, code, color, 0);
+ tileinfo.set(bank, code, color, 0);
}
VIDEO_START_MEMBER(kingofb_state,kingofb)
@@ -254,7 +254,7 @@ TILE_GET_INFO_MEMBER(kingofb_state::ringking_get_bg_tile_info)
int code = (tile_index / 16) ? m_videoram[tile_index] : 0;
int color = ((m_colorram[tile_index] & 0x70) >> 4) + 8 * m_palette_bank;
- SET_TILE_INFO_MEMBER(4, code, color, 0);
+ tileinfo.set(4, code, color, 0);
}
VIDEO_START_MEMBER(kingofb_state,ringking)
diff --git a/src/mame/video/klax.cpp b/src/mame/video/klax.cpp
index afa3634a385..a99221d701c 100644
--- a/src/mame/video/klax.cpp
+++ b/src/mame/video/klax.cpp
@@ -23,7 +23,7 @@ TILE_GET_INFO_MEMBER(klax_state::get_playfield_tile_info)
const u16 data2 = m_playfield_tilemap->extmem_read(tile_index) >> 8;
const u32 code = data1 & 0x1fff;
const u32 color = data2 & 0x0f;
- SET_TILE_INFO_MEMBER(0, code, color, (data1 >> 15) & 1);
+ tileinfo.set(0, code, color, (data1 >> 15) & 1);
}
diff --git a/src/mame/video/kncljoe.cpp b/src/mame/video/kncljoe.cpp
index 5a366683f30..b600f77f024 100644
--- a/src/mame/video/kncljoe.cpp
+++ b/src/mame/video/kncljoe.cpp
@@ -83,7 +83,7 @@ TILE_GET_INFO_MEMBER(kncljoe_state::get_bg_tile_info)
int attr = m_videoram[2 * tile_index + 1];
int code = m_videoram[2 * tile_index] + ((attr & 0xc0) << 2) + (m_tile_bank << 10);
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code,
attr & 0xf,
TILE_FLIPXY((attr & 0x30) >> 4));
diff --git a/src/mame/video/konamigx.cpp b/src/mame/video/konamigx.cpp
index 875a027bfce..398afdde993 100644
--- a/src/mame/video/konamigx.cpp
+++ b/src/mame/video/konamigx.cpp
@@ -916,7 +916,7 @@ TILE_GET_INFO_MEMBER(konamigx_state::get_gx_psac_tile_info)
colour = (m_psac_colorbase << 4) + col;
- SET_TILE_INFO_MEMBER(0, tileno, colour, TILE_FLIPYX(flip));
+ tileinfo.set(0, tileno, colour, TILE_FLIPYX(flip));
}
@@ -957,7 +957,7 @@ TILE_GET_INFO_MEMBER(konamigx_state::get_gx_psac3_tile_info)
if (tmap[(base_index*2)+1] & 0x20) flip |= TILE_FLIPY;
if (tmap[(base_index*2)+1] & 0x10) flip |= TILE_FLIPX;
- SET_TILE_INFO_MEMBER(0, tileno, colour, flip);
+ tileinfo.set(0, tileno, colour, flip);
}
TILE_GET_INFO_MEMBER(konamigx_state::get_gx_psac3_alt_tile_info)
@@ -978,7 +978,7 @@ TILE_GET_INFO_MEMBER(konamigx_state::get_gx_psac3_alt_tile_info)
if (tmap[(base_index*2)+1] & 0x20) flip |= TILE_FLIPY;
if (tmap[(base_index*2)+1] & 0x10) flip |= TILE_FLIPX;
- SET_TILE_INFO_MEMBER(0, tileno, colour, flip);
+ tileinfo.set(0, tileno, colour, flip);
}
@@ -1004,7 +1004,7 @@ TILE_GET_INFO_MEMBER(konamigx_state::get_gx_psac1a_tile_info)
if (flipx) flip |= TILE_FLIPX;
if (flipy) flip |= TILE_FLIPY;
- SET_TILE_INFO_MEMBER(1, tileno, colour, flip);
+ tileinfo.set(1, tileno, colour, flip);
}
TILE_GET_INFO_MEMBER(konamigx_state::get_gx_psac1b_tile_info)
@@ -1026,7 +1026,7 @@ TILE_GET_INFO_MEMBER(konamigx_state::get_gx_psac1b_tile_info)
if (flipx) flip |= TILE_FLIPX;
if (flipy) flip |= TILE_FLIPY;
- SET_TILE_INFO_MEMBER(0, tileno, colour, flip);
+ tileinfo.set(0, tileno, colour, flip);
}
K056832_CB_MEMBER(konamigx_state::type2_tile_callback)
diff --git a/src/mame/video/kopunch.cpp b/src/mame/video/kopunch.cpp
index 149cdcab5d6..417adbe8623 100644
--- a/src/mame/video/kopunch.cpp
+++ b/src/mame/video/kopunch.cpp
@@ -83,7 +83,7 @@ TILE_GET_INFO_MEMBER(kopunch_state::get_fg_tile_info)
{
int code = m_vram_fg[tile_index];
- SET_TILE_INFO_MEMBER(0, code, 0, 0);
+ tileinfo.set(0, code, 0, 0);
}
TILE_GET_INFO_MEMBER(kopunch_state::get_bg_tile_info)
@@ -91,7 +91,7 @@ TILE_GET_INFO_MEMBER(kopunch_state::get_bg_tile_info)
// note: highest bit is unused
int code = (m_vram_bg[tile_index] & 0x7f) | m_gfxbank << 7;
- SET_TILE_INFO_MEMBER(1, code, 0, 0);
+ tileinfo.set(1, code, 0, 0);
}
void kopunch_state::video_start()
diff --git a/src/mame/video/ksayakyu.cpp b/src/mame/video/ksayakyu.cpp
index c900e78ce66..0c95f1e69f1 100644
--- a/src/mame/video/ksayakyu.cpp
+++ b/src/mame/video/ksayakyu.cpp
@@ -51,7 +51,7 @@ TILE_GET_INFO_MEMBER(ksayakyu_state::get_ksayakyu_tile_info)
int code = memregion("user1")->base()[tile_index];
int attr = memregion("user1")->base()[tile_index + 0x2000];
code += (attr & 3) << 8;
- SET_TILE_INFO_MEMBER(1, code, ((attr >> 2) & 0x0f) * 2, (attr & 0x80) ? TILE_FLIPX : 0);
+ tileinfo.set(1, code, ((attr >> 2) & 0x0f) * 2, (attr & 0x80) ? TILE_FLIPX : 0);
}
/*
@@ -69,7 +69,7 @@ TILE_GET_INFO_MEMBER(ksayakyu_state::get_text_tile_info)
code |= (attr & 3) << 8;
- SET_TILE_INFO_MEMBER(0, code, color, flags);
+ tileinfo.set(0, code, color, flags);
}
/*
diff --git a/src/mame/video/kyugo.cpp b/src/mame/video/kyugo.cpp
index 756c0a6f777..7213eb9420a 100644
--- a/src/mame/video/kyugo.cpp
+++ b/src/mame/video/kyugo.cpp
@@ -19,7 +19,7 @@
TILE_GET_INFO_MEMBER(kyugo_state::get_fg_tile_info)
{
int code = m_fgvideoram[tile_index];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code,
2 * m_color_codes[code >> 3] + m_fgcolor,
0);
@@ -30,7 +30,7 @@ TILE_GET_INFO_MEMBER(kyugo_state::get_bg_tile_info)
{
int code = m_bgvideoram[tile_index];
int attr = m_bgattribram[tile_index];
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
code | ((attr & 0x03) << 8),
(attr >> 4) | (m_bgpalbank << 4),
TILE_FLIPYX((attr & 0x0c) >> 2));
diff --git a/src/mame/video/labyrunr.cpp b/src/mame/video/labyrunr.cpp
index e3cf3776d9c..8dfd6b2ca34 100644
--- a/src/mame/video/labyrunr.cpp
+++ b/src/mame/video/labyrunr.cpp
@@ -59,7 +59,7 @@ TILE_GET_INFO_MEMBER(labyrunr_state::get_tile_info0)
bank = (bank & ~(mask << 1)) | ((ctrl_4 & mask) << 1);
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code + bank * 256,
((ctrl_6 & 0x30) * 2 + 16)+(attr & 7),
0);
@@ -88,7 +88,7 @@ TILE_GET_INFO_MEMBER(labyrunr_state::get_tile_info1)
bank = (bank & ~(mask << 1)) | ((ctrl_4 & mask) << 1);
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code+bank*256,
((ctrl_6 & 0x30) * 2 + 16) + (attr & 7),
0);
diff --git a/src/mame/video/ladybug.cpp b/src/mame/video/ladybug.cpp
index 040c8cd6966..482e89c513a 100644
--- a/src/mame/video/ladybug.cpp
+++ b/src/mame/video/ladybug.cpp
@@ -114,7 +114,7 @@ TILE_GET_INFO_MEMBER(ladybug_video_device::get_bg_tile_info)
int const code = m_bg_ram[tile_index] + (BIT(m_bg_ram[0x0400 | tile_index], 3) << 8);
int const color = m_bg_ram[0x0400 | tile_index] & 0x07;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
@@ -393,13 +393,13 @@ TILE_GET_INFO_MEMBER(sraider_state::get_grid_tile_info)
{
if (tile_index < 512)
{
- SET_TILE_INFO_MEMBER(3, tile_index, 0, 0);
+ tileinfo.set(3, tile_index, 0, 0);
}
else
{
int temp = tile_index / 32;
tile_index = (31 - temp) * 32 + (tile_index % 32);
- SET_TILE_INFO_MEMBER(4, tile_index, 0, 0);
+ tileinfo.set(4, tile_index, 0, 0);
}
}
diff --git a/src/mame/video/ladyfrog.cpp b/src/mame/video/ladyfrog.cpp
index 22d146d568e..cf34b9bbb97 100644
--- a/src/mame/video/ladyfrog.cpp
+++ b/src/mame/video/ladyfrog.cpp
@@ -25,7 +25,7 @@ TILE_GET_INFO_MEMBER(ladyfrog_state::get_tile_info)
{
int pal = m_videoram[tile_index * 2 + 1] & 0x0f;
int tile = m_videoram[tile_index * 2] + ((m_videoram[tile_index * 2 + 1] & 0xc0) << 2)+ ((m_videoram[tile_index * 2 + 1] & 0x30) << 6);
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
tile + 0x1000 * m_tilebank,
pal,TILE_FLIPY
);
diff --git a/src/mame/video/lasso.cpp b/src/mame/video/lasso.cpp
index cc0dfc2d766..6ba87f447e6 100644
--- a/src/mame/video/lasso.cpp
+++ b/src/mame/video/lasso.cpp
@@ -115,7 +115,7 @@ TILE_GET_INFO_MEMBER(lasso_state::lasso_get_bg_tile_info)
int code = m_videoram[tile_index];
int color = m_colorram[tile_index];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code + ((uint16_t)m_gfxbank << 8),
color & 0x0f,
0);
@@ -127,7 +127,7 @@ TILE_GET_INFO_MEMBER(lasso_state::wwjgtin_get_track_tile_info)
int code = ROM[tile_index];
int color = ROM[tile_index + 0x2000];
- SET_TILE_INFO_MEMBER(2,
+ tileinfo.set(2,
code,
color & 0x0f,
0);
@@ -138,7 +138,7 @@ TILE_GET_INFO_MEMBER(lasso_state::pinbo_get_bg_tile_info)
int code = m_videoram[tile_index];
int color = m_colorram[tile_index];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code + ((color & 0x30) << 4),
color & 0x0f,
0);
diff --git a/src/mame/video/lastduel.cpp b/src/mame/video/lastduel.cpp
index ec09ebd9088..c6915755688 100644
--- a/src/mame/video/lastduel.cpp
+++ b/src/mame/video/lastduel.cpp
@@ -22,7 +22,7 @@ TILE_GET_INFO_MEMBER(lastduel_state::ld_get_bg_tile_info)
{
int const tile = m_vram[1][2 * tile_index] & 0x1fff;
int const color = m_vram[1][2 * tile_index + 1];
- SET_TILE_INFO_MEMBER(2,
+ tileinfo.set(2,
tile,color & 0xf,
TILE_FLIPYX((color & 0x60) >> 5));
}
@@ -31,7 +31,7 @@ TILE_GET_INFO_MEMBER(lastduel_state::ld_get_fg_tile_info)
{
int const tile = m_vram[0][2 * tile_index] & 0x1fff;
int const color = m_vram[0][2 * tile_index + 1];
- SET_TILE_INFO_MEMBER(3,
+ tileinfo.set(3,
tile,
color & 0xf,
TILE_FLIPYX((color & 0x60) >> 5));
@@ -42,7 +42,7 @@ TILE_GET_INFO_MEMBER(lastduel_state::get_bg_tile_info)
{
int const tile = m_vram[1][tile_index] & 0x1fff;
int const color = m_vram[1][tile_index + 0x0800];
- SET_TILE_INFO_MEMBER(2,
+ tileinfo.set(2,
tile,
color & 0xf,
TILE_FLIPYX((color & 0x60) >> 5));
@@ -52,7 +52,7 @@ TILE_GET_INFO_MEMBER(lastduel_state::get_fg_tile_info)
{
int const tile = m_vram[0][tile_index] & 0x1fff;
int const color = m_vram[0][tile_index + 0x0800];
- SET_TILE_INFO_MEMBER(3,
+ tileinfo.set(3,
tile,
color & 0xf,
TILE_FLIPYX((color & 0x60) >> 5));
@@ -62,7 +62,7 @@ TILE_GET_INFO_MEMBER(lastduel_state::get_fg_tile_info)
TILE_GET_INFO_MEMBER(lastduel_state::get_fix_info)
{
int const tile = m_txram[tile_index];
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
tile & 0x7ff,
tile>>12,
(tile & 0x800) ? TILE_FLIPY : 0);
diff --git a/src/mame/video/legionna.cpp b/src/mame/video/legionna.cpp
index c2acb3c3ffd..082a38cf15a 100644
--- a/src/mame/video/legionna.cpp
+++ b/src/mame/video/legionna.cpp
@@ -145,31 +145,31 @@ void legionna_state::text_w(offs_t offset, u16 data, u16 mem_mask)
TILE_GET_INFO_MEMBER(legionna_state::get_back_tile_info)
{
const u16 tile = m_back_data[tile_index];
- SET_TILE_INFO_MEMBER(2, (tile & 0xfff) | m_back_gfx_bank, (tile >> 12) & 0xf, 0);
+ tileinfo.set(2, (tile & 0xfff) | m_back_gfx_bank, (tile >> 12) & 0xf, 0);
}
TILE_GET_INFO_MEMBER(legionna_state::get_mid_tile_info_split)
{
const u16 tile = m_mid_data[tile_index];
- SET_TILE_INFO_MEMBER(4, (tile & 0xfff) | m_mid_gfx_bank, (tile >> 12) & 0xf, 0);
+ tileinfo.set(4, (tile & 0xfff) | m_mid_gfx_bank, (tile >> 12) & 0xf, 0);
}
TILE_GET_INFO_MEMBER(legionna_state::get_mid_tile_info_share_bgrom)
{
const u16 tile = m_mid_data[tile_index];
- SET_TILE_INFO_MEMBER(2, (tile & 0xfff) | 0x1000, ((tile >> 12) & 0xf) | 0x10, 0);
+ tileinfo.set(2, (tile & 0xfff) | 0x1000, ((tile >> 12) & 0xf) | 0x10, 0);
}
TILE_GET_INFO_MEMBER(legionna_state::get_fore_tile_info)
{
const u16 tile = m_fore_data[tile_index];
- SET_TILE_INFO_MEMBER(3, (tile & 0xfff) | m_fore_gfx_bank, (tile >> 12) & 0xf, 0);
+ tileinfo.set(3, (tile & 0xfff) | m_fore_gfx_bank, (tile >> 12) & 0xf, 0);
}
TILE_GET_INFO_MEMBER(legionna_state::get_text_tile_info)
{
const u16 tile = m_textram[tile_index];
- SET_TILE_INFO_MEMBER(1, tile & 0xfff, (tile >> 12) & 0xf, 0);
+ tileinfo.set(1, tile & 0xfff, (tile >> 12) & 0xf, 0);
}
void legionna_state::common_video_allocate_ptr()
diff --git a/src/mame/video/leland.cpp b/src/mame/video/leland.cpp
index 7861ac0c553..e0e33b33c03 100644
--- a/src/mame/video/leland.cpp
+++ b/src/mame/video/leland.cpp
@@ -64,7 +64,7 @@ TILE_GET_INFO_MEMBER(leland_state::leland_get_tile_info)
int char_bank = ((m_gfxbank >> 4) & 0x03) << 10;
int prom_bank = ((m_gfxbank >> 3) & 0x01) << 13;
int tile = m_bg_prom[prom_bank | tile_index] | ((tile_index >> 7) & 0x300) | char_bank;
- SET_TILE_INFO_MEMBER(0, tile, m_bg_prom[prom_bank | tile_index] >> 5, 0);
+ tileinfo.set(0, tile, m_bg_prom[prom_bank | tile_index] >> 5, 0);
}
@@ -83,7 +83,7 @@ TILEMAP_MAPPER_MEMBER(ataxx_state::ataxx_scan)
TILE_GET_INFO_MEMBER(ataxx_state::ataxx_get_tile_info)
{
u16 tile = m_ataxx_qram[tile_index] | ((m_ataxx_qram[0x4000 | tile_index] & 0x7f) << 8);
- SET_TILE_INFO_MEMBER(0, tile, 0, 0);
+ tileinfo.set(0, tile, 0, 0);
}
diff --git a/src/mame/video/lemmings.cpp b/src/mame/video/lemmings.cpp
index 3a64c13db9b..4b4924bc1e6 100644
--- a/src/mame/video/lemmings.cpp
+++ b/src/mame/video/lemmings.cpp
@@ -25,7 +25,7 @@ TILE_GET_INFO_MEMBER(lemmings_state::get_tile_info)
{
uint16_t tile = m_vram_data[tile_index];
- SET_TILE_INFO_MEMBER(2,
+ tileinfo.set(2,
tile&0x7ff,
(tile>>12)&0xf,
0);
diff --git a/src/mame/video/liberate.cpp b/src/mame/video/liberate.cpp
index 5c1acb8b79d..36749a569a9 100644
--- a/src/mame/video/liberate.cpp
+++ b/src/mame/video/liberate.cpp
@@ -66,7 +66,7 @@ TILE_GET_INFO_MEMBER(liberate_state::get_back_tile_info)
bank = 3;
else
bank = 2;
- SET_TILE_INFO_MEMBER(bank, tile & 0x7f, m_background_color, 0);
+ tileinfo.set(bank, tile & 0x7f, m_background_color, 0);
}
TILE_GET_INFO_MEMBER(liberate_state::get_fix_tile_info)
@@ -78,7 +78,7 @@ TILE_GET_INFO_MEMBER(liberate_state::get_fix_tile_info)
tile = videoram[tile_index] + (colorram[tile_index] << 8);
color = (colorram[tile_index] & 0x70) >> 4;
- SET_TILE_INFO_MEMBER(0, tile, color, 0);
+ tileinfo.set(0, tile, color, 0);
}
TILE_GET_INFO_MEMBER(liberate_state::prosport_get_back_tile_info)
@@ -97,7 +97,7 @@ TILE_GET_INFO_MEMBER(liberate_state::prosport_get_back_tile_info)
tile += m_io_ram[0]&0x20; //Pro Bowling bg tiles banking bit
- SET_TILE_INFO_MEMBER(8, tile, 0, 0);
+ tileinfo.set(8, tile, 0, 0);
}
/***************************************************************************/
diff --git a/src/mame/video/lkage.cpp b/src/mame/video/lkage.cpp
index 082897d358a..26a198caecc 100644
--- a/src/mame/video/lkage.cpp
+++ b/src/mame/video/lkage.cpp
@@ -70,19 +70,19 @@ WRITE8_MEMBER(lkage_state::lkage_videoram_w)
TILE_GET_INFO_MEMBER(lkage_state::get_bg_tile_info)
{
int code = m_videoram[tile_index + 0x800] + 256 * (m_bg_tile_bank ? 5 : 1);
- SET_TILE_INFO_MEMBER(0/*gfx*/, code, 0/*color*/, 0/*flags*/ );
+ tileinfo.set(0/*gfx*/, code, 0/*color*/, 0/*flags*/ );
}
TILE_GET_INFO_MEMBER(lkage_state::get_fg_tile_info)
{
int code = m_videoram[tile_index + 0x400] + 256 * (m_fg_tile_bank ? 1 : 0);
- SET_TILE_INFO_MEMBER(0/*gfx*/, code, 0/*color*/, 0/*flags*/);
+ tileinfo.set(0/*gfx*/, code, 0/*color*/, 0/*flags*/);
}
TILE_GET_INFO_MEMBER(lkage_state::get_tx_tile_info)
{
int code = m_videoram[tile_index] + 256 * (m_tx_tile_bank ? 4 : 0);
- SET_TILE_INFO_MEMBER(0/*gfx*/, code, 0/*color*/, 0/*flags*/);
+ tileinfo.set(0/*gfx*/, code, 0/*color*/, 0/*flags*/);
}
void lkage_state::video_start()
diff --git a/src/mame/video/lockon.cpp b/src/mame/video/lockon.cpp
index 5334f22d80f..bad09c07801 100644
--- a/src/mame/video/lockon.cpp
+++ b/src/mame/video/lockon.cpp
@@ -144,7 +144,7 @@ TILE_GET_INFO_MEMBER(lockon_state::get_lockon_tile_info)
uint32_t col = (m_char_ram[tile_index] >> 10) & 0x3f;
col = (col & 0x1f) + (col & 0x20 ? 64 : 0);
- SET_TILE_INFO_MEMBER(0, tileno, col, 0);
+ tileinfo.set(0, tileno, col, 0);
}
diff --git a/src/mame/video/lordgun.cpp b/src/mame/video/lordgun.cpp
index eabeca1e51c..755a09a887c 100644
--- a/src/mame/video/lordgun.cpp
+++ b/src/mame/video/lordgun.cpp
@@ -53,7 +53,7 @@ TILE_GET_INFO_MEMBER(lordgun_state::get_tile_info)
uint16_t attr = m_vram[Layer][tile_index * 2 + 0 ];
uint16_t code = m_vram[Layer][ tile_index * 2 + 1 ];
uint16_t pri = (attr & 0x0e00) >> 9;
- SET_TILE_INFO_MEMBER(Layer, code, ((attr & 0x0030) >> 4) + 0x10 + 0x4 * ((Layer + 1) & 3) + pri*0x800/0x40, TILE_FLIPXY(attr >> 14));
+ tileinfo.set(Layer, code, ((attr & 0x0030) >> 4) + 0x10 + 0x4 * ((Layer + 1) & 3) + pri*0x800/0x40, TILE_FLIPXY(attr >> 14));
}
/***************************************************************************
diff --git a/src/mame/video/lucky74.cpp b/src/mame/video/lucky74.cpp
index c2436f0dc47..0472bcbf171 100644
--- a/src/mame/video/lucky74.cpp
+++ b/src/mame/video/lucky74.cpp
@@ -206,7 +206,7 @@ TILE_GET_INFO_MEMBER(lucky74_state::get_fg_tile_info)
int code = m_fg_videoram[tile_index] + ((attr & 0xf0) << 4);
int color = (attr & 0x0f);
- SET_TILE_INFO_MEMBER(bank, code, color, 0);
+ tileinfo.set(bank, code, color, 0);
}
TILE_GET_INFO_MEMBER(lucky74_state::get_bg_tile_info)
@@ -221,7 +221,7 @@ TILE_GET_INFO_MEMBER(lucky74_state::get_bg_tile_info)
int code = m_bg_videoram[tile_index] + ((attr & 0xf0) << 4);
int color = (attr & 0x0f);
- SET_TILE_INFO_MEMBER(bank, code, color, 0);
+ tileinfo.set(bank, code, color, 0);
}
diff --git a/src/mame/video/lvcards.cpp b/src/mame/video/lvcards.cpp
index f7e19bb21ad..3c3819990d7 100644
--- a/src/mame/video/lvcards.cpp
+++ b/src/mame/video/lvcards.cpp
@@ -66,7 +66,7 @@ TILE_GET_INFO_MEMBER(lvcards_state::get_bg_tile_info)
int color = attr & 0x0f;
int flags = (attr & 0x40) ? TILE_FLIPX : 0;
- SET_TILE_INFO_MEMBER(0, code, color, flags);
+ tileinfo.set(0, code, color, flags);
}
void lvcards_state::video_start()
diff --git a/src/mame/video/lwings.cpp b/src/mame/video/lwings.cpp
index e0c36dea97f..3d030a5f7c0 100644
--- a/src/mame/video/lwings.cpp
+++ b/src/mame/video/lwings.cpp
@@ -26,7 +26,7 @@ TILE_GET_INFO_MEMBER(lwings_state::get_fg_tile_info)
{
int code = m_fgvideoram[tile_index];
int color = m_fgvideoram[tile_index + 0x400];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code + ((color & 0xc0) << 2),
color & 0x0f,
TILE_FLIPYX((color & 0x30) >> 4));
@@ -36,7 +36,7 @@ TILE_GET_INFO_MEMBER(lwings_state::lwings_get_bg1_tile_info)
{
int code = m_bg1videoram[tile_index];
int color = m_bg1videoram[tile_index + 0x400];
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
code + ((color & 0xe0) << 3),
color & 0x07,
TILE_FLIPYX((color & 0x18) >> 3));
@@ -47,7 +47,7 @@ TILE_GET_INFO_MEMBER(lwings_state::trojan_get_bg1_tile_info)
int code = m_bg1videoram[tile_index];
int color = m_bg1videoram[tile_index + 0x400];
code += (color & 0xe0)<<3;
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
code,
m_bg2_avenger_hw ? ((color & 7) ^ 6) : (color & 7),
((color & 0x10) ? TILE_FLIPX : 0));
@@ -64,7 +64,7 @@ TILE_GET_INFO_MEMBER(lwings_state::get_bg2_tile_info)
tile_index = (tile_index + m_bg2_image * 0x20) & mask;
code = rom[tile_index];
color = rom[tile_index + 1];
- SET_TILE_INFO_MEMBER(3,
+ tileinfo.set(3,
code + ((color & 0x80) << 1),
color & 0x07,
TILE_FLIPYX((color & 0x30) >> 4));
diff --git a/src/mame/video/m10.cpp b/src/mame/video/m10.cpp
index ce111021505..bf770252b75 100644
--- a/src/mame/video/m10.cpp
+++ b/src/mame/video/m10.cpp
@@ -52,7 +52,7 @@ TILEMAP_MAPPER_MEMBER(m10_state::tilemap_scan)
TILE_GET_INFO_MEMBER(m10_state::get_tile_info)
{
- SET_TILE_INFO_MEMBER(0, m_videoram[tile_index], m_colorram[tile_index] & 0x07, 0);
+ tileinfo.set(0, m_videoram[tile_index], m_colorram[tile_index] & 0x07, 0);
}
diff --git a/src/mame/video/m107.cpp b/src/mame/video/m107.cpp
index 880295c76b4..7b74a5b157c 100644
--- a/src/mame/video/m107.cpp
+++ b/src/mame/video/m107.cpp
@@ -53,7 +53,7 @@ TILE_GET_INFO_MEMBER(m107_state::get_pf_tile_info)
attrib = m_vram_data[tile_index + 1];
tile = m_vram_data[tile_index] + ((attrib & 0x1000) << 4);
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
tile,
attrib & 0x7f,
TILE_FLIPYX(attrib >> 10));
diff --git a/src/mame/video/m52.cpp b/src/mame/video/m52.cpp
index e1f7eab1cbc..3749864b29d 100644
--- a/src/mame/video/m52.cpp
+++ b/src/mame/video/m52.cpp
@@ -139,7 +139,7 @@ TILE_GET_INFO_MEMBER(m52_state::get_tile_info)
flag |= TILE_FORCE_LAYER0; /* lines 0 to 6 are opaqe? */
}
- SET_TILE_INFO_MEMBER(0, code, color & 0x7f, flag);
+ tileinfo.set(0, code, color & 0x7f, flag);
}
diff --git a/src/mame/video/m57.cpp b/src/mame/video/m57.cpp
index be3b81010d0..62b496edc71 100644
--- a/src/mame/video/m57.cpp
+++ b/src/mame/video/m57.cpp
@@ -113,7 +113,7 @@ TILE_GET_INFO_MEMBER(m57_state::get_tile_info)
uint8_t attr = m_videoram[tile_index * 2 + 0];
uint16_t code = m_videoram[tile_index * 2 + 1] | ((attr & 0xc0) << 2);
- SET_TILE_INFO_MEMBER(0, code, attr & 0x0f, TILE_FLIPXY(attr >> 4));
+ tileinfo.set(0, code, attr & 0x0f, TILE_FLIPXY(attr >> 4));
}
diff --git a/src/mame/video/m58.cpp b/src/mame/video/m58.cpp
index 1e20b51308c..e36d9216be1 100644
--- a/src/mame/video/m58.cpp
+++ b/src/mame/video/m58.cpp
@@ -146,7 +146,7 @@ TILE_GET_INFO_MEMBER(m58_state::get_bg_tile_info)
int color = attr & 0x1f;
int flags = (attr & 0x20) ? TILE_FLIPX : 0;
- SET_TILE_INFO_MEMBER(0, code, color, flags);
+ tileinfo.set(0, code, color, flags);
}
diff --git a/src/mame/video/m62.cpp b/src/mame/video/m62.cpp
index 4e0e61155cf..bb6579dda2e 100644
--- a/src/mame/video/m62.cpp
+++ b/src/mame/video/m62.cpp
@@ -379,7 +379,7 @@ TILE_GET_INFO_MEMBER(m62_state::get_kungfum_bg_tile_info)
{
flags |= TILE_FLIPX;
}
- SET_TILE_INFO_MEMBER(0, code | ((color & 0xc0)<< 2), color & 0x1f, flags);
+ tileinfo.set(0, code | ((color & 0xc0)<< 2), color & 0x1f, flags);
/* is the following right? */
if ((tile_index / 64) < 6 || ((color & 0x1f) >> 1) > 0x0c)
@@ -423,7 +423,7 @@ TILE_GET_INFO_MEMBER(m62_state::get_ldrun_bg_tile_info)
{
flags |= TILE_FLIPX;
}
- SET_TILE_INFO_MEMBER(0, code | ((color & 0xc0) << 2), color & 0x1f, flags);
+ tileinfo.set(0, code | ((color & 0xc0) << 2), color & 0x1f, flags);
if (((color & 0x1f) >> 1) >= 0x0c)
tileinfo.group = 1;
else
@@ -461,7 +461,7 @@ TILE_GET_INFO_MEMBER(m62_state::get_ldrun2_bg_tile_info)
{
flags |= TILE_FLIPX;
}
- SET_TILE_INFO_MEMBER(0, code | ((color & 0xc0) << 2), color & 0x1f, flags);
+ tileinfo.set(0, code | ((color & 0xc0) << 2), color & 0x1f, flags);
if (((color & 0x1f) >> 1) >= 0x04)
tileinfo.group = 1;
else
@@ -514,7 +514,7 @@ TILE_GET_INFO_MEMBER(m62_state::get_battroad_bg_tile_info)
{
flags |= TILE_FLIPX;
}
- SET_TILE_INFO_MEMBER(0, code | ((color & 0x40) << 3) | ((color & 0x10) << 4), color & 0x0f, flags);
+ tileinfo.set(0, code | ((color & 0x40) << 3) | ((color & 0x10) << 4), color & 0x0f, flags);
if (((color & 0x1f) >> 1) >= 0x04)
tileinfo.group = 1;
else
@@ -527,7 +527,7 @@ TILE_GET_INFO_MEMBER(m62_state::get_battroad_fg_tile_info)
int color;
code = m_m62_textram[tile_index << 1];
color = m_m62_textram[(tile_index << 1) | 1];
- SET_TILE_INFO_MEMBER(0, code | ((color & 0x40) << 3) | ((color & 0x10) << 4), color & 0x0f, 0);
+ tileinfo.set(0, code | ((color & 0x40) << 3) | ((color & 0x10) << 4), color & 0x0f, 0);
}
VIDEO_START_MEMBER(m62_state,battroad)
@@ -563,7 +563,7 @@ TILE_GET_INFO_MEMBER(m62_state::get_ldrun4_bg_tile_info)
int color;
code = m_m62_tileram[tile_index << 1];
color = m_m62_tileram[(tile_index << 1) | 1];
- SET_TILE_INFO_MEMBER(0, code | ((color & 0xc0) << 2) | ((color & 0x20) << 5), color & 0x1f, 0);
+ tileinfo.set(0, code | ((color & 0xc0) << 2) | ((color & 0x20) << 5), color & 0x1f, 0);
}
VIDEO_START_MEMBER(m62_state,ldrun4)
@@ -593,7 +593,7 @@ TILE_GET_INFO_MEMBER(m62_state::get_lotlot_bg_tile_info)
{
flags |= TILE_FLIPX;
}
- SET_TILE_INFO_MEMBER(0, code | ((color & 0xc0) << 2), color & 0x1f, flags);
+ tileinfo.set(0, code | ((color & 0xc0) << 2), color & 0x1f, flags);
}
TILE_GET_INFO_MEMBER(m62_state::get_lotlot_fg_tile_info)
@@ -602,7 +602,7 @@ TILE_GET_INFO_MEMBER(m62_state::get_lotlot_fg_tile_info)
int color;
code = m_m62_textram[tile_index << 1];
color = m_m62_textram[(tile_index << 1) | 1];
- SET_TILE_INFO_MEMBER(0, code | ((color & 0xc0) << 2), color & 0x1f, 0);
+ tileinfo.set(0, code | ((color & 0xc0) << 2), color & 0x1f, 0);
}
VIDEO_START_MEMBER(m62_state,lotlot)
@@ -651,7 +651,7 @@ TILE_GET_INFO_MEMBER(m62_state::get_kidniki_bg_tile_info)
int color;
code = m_m62_tileram[tile_index << 1];
color = m_m62_tileram[(tile_index << 1) | 1];
- SET_TILE_INFO_MEMBER(0, code | ((color & 0xe0) << 3) | (m_kidniki_background_bank << 11), color & 0x1f, 0);
+ tileinfo.set(0, code | ((color & 0xe0) << 3) | (m_kidniki_background_bank << 11), color & 0x1f, 0);
tileinfo.group = ((color & 0xe0) == 0xe0) ? 1 : 0;
}
@@ -661,7 +661,7 @@ TILE_GET_INFO_MEMBER(m62_state::get_kidniki_fg_tile_info)
int color;
code = m_m62_textram[tile_index << 1];
color = m_m62_textram[(tile_index << 1) | 1];
- SET_TILE_INFO_MEMBER(0, code | ( ( color & 0xc0 ) << 2 ), color & 0x1f, 0);
+ tileinfo.set(0, code | ( ( color & 0xc0 ) << 2 ), color & 0x1f, 0);
}
VIDEO_START_MEMBER(m62_state,kidniki)
@@ -706,7 +706,7 @@ TILE_GET_INFO_MEMBER(m62_state::get_spelunkr_bg_tile_info)
int color;
code = m_m62_tileram[tile_index << 1];
color = m_m62_tileram[(tile_index << 1) | 1];
- SET_TILE_INFO_MEMBER(0, code | ((color & 0x10) << 4) | ((color & 0x20) << 6) | ((color & 0xc0) << 3), (color & 0x0f) | (m_spelunkr_palbank << 4), 0);
+ tileinfo.set(0, code | ((color & 0x10) << 4) | ((color & 0x20) << 6) | ((color & 0xc0) << 3), (color & 0x0f) | (m_spelunkr_palbank << 4), 0);
}
TILE_GET_INFO_MEMBER(m62_state::get_spelunkr_fg_tile_info)
@@ -716,7 +716,7 @@ TILE_GET_INFO_MEMBER(m62_state::get_spelunkr_fg_tile_info)
code = m_m62_textram[tile_index << 1];
color = m_m62_textram[(tile_index << 1) | 1];
if (color & 0xe0) popmessage("fg tilemap %x %x", tile_index, color & 0xe0);
- SET_TILE_INFO_MEMBER(0, code | ((color & 0x10) << 4), (color & 0x0f) | (m_spelunkr_palbank << 4), 0);
+ tileinfo.set(0, code | ((color & 0x10) << 4), (color & 0x0f) | (m_spelunkr_palbank << 4), 0);
}
VIDEO_START_MEMBER(m62_state,spelunkr)
@@ -758,7 +758,7 @@ TILE_GET_INFO_MEMBER(m62_state::get_spelunk2_bg_tile_info)
int color;
code = m_m62_tileram[tile_index << 1];
color = m_m62_tileram[(tile_index << 1) | 1];
- SET_TILE_INFO_MEMBER(0, code | ((color & 0xf0) << 4), (color & 0x0f) | (m_spelunkr_palbank << 4), 0 );
+ tileinfo.set(0, code | ((color & 0xf0) << 4), (color & 0x0f) | (m_spelunkr_palbank << 4), 0 );
}
VIDEO_START_MEMBER(m62_state,spelunk2)
@@ -788,7 +788,7 @@ TILE_GET_INFO_MEMBER(m62_state::get_youjyudn_bg_tile_info)
int color;
code = m_m62_tileram[tile_index << 1];
color = m_m62_tileram[(tile_index << 1) | 1];
- SET_TILE_INFO_MEMBER(0, code | ((color & 0x60) << 3), color & 0x1f, 0);
+ tileinfo.set(0, code | ((color & 0x60) << 3), color & 0x1f, 0);
if (((color & 0x1f) >> 1) >= 0x08)
tileinfo.group = 1;
else
@@ -801,7 +801,7 @@ TILE_GET_INFO_MEMBER(m62_state::get_youjyudn_fg_tile_info)
int color;
code = m_m62_textram[tile_index << 1];
color = m_m62_textram[(tile_index << 1) | 1];
- SET_TILE_INFO_MEMBER(0, code | ((color & 0xc0) << 2), (color & 0x0f), 0);
+ tileinfo.set(0, code | ((color & 0xc0) << 2), (color & 0x0f), 0);
}
VIDEO_START_MEMBER(m62_state,youjyudn)
@@ -836,7 +836,7 @@ TILE_GET_INFO_MEMBER(m62_state::get_horizon_bg_tile_info)
{
int const code = m_m62_tileram[tile_index << 1];
int const color = m_m62_tileram[(tile_index << 1) | 1];
- SET_TILE_INFO_MEMBER(0, code | ((color & 0xc0) << 2) | ((color & 0x20) << 5), color & 0x1f, 0);
+ tileinfo.set(0, code | ((color & 0xc0) << 2) | ((color & 0x20) << 5), color & 0x1f, 0);
if (((color & 0x1f) >> 1) >= 0x08)
tileinfo.group = 1;
diff --git a/src/mame/video/m72.cpp b/src/mame/video/m72.cpp
index 6cf2a07c0d1..d231f61d1ec 100644
--- a/src/mame/video/m72.cpp
+++ b/src/mame/video/m72.cpp
@@ -30,7 +30,7 @@ inline void m72_state::m72_m81_get_tile_info(tile_data &tileinfo,int tile_index,
else pri = 0;
/* attr & 0x0010 is used in bchopper and hharry, more priority? */
- SET_TILE_INFO_MEMBER(gfxnum,
+ tileinfo.set(gfxnum,
code & 0x3fff,
attr & 0x000f,
TILE_FLIPYX((code & 0xc000) >> 14));
@@ -70,7 +70,7 @@ TILE_GET_INFO_MEMBER(m72_state::rtype2_get_tile_info)
/* (m_videoram[N][tile_index+2] & 0x10) is used by majtitle on the green, but it's not clear for what */
/* (m_videoram[N][tile_index+3] & 0xfe) are used as well */
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
code,
attr & 0x000f,
TILE_FLIPYX((attr & 0x0060) >> 5));
diff --git a/src/mame/video/m90.cpp b/src/mame/video/m90.cpp
index 2bdeef80636..7e8b65e486b 100644
--- a/src/mame/video/m90.cpp
+++ b/src/mame/video/m90.cpp
@@ -41,7 +41,7 @@ TILE_GET_INFO_MEMBER(m90_state::get_tile_info)
tile=vram[tile_index<<1];
color=vram[(tile_index<<1)|1];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
tile,
color&0xf,
TILE_FLIPYX((color & 0xc0) >> 6));
diff --git a/src/mame/video/m92.cpp b/src/mame/video/m92.cpp
index 7ac04a05988..ddc8ecae1ad 100644
--- a/src/mame/video/m92.cpp
+++ b/src/mame/video/m92.cpp
@@ -154,7 +154,7 @@ TILE_GET_INFO_MEMBER(m92_state::get_pf_tile_info)
attrib = m_vram_data[tile_index + 1];
tile = m_vram_data[tile_index] + ((attrib & 0x8000) << 1);
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
tile,
attrib & 0x7f,
TILE_FLIPYX(attrib >> 9));
diff --git a/src/mame/video/macrossp.cpp b/src/mame/video/macrossp.cpp
index b50a8371b3f..40fc8880978 100644
--- a/src/mame/video/macrossp.cpp
+++ b/src/mame/video/macrossp.cpp
@@ -66,7 +66,7 @@ TILE_GET_INFO_MEMBER(macrossp_state::get_macrossp_scra_tile_info)
break;
}
- SET_TILE_INFO_MEMBER(1, tileno, color, TILE_FLIPYX((attr & 0xc0000000) >> 30));
+ tileinfo.set(1, tileno, color, TILE_FLIPYX((attr & 0xc0000000) >> 30));
}
/*** SCR B LAYER ***/
@@ -101,7 +101,7 @@ TILE_GET_INFO_MEMBER(macrossp_state::get_macrossp_scrb_tile_info)
break;
}
- SET_TILE_INFO_MEMBER(2, tileno, color, TILE_FLIPYX((attr & 0xc0000000) >> 30));
+ tileinfo.set(2, tileno, color, TILE_FLIPYX((attr & 0xc0000000) >> 30));
}
/*** SCR C LAYER ***/
@@ -136,7 +136,7 @@ TILE_GET_INFO_MEMBER(macrossp_state::get_macrossp_scrc_tile_info)
break;
}
- SET_TILE_INFO_MEMBER(3, tileno, color, TILE_FLIPYX((attr & 0xc0000000) >> 30));
+ tileinfo.set(3, tileno, color, TILE_FLIPYX((attr & 0xc0000000) >> 30));
}
/*** TEXT LAYER ***/
@@ -156,7 +156,7 @@ TILE_GET_INFO_MEMBER(macrossp_state::get_macrossp_text_tile_info)
tileno = m_text_videoram[tile_index] & 0x0000ffff;
colour = (m_text_videoram[tile_index] & 0x00fe0000) >> 17;
- SET_TILE_INFO_MEMBER(4, tileno, colour, 0);
+ tileinfo.set(4, tileno, colour, 0);
}
diff --git a/src/mame/video/madalien.cpp b/src/mame/video/madalien.cpp
index 56496074be2..3ab2a3e0d94 100644
--- a/src/mame/video/madalien.cpp
+++ b/src/mame/video/madalien.cpp
@@ -92,7 +92,7 @@ TILE_GET_INFO_MEMBER(madalien_state::get_tile_info_BG_1)
{
uint8_t *map = memregion("user1")->base() + ((*m_video_flags & 0x08) << 6);
- SET_TILE_INFO_MEMBER(1, map[tile_index], BIT(*m_video_flags, 2) ? 2 : 0, 0);
+ tileinfo.set(1, map[tile_index], BIT(*m_video_flags, 2) ? 2 : 0, 0);
}
@@ -100,13 +100,13 @@ TILE_GET_INFO_MEMBER(madalien_state::get_tile_info_BG_2)
{
uint8_t *map = memregion("user1")->base() + ((*m_video_flags & 0x08) << 6) + 0x80;
- SET_TILE_INFO_MEMBER(1, map[tile_index], BIT(*m_video_flags, 2) ? 2 : 0, 0);
+ tileinfo.set(1, map[tile_index], BIT(*m_video_flags, 2) ? 2 : 0, 0);
}
TILE_GET_INFO_MEMBER(madalien_state::get_tile_info_FG)
{
- SET_TILE_INFO_MEMBER(0, m_videoram[tile_index], 0, 0);
+ tileinfo.set(0, m_videoram[tile_index], 0, 0);
}
WRITE8_MEMBER(madalien_state::madalien_videoram_w)
diff --git a/src/mame/video/mainsnk.cpp b/src/mame/video/mainsnk.cpp
index 1be055435e2..5fe7dda54cb 100644
--- a/src/mame/video/mainsnk.cpp
+++ b/src/mame/video/mainsnk.cpp
@@ -50,7 +50,7 @@ TILE_GET_INFO_MEMBER(mainsnk_state::get_tx_tile_info)
{
int code = m_fgram[tile_index];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code,
0,
tile_index & 0x400 ? TILE_FORCE_LAYER0 : 0);
@@ -60,7 +60,7 @@ TILE_GET_INFO_MEMBER(mainsnk_state::get_bg_tile_info)
{
int code = (m_bgram[tile_index]);
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
m_bg_tile_offset + code,
0,
0);
diff --git a/src/mame/video/mappy.cpp b/src/mame/video/mappy.cpp
index 5a4b7a66d13..d9ad09fbe91 100644
--- a/src/mame/video/mappy.cpp
+++ b/src/mame/video/mappy.cpp
@@ -264,7 +264,7 @@ TILE_GET_INFO_MEMBER(mappy_state::superpac_get_tile_info)
tileinfo.category = (attr & 0x40) >> 6;
tileinfo.group = attr & 0x3f;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
m_videoram[tile_index],
attr & 0x3f,
0);
@@ -276,7 +276,7 @@ TILE_GET_INFO_MEMBER(mappy_state::phozon_get_tile_info)
tileinfo.category = (attr & 0x40) >> 6;
tileinfo.group = attr & 0x3f;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
m_videoram[tile_index] + ((attr & 0x80) << 1),
attr & 0x3f,
0);
@@ -288,7 +288,7 @@ TILE_GET_INFO_MEMBER(mappy_state::mappy_get_tile_info)
tileinfo.category = (attr & 0x40) >> 6;
tileinfo.group = attr & 0x3f;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
m_videoram[tile_index],
attr & 0x3f,
0);
diff --git a/src/mame/video/marineb.cpp b/src/mame/video/marineb.cpp
index 03995835aa0..25159883fca 100644
--- a/src/mame/video/marineb.cpp
+++ b/src/mame/video/marineb.cpp
@@ -51,7 +51,7 @@ TILE_GET_INFO_MEMBER(marineb_state::get_tile_info)
uint8_t code = m_videoram[tile_index];
uint8_t col = m_colorram[tile_index];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code | ((col & 0xc0) << 2),
(col & 0x0f) | (m_palette_bank << 4),
TILE_FLIPXY((col >> 4) & 0x03));
diff --git a/src/mame/video/mario.cpp b/src/mame/video/mario.cpp
index 162d3de1ea4..47d2fa9212b 100644
--- a/src/mame/video/mario.cpp
+++ b/src/mame/video/mario.cpp
@@ -115,7 +115,7 @@ TILE_GET_INFO_MEMBER(mario_state::get_bg_tile_info)
{
int code = m_videoram[tile_index] + 256 * m_gfx_bank;
int color = 8 + (m_videoram[tile_index] >> 5) + 16 * m_palette_bank;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
void mario_state::video_start()
diff --git a/src/mame/video/markham.cpp b/src/mame/video/markham.cpp
index 38415d8dce0..78eddae8360 100644
--- a/src/mame/video/markham.cpp
+++ b/src/mame/video/markham.cpp
@@ -49,7 +49,7 @@ TILE_GET_INFO_MEMBER(markham_state::get_bg_tile_info)
int code = m_videoram[(tile_index * 2) + 1] + ((attr & 0x60) << 3);
int color = (attr & 0x1f) | ((attr & 0x80) >> 2);
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
void markham_state::video_start()
diff --git a/src/mame/video/mb60553.cpp b/src/mame/video/mb60553.cpp
index 587c1612a47..98875062526 100644
--- a/src/mame/video/mb60553.cpp
+++ b/src/mame/video/mb60553.cpp
@@ -116,7 +116,7 @@ TILE_GET_INFO_MEMBER(mb60553_zooming_tilemap_device::get_tile_info)
pal = (data >> 12) & 0xF;
bankno = (data >> 9) & 0x7;
- SET_TILE_INFO_MEMBER(m_gfx_region, tileno + m_bank[bankno] * 0x200, pal + m_pal_base, 0);
+ tileinfo.set(m_gfx_region, tileno + m_bank[bankno] * 0x200, pal + m_pal_base, 0);
}
void mb60553_zooming_tilemap_device::reg_written( int num_reg)
diff --git a/src/mame/video/mcr.cpp b/src/mame/video/mcr.cpp
index 1a0d21a1475..1afb17da42c 100644
--- a/src/mame/video/mcr.cpp
+++ b/src/mame/video/mcr.cpp
@@ -25,7 +25,7 @@
*/
TILE_GET_INFO_MEMBER(mcr_state::mcr_90009_get_tile_info)
{
- SET_TILE_INFO_MEMBER(0, m_videoram[tile_index], 0, 0);
+ tileinfo.set(0, m_videoram[tile_index], 0, 0);
/* sprite color base is constant 0x10 */
tileinfo.category = 1;
@@ -50,7 +50,7 @@ TILE_GET_INFO_MEMBER(mcr_state::mcr_90010_get_tile_info)
int data = m_videoram[tile_index * 2] | (m_videoram[tile_index * 2 + 1] << 8);
int code = data & 0x1ff;
int color = (data >> 11) & 3;
- SET_TILE_INFO_MEMBER(0, code, color, TILE_FLIPYX(data >> 9));
+ tileinfo.set(0, code, color, TILE_FLIPYX(data >> 9));
/* sprite color base comes from the top 2 bits */
tileinfo.category = (data >> 14) & 3;
@@ -75,7 +75,7 @@ TILE_GET_INFO_MEMBER(mcr_state::mcr_91490_get_tile_info)
int data = m_videoram[tile_index * 2] | (m_videoram[tile_index * 2 + 1] << 8);
int code = data & 0x3ff;
int color = (data >> 12) & 3;
- SET_TILE_INFO_MEMBER(0, code, color, TILE_FLIPYX(data >> 10));
+ tileinfo.set(0, code, color, TILE_FLIPYX(data >> 10));
/* sprite color base might come from the top 2 bits */
tileinfo.category = (data >> 14) & 3;
diff --git a/src/mame/video/mcr3.cpp b/src/mame/video/mcr3.cpp
index 1d91b11f580..41927444bb2 100644
--- a/src/mame/video/mcr3.cpp
+++ b/src/mame/video/mcr3.cpp
@@ -24,7 +24,7 @@ TILE_GET_INFO_MEMBER(mcr3_state::get_bg_tile_info)
int data = m_videoram[tile_index * 2] | (m_videoram[tile_index * 2 + 1] << 8);
int code = (data & 0x3ff) | ((data >> 4) & 0x400);
int color = (data >> 12) & 3;
- SET_TILE_INFO_MEMBER(0, code, color, TILE_FLIPYX((data >> 10) & 3));
+ tileinfo.set(0, code, color, TILE_FLIPYX((data >> 10) & 3));
}
#endif
@@ -34,7 +34,7 @@ TILE_GET_INFO_MEMBER(mcr3_state::mcrmono_get_bg_tile_info)
int data = m_videoram[tile_index * 2] | (m_videoram[tile_index * 2 + 1] << 8);
int code = (data & 0x3ff) | ((data >> 4) & 0x400);
int color = ((data >> 12) & 3) ^ 3;
- SET_TILE_INFO_MEMBER(0, code, color, TILE_FLIPYX(data >> 10));
+ tileinfo.set(0, code, color, TILE_FLIPYX(data >> 10));
}
@@ -49,13 +49,13 @@ TILE_GET_INFO_MEMBER(mcr3_state::spyhunt_get_bg_tile_info)
{
int data = m_videoram[tile_index];
int code = (data & 0x3f) | ((data >> 1) & 0x40);
- SET_TILE_INFO_MEMBER(0, code, 0, (data & 0x40) ? TILE_FLIPY : 0);
+ tileinfo.set(0, code, 0, (data & 0x40) ? TILE_FLIPY : 0);
}
TILE_GET_INFO_MEMBER(mcr3_state::spyhunt_get_alpha_tile_info)
{
- SET_TILE_INFO_MEMBER(2, m_spyhunt_alpharam[tile_index], 0, 0);
+ tileinfo.set(2, m_spyhunt_alpharam[tile_index], 0, 0);
}
diff --git a/src/mame/video/mcr68.cpp b/src/mame/video/mcr68.cpp
index faba58dc3fc..de5d85fbd73 100644
--- a/src/mame/video/mcr68.cpp
+++ b/src/mame/video/mcr68.cpp
@@ -25,7 +25,7 @@ TILE_GET_INFO_MEMBER(mcr68_state::get_bg_tile_info)
int data = LOW_BYTE(videoram[tile_index * 2]) | (LOW_BYTE(videoram[tile_index * 2 + 1]) << 8);
int code = (data & 0x3ff) | ((data >> 4) & 0xc00);
int color = (~data >> 12) & 3;
- SET_TILE_INFO_MEMBER(0, code, color, TILE_FLIPYX(data >> 10));
+ tileinfo.set(0, code, color, TILE_FLIPYX(data >> 10));
if (m_gfxdecode->gfx(0)->elements() < 0x1000)
tileinfo.category = (data >> 15) & 1;
}
diff --git a/src/mame/video/meadows.cpp b/src/mame/video/meadows.cpp
index 9a106a01438..ee91bc511a0 100644
--- a/src/mame/video/meadows.cpp
+++ b/src/mame/video/meadows.cpp
@@ -23,7 +23,7 @@
TILE_GET_INFO_MEMBER(meadows_state::get_tile_info)
{
uint8_t *videoram = m_videoram;
- SET_TILE_INFO_MEMBER(0, videoram[tile_index] & 0x7f, 0, 0);
+ tileinfo.set(0, videoram[tile_index] & 0x7f, 0, 0);
}
diff --git a/src/mame/video/mermaid.cpp b/src/mame/video/mermaid.cpp
index 3e3b592d04b..dddc87e4fa9 100644
--- a/src/mame/video/mermaid.cpp
+++ b/src/mame/video/mermaid.cpp
@@ -138,7 +138,7 @@ TILE_GET_INFO_MEMBER(mermaid_state::get_bg_tile_info)
int sx = tile_index % 32;
int color = (sx >= 26) ? 0 : 1;
- SET_TILE_INFO_MEMBER(2, code, color, 0);
+ tileinfo.set(2, code, color, 0);
}
TILE_GET_INFO_MEMBER(mermaid_state::get_fg_tile_info)
@@ -151,7 +151,7 @@ TILE_GET_INFO_MEMBER(mermaid_state::get_fg_tile_info)
code |= m_rougien_gfxbank1 * 0x2800;
code |= m_rougien_gfxbank2 * 0x2400;
- SET_TILE_INFO_MEMBER(0, code, color, flags);
+ tileinfo.set(0, code, color, flags);
}
void mermaid_state::video_start()
diff --git a/src/mame/video/metlclsh.cpp b/src/mame/video/metlclsh.cpp
index 018a1e71c63..171f0e48fb3 100644
--- a/src/mame/video/metlclsh.cpp
+++ b/src/mame/video/metlclsh.cpp
@@ -71,7 +71,7 @@ TILEMAP_MAPPER_MEMBER(metlclsh_state::metlclsh_bgtilemap_scan)
TILE_GET_INFO_MEMBER(metlclsh_state::get_bg_tile_info)
{
- SET_TILE_INFO_MEMBER(1, m_bgram[tile_index] + (m_gfxbank << 7), 0, 0);
+ tileinfo.set(1, m_bgram[tile_index] + (m_gfxbank << 7), 0, 0);
}
WRITE8_MEMBER(metlclsh_state::metlclsh_bgram_w)
@@ -114,7 +114,7 @@ TILE_GET_INFO_MEMBER(metlclsh_state::get_fg_tile_info)
{
uint8_t code = m_fgram[tile_index + 0x000];
uint8_t attr = m_fgram[tile_index + 0x400];
- SET_TILE_INFO_MEMBER(2, code + ((attr & 0x03) << 8), (attr >> 5) & 3, 0);
+ tileinfo.set(2, code + ((attr & 0x03) << 8), (attr >> 5) & 3, 0);
tileinfo.category = ((attr & 0x80) ? 1 : 2);
}
diff --git a/src/mame/video/metro.cpp b/src/mame/video/metro.cpp
index b27d5e2fb8b..7847b40ddad 100644
--- a/src/mame/video/metro.cpp
+++ b/src/mame/video/metro.cpp
@@ -14,7 +14,7 @@ TILE_GET_INFO_MEMBER(metro_state::k053936_get_tile_info)
{
int code = m_k053936_ram[tile_index];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code & 0x7fff,
0xe,
0);
@@ -24,7 +24,7 @@ TILE_GET_INFO_MEMBER(metro_state::k053936_gstrik2_get_tile_info)
{
int code = m_k053936_ram[tile_index];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
(code & 0x7fff)>>2,
0xe,
0);
diff --git a/src/mame/video/microtan.cpp b/src/mame/video/microtan.cpp
index 39087f4873a..3b7f70397ac 100644
--- a/src/mame/video/microtan.cpp
+++ b/src/mame/video/microtan.cpp
@@ -33,7 +33,7 @@ TILE_GET_INFO_MEMBER(microtan_state::get_bg_tile_info)
int gfxn = m_chunky_buffer[tile_index];
int code = m_videoram[tile_index];
- SET_TILE_INFO_MEMBER(gfxn, code, 0, 0);
+ tileinfo.set(gfxn, code, 0, 0);
}
void microtan_state::video_start()
diff --git a/src/mame/video/mikie.cpp b/src/mame/video/mikie.cpp
index 5e1c739dfa3..f9b837a9a50 100644
--- a/src/mame/video/mikie.cpp
+++ b/src/mame/video/mikie.cpp
@@ -120,7 +120,7 @@ TILE_GET_INFO_MEMBER(mikie_state::get_bg_tile_info)
else
tileinfo.category = 0;
- SET_TILE_INFO_MEMBER(0, code, color, flags);
+ tileinfo.set(0, code, color, flags);
}
diff --git a/src/mame/video/mitchell.cpp b/src/mame/video/mitchell.cpp
index 473abc30d91..5ccd9b53474 100644
--- a/src/mame/video/mitchell.cpp
+++ b/src/mame/video/mitchell.cpp
@@ -20,7 +20,7 @@ TILE_GET_INFO_MEMBER(mitchell_state::get_tile_info)
{
uint8_t attr = m_colorram[tile_index];
int code = m_videoram[2 * tile_index] + (m_videoram[2 * tile_index + 1] << 8);
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code,
attr & 0x7f,
(attr & 0x80) ? TILE_FLIPX : 0);
diff --git a/src/mame/video/mjkjidai.cpp b/src/mame/video/mjkjidai.cpp
index 3ba6d090ed6..8a145252cc0 100644
--- a/src/mame/video/mjkjidai.cpp
+++ b/src/mame/video/mjkjidai.cpp
@@ -15,7 +15,7 @@ TILE_GET_INFO_MEMBER(mjkjidai_state::get_tile_info)
int attr = m_videoram[tile_index + 0x800];
int code = m_videoram[tile_index] + ((attr & 0x1f) << 8);
int color = m_videoram[tile_index + 0x1000];
- SET_TILE_INFO_MEMBER(0,code,color >> 3,0);
+ tileinfo.set(0,code,color >> 3,0);
}
diff --git a/src/mame/video/model3.cpp b/src/mame/video/model3.cpp
index 77012df954a..6e62815f19a 100644
--- a/src/mame/video/model3.cpp
+++ b/src/mame/video/model3.cpp
@@ -221,7 +221,7 @@ do { \
uint16_t t = BYTE_REVERSE16(tiles[(tile_index & 3) ^ NATIVE_ENDIAN_VALUE_LE_BE(2,0)]); \
int tile = ((t << 1) & 0x7ffe) | ((t >> 15) & 0x1); \
int color = (t & 0x7ff0) >> 4; \
- SET_TILE_INFO_MEMBER(0, tile, color, 0); \
+ tileinfo.set(0, tile, color, 0); \
} while (0)
#define MODEL3_TILE_INFO8(address) \
@@ -230,7 +230,7 @@ do { \
uint16_t t = BYTE_REVERSE16(tiles[(tile_index & 3) ^ NATIVE_ENDIAN_VALUE_LE_BE(2,0)]); \
int tile = ((t << 1) & 0x7ffe) | ((t >> 15) & 0x1); \
int color = (t & 0x7f00) >> 8; \
- SET_TILE_INFO_MEMBER(1, tile >> 1, color, 0); \
+ tileinfo.set(1, tile >> 1, color, 0); \
} while (0)
TILE_GET_INFO_MEMBER(model3_state::tile_info_layer0_4bit) { MODEL3_TILE_INFO4(0x000); }
diff --git a/src/mame/video/mosaic.cpp b/src/mame/video/mosaic.cpp
index d3529f317b9..ce51b036873 100644
--- a/src/mame/video/mosaic.cpp
+++ b/src/mame/video/mosaic.cpp
@@ -20,7 +20,7 @@
TILE_GET_INFO_MEMBER(mosaic_state::get_fg_tile_info)
{
tile_index *= 2;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
m_fgvideoram[tile_index] + (m_fgvideoram[tile_index+1] << 8),
0,
0);
@@ -29,7 +29,7 @@ TILE_GET_INFO_MEMBER(mosaic_state::get_fg_tile_info)
TILE_GET_INFO_MEMBER(mosaic_state::get_bg_tile_info)
{
tile_index *= 2;
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
m_bgvideoram[tile_index] + (m_bgvideoram[tile_index+1] << 8),
0,
0);
diff --git a/src/mame/video/mrdo.cpp b/src/mame/video/mrdo.cpp
index dae9fe3f180..0952ce68f0e 100644
--- a/src/mame/video/mrdo.cpp
+++ b/src/mame/video/mrdo.cpp
@@ -135,7 +135,7 @@ void mrdo_state::mrdo_palette(palette_device &palette) const
TILE_GET_INFO_MEMBER(mrdo_state::get_bg_tile_info)
{
uint8_t attr = m_bgvideoram[tile_index];
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
m_bgvideoram[tile_index + 0x400] + ((attr & 0x80) << 1),
attr & 0x3f,
(attr & 0x40) ? TILE_FORCE_LAYER0 : 0);
@@ -144,7 +144,7 @@ TILE_GET_INFO_MEMBER(mrdo_state::get_bg_tile_info)
TILE_GET_INFO_MEMBER(mrdo_state::get_fg_tile_info)
{
uint8_t attr = m_fgvideoram[tile_index];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
m_fgvideoram[tile_index+0x400] + ((attr & 0x80) << 1),
attr & 0x3f,
(attr & 0x40) ? TILE_FORCE_LAYER0 : 0);
diff --git a/src/mame/video/mrjong.cpp b/src/mame/video/mrjong.cpp
index eb0a5875a36..cbde07f0141 100644
--- a/src/mame/video/mrjong.cpp
+++ b/src/mame/video/mrjong.cpp
@@ -93,7 +93,7 @@ TILE_GET_INFO_MEMBER(mrjong_state::get_bg_tile_info)
int color = m_colorram[tile_index] & 0x1f;
int flags = ((m_colorram[tile_index] & 0x40) ? TILE_FLIPX : 0) | ((m_colorram[tile_index] & 0x80) ? TILE_FLIPY : 0);
- SET_TILE_INFO_MEMBER(0, code, color, flags);
+ tileinfo.set(0, code, color, flags);
}
void mrjong_state::video_start()
diff --git a/src/mame/video/ms1_tmap.cpp b/src/mame/video/ms1_tmap.cpp
index e1b84e30536..c5cd2255f74 100644
--- a/src/mame/video/ms1_tmap.cpp
+++ b/src/mame/video/ms1_tmap.cpp
@@ -228,7 +228,7 @@ TILE_GET_INFO_MEMBER(megasys1_tilemap_device::get_scroll_tile_info_8x8)
{
uint16_t code = m_scrollram[tile_index];
uint16_t tile = ((code & 0xfff) + m_tile_bank) * m_8x8_scroll_factor;
- SET_TILE_INFO_MEMBER(0, tile, code >> (16 - m_bits_per_color_code), 0);
+ tileinfo.set(0, tile, code >> (16 - m_bits_per_color_code), 0);
}
TILE_GET_INFO_MEMBER(megasys1_tilemap_device::get_scroll_tile_info_16x16)
@@ -237,7 +237,7 @@ TILE_GET_INFO_MEMBER(megasys1_tilemap_device::get_scroll_tile_info_16x16)
uint16_t tile = ((code & 0xfff) + m_tile_bank) * m_16x16_scroll_factor;
tile+= tile_index & 3;
- SET_TILE_INFO_MEMBER(0, tile, code >> (16 - m_bits_per_color_code), 0);
+ tileinfo.set(0, tile, code >> (16 - m_bits_per_color_code), 0);
}
READ16_MEMBER(megasys1_tilemap_device::scroll_r)
diff --git a/src/mame/video/ms32.cpp b/src/mame/video/ms32.cpp
index 8ec947954e1..b2b63ad52ca 100644
--- a/src/mame/video/ms32.cpp
+++ b/src/mame/video/ms32.cpp
@@ -29,7 +29,7 @@ TILE_GET_INFO_MEMBER(ms32_state::get_ms32_tx_tile_info)
tileno = m_txram[tile_index *2] & 0xffff;
colour = m_txram[tile_index *2+1] & 0x000f;
- SET_TILE_INFO_MEMBER(2,tileno,colour,0);
+ tileinfo.set(2,tileno,colour,0);
}
TILE_GET_INFO_MEMBER(ms32_state::get_ms32_roz_tile_info)
@@ -39,7 +39,7 @@ TILE_GET_INFO_MEMBER(ms32_state::get_ms32_roz_tile_info)
tileno = m_rozram[tile_index *2] & 0xffff;
colour = m_rozram[tile_index *2+1] & 0x000f;
- SET_TILE_INFO_MEMBER(0,tileno,colour,0);
+ tileinfo.set(0,tileno,colour,0);
}
TILE_GET_INFO_MEMBER(ms32_state::get_ms32_bg_tile_info)
@@ -49,7 +49,7 @@ TILE_GET_INFO_MEMBER(ms32_state::get_ms32_bg_tile_info)
tileno = m_bgram[tile_index *2] & 0xffff;
colour = m_bgram[tile_index *2+1] & 0x000f;
- SET_TILE_INFO_MEMBER(1,tileno,colour,0);
+ tileinfo.set(1,tileno,colour,0);
}
TILE_GET_INFO_MEMBER(ms32_state::get_ms32_extra_tile_info)
@@ -59,7 +59,7 @@ TILE_GET_INFO_MEMBER(ms32_state::get_ms32_extra_tile_info)
tileno = m_f1superb_extraram[tile_index *2] & 0xffff;
colour = m_f1superb_extraram[tile_index *2+1] & 0x000f;
- SET_TILE_INFO_MEMBER(3,tileno,colour+0x50,0);
+ tileinfo.set(3,tileno,colour+0x50,0);
}
diff --git a/src/mame/video/msisaac.cpp b/src/mame/video/msisaac.cpp
index da1624a0985..7ba6609bd30 100644
--- a/src/mame/video/msisaac.cpp
+++ b/src/mame/video/msisaac.cpp
@@ -17,7 +17,7 @@
TILE_GET_INFO_MEMBER(msisaac_state::get_fg_tile_info)
{
int tile_number = m_videoram[tile_index];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
tile_number,
0x10,
0);
@@ -26,7 +26,7 @@ TILE_GET_INFO_MEMBER(msisaac_state::get_fg_tile_info)
TILE_GET_INFO_MEMBER(msisaac_state::get_bg_tile_info)
{
int tile_number = m_videoram2[tile_index];
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
0x100 + tile_number,
0x30,
0);
@@ -39,7 +39,7 @@ TILE_GET_INFO_MEMBER(msisaac_state::get_bg2_tile_info)
/* graphics 0 or 1 */
int gfx_b = (m_bg2_textbank >> 3) & 1;
- SET_TILE_INFO_MEMBER(gfx_b,
+ tileinfo.set(gfx_b,
tile_number,
0x20,
0);
diff --git a/src/mame/video/mugsmash.cpp b/src/mame/video/mugsmash.cpp
index a5adb059819..223cf08435a 100644
--- a/src/mame/video/mugsmash.cpp
+++ b/src/mame/video/mugsmash.cpp
@@ -75,7 +75,7 @@ TILE_GET_INFO_MEMBER(mugsmash_state::get_mugsmash_tile_info1)
colour = m_videoram1[tile_index * 2] & 0x000f;
fx = (m_videoram1[tile_index * 2] & 0xc0) >> 6;
- SET_TILE_INFO_MEMBER(1, tileno, colour, TILE_FLIPYX(fx));
+ tileinfo.set(1, tileno, colour, TILE_FLIPYX(fx));
}
WRITE16_MEMBER(mugsmash_state::mugsmash_videoram1_w)
@@ -100,7 +100,7 @@ TILE_GET_INFO_MEMBER(mugsmash_state::get_mugsmash_tile_info2)
colour = m_videoram2[tile_index * 2] & 0x000f;
fx = (m_videoram2[tile_index * 2] & 0xc0) >> 6;
- SET_TILE_INFO_MEMBER(1, tileno, 16 + colour, TILE_FLIPYX(fx));
+ tileinfo.set(1, tileno, 16 + colour, TILE_FLIPYX(fx));
}
WRITE16_MEMBER(mugsmash_state::mugsmash_videoram2_w)
diff --git a/src/mame/video/mustache.cpp b/src/mame/video/mustache.cpp
index 317abfcff71..a9a2fc85e0e 100644
--- a/src/mame/video/mustache.cpp
+++ b/src/mame/video/mustache.cpp
@@ -47,7 +47,7 @@ TILE_GET_INFO_MEMBER(mustache_state::get_bg_tile_info)
int code = m_videoram[2 * tile_index] + ((attr & 0x60) << 3) + ((m_control_byte & 0x08) << 7);
int color = attr & 0x0f;
- SET_TILE_INFO_MEMBER(0, code, color, ((attr & 0x10) ? TILE_FLIPX : 0) | ((attr & 0x80) ? TILE_FLIPY : 0) );
+ tileinfo.set(0, code, color, ((attr & 0x10) ? TILE_FLIPX : 0) | ((attr & 0x80) ? TILE_FLIPY : 0) );
}
diff --git a/src/mame/video/mystston.cpp b/src/mame/video/mystston.cpp
index ff1c37aaa1b..3d3530b2726 100644
--- a/src/mame/video/mystston.cpp
+++ b/src/mame/video/mystston.cpp
@@ -155,7 +155,7 @@ TILE_GET_INFO_MEMBER(mystston_state::get_bg_tile_info)
int code = ((m_bg_videoram[page | 0x200 | tile_index] & 0x01) << 8) | m_bg_videoram[page | tile_index];
int flags = (tile_index & 0x10) ? TILE_FLIPY : 0;
- SET_TILE_INFO_MEMBER(1, code, 0, flags);
+ tileinfo.set(1, code, 0, flags);
}
@@ -164,7 +164,7 @@ TILE_GET_INFO_MEMBER(mystston_state::get_fg_tile_info)
int code = ((m_fg_videoram[0x400 | tile_index] & 0x07) << 8) | m_fg_videoram[tile_index];
int color = ((*m_video_control & 0x01) << 1) | ((*m_video_control & 0x02) >> 1);
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
diff --git a/src/mame/video/mystwarr.cpp b/src/mame/video/mystwarr.cpp
index ab0787c7320..6ce51820ac7 100644
--- a/src/mame/video/mystwarr.cpp
+++ b/src/mame/video/mystwarr.cpp
@@ -145,7 +145,7 @@ TILE_GET_INFO_MEMBER(mystwarr_state::get_gai_936_tile_info)
colour |= m_sub1_colorbase << 4;
- SET_TILE_INFO_MEMBER(0, tileno, colour, 0);
+ tileinfo.set(0, tileno, colour, 0);
}
VIDEO_START_MEMBER(mystwarr_state, gaiapols)
@@ -178,7 +178,7 @@ TILE_GET_INFO_MEMBER(mystwarr_state::get_ult_936_tile_info)
colour = m_sub1_colorbase;
- SET_TILE_INFO_MEMBER(0, tileno, colour, (dat1[tile_index]&0x40) ? TILE_FLIPX : 0);
+ tileinfo.set(0, tileno, colour, (dat1[tile_index]&0x40) ? TILE_FLIPX : 0);
}
VIDEO_START_MEMBER(mystwarr_state, dadandrn)
diff --git a/src/mame/video/namco_c123tmap.cpp b/src/mame/video/namco_c123tmap.cpp
index 655df74b8a3..f3feb19138b 100644
--- a/src/mame/video/namco_c123tmap.cpp
+++ b/src/mame/video/namco_c123tmap.cpp
@@ -106,7 +106,7 @@ TILE_GET_INFO_MEMBER(namco_c123tmap_device::get_tile_info)
int tile, mask;
m_tilemapinfo.cb(vram[tile_index], &tile, &mask);
tileinfo.mask_data = m_mask + mask * 8;
- SET_TILE_INFO_MEMBER(0, tile, 0, 0);
+ tileinfo.set(0, tile, 0, 0);
} /* get_tile_info */
void namco_c123tmap_device::init_scroll(int flip) // 8 bit control with external flip screen value
diff --git a/src/mame/video/namco_c169roz.cpp b/src/mame/video/namco_c169roz.cpp
index 89ca7a3ea2c..252e0e08170 100644
--- a/src/mame/video/namco_c169roz.cpp
+++ b/src/mame/video/namco_c169roz.cpp
@@ -85,7 +85,7 @@ TILE_GET_INFO_MEMBER(namco_c169roz_device::get_info)
m_c169_cb(m_videoram[tile_index&(m_ramsize-1)] & 0x3fff, &tile, &mask, Which); // need to mask with ramsize because the nb1/fl games have twice as much RAM, presumably the tilemaps mirror in ns2?
tileinfo.mask_data = m_mask + 32 * mask;
- SET_TILE_INFO_MEMBER(0, tile, 0/*color*/, 0/*flag*/);
+ tileinfo.set(0, tile, 0/*color*/, 0/*flag*/);
}
TILEMAP_MAPPER_MEMBER( namco_c169roz_device::mapper )
diff --git a/src/mame/video/namcona1.cpp b/src/mame/video/namcona1.cpp
index aa92be6a294..9aec37606c3 100644
--- a/src/mame/video/namcona1.cpp
+++ b/src/mame/video/namcona1.cpp
@@ -34,11 +34,11 @@ void namcona1_state::tilemap_get_info(
if (data & 0x8000)
{
- SET_TILE_INFO_MEMBER(gfx, tile, color, TILE_FORCE_LAYER0);
+ tileinfo.set(gfx, tile, color, TILE_FORCE_LAYER0);
}
else
{
- SET_TILE_INFO_MEMBER(gfx, tile, color, 0);
+ tileinfo.set(gfx, tile, color, 0);
tileinfo.mask_data = &m_shaperam[tile << 3];
}
} /* tilemap_get_info */
@@ -76,11 +76,11 @@ TILE_GET_INFO_MEMBER(namcona1_state::roz_get_info)
if (data & 0x8000)
{
- SET_TILE_INFO_MEMBER(gfx, tile, color, TILE_FORCE_LAYER0);
+ tileinfo.set(gfx, tile, color, TILE_FORCE_LAYER0);
}
else
{
- SET_TILE_INFO_MEMBER(gfx, tile, color, 0);
+ tileinfo.set(gfx, tile, color, 0);
tileinfo.mask_data = &m_shaperam[tile << 3];
}
} /* roz_get_info */
diff --git a/src/mame/video/namcos22.cpp b/src/mame/video/namcos22.cpp
index 4a2c9d96900..3c9f44531e0 100644
--- a/src/mame/video/namcos22.cpp
+++ b/src/mame/video/namcos22.cpp
@@ -1751,7 +1751,7 @@ TILE_GET_INFO_MEMBER(namcos22_state::get_text_tile_info)
* ----.xx--.----.---- flip
* ----.--xx.xxxx.xxxx code
*/
- SET_TILE_INFO_MEMBER(0, data & 0x03ff, data >> 12, TILE_FLIPYX((data & 0x0c00) >> 10));
+ tileinfo.set(0, data & 0x03ff, data >> 12, TILE_FLIPYX((data & 0x0c00) >> 10));
}
WRITE32_MEMBER(namcos22_state::namcos22_textram_w)
diff --git a/src/mame/video/namcos2_roz.cpp b/src/mame/video/namcos2_roz.cpp
index f4643e6611f..29a978c89a7 100644
--- a/src/mame/video/namcos2_roz.cpp
+++ b/src/mame/video/namcos2_roz.cpp
@@ -52,7 +52,7 @@ void namcos2_roz_device::device_start()
TILE_GET_INFO_MEMBER(namcos2_roz_device::roz_tile_info)
{
int tile = m_rozram[tile_index];
- SET_TILE_INFO_MEMBER(0, tile, 0/*color*/, 0);
+ tileinfo.set(0, tile, 0/*color*/, 0);
}
struct roz_param
diff --git a/src/mame/video/namcos86.cpp b/src/mame/video/namcos86.cpp
index e1fd9a556fa..2e6c86498c4 100644
--- a/src/mame/video/namcos86.cpp
+++ b/src/mame/video/namcos86.cpp
@@ -98,7 +98,7 @@ inline void namcos86_state::get_tile_info(tile_data &tileinfo,int tile_index,int
else
tile_offs = ((m_tile_address_prom[((layer & 1) << 4) + ((attr & 0x03) << 2)] & 0x0e) >> 1) * 0x100 + m_tilebank * 0x800;
- SET_TILE_INFO_MEMBER((layer & 2) ? 1 : 0,
+ tileinfo.set((layer & 2) ? 1 : 0,
vram[2*tile_index] + tile_offs,
attr,
0);
diff --git a/src/mame/video/nemesis.cpp b/src/mame/video/nemesis.cpp
index e136447af93..82ac7111146 100644
--- a/src/mame/video/nemesis.cpp
+++ b/src/mame/video/nemesis.cpp
@@ -43,11 +43,11 @@ TILE_GET_INFO_MEMBER(nemesis_state::get_bg_tile_info)
if (code & 0xf800)
{
- SET_TILE_INFO_MEMBER(0, code & 0x7ff, color & 0x7f, flags );
+ tileinfo.set(0, code & 0x7ff, color & 0x7f, flags );
}
else
{
- SET_TILE_INFO_MEMBER(0, 0, 0x00, 0 );
+ tileinfo.set(0, 0, 0x00, 0 );
tileinfo.pen_data = m_blank_tile;
}
@@ -78,11 +78,11 @@ TILE_GET_INFO_MEMBER(nemesis_state::get_fg_tile_info)
if (code & 0xf800)
{
- SET_TILE_INFO_MEMBER(0, code & 0x7ff, color & 0x7f, flags );
+ tileinfo.set(0, code & 0x7ff, color & 0x7f, flags );
}
else
{
- SET_TILE_INFO_MEMBER(0, 0, 0x00, 0 );
+ tileinfo.set(0, 0, 0x00, 0 );
tileinfo.pen_data = m_blank_tile;
}
diff --git a/src/mame/video/news.cpp b/src/mame/video/news.cpp
index 4284b28ec31..6f3abe13378 100644
--- a/src/mame/video/news.cpp
+++ b/src/mame/video/news.cpp
@@ -13,7 +13,7 @@
TILE_GET_INFO_MEMBER(news_state::get_fg_tile_info)
{
int code = (m_fgram[tile_index * 2] << 8) | m_fgram[tile_index * 2 + 1];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code & 0x0fff,
(code & 0xf000) >> 12,
0);
@@ -28,7 +28,7 @@ TILE_GET_INFO_MEMBER(news_state::get_bg_tile_info)
if ((code & 0x0e00) == 0x0e00)
code = (code & 0x1ff) | (m_bgpic << 9);
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code,
color,
0);
diff --git a/src/mame/video/ninjakd2.cpp b/src/mame/video/ninjakd2.cpp
index cd80646fec3..424349c8321 100644
--- a/src/mame/video/ninjakd2.cpp
+++ b/src/mame/video/ninjakd2.cpp
@@ -25,7 +25,7 @@ TILE_GET_INFO_MEMBER(ninjakd2_state::get_fg_tile_info)
int const flipyx = (hi & 0x30) >> 4;
int const color = hi & 0x0f;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
tile,
color,
TILE_FLIPYX(flipyx));
@@ -39,7 +39,7 @@ TILE_GET_INFO_MEMBER(ninjakd2_state::ninjakd2_get_bg_tile_info)
int const flipyx = (hi & 0x30) >> 4;
int const color = hi & 0x0f;
- SET_TILE_INFO_MEMBER(2,
+ tileinfo.set(2,
tile,
color,
TILE_FLIPYX(flipyx));
@@ -53,7 +53,7 @@ TILE_GET_INFO_MEMBER(mnight_state::mnight_get_bg_tile_info)
int const flipy = (hi & 0x20) >> 5;
int const color = hi & 0x0f;
- SET_TILE_INFO_MEMBER(2,
+ tileinfo.set(2,
tile,
color,
flipy ? TILE_FLIPY : 0);
@@ -79,7 +79,7 @@ TILE_GET_INFO_MEMBER(robokid_state::robokid_get_bg_tile_info)
int const tile = ((hi & 0x10) << 7) | ((hi & 0x20) << 5) | ((hi & 0xc0) << 2) | lo;
int const color = hi & 0x0f;
- SET_TILE_INFO_MEMBER(Layer + 2,
+ tileinfo.set(Layer + 2,
tile,
color,
0);
diff --git a/src/mame/video/nmk16.cpp b/src/mame/video/nmk16.cpp
index 97baf3b98d9..d0b71ada106 100644
--- a/src/mame/video/nmk16.cpp
+++ b/src/mame/video/nmk16.cpp
@@ -40,26 +40,26 @@ template<unsigned Layer, unsigned Gfx>
TILE_GET_INFO_MEMBER(nmk16_state::common_get_bg_tile_info)
{
const u16 code = m_bgvideoram[Layer][(m_tilerambank << 13) | tile_index];
- SET_TILE_INFO_MEMBER(Gfx, (code & 0xfff) | (m_bgbank << 12), code >> 12, 0);
+ tileinfo.set(Gfx, (code & 0xfff) | (m_bgbank << 12), code >> 12, 0);
}
TILE_GET_INFO_MEMBER(nmk16_state::common_get_tx_tile_info)
{
const u16 code = m_txvideoram[tile_index];
- SET_TILE_INFO_MEMBER(0, code & 0xfff, code >> 12, 0);
+ tileinfo.set(0, code & 0xfff, code >> 12, 0);
}
TILE_GET_INFO_MEMBER(nmk16_state::bioship_get_bg_tile_info)
{
const u16 code = m_tilemap_rom[(m_bioship_background_bank << 13) | tile_index]; // ROM Based
- SET_TILE_INFO_MEMBER(3, code & 0xfff, code >> 12, 0);
+ tileinfo.set(3, code & 0xfff, code >> 12, 0);
}
TILE_GET_INFO_MEMBER(nmk16_state::bjtwin_get_bg_tile_info)
{
const u16 code = m_bgvideoram[0][tile_index];
const u8 bank = BIT(code, 11);
- SET_TILE_INFO_MEMBER(bank,
+ tileinfo.set(bank,
(code & 0x7ff) + ((bank) ? (m_bgbank << 11) : 0),
code >> 12,
0);
@@ -399,7 +399,7 @@ u32 nmk16_state::screen_update_bjtwin(screen_device &screen, bitmap_ind16 &bitma
TILE_GET_INFO_MEMBER(afega_state::get_bg_tile_info_8bit)
{
const u16 code = m_bgvideoram[0][tile_index];
- SET_TILE_INFO_MEMBER(1, code, 0, 0);
+ tileinfo.set(1, code, 0, 0);
}
VIDEO_START_MEMBER(afega_state,grdnstrm)
diff --git a/src/mame/video/nova2001.cpp b/src/mame/video/nova2001.cpp
index 2362a724bc1..8ae5eabd206 100644
--- a/src/mame/video/nova2001.cpp
+++ b/src/mame/video/nova2001.cpp
@@ -77,7 +77,7 @@ TILE_GET_INFO_MEMBER(nova2001_state::nova2001_get_bg_tile_info)
int const code = m_bg_videoram[tile_index];
int const color = m_bg_videoram[tile_index + 0x400] & 0x0f;
- SET_TILE_INFO_MEMBER(2, code, color, 0);
+ tileinfo.set(2, code, color, 0);
}
TILE_GET_INFO_MEMBER(nova2001_state::nova2001_get_fg_tile_info)
@@ -86,7 +86,7 @@ TILE_GET_INFO_MEMBER(nova2001_state::nova2001_get_fg_tile_info)
int const code = m_fg_videoram[tile_index];
int const color = attr & 0x0f;
- SET_TILE_INFO_MEMBER(1, code, color, 0);
+ tileinfo.set(1, code, color, 0);
tileinfo.category = (attr & 0x10) >> 4;
}
@@ -97,7 +97,7 @@ TILE_GET_INFO_MEMBER(nova2001_state::ninjakun_get_bg_tile_info)
int const code = m_bg_videoram[tile_index] + ((attr & 0xc0) << 2);
int const color = attr & 0x0f;
- SET_TILE_INFO_MEMBER(2, code, color, 0);
+ tileinfo.set(2, code, color, 0);
}
TILE_GET_INFO_MEMBER(nova2001_state::ninjakun_get_fg_tile_info)
@@ -106,7 +106,7 @@ TILE_GET_INFO_MEMBER(nova2001_state::ninjakun_get_fg_tile_info)
int const code = m_fg_videoram[tile_index] + ((attr & 0x20) << 3);
int const color = attr & 0x0f;
- SET_TILE_INFO_MEMBER(1, code, color, 0);
+ tileinfo.set(1, code, color, 0);
tileinfo.category = (attr & 0x10) >> 4;
}
@@ -117,7 +117,7 @@ TILE_GET_INFO_MEMBER(nova2001_state::pkunwar_get_bg_tile_info)
int const code = m_bg_videoram[tile_index] + ((attr & 0x07) << 8);
int const color = (attr & 0xf0) >> 4;
- SET_TILE_INFO_MEMBER(1, code, color, 0);
+ tileinfo.set(1, code, color, 0);
tileinfo.category = (attr & 0x08) >> 3;
}
@@ -128,7 +128,7 @@ TILE_GET_INFO_MEMBER(nova2001_state::raiders5_get_bg_tile_info)
int const code = m_bg_videoram[tile_index] + ((attr & 0x01) << 8);
int const color = (attr & 0xf0) >> 4;
- SET_TILE_INFO_MEMBER(2, code, color, 0);
+ tileinfo.set(2, code, color, 0);
}
TILE_GET_INFO_MEMBER(nova2001_state::raiders5_get_fg_tile_info)
@@ -136,7 +136,7 @@ TILE_GET_INFO_MEMBER(nova2001_state::raiders5_get_fg_tile_info)
int const code = m_fg_videoram[tile_index];
int const color = (m_fg_videoram[tile_index + 0x400] & 0xf0) >> 4;
- SET_TILE_INFO_MEMBER(1, code, color, 0);
+ tileinfo.set(1, code, color, 0);
}
diff --git a/src/mame/video/nycaptor.cpp b/src/mame/video/nycaptor.cpp
index c3b2abcbb68..b6f05ebeee2 100644
--- a/src/mame/video/nycaptor.cpp
+++ b/src/mame/video/nycaptor.cpp
@@ -51,7 +51,7 @@ TILE_GET_INFO_MEMBER(nycaptor_state::get_tile_info)
}
#endif
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
m_videoram[tile_index * 2] + ((m_videoram[tile_index * 2 + 1] & 0xc0) << 2) + 0x400 * m_char_bank,
pal, 0
);
diff --git a/src/mame/video/offtwall.cpp b/src/mame/video/offtwall.cpp
index d7217b32847..f71c058acf6 100644
--- a/src/mame/video/offtwall.cpp
+++ b/src/mame/video/offtwall.cpp
@@ -23,7 +23,7 @@ TILE_GET_INFO_MEMBER(offtwall_state::get_playfield_tile_info)
uint16_t data2 = m_vad->playfield().extmem_read(tile_index) >> 8;
int code = data1 & 0x7fff;
int color = 0x10 + (data2 & 0x0f);
- SET_TILE_INFO_MEMBER(0, code, color, (data1 >> 15) & 1);
+ tileinfo.set(0, code, color, (data1 >> 15) & 1);
}
diff --git a/src/mame/video/ohmygod.cpp b/src/mame/video/ohmygod.cpp
index 170f4111862..470c64a42a4 100644
--- a/src/mame/video/ohmygod.cpp
+++ b/src/mame/video/ohmygod.cpp
@@ -13,7 +13,7 @@ TILE_GET_INFO_MEMBER(ohmygod_state::get_tile_info)
{
uint16_t code = m_videoram[2 * tile_index + 1];
uint16_t attr = m_videoram[2 * tile_index];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code,
(attr & 0x0f00) >> 8,
0);
diff --git a/src/mame/video/ojankohs.cpp b/src/mame/video/ojankohs.cpp
index 00c93eebdaf..0e4c151869f 100644
--- a/src/mame/video/ojankohs.cpp
+++ b/src/mame/video/ojankohs.cpp
@@ -157,7 +157,7 @@ TILE_GET_INFO_MEMBER(ojankohs_state::ojankohs_get_tile_info)
color |= (m_gfxreg & 0xe0) >> 2;
}
- SET_TILE_INFO_MEMBER(0, tile, color, 0);
+ tileinfo.set(0, tile, color, 0);
}
TILE_GET_INFO_MEMBER(ojankohs_state::ojankoy_get_tile_info)
@@ -167,7 +167,7 @@ TILE_GET_INFO_MEMBER(ojankohs_state::ojankoy_get_tile_info)
int flipx = ((m_colorram[tile_index] & 0x40) >> 6) ? TILEMAP_FLIPX : 0;
int flipy = ((m_colorram[tile_index] & 0x80) >> 7) ? TILEMAP_FLIPY : 0;
- SET_TILE_INFO_MEMBER(0, tile, color, (flipx | flipy));
+ tileinfo.set(0, tile, color, (flipx | flipy));
}
diff --git a/src/mame/video/oneshot.cpp b/src/mame/video/oneshot.cpp
index 4ab2451c528..df08b6923a6 100644
--- a/src/mame/video/oneshot.cpp
+++ b/src/mame/video/oneshot.cpp
@@ -11,7 +11,7 @@ TILE_GET_INFO_MEMBER(oneshot_state::get_bg_tile_info)
{
const u32 tileno = m_bg_videoram[tile_index * 2 + 1];
- SET_TILE_INFO_MEMBER(0, tileno, 0, 0);
+ tileinfo.set(0, tileno, 0, 0);
}
void oneshot_state::bg_videoram_w(offs_t offset, u16 data, u16 mem_mask)
@@ -25,7 +25,7 @@ TILE_GET_INFO_MEMBER(oneshot_state::get_mid_tile_info)
{
const u32 tileno = m_mid_videoram[tile_index * 2 + 1];
- SET_TILE_INFO_MEMBER(0, tileno, 2, 0);
+ tileinfo.set(0, tileno, 2, 0);
}
void oneshot_state::mid_videoram_w(offs_t offset, u16 data, u16 mem_mask)
@@ -40,7 +40,7 @@ TILE_GET_INFO_MEMBER(oneshot_state::get_fg_tile_info)
{
const u32 tileno = m_fg_videoram[tile_index * 2 + 1];
- SET_TILE_INFO_MEMBER(0, tileno, 3, 0);
+ tileinfo.set(0, tileno, 3, 0);
}
void oneshot_state::fg_videoram_w(offs_t offset, u16 data, u16 mem_mask)
diff --git a/src/mame/video/orbit.cpp b/src/mame/video/orbit.cpp
index 107f5bce745..320384bf03a 100644
--- a/src/mame/video/orbit.cpp
+++ b/src/mame/video/orbit.cpp
@@ -26,7 +26,7 @@ TILE_GET_INFO_MEMBER(orbit_state::get_tile_info)
if (m_flip_screen)
flags |= TILE_FLIPY;
- SET_TILE_INFO_MEMBER(3, code & 0x3f, 0, flags);
+ tileinfo.set(3, code & 0x3f, 0, flags);
}
diff --git a/src/mame/video/orca40c.cpp b/src/mame/video/orca40c.cpp
index fab592cf092..8ddd76705ef 100644
--- a/src/mame/video/orca40c.cpp
+++ b/src/mame/video/orca40c.cpp
@@ -207,7 +207,7 @@ TILE_GET_INFO_MEMBER(orca_ovg_40c_device::get_bg_tile_info)
int code = m_videoram_2[tile_index];
int color = (m_attributeram[(tile_index & 0x1f) << 1 | 1] >> 4) & 0x07;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
TILE_GET_INFO_MEMBER(orca_ovg_40c_device::get_fg_tile_info)
@@ -215,7 +215,7 @@ TILE_GET_INFO_MEMBER(orca_ovg_40c_device::get_fg_tile_info)
int code = m_videoram[tile_index];
int color = (m_attributeram[(tile_index & 0x1f) << 1 | 1] >> 0) & 0x07;
- SET_TILE_INFO_MEMBER(3, code, color, 0);
+ tileinfo.set(3, code, color, 0);
}
void orca_ovg_40c_device::draw_bullets( bitmap_rgb32 &bitmap, const rectangle &cliprect )
diff --git a/src/mame/video/pacland.cpp b/src/mame/video/pacland.cpp
index cf3dda78933..4e620eb35f1 100644
--- a/src/mame/video/pacland.cpp
+++ b/src/mame/video/pacland.cpp
@@ -158,7 +158,7 @@ TILE_GET_INFO_MEMBER(pacland_state::get_bg_tile_info)
int color = ((attr & 0x3e) >> 1) + ((code & 0x1c0) >> 1);
int flags = TILE_FLIPYX(attr >> 6);
- SET_TILE_INFO_MEMBER(1, code, color, flags);
+ tileinfo.set(1, code, color, flags);
}
TILE_GET_INFO_MEMBER(pacland_state::get_fg_tile_info)
@@ -172,7 +172,7 @@ TILE_GET_INFO_MEMBER(pacland_state::get_fg_tile_info)
tileinfo.category = (attr & 0x20) ? 1 : 0;
tileinfo.group = color;
- SET_TILE_INFO_MEMBER(0, code, color, flags);
+ tileinfo.set(0, code, color, flags);
}
diff --git a/src/mame/video/pacman.cpp b/src/mame/video/pacman.cpp
index a0bc5e2eafd..b2b1f72305a 100644
--- a/src/mame/video/pacman.cpp
+++ b/src/mame/video/pacman.cpp
@@ -135,7 +135,7 @@ TILE_GET_INFO_MEMBER(pacman_state::pacman_get_tile_info)
int code = m_videoram[tile_index] | (m_charbank << 8);
int attr = (m_colorram[tile_index] & 0x1f) | (m_colortablebank << 5) | (m_palettebank << 6 );
- SET_TILE_INFO_MEMBER(0,code,attr,0);
+ tileinfo.set(0,code,attr,0);
}
/***************************************************************************
@@ -358,7 +358,7 @@ TILE_GET_INFO_MEMBER(pacman_state::s2650_get_tile_info)
code = m_videoram[tile_index] + (colbank << 8);
attr = m_colorram[tile_index & 0x1f];
- SET_TILE_INFO_MEMBER(0,code,attr & 0x1f,0);
+ tileinfo.set(0,code,attr & 0x1f,0);
}
VIDEO_START_MEMBER(pacman_state,s2650games)
@@ -503,7 +503,7 @@ TILE_GET_INFO_MEMBER(pacman_state::jrpacman_get_tile_info)
code = m_videoram[tile_index] | (m_charbank << 8);
attr = (m_videoram[color_index] & 0x1f) | (m_colortablebank << 5) | (m_palettebank << 6 );
- SET_TILE_INFO_MEMBER(0,code,attr,0);
+ tileinfo.set(0,code,attr,0);
}
void pacman_state::jrpacman_mark_tile_dirty( int offset )
diff --git a/src/mame/video/pandoras.cpp b/src/mame/video/pandoras.cpp
index e59d2af5a6a..3b9202fa254 100644
--- a/src/mame/video/pandoras.cpp
+++ b/src/mame/video/pandoras.cpp
@@ -88,7 +88,7 @@ void pandoras_state::pandoras_palette(palette_device &palette) const
TILE_GET_INFO_MEMBER(pandoras_state::get_tile_info0)
{
uint8_t attr = m_colorram[tile_index];
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
m_videoram[tile_index] + ((attr & 0x10) << 4),
attr & 0x0f,
TILE_FLIPYX((attr & 0xc0) >> 6));
diff --git a/src/mame/video/paradise.cpp b/src/mame/video/paradise.cpp
index 3e5a14ba998..4880da2384d 100644
--- a/src/mame/video/paradise.cpp
+++ b/src/mame/video/paradise.cpp
@@ -102,7 +102,7 @@ WRITE8_MEMBER(paradise_state::palbank_w)
TILE_GET_INFO_MEMBER(paradise_state::get_tile_info_0)
{
int code = m_vram_0[tile_index] + (m_vram_0[tile_index + 0x400] << 8);
- SET_TILE_INFO_MEMBER(1, code, m_palbank, 0);
+ tileinfo.set(1, code, m_palbank, 0);
}
@@ -116,7 +116,7 @@ WRITE8_MEMBER(paradise_state::vram_1_w)
TILE_GET_INFO_MEMBER(paradise_state::get_tile_info_1)
{
int code = m_vram_1[tile_index] + (m_vram_1[tile_index + 0x400] << 8);
- SET_TILE_INFO_MEMBER(2, code, 0, 0);
+ tileinfo.set(2, code, 0, 0);
}
@@ -130,7 +130,7 @@ WRITE8_MEMBER(paradise_state::vram_2_w)
TILE_GET_INFO_MEMBER(paradise_state::get_tile_info_2)
{
int code = m_vram_2[tile_index] + (m_vram_2[tile_index + 0x400] << 8);
- SET_TILE_INFO_MEMBER(3, code, 0, 0);
+ tileinfo.set(3, code, 0, 0);
}
/* 256 x 256 bitmap. 4 bits per pixel so every byte encodes 2 pixels */
diff --git a/src/mame/video/pass.cpp b/src/mame/video/pass.cpp
index cb8289e7bb9..e3122aa1c7c 100644
--- a/src/mame/video/pass.cpp
+++ b/src/mame/video/pass.cpp
@@ -13,7 +13,7 @@ TILE_GET_INFO_MEMBER(pass_state::get_pass_bg_tile_info)
tileno = m_bg_videoram[tile_index] & 0x1fff;
fx = (m_bg_videoram[tile_index] & 0xc000) >> 14;
- SET_TILE_INFO_MEMBER(1, tileno, 0, TILE_FLIPYX(fx));
+ tileinfo.set(1, tileno, 0, TILE_FLIPYX(fx));
}
@@ -32,7 +32,7 @@ TILE_GET_INFO_MEMBER(pass_state::get_pass_fg_tile_info)
tileno = m_fg_videoram[tile_index] & 0x3fff;
flip = (m_fg_videoram[tile_index] & 0xc000) >>14;
- SET_TILE_INFO_MEMBER(0, tileno, 0, TILE_FLIPYX(flip));
+ tileinfo.set(0, tileno, 0, TILE_FLIPYX(flip));
}
diff --git a/src/mame/video/pbaction.cpp b/src/mame/video/pbaction.cpp
index 15f41317a7f..4f6d9cc0a52 100644
--- a/src/mame/video/pbaction.cpp
+++ b/src/mame/video/pbaction.cpp
@@ -57,7 +57,7 @@ TILE_GET_INFO_MEMBER(pbaction_state::get_bg_tile_info)
int color = attr & 0x07;
int flags = (attr & 0x80) ? TILE_FLIPY : 0;
- SET_TILE_INFO_MEMBER(1, code, color, flags);
+ tileinfo.set(1, code, color, flags);
}
TILE_GET_INFO_MEMBER(pbaction_state::get_fg_tile_info)
@@ -67,7 +67,7 @@ TILE_GET_INFO_MEMBER(pbaction_state::get_fg_tile_info)
int color = attr & 0x0f;
int flags = ((attr & 0x40) ? TILE_FLIPX : 0) | ((attr & 0x80) ? TILE_FLIPY : 0);
- SET_TILE_INFO_MEMBER(0, code, color, flags);
+ tileinfo.set(0, code, color, flags);
}
void pbaction_state::video_start()
diff --git a/src/mame/video/pc080sn.cpp b/src/mame/video/pc080sn.cpp
index 58f02203200..5942c98b75c 100644
--- a/src/mame/video/pc080sn.cpp
+++ b/src/mame/video/pc080sn.cpp
@@ -147,7 +147,7 @@ void pc080sn_device::common_get_pc080sn_bg_tile_info( tile_data &tileinfo, int t
attr = ram[tile_index];
}
- SET_TILE_INFO_MEMBER(gfxnum,
+ tileinfo.set(gfxnum,
code,
(attr & 0x1ff),
TILE_FLIPYX((attr & 0xc000) >> 14));
@@ -173,7 +173,7 @@ void pc080sn_device::common_get_pc080sn_fg_tile_info( tile_data &tileinfo, int t
attr = ram[tile_index];
}
- SET_TILE_INFO_MEMBER(gfxnum,
+ tileinfo.set(gfxnum,
code,
(attr & 0x1ff),
TILE_FLIPYX((attr & 0xc000) >> 14));
diff --git a/src/mame/video/pgm.cpp b/src/mame/video/pgm.cpp
index a26506389a1..cf6ea0ab47d 100644
--- a/src/mame/video/pgm.cpp
+++ b/src/mame/video/pgm.cpp
@@ -550,7 +550,7 @@ TILE_GET_INFO_MEMBER(pgm_state::get_tx_tile_info)
const u32 colour = (m_tx_videoram[tile_index * 2 + 1] & 0x3e) >> 1;
const u8 flipyx = (m_tx_videoram[tile_index * 2 + 1] & 0xc0) >> 6;
- SET_TILE_INFO_MEMBER(0,tileno,colour,TILE_FLIPYX(flipyx));
+ tileinfo.set(0,tileno,colour,TILE_FLIPYX(flipyx));
}
/* BG Layer */
@@ -569,7 +569,7 @@ TILE_GET_INFO_MEMBER(pgm_state::get_bg_tile_info)
const u32 colour = (m_bg_videoram[tile_index * 2 + 1] & 0x3e) >> 1;
const u8 flipyx = (m_bg_videoram[tile_index * 2 + 1] & 0xc0) >> 6;
- SET_TILE_INFO_MEMBER(1,tileno,colour,TILE_FLIPYX(flipyx));
+ tileinfo.set(1,tileno,colour,TILE_FLIPYX(flipyx));
}
diff --git a/src/mame/video/pgm2.cpp b/src/mame/video/pgm2.cpp
index 5216e6d68c5..692d5460c28 100644
--- a/src/mame/video/pgm2.cpp
+++ b/src/mame/video/pgm2.cpp
@@ -351,7 +351,7 @@ TILE_GET_INFO_MEMBER(pgm2_state::get_fg_tile_info)
u8 const colour = (m_fg_videoram[tile_index] & 0x007c0000) >> 18; // 5 bits
u8 const flipxy = (m_fg_videoram[tile_index] & 0x01800000) >> 23;
- SET_TILE_INFO_MEMBER(0, tileno, colour, TILE_FLIPXY(flipxy));
+ tileinfo.set(0, tileno, colour, TILE_FLIPXY(flipxy));
}
WRITE32_MEMBER(pgm2_state::bg_videoram_w)
@@ -366,7 +366,7 @@ TILE_GET_INFO_MEMBER(pgm2_state::get_bg_tile_info)
u8 const colour = (m_bg_videoram[tile_index] & 0x003c0000) >> 18; // 4 bits
u8 const flipxy = (m_bg_videoram[tile_index] & 0x01800000) >> 23;
- SET_TILE_INFO_MEMBER(0, tileno, colour, TILE_FLIPXY(flipxy));
+ tileinfo.set(0, tileno, colour, TILE_FLIPXY(flipxy));
}
void pgm2_state::video_start()
diff --git a/src/mame/video/phoenix.cpp b/src/mame/video/phoenix.cpp
index 9c530ca110e..2b061b12ec9 100644
--- a/src/mame/video/phoenix.cpp
+++ b/src/mame/video/phoenix.cpp
@@ -138,7 +138,7 @@ TILE_GET_INFO_MEMBER(phoenix_state::get_fg_tile_info)
code = m_videoram_pg[m_videoram_pg_index][tile_index];
col = (code >> 5);
col = col | 0x08 | (m_palette_bank << 4);
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
code,
col,
0);
@@ -151,7 +151,7 @@ TILE_GET_INFO_MEMBER(phoenix_state::get_bg_tile_info)
code = m_videoram_pg[m_videoram_pg_index][tile_index + 0x800];
col = (code >> 5);
col = col | 0x00 | (m_palette_bank << 4);
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code,
col,
0);
diff --git a/src/mame/video/pingpong.cpp b/src/mame/video/pingpong.cpp
index 5ca96fd42a3..f5661b8f86a 100644
--- a/src/mame/video/pingpong.cpp
+++ b/src/mame/video/pingpong.cpp
@@ -99,7 +99,7 @@ TILE_GET_INFO_MEMBER(pingpong_state::get_bg_tile_info)
int color = attr & 0x1f;
int flags = ((attr & 0x40) ? TILE_FLIPX : 0) | ((attr & 0x80) ? TILE_FLIPY : 0);
- SET_TILE_INFO_MEMBER(0, code, color, flags);
+ tileinfo.set(0, code, color, flags);
}
void pingpong_state::video_start()
diff --git a/src/mame/video/pirates.cpp b/src/mame/video/pirates.cpp
index 56dd486e730..12c96d84f8b 100644
--- a/src/mame/video/pirates.cpp
+++ b/src/mame/video/pirates.cpp
@@ -13,7 +13,7 @@ TILE_GET_INFO_MEMBER(pirates_state::get_tx_tile_info)
int code = m_tx_tileram[tile_index*2];
int colr = m_tx_tileram[tile_index*2+1];
- SET_TILE_INFO_MEMBER(0,code,colr,0);
+ tileinfo.set(0,code,colr,0);
}
TILE_GET_INFO_MEMBER(pirates_state::get_fg_tile_info)
@@ -21,7 +21,7 @@ TILE_GET_INFO_MEMBER(pirates_state::get_fg_tile_info)
int code = m_fg_tileram[tile_index*2];
int colr = m_fg_tileram[tile_index*2+1]+0x80;
- SET_TILE_INFO_MEMBER(0,code,colr,0);
+ tileinfo.set(0,code,colr,0);
}
TILE_GET_INFO_MEMBER(pirates_state::get_bg_tile_info)
@@ -29,7 +29,7 @@ TILE_GET_INFO_MEMBER(pirates_state::get_bg_tile_info)
int code = m_bg_tileram[tile_index*2];
int colr = m_bg_tileram[tile_index*2+1]+ 0x100;
- SET_TILE_INFO_MEMBER(0,code,colr,0);
+ tileinfo.set(0,code,colr,0);
}
diff --git a/src/mame/video/pitnrun.cpp b/src/mame/video/pitnrun.cpp
index 4d747a5946b..f71bd515720 100644
--- a/src/mame/video/pitnrun.cpp
+++ b/src/mame/video/pitnrun.cpp
@@ -26,7 +26,7 @@ In debug build press 'w' for spotlight and 'e' for lightning
TILE_GET_INFO_MEMBER(pitnrun_state::get_tile_info1)
{
int code = m_videoram[tile_index];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code,
0,
0);
@@ -35,7 +35,7 @@ TILE_GET_INFO_MEMBER(pitnrun_state::get_tile_info1)
TILE_GET_INFO_MEMBER(pitnrun_state::get_tile_info2)
{
int code = m_videoram2[tile_index];
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
code + (m_char_bank<<8),
m_color_select&1,
0);
diff --git a/src/mame/video/playch10.cpp b/src/mame/video/playch10.cpp
index e588fb72a7e..f6bdefca2cd 100644
--- a/src/mame/video/playch10.cpp
+++ b/src/mame/video/playch10.cpp
@@ -68,7 +68,7 @@ TILE_GET_INFO_MEMBER(playch10_state::get_bg_tile_info)
int code = videoram[offs] + ((videoram[offs + 1] & 0x07) << 8);
int color = (videoram[offs + 1] >> 3) & 0x1f;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
void playch10_state::video_start()
diff --git a/src/mame/video/playmark.cpp b/src/mame/video/playmark.cpp
index 7294bc50ee6..becc97f0b06 100644
--- a/src/mame/video/playmark.cpp
+++ b/src/mame/video/playmark.cpp
@@ -15,14 +15,14 @@ TILE_GET_INFO_MEMBER(playmark_state::bigtwin_get_tx_tile_info)
{
uint16_t code = m_videoram1[2 * tile_index];
uint16_t color = m_videoram1[2 * tile_index + 1];
- SET_TILE_INFO_MEMBER(2, code, color, 0);
+ tileinfo.set(2, code, color, 0);
}
TILE_GET_INFO_MEMBER(playmark_state::bigtwin_get_fg_tile_info)
{
uint16_t code = m_videoram2[2 * tile_index];
uint16_t color = m_videoram2[2 * tile_index + 1];
- SET_TILE_INFO_MEMBER(1, code, color, 0);
+ tileinfo.set(1, code, color, 0);
}
@@ -31,7 +31,7 @@ TILE_GET_INFO_MEMBER(playmark_state::wbeachvl_get_tx_tile_info)
uint16_t code = m_videoram1[2 * tile_index];
uint16_t color = m_videoram1[2 * tile_index + 1];
- SET_TILE_INFO_MEMBER(2, code, (color >> 2), 0);
+ tileinfo.set(2, code, (color >> 2), 0);
}
TILE_GET_INFO_MEMBER(playmark_state::wbeachvl_get_fg_tile_info)
@@ -39,7 +39,7 @@ TILE_GET_INFO_MEMBER(playmark_state::wbeachvl_get_fg_tile_info)
uint16_t code = m_videoram2[2 * tile_index];
uint16_t color = m_videoram2[2 * tile_index + 1];
- SET_TILE_INFO_MEMBER(1, (code & 0x7fff), (color >> 2) + 8, (code & 0x8000) ? TILE_FLIPX : 0);
+ tileinfo.set(1, (code & 0x7fff), (color >> 2) + 8, (code & 0x8000) ? TILE_FLIPX : 0);
}
TILE_GET_INFO_MEMBER(playmark_state::wbeachvl_get_bg_tile_info)
@@ -47,7 +47,7 @@ TILE_GET_INFO_MEMBER(playmark_state::wbeachvl_get_bg_tile_info)
uint16_t code = m_videoram3[2 * tile_index];
uint16_t color = m_videoram3[2 * tile_index + 1];
- SET_TILE_INFO_MEMBER(1, (code & 0x7fff), (color >> 2), (code & 0x8000) ? TILE_FLIPX : 0);
+ tileinfo.set(1, (code & 0x7fff), (color >> 2), (code & 0x8000) ? TILE_FLIPX : 0);
}
@@ -56,7 +56,7 @@ TILE_GET_INFO_MEMBER(playmark_state::hrdtimes_get_tx_tile_info)
int code = m_videoram1[tile_index] & 0x0fff;
int colr = m_videoram1[tile_index] & 0xe000;
- SET_TILE_INFO_MEMBER(3, code, (colr >> 13), 0);
+ tileinfo.set(3, code, (colr >> 13), 0);
}
TILE_GET_INFO_MEMBER(playmark_state::hrdtimes_get_fg_tile_info)
@@ -64,7 +64,7 @@ TILE_GET_INFO_MEMBER(playmark_state::hrdtimes_get_fg_tile_info)
int code = m_videoram2[tile_index] & 0x1fff;
int colr = m_videoram2[tile_index] & 0xe000;
- SET_TILE_INFO_MEMBER(2, code, (colr >> 13) + 8, 0);
+ tileinfo.set(2, code, (colr >> 13) + 8, 0);
}
TILE_GET_INFO_MEMBER(playmark_state::hrdtimes_get_bg_tile_info)
@@ -72,7 +72,7 @@ TILE_GET_INFO_MEMBER(playmark_state::hrdtimes_get_bg_tile_info)
int code = m_videoram3[tile_index] & 0x1fff;
int colr = m_videoram3[tile_index] & 0xe000;
- SET_TILE_INFO_MEMBER(1, code, (colr >> 13), 0);
+ tileinfo.set(1, code, (colr >> 13), 0);
}
@@ -81,7 +81,7 @@ TILE_GET_INFO_MEMBER(playmark_state::bigtwinb_get_tx_tile_info)
int code = m_videoram1[tile_index] & 0x0fff;
int colr = m_videoram1[tile_index] & 0xf000;
- SET_TILE_INFO_MEMBER(3, code, (colr >> 12), 0);
+ tileinfo.set(3, code, (colr >> 12), 0);
}
/***************************************************************************
diff --git a/src/mame/video/plygonet.cpp b/src/mame/video/plygonet.cpp
index 390be8274f1..c52be827f65 100644
--- a/src/mame/video/plygonet.cpp
+++ b/src/mame/video/plygonet.cpp
@@ -24,7 +24,7 @@ TILE_GET_INFO_MEMBER(polygonet_state::ttl_get_tile_info)
attr = m_ttl_vram[tile_index]>>12; /* palette in all 4 bits? */
- SET_TILE_INFO_MEMBER(m_ttl_gfx_index, code, attr, 0);
+ tileinfo.set(m_ttl_gfx_index, code, attr, 0);
}
TILE_GET_INFO_MEMBER(polygonet_state::roz_get_tile_info)
@@ -34,7 +34,7 @@ TILE_GET_INFO_MEMBER(polygonet_state::roz_get_tile_info)
attr = (m_roz_vram[tile_index] >> 12) + 16; /* roz base palette is palette 16 */
code = m_roz_vram[tile_index] & 0x3ff;
- SET_TILE_INFO_MEMBER(0, code, attr, 0);
+ tileinfo.set(0, code, attr, 0);
}
READ32_MEMBER(polygonet_state::polygonet_ttl_ram_r)
diff --git a/src/mame/video/pokechmp.cpp b/src/mame/video/pokechmp.cpp
index 1d55064a01a..c3fb4df564d 100644
--- a/src/mame/video/pokechmp.cpp
+++ b/src/mame/video/pokechmp.cpp
@@ -28,7 +28,7 @@ TILE_GET_INFO_MEMBER(pokechmp_state::get_bg_tile_info)
int code = videoram[tile_index*2+1] + ((videoram[tile_index*2] & 0x3f) << 8);
int color = videoram[tile_index*2] >> 6;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
void pokechmp_state::video_start()
diff --git a/src/mame/video/polepos.cpp b/src/mame/video/polepos.cpp
index 8b6e4d381eb..d35dab4d235 100644
--- a/src/mame/video/polepos.cpp
+++ b/src/mame/video/polepos.cpp
@@ -147,7 +147,7 @@ TILE_GET_INFO_MEMBER(polepos_state::bg_get_tile_info)
uint16_t word = m_view16_memory[tile_index];
int code = (word & 0xff) | ((word & 0x4000) >> 6);
int color = (word & 0x3f00) >> 8;
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
code,
color,
0);
@@ -171,7 +171,7 @@ TILE_GET_INFO_MEMBER(polepos_state::tx_get_tile_info)
/* 128V input to the palette PROM */
if (tile_index >= 32*16) color |= 0x40;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code,
color,
0);
diff --git a/src/mame/video/poolshrk.cpp b/src/mame/video/poolshrk.cpp
index 973da751bda..d87c7028eb3 100644
--- a/src/mame/video/poolshrk.cpp
+++ b/src/mame/video/poolshrk.cpp
@@ -14,7 +14,7 @@ Atari Poolshark video emulation
TILE_GET_INFO_MEMBER(poolshrk_state::get_tile_info)
{
- SET_TILE_INFO_MEMBER(1, m_playfield_ram[tile_index] & 0x3f, 0, 0);
+ tileinfo.set(1, m_playfield_ram[tile_index] & 0x3f, 0, 0);
}
diff --git a/src/mame/video/pooyan.cpp b/src/mame/video/pooyan.cpp
index cbe34704d3c..eff2e3e7596 100644
--- a/src/mame/video/pooyan.cpp
+++ b/src/mame/video/pooyan.cpp
@@ -100,7 +100,7 @@ TILE_GET_INFO_MEMBER(pooyan_state::get_bg_tile_info)
int color = attr & 0x0f;
int flags = TILE_FLIPYX(attr >> 6);
- SET_TILE_INFO_MEMBER(0, code, color, flags);
+ tileinfo.set(0, code, color, flags);
}
diff --git a/src/mame/video/popeye.cpp b/src/mame/video/popeye.cpp
index 3c6af625e04..56515ac25f6 100644
--- a/src/mame/video/popeye.cpp
+++ b/src/mame/video/popeye.cpp
@@ -236,7 +236,7 @@ TILE_GET_INFO_MEMBER(tnx1_state::get_fg_tile_info)
int code = m_videoram[tile_index];
int color = m_colorram[tile_index] & 0x0f;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
void tnx1_state::video_start()
diff --git a/src/mame/video/portrait.cpp b/src/mame/video/portrait.cpp
index 46eb33b7d45..17731d8a07e 100644
--- a/src/mame/video/portrait.cpp
+++ b/src/mame/video/portrait.cpp
@@ -51,7 +51,7 @@ inline void portrait_state::get_tile_info( tile_data &tileinfo, int tile_index,
else
color = ((tilenum&0xff)>>1)+0x80;
- SET_TILE_INFO_MEMBER(0, tilenum, color, flags );
+ tileinfo.set(0, tilenum, color, flags );
}
TILE_GET_INFO_MEMBER(portrait_state::get_bg_tile_info)
diff --git a/src/mame/video/powerins.cpp b/src/mame/video/powerins.cpp
index 18accbb4169..066cd08a64e 100644
--- a/src/mame/video/powerins.cpp
+++ b/src/mame/video/powerins.cpp
@@ -99,7 +99,7 @@ Offset:
TILE_GET_INFO_MEMBER(powerins_state::get_tile_info_0)
{
uint16_t code = m_vram[0][tile_index];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
(code & 0x07ff) | (m_tile_bank << 11),
((code & 0xf000) >> 12) | ((code & 0x0800) >> 7),
0);
@@ -130,7 +130,7 @@ Offset:
TILE_GET_INFO_MEMBER(powerins_state::get_tile_info_1)
{
uint16_t code = m_vram[1][tile_index];
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
code & 0x0fff,
(code & 0xf000) >> 12,
0);
diff --git a/src/mame/video/prehisle.cpp b/src/mame/video/prehisle.cpp
index b545ff0b02d..0ec2276b67a 100644
--- a/src/mame/video/prehisle.cpp
+++ b/src/mame/video/prehisle.cpp
@@ -65,7 +65,7 @@ TILE_GET_INFO_MEMBER(prehisle_state::get_bg_tile_info)
int const color = attr >> 12;
int const flags = (attr & 0x800) ? TILE_FLIPX : 0;
- SET_TILE_INFO_MEMBER(1, code, color, flags);
+ tileinfo.set(1, code, color, flags);
}
/* tile layout
@@ -80,7 +80,7 @@ TILE_GET_INFO_MEMBER(prehisle_state::get_fg_tile_info)
int const color = attr >> 12;
int const flags = (attr & 0x800) ? TILE_FLIPY : 0;
- SET_TILE_INFO_MEMBER(2, code, color, flags);
+ tileinfo.set(2, code, color, flags);
}
/* tile layout
@@ -93,7 +93,7 @@ TILE_GET_INFO_MEMBER(prehisle_state::get_tx_tile_info)
int const code = attr & 0xfff;
int const color = attr >> 12;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
void prehisle_state::video_start()
diff --git a/src/mame/video/psikyo.cpp b/src/mame/video/psikyo.cpp
index 75ad95db0d2..0e85f0c5249 100644
--- a/src/mame/video/psikyo.cpp
+++ b/src/mame/video/psikyo.cpp
@@ -77,7 +77,7 @@ template<int Layer>
TILE_GET_INFO_MEMBER(psikyo_state::get_tile_info)
{
u16 code = ((u16 *)m_vram[Layer].target())[BYTE_XOR_BE(tile_index)];
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
(code & 0x1fff) + 0x2000 * m_tilemap_bank[Layer],
((code >> 13) & 7) + (Layer * 0x40),
0);
diff --git a/src/mame/video/psychic5.cpp b/src/mame/video/psychic5.cpp
index 863f2ed59e7..2b635b10ec1 100644
--- a/src/mame/video/psychic5.cpp
+++ b/src/mame/video/psychic5.cpp
@@ -154,7 +154,7 @@ TILE_GET_INFO_MEMBER(psychic5_state::get_bg_tile_info)
int color = attr & 0x0f;
int flags = TILE_FLIPYX((attr & 0x30) >> 4);
- SET_TILE_INFO_MEMBER(1, code, color, flags);
+ tileinfo.set(1, code, color, flags);
}
TILE_GET_INFO_MEMBER(psychic5_state::get_fg_tile_info)
@@ -165,7 +165,7 @@ TILE_GET_INFO_MEMBER(psychic5_state::get_fg_tile_info)
int color = attr & 0x0f;
int flags = TILE_FLIPYX((attr & 0x30) >> 4);
- SET_TILE_INFO_MEMBER(2, code, color, flags);
+ tileinfo.set(2, code, color, flags);
}
diff --git a/src/mame/video/punchout.cpp b/src/mame/video/punchout.cpp
index fa3285eaa40..adad5eac22c 100644
--- a/src/mame/video/punchout.cpp
+++ b/src/mame/video/punchout.cpp
@@ -24,7 +24,7 @@ TILE_GET_INFO_MEMBER(punchout_state::top_get_info)
int code = m_bg_top_videoram[tile_index*2] + ((attr & 0x03) << 8);
int color = ((attr & 0x7c) >> 2);
int flipx = attr & 0x80;
- SET_TILE_INFO_MEMBER(0, code, color, flipx ? TILE_FLIPX : 0);
+ tileinfo.set(0, code, color, flipx ? TILE_FLIPX : 0);
}
TILE_GET_INFO_MEMBER(punchout_state::armwrest_top_get_info)
@@ -32,7 +32,7 @@ TILE_GET_INFO_MEMBER(punchout_state::armwrest_top_get_info)
int attr = m_bg_top_videoram[tile_index*2 + 1];
int code = m_bg_top_videoram[tile_index*2] + ((attr & 0x03) << 8) + ((attr & 0x80) << 3);
int color = ((attr & 0x7c) >> 2);
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
TILE_GET_INFO_MEMBER(punchout_state::bot_get_info)
@@ -41,7 +41,7 @@ TILE_GET_INFO_MEMBER(punchout_state::bot_get_info)
int code = m_bg_bot_videoram[tile_index*2] + ((attr & 0x03) << 8);
int color = ((attr & 0x7c) >> 2);
int flipx = attr & 0x80;
- SET_TILE_INFO_MEMBER(1, code, color, flipx ? TILE_FLIPX : 0);
+ tileinfo.set(1, code, color, flipx ? TILE_FLIPX : 0);
}
TILE_GET_INFO_MEMBER(punchout_state::armwrest_bot_get_info)
@@ -50,7 +50,7 @@ TILE_GET_INFO_MEMBER(punchout_state::armwrest_bot_get_info)
int code = m_bg_bot_videoram[tile_index*2] + ((attr & 0x03) << 8);
int color = ((attr & 0x7c) >> 2) + 0x40;
int flipx = attr & 0x80;
- SET_TILE_INFO_MEMBER(0, code, color, flipx ? TILE_FLIPX : 0);
+ tileinfo.set(0, code, color, flipx ? TILE_FLIPX : 0);
}
TILE_GET_INFO_MEMBER(punchout_state::bs1_get_info)
@@ -59,7 +59,7 @@ TILE_GET_INFO_MEMBER(punchout_state::bs1_get_info)
int code = m_spr1_videoram[tile_index*4] + ((m_spr1_videoram[tile_index*4 + 1] & 0x1f) << 8);
int color = attr & 0x1f;
int flipx = attr & 0x80;
- SET_TILE_INFO_MEMBER(2, code, color, flipx ? TILE_FLIPX : 0);
+ tileinfo.set(2, code, color, flipx ? TILE_FLIPX : 0);
}
TILE_GET_INFO_MEMBER(punchout_state::bs2_get_info)
@@ -68,7 +68,7 @@ TILE_GET_INFO_MEMBER(punchout_state::bs2_get_info)
int code = m_spr2_videoram[tile_index*4] + ((m_spr2_videoram[tile_index*4 + 1] & 0x0f) << 8);
int color = attr & 0x3f;
int flipx = attr & 0x80;
- SET_TILE_INFO_MEMBER(3, code, color, flipx ? TILE_FLIPX : 0);
+ tileinfo.set(3, code, color, flipx ? TILE_FLIPX : 0);
}
TILE_GET_INFO_MEMBER(punchout_state::armwrest_fg_get_info)
@@ -77,7 +77,7 @@ TILE_GET_INFO_MEMBER(punchout_state::armwrest_fg_get_info)
int code = m_armwrest_fg_videoram[tile_index*2] + 256 * (attr & 0x07);
int color = ((attr & 0xf8) >> 3);
int flipx = attr & 0x80;
- SET_TILE_INFO_MEMBER(1, code, color, flipx ? TILE_FLIPX : 0);
+ tileinfo.set(1, code, color, flipx ? TILE_FLIPX : 0);
}
TILEMAP_MAPPER_MEMBER(punchout_state::armwrest_bs1_scan)
diff --git a/src/mame/video/quizdna.cpp b/src/mame/video/quizdna.cpp
index 9ed8ad933f1..307aa4e8baf 100644
--- a/src/mame/video/quizdna.cpp
+++ b/src/mame/video/quizdna.cpp
@@ -23,7 +23,7 @@ TILE_GET_INFO_MEMBER(quizdna_state::get_bg_tile_info)
if (code>0x7fff)
code &= 0x83ff;
- SET_TILE_INFO_MEMBER(1, code, col, 0);
+ tileinfo.set(1, code, col, 0);
}
TILE_GET_INFO_MEMBER(quizdna_state::get_fg_tile_info)
@@ -42,7 +42,7 @@ TILE_GET_INFO_MEMBER(quizdna_state::get_fg_tile_info)
col >>= 5;
col = (col & 3) | ((col & 4) << 1);
- SET_TILE_INFO_MEMBER(0, code, col, 0);
+ tileinfo.set(0, code, col, 0);
}
diff --git a/src/mame/video/quizpani.cpp b/src/mame/video/quizpani.cpp
index 17770ae670c..8ecb2ce8b17 100644
--- a/src/mame/video/quizpani.cpp
+++ b/src/mame/video/quizpani.cpp
@@ -20,7 +20,7 @@ TILE_GET_INFO_MEMBER(quizpani_state::bg_tile_info)
{
int code = m_bg_videoram[tile_index];
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
(code & 0xfff) + (0x1000 * m_bgbank),
code >> 12,
0);
@@ -30,7 +30,7 @@ TILE_GET_INFO_MEMBER(quizpani_state::txt_tile_info)
{
int code = m_txt_videoram[tile_index];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
(code & 0xfff) + (0x1000 * m_txtbank),
code >> 12,
0);
diff --git a/src/mame/video/raiden.cpp b/src/mame/video/raiden.cpp
index 0fba5069bba..1ffc38affff 100644
--- a/src/mame/video/raiden.cpp
+++ b/src/mame/video/raiden.cpp
@@ -201,7 +201,7 @@ TILE_GET_INFO_MEMBER(raiden_state::get_back_tile_info)
int tile = tiledata & 0x0fff;
int color = tiledata >> 12;
- SET_TILE_INFO_MEMBER(1, tile, color, 0);
+ tileinfo.set(1, tile, color, 0);
}
TILE_GET_INFO_MEMBER(raiden_state::get_fore_tile_info)
@@ -210,7 +210,7 @@ TILE_GET_INFO_MEMBER(raiden_state::get_fore_tile_info)
int tile = tiledata & 0x0fff;
int color = tiledata >> 12;
- SET_TILE_INFO_MEMBER(2, tile, color, 0);
+ tileinfo.set(2, tile, color, 0);
}
TILE_GET_INFO_MEMBER(raiden_state::get_text_tile_info)
@@ -219,7 +219,7 @@ TILE_GET_INFO_MEMBER(raiden_state::get_text_tile_info)
int tile = (tiledata & 0xff) | ((tiledata >> 6) & 0x300);
int color = (tiledata >> 8) & 0x0f;
- SET_TILE_INFO_MEMBER(0, tile, color, 0);
+ tileinfo.set(0, tile, color, 0);
}
void raiden_state::common_video_start()
diff --git a/src/mame/video/raiden2.cpp b/src/mame/video/raiden2.cpp
index a7237a49c6b..c438267e519 100644
--- a/src/mame/video/raiden2.cpp
+++ b/src/mame/video/raiden2.cpp
@@ -260,7 +260,7 @@ TILE_GET_INFO_MEMBER(raiden2_state::get_back_tile_info)
tile = (tile & 0xfff) | (m_bg_bank << 12);
- SET_TILE_INFO_MEMBER(1,tile+0x0000,color,0);
+ tileinfo.set(1,tile+0x0000,color,0);
}
TILE_GET_INFO_MEMBER(raiden2_state::get_mid_tile_info)
@@ -270,7 +270,7 @@ TILE_GET_INFO_MEMBER(raiden2_state::get_mid_tile_info)
tile = (tile & 0xfff) | (m_mid_bank << 12);
- SET_TILE_INFO_MEMBER(1,tile,color,0);
+ tileinfo.set(1,tile,color,0);
}
TILE_GET_INFO_MEMBER(raiden2_state::get_fore_tile_info)
@@ -280,7 +280,7 @@ TILE_GET_INFO_MEMBER(raiden2_state::get_fore_tile_info)
tile = (tile & 0xfff) | (m_fg_bank << 12);
- SET_TILE_INFO_MEMBER(1,tile,color,0);
+ tileinfo.set(1,tile,color,0);
}
TILE_GET_INFO_MEMBER(raiden2_state::get_text_tile_info)
@@ -290,7 +290,7 @@ TILE_GET_INFO_MEMBER(raiden2_state::get_text_tile_info)
tile &= 0xfff;
- SET_TILE_INFO_MEMBER(0,tile + m_tx_bank * 0x1000,color,0);
+ tileinfo.set(0,tile + m_tx_bank * 0x1000,color,0);
}
void raiden2_state::video_start()
diff --git a/src/mame/video/rallyx.cpp b/src/mame/video/rallyx.cpp
index f89fc48442a..dd2107a15f0 100644
--- a/src/mame/video/rallyx.cpp
+++ b/src/mame/video/rallyx.cpp
@@ -218,7 +218,7 @@ inline void rallyx_state::rallyx_get_tile_info( tile_data &tileinfo, int tile_in
{
uint8_t attr = m_videoram[ram_offs + tile_index + 0x800];
tileinfo.category = (attr & 0x20) >> 5;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
m_videoram[ram_offs + tile_index],
attr & 0x3f,
TILE_FLIPYX(attr >> 6) ^ TILE_FLIPX);
@@ -241,7 +241,7 @@ inline void rallyx_state::locomotn_get_tile_info(tile_data &tileinfo,int tile_in
int code = m_videoram[ram_offs + tile_index];
code = (code & 0x7f) + 2 * (attr & 0x40) + 2 * (code & 0x80);
tileinfo.category = (attr & 0x20) >> 5;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code,
attr & 0x3f,
(attr & 0x80) ? (TILE_FLIPX | TILE_FLIPY) : 0);
diff --git a/src/mame/video/realbrk.cpp b/src/mame/video/realbrk.cpp
index a0ad8393805..767745951db 100644
--- a/src/mame/video/realbrk.cpp
+++ b/src/mame/video/realbrk.cpp
@@ -75,7 +75,7 @@ TILE_GET_INFO_MEMBER(realbrk_state::get_tile_info)
{
const u16 attr = m_vram[Layer][tile_index * 2 + 0];
const u16 code = m_vram[Layer][tile_index * 2 + 1];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code,
attr & 0x7f,
TILE_FLIPYX( attr >> 14 ));
@@ -98,7 +98,7 @@ TILE_GET_INFO_MEMBER(realbrk_state::get_tile_info)
TILE_GET_INFO_MEMBER(realbrk_state::get_tile_info_2)
{
const u16 code = m_vram[2][tile_index];
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
code & 0x0fff,
((code & 0xf000) >> 12) | ((m_vregs[0xa/2] & 0x7f) << 4),
0);
diff --git a/src/mame/video/redclash.cpp b/src/mame/video/redclash.cpp
index fb7ab34796a..66051d0768b 100644
--- a/src/mame/video/redclash.cpp
+++ b/src/mame/video/redclash.cpp
@@ -128,7 +128,7 @@ TILE_GET_INFO_MEMBER(redclash_state::get_fg_tile_info)
int code = m_videoram[tile_index];
int color = (m_videoram[tile_index] & 0x70) >> 4; // ??
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
diff --git a/src/mame/video/relief.cpp b/src/mame/video/relief.cpp
index 76ed4c60b1a..38e25ce71d4 100644
--- a/src/mame/video/relief.cpp
+++ b/src/mame/video/relief.cpp
@@ -23,7 +23,7 @@ TILE_GET_INFO_MEMBER(relief_state::get_playfield_tile_info)
uint16_t data2 = m_vad->playfield().extmem_read(tile_index) & 0xff;
int code = data1 & 0x7fff;
int color = 0x20 + (data2 & 0x0f);
- SET_TILE_INFO_MEMBER(0, code, color, (data1 >> 15) & 1);
+ tileinfo.set(0, code, color, (data1 >> 15) & 1);
}
@@ -33,7 +33,7 @@ TILE_GET_INFO_MEMBER(relief_state::get_playfield2_tile_info)
uint16_t data2 = m_vad->playfield2().extmem_read(tile_index) >> 8;
int code = data1 & 0x7fff;
int color = data2 & 0x0f;
- SET_TILE_INFO_MEMBER(0, code, color, (data1 >> 15) & 1);
+ tileinfo.set(0, code, color, (data1 >> 15) & 1);
}
diff --git a/src/mame/video/renegade.cpp b/src/mame/video/renegade.cpp
index 561f4e20947..9d155b0c130 100644
--- a/src/mame/video/renegade.cpp
+++ b/src/mame/video/renegade.cpp
@@ -41,7 +41,7 @@ TILE_GET_INFO_MEMBER(renegade_state::get_bg_tilemap_info)
{
const uint8_t *source = &m_bg_videoram[tile_index];
uint8_t attributes = source[0x400]; /* CCC??BBB */
- SET_TILE_INFO_MEMBER(1 + (attributes & 0x7),
+ tileinfo.set(1 + (attributes & 0x7),
source[0],
attributes >> 5,
0);
@@ -51,7 +51,7 @@ TILE_GET_INFO_MEMBER(renegade_state::get_fg_tilemap_info)
{
const uint8_t *source = &m_fg_videoram[tile_index];
uint8_t attributes = source[0x400];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
((attributes & 3) << 8) | source[0],
attributes >> 6,
0);
diff --git a/src/mame/video/retofinv.cpp b/src/mame/video/retofinv.cpp
index 5497f93d52e..c7494c12ad0 100644
--- a/src/mame/video/retofinv.cpp
+++ b/src/mame/video/retofinv.cpp
@@ -96,7 +96,7 @@ TILEMAP_MAPPER_MEMBER(retofinv_state::tilemap_scan)
TILE_GET_INFO_MEMBER(retofinv_state::bg_get_tile_info)
{
- SET_TILE_INFO_MEMBER(2,
+ tileinfo.set(2,
m_bg_videoram[tile_index] + 256 * m_bg_bank,
m_bg_videoram[0x400 + tile_index] & 0x3f,
0);
@@ -108,7 +108,7 @@ TILE_GET_INFO_MEMBER(retofinv_state::fg_get_tile_info)
tileinfo.group = color;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
m_fg_videoram[tile_index] + 256 * m_fg_bank,
color,
0);
diff --git a/src/mame/video/rocnrope.cpp b/src/mame/video/rocnrope.cpp
index cce2c4cfec2..6f6a5551385 100644
--- a/src/mame/video/rocnrope.cpp
+++ b/src/mame/video/rocnrope.cpp
@@ -104,7 +104,7 @@ TILE_GET_INFO_MEMBER(rocnrope_state::get_bg_tile_info)
int color = attr & 0x0f;
int flags = ((attr & 0x40) ? TILE_FLIPX : 0) | ((attr & 0x20) ? TILE_FLIPY : 0);
- SET_TILE_INFO_MEMBER(1, code, color, flags);
+ tileinfo.set(1, code, color, flags);
}
void rocnrope_state::video_start()
diff --git a/src/mame/video/rollrace.cpp b/src/mame/video/rollrace.cpp
index 22e33b03bc1..b33f663a4b5 100644
--- a/src/mame/video/rollrace.cpp
+++ b/src/mame/video/rollrace.cpp
@@ -14,7 +14,7 @@ TILE_GET_INFO_MEMBER(rollrace_state::get_fg_tile_info)
int code = m_videoram[tile_index];
int color = m_colorram[(tile_index & 0x1f)*2+1] & 0x1f;
- SET_TILE_INFO_MEMBER(RA_FGCHAR_BASE + m_chrbank,
+ tileinfo.set(RA_FGCHAR_BASE + m_chrbank,
code,
color,
TILE_FLIPY);
diff --git a/src/mame/video/rpunch.cpp b/src/mame/video/rpunch.cpp
index 28b829bd959..9aeef547d2a 100644
--- a/src/mame/video/rpunch.cpp
+++ b/src/mame/video/rpunch.cpp
@@ -31,7 +31,7 @@ TILE_GET_INFO_MEMBER(rpunch_state::get_bg0_tile_info)
if (m_videoflags & 0x0400) code = (data & 0x0fff) | 0x2000;
else code = (data & 0x1fff);
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code,
((m_videoflags & 0x0010) >> 1) | ((data >> 13) & 7),
0);
@@ -45,7 +45,7 @@ TILE_GET_INFO_MEMBER(rpunch_state::get_bg1_tile_info)
if (m_videoflags & 0x0800) code = (data & 0x0fff) | 0x2000;
else code = (data & 0x1fff);
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
code,
((m_videoflags & 0x0020) >> 2) | ((data >> 13) & 7),
0);
diff --git a/src/mame/video/runaway.cpp b/src/mame/video/runaway.cpp
index 218ba16bb13..f84ec362306 100644
--- a/src/mame/video/runaway.cpp
+++ b/src/mame/video/runaway.cpp
@@ -54,7 +54,7 @@ TILE_GET_INFO_MEMBER(runaway_state::runaway_get_tile_info)
{
uint8_t code = m_video_ram[tile_index];
- SET_TILE_INFO_MEMBER(0, ((code & 0x3f) << 1) | ((code & 0x40) >> 6) | (m_tile_bank << 7), 0, (code & 0x80) ? TILE_FLIPY : 0);
+ tileinfo.set(0, ((code & 0x3f) << 1) | ((code & 0x40) >> 6) | (m_tile_bank << 7), 0, (code & 0x80) ? TILE_FLIPY : 0);
}
@@ -62,7 +62,7 @@ TILE_GET_INFO_MEMBER(runaway_state::qwak_get_tile_info)
{
uint8_t code = m_video_ram[tile_index];
- SET_TILE_INFO_MEMBER(0, ((code & 0x7f) << 1) | ((code & 0x80) >> 7), 0, 0);
+ tileinfo.set(0, ((code & 0x7f) << 1) | ((code & 0x80) >> 7), 0, 0);
}
diff --git a/src/mame/video/rungun.cpp b/src/mame/video/rungun.cpp
index 607f970608f..cf5a87fc85f 100644
--- a/src/mame/video/rungun.cpp
+++ b/src/mame/video/rungun.cpp
@@ -25,7 +25,7 @@ TILE_GET_INFO_MEMBER(rungun_state::ttl_get_tile_info)
attr = (lvram[BYTE_XOR_LE(tile_index<<2)] & 0xf0) >> 4;
code = ((lvram[BYTE_XOR_LE(tile_index<<2)] & 0x0f) << 8) | (lvram[BYTE_XOR_LE((tile_index<<2)+2)]);
- SET_TILE_INFO_MEMBER(m_ttl_gfx_index, code, attr, 0);
+ tileinfo.set(m_ttl_gfx_index, code, attr, 0);
}
K055673_CB_MEMBER(rungun_state::sprite_callback)
@@ -65,7 +65,7 @@ TILE_GET_INFO_MEMBER(rungun_state::get_rng_936_tile_info)
flipx = (m_psac2_vram[tile_index * 2 + 1 + base_addr] & 0xc000) >> 14;
colour = 0x10 + (m_psac2_vram[tile_index * 2 + base_addr] & 0x000f);
- SET_TILE_INFO_MEMBER(0, tileno, colour, TILE_FLIPYX(flipx));
+ tileinfo.set(0, tileno, colour, TILE_FLIPYX(flipx));
}
diff --git a/src/mame/video/sauro.cpp b/src/mame/video/sauro.cpp
index 1a8bcb4c800..3d42be72193 100644
--- a/src/mame/video/sauro.cpp
+++ b/src/mame/video/sauro.cpp
@@ -48,7 +48,7 @@ TILE_GET_INFO_MEMBER(sauro_state::get_tile_info_bg)
int color = ((m_colorram[tile_index] >> 4) & 0x0f) | m_palette_bank;
int flags = m_colorram[tile_index] & 0x08 ? TILE_FLIPX : 0;
- SET_TILE_INFO_MEMBER(0, code, color, flags);
+ tileinfo.set(0, code, color, flags);
}
TILE_GET_INFO_MEMBER(sauro_state::get_tile_info_fg)
@@ -57,7 +57,7 @@ TILE_GET_INFO_MEMBER(sauro_state::get_tile_info_fg)
int color = ((m_colorram2[tile_index] >> 4) & 0x0f) | m_palette_bank;
int flags = m_colorram2[tile_index] & 0x08 ? TILE_FLIPX : 0;
- SET_TILE_INFO_MEMBER(1, code, color, flags);
+ tileinfo.set(1, code, color, flags);
}
/* Sauro */
diff --git a/src/mame/video/sbasketb.cpp b/src/mame/video/sbasketb.cpp
index c9adefe411b..73de0999b10 100644
--- a/src/mame/video/sbasketb.cpp
+++ b/src/mame/video/sbasketb.cpp
@@ -119,7 +119,7 @@ TILE_GET_INFO_MEMBER(sbasketb_state::get_bg_tile_info)
int color = m_colorram[tile_index] & 0x0f;
int flags = ((m_colorram[tile_index] & 0x40) ? TILE_FLIPX : 0) | ((m_colorram[tile_index] & 0x80) ? TILE_FLIPY : 0);
- SET_TILE_INFO_MEMBER(0, code, color, flags);
+ tileinfo.set(0, code, color, flags);
}
void sbasketb_state::video_start()
diff --git a/src/mame/video/sbugger.cpp b/src/mame/video/sbugger.cpp
index cedc1458cef..4464d7f6936 100644
--- a/src/mame/video/sbugger.cpp
+++ b/src/mame/video/sbugger.cpp
@@ -12,7 +12,7 @@ TILE_GET_INFO_MEMBER(sbugger_state::get_tile_info)
tileno = m_videoram[tile_index];
color = m_videoram_attr[tile_index];
- SET_TILE_INFO_MEMBER(0,tileno,color,0);
+ tileinfo.set(0,tileno,color,0);
}
WRITE8_MEMBER(sbugger_state::videoram_w)
diff --git a/src/mame/video/scotrsht.cpp b/src/mame/video/scotrsht.cpp
index b8ed76edc2c..5614231e09d 100644
--- a/src/mame/video/scotrsht.cpp
+++ b/src/mame/video/scotrsht.cpp
@@ -83,7 +83,7 @@ TILE_GET_INFO_MEMBER(scotrsht_state::get_bg_tile_info)
// data & 0x80 -> tile priority?
- SET_TILE_INFO_MEMBER(0, code, color, flag);
+ tileinfo.set(0, code, color, flag);
}
/* Same as Jailbreak + palette bank */
diff --git a/src/mame/video/sderby.cpp b/src/mame/video/sderby.cpp
index 14e9e847781..d04126fec94 100644
--- a/src/mame/video/sderby.cpp
+++ b/src/mame/video/sderby.cpp
@@ -12,7 +12,7 @@ TILE_GET_INFO_MEMBER(sderby_state::get_sderby_tile_info)
tileno = m_videoram[tile_index*2];
colour = m_videoram[tile_index*2+1] & 0x0f;
- SET_TILE_INFO_MEMBER(1,tileno,colour,0);
+ tileinfo.set(1,tileno,colour,0);
}
WRITE16_MEMBER(sderby_state::sderby_videoram_w)
@@ -30,7 +30,7 @@ TILE_GET_INFO_MEMBER(sderby_state::get_sderby_md_tile_info)
tileno = m_md_videoram[tile_index*2];
colour = m_md_videoram[tile_index*2+1] & 0x0f;
- SET_TILE_INFO_MEMBER(1,tileno,colour+16,0);
+ tileinfo.set(1,tileno,colour+16,0);
}
WRITE16_MEMBER(sderby_state::sderby_md_videoram_w)
@@ -48,7 +48,7 @@ TILE_GET_INFO_MEMBER(sderby_state::get_sderby_fg_tile_info)
tileno = m_fg_videoram[tile_index*2];
colour = m_fg_videoram[tile_index*2+1] & 0x0f;
- SET_TILE_INFO_MEMBER(0,tileno,colour+32,0);
+ tileinfo.set(0,tileno,colour+32,0);
}
WRITE16_MEMBER(sderby_state::sderby_fg_videoram_w)
diff --git a/src/mame/video/segag80r.cpp b/src/mame/video/segag80r.cpp
index d1e4d2e81a7..5e3b87ebea1 100644
--- a/src/mame/video/segag80r.cpp
+++ b/src/mame/video/segag80r.cpp
@@ -165,7 +165,7 @@ void segag80r_state::spaceod_bg_init_palette()
TILE_GET_INFO_MEMBER(segag80r_state::spaceod_get_tile_info)
{
int code = memregion("gfx2")->base()[tile_index + 0x1000 * (m_spaceod_bg_control >> 6)];
- SET_TILE_INFO_MEMBER(1, code + 0x100 * ((m_spaceod_bg_control >> 2) & 1), 0, 0);
+ tileinfo.set(1, code + 0x100 * ((m_spaceod_bg_control >> 2) & 1), 0, 0);
}
@@ -180,7 +180,7 @@ TILEMAP_MAPPER_MEMBER(segag80r_state::spaceod_scan_rows)
TILE_GET_INFO_MEMBER(segag80r_state::bg_get_tile_info)
{
int code = memregion("gfx2")->base()[tile_index];
- SET_TILE_INFO_MEMBER(1, code + 0x100 * m_bg_char_bank, code >> 4, 0);
+ tileinfo.set(1, code + 0x100 * m_bg_char_bank, code >> 4, 0);
}
diff --git a/src/mame/video/segaic16.cpp b/src/mame/video/segaic16.cpp
index a3068395a16..35c8abae679 100644
--- a/src/mame/video/segaic16.cpp
+++ b/src/mame/video/segaic16.cpp
@@ -808,7 +808,7 @@ TILE_GET_INFO_MEMBER( segaic16_video_device::tilemap_16a_tile_info )
int code = ((data >> 1) & 0x1000) | (data & 0xfff);
int color = (data >> 5) & 0x7f;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
tileinfo.category = (data >> 12) & 1;
}
@@ -820,7 +820,7 @@ TILE_GET_INFO_MEMBER( segaic16_video_device::tilemap_16a_text_info )
int color = (data >> 8) & 0x07;
int code = data & 0xff;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
tileinfo.category = (data >> 11) & 1;
}
@@ -1022,7 +1022,7 @@ TILE_GET_INFO_MEMBER( segaic16_video_device::tilemap_16b_tile_info )
code = info->bank[code / info->banksize] * info->banksize + code % info->banksize;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
tileinfo.category = (data >> 15) & 1;
}
@@ -1035,7 +1035,7 @@ TILE_GET_INFO_MEMBER( segaic16_video_device::tilemap_16b_text_info )
int color = (data >> 9) & 0x07;
int code = data & 0x1ff;
- SET_TILE_INFO_MEMBER(0, bank * info->banksize + code, color, 0);
+ tileinfo.set(0, bank * info->banksize + code, color, 0);
tileinfo.category = (data >> 15) & 1;
}
@@ -1049,7 +1049,7 @@ TILE_GET_INFO_MEMBER( segaic16_video_device::tilemap_16b_alt_tile_info )
code = info->bank[code / info->banksize] * info->banksize + code % info->banksize;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
tileinfo.category = (data >> 15) & 1;
}
@@ -1062,7 +1062,7 @@ TILE_GET_INFO_MEMBER( segaic16_video_device::tilemap_16b_alt_text_info )
int color = (data >> 8) & 0x07;
int code = data & 0xff;
- SET_TILE_INFO_MEMBER(0, bank * info->banksize + code, color, 0);
+ tileinfo.set(0, bank * info->banksize + code, color, 0);
tileinfo.category = (data >> 15) & 1;
}
diff --git a/src/mame/video/segaic24.cpp b/src/mame/video/segaic24.cpp
index 218c79e5bb7..477d85f3040 100644
--- a/src/mame/video/segaic24.cpp
+++ b/src/mame/video/segaic24.cpp
@@ -47,7 +47,7 @@ const gfx_layout segas24_tile_device::char_layout = {
void segas24_tile_device::tile_info(int offset, tile_data &tileinfo, tilemap_memory_index tile_index)
{
uint16_t val = tile_ram[tile_index|offset];
- SET_TILE_INFO_MEMBER(char_gfx_index, val & tile_mask, (val >> 7) & 0xff, 0);
+ tileinfo.set(char_gfx_index, val & tile_mask, (val >> 7) & 0xff, 0);
tileinfo.category = (val & 0x8000) != 0;
}
diff --git a/src/mame/video/segas32.cpp b/src/mame/video/segas32.cpp
index 14d4f97bbd0..b666713c00f 100644
--- a/src/mame/video/segas32.cpp
+++ b/src/mame/video/segas32.cpp
@@ -471,7 +471,7 @@ TILE_GET_INFO_MEMBER(segas32_state::get_tile_info)
{
struct segas32_state::cache_entry *entry = (struct segas32_state::cache_entry *)tilemap.user_data();
uint16_t data = m_videoram[((entry->page & 0x7f) << 9) | tile_index];
- SET_TILE_INFO_MEMBER(0, (entry->bank << 13) | (data & 0x1fff), (data >> 4) & 0x1ff, (data >> 14) & 3);
+ tileinfo.set(0, (entry->bank << 13) | (data & 0x1fff), (data >> 4) & 0x1ff, (data >> 14) & 3);
}
diff --git a/src/mame/video/seibuspi.cpp b/src/mame/video/seibuspi.cpp
index 9429aa22d5f..5a496feeb0f 100644
--- a/src/mame/video/seibuspi.cpp
+++ b/src/mame/video/seibuspi.cpp
@@ -663,7 +663,7 @@ TILE_GET_INFO_MEMBER(seibuspi_state::get_text_tile_info)
tile &= 0xfff;
- SET_TILE_INFO_MEMBER(2, tile, color, 0);
+ tileinfo.set(2, tile, color, 0);
}
TILE_GET_INFO_MEMBER(seibuspi_state::get_back_tile_info)
@@ -675,7 +675,7 @@ TILE_GET_INFO_MEMBER(seibuspi_state::get_back_tile_info)
tile &= 0x1fff;
tile |= m_back_layer_d14;
- SET_TILE_INFO_MEMBER(1, tile, color, 0);
+ tileinfo.set(1, tile, color, 0);
}
TILE_GET_INFO_MEMBER(seibuspi_state::get_midl_tile_info)
@@ -688,7 +688,7 @@ TILE_GET_INFO_MEMBER(seibuspi_state::get_midl_tile_info)
tile |= 0x2000;
tile |= m_midl_layer_d14;
- SET_TILE_INFO_MEMBER(1, tile, color + 16, 0);
+ tileinfo.set(1, tile, color + 16, 0);
}
TILE_GET_INFO_MEMBER(seibuspi_state::get_fore_tile_info)
@@ -702,7 +702,7 @@ TILE_GET_INFO_MEMBER(seibuspi_state::get_fore_tile_info)
tile |= m_fore_layer_d13;
tile |= m_fore_layer_d14;
- SET_TILE_INFO_MEMBER(1, tile, color + 8, 0);
+ tileinfo.set(1, tile, color + 8, 0);
}
diff --git a/src/mame/video/seicross.cpp b/src/mame/video/seicross.cpp
index f9d43d0ee59..046fe91be3b 100644
--- a/src/mame/video/seicross.cpp
+++ b/src/mame/video/seicross.cpp
@@ -81,7 +81,7 @@ TILE_GET_INFO_MEMBER(seicross_state::get_bg_tile_info)
int color = m_colorram[tile_index] & 0x0f;
int flags = ((m_colorram[tile_index] & 0x40) ? TILE_FLIPX : 0) | ((m_colorram[tile_index] & 0x80) ? TILE_FLIPY : 0);
- SET_TILE_INFO_MEMBER(0, code, color, flags);
+ tileinfo.set(0, code, color, flags);
}
void seicross_state::video_start()
diff --git a/src/mame/video/senjyo.cpp b/src/mame/video/senjyo.cpp
index 0c2a66e6526..e8d7b0d28a3 100644
--- a/src/mame/video/senjyo.cpp
+++ b/src/mame/video/senjyo.cpp
@@ -26,7 +26,7 @@ TILE_GET_INFO_MEMBER(senjyo_state::get_fg_tile_info)
if (m_is_senjyo && (tile_index & 0x1f) >= 32-8)
flags |= TILE_FORCE_LAYER0;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
m_fgvideoram[tile_index] + ((attr & 0x10) << 4),
attr & 0x07,
flags);
@@ -36,7 +36,7 @@ TILE_GET_INFO_MEMBER(senjyo_state::senjyo_bg1_tile_info)
{
uint8_t code = m_bg1videoram[tile_index];
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
code,
(code & 0x70) >> 4,
0);
@@ -48,7 +48,7 @@ TILE_GET_INFO_MEMBER(senjyo_state::starforc_bg1_tile_info)
/* they wired bit 7 of the tile code in place of bit 4 to get the color code */
uint8_t code = m_bg1videoram[tile_index];
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
code,
bitswap<3>(((code & 0xe0) >> 5), 1, 0, 2),
0);
@@ -58,7 +58,7 @@ TILE_GET_INFO_MEMBER(senjyo_state::get_bg2_tile_info)
{
uint8_t code = m_bg2videoram[tile_index];
- SET_TILE_INFO_MEMBER(2,
+ tileinfo.set(2,
code,
(code & 0xe0) >> 5,
0);
@@ -68,7 +68,7 @@ TILE_GET_INFO_MEMBER(senjyo_state::get_bg3_tile_info)
{
uint8_t code = m_bg3videoram[tile_index];
- SET_TILE_INFO_MEMBER(3,
+ tileinfo.set(3,
code,
(code & 0xe0) >> 5,
0);
diff --git a/src/mame/video/seta.cpp b/src/mame/video/seta.cpp
index 27a906e0b8b..154252c713d 100644
--- a/src/mame/video/seta.cpp
+++ b/src/mame/video/seta.cpp
@@ -306,7 +306,7 @@ TILE_GET_INFO_MEMBER(seta_state::twineagl_get_tile_info)
const u16 attr = vram[tile_index + 0x800];
if ((code & 0x3e00) == 0x3e00)
code = (code & 0xc07f) | ((m_twineagl_tilebank[(code & 0x0180) >> 7] >> 1) << 7);
- SET_TILE_INFO_MEMBER(1, (code & 0x3fff), attr & 0x1f, TILE_FLIPXY((code & 0xc000) >> 14));
+ tileinfo.set(1, (code & 0x3fff), attr & 0x1f, TILE_FLIPXY((code & 0xc000) >> 14));
}
template<int Layer>
@@ -327,7 +327,7 @@ TILE_GET_INFO_MEMBER(seta_state::get_tile_info)
popmessage("Missing Color Mode = 1 for Layer = %d. Contact MAMETesters.", Layer);
}
- SET_TILE_INFO_MEMBER(gfx, m_tiles_offset + (code & 0x3fff), attr & 0x1f, TILE_FLIPXY((code & 0xc000) >> 14));
+ tileinfo.set(gfx, m_tiles_offset + (code & 0x3fff), attr & 0x1f, TILE_FLIPXY((code & 0xc000) >> 14));
}
diff --git a/src/mame/video/sf.cpp b/src/mame/video/sf.cpp
index d2c1de6804f..71516db2489 100644
--- a/src/mame/video/sf.cpp
+++ b/src/mame/video/sf.cpp
@@ -15,7 +15,7 @@ TILE_GET_INFO_MEMBER(sf_state::get_bg_tile_info)
int attr = base[0x10000];
int color = base[0];
int code = (base[0x10000 + 1] << 8) | base[1];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code,
color,
TILE_FLIPYX(attr & 3));
@@ -27,7 +27,7 @@ TILE_GET_INFO_MEMBER(sf_state::get_fg_tile_info)
int attr = base[0x10000];
int color = base[0];
int code = (base[0x10000 + 1] << 8) | base[1];
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
code,
color,
TILE_FLIPYX(attr & 3));
@@ -36,7 +36,7 @@ TILE_GET_INFO_MEMBER(sf_state::get_fg_tile_info)
TILE_GET_INFO_MEMBER(sf_state::get_tx_tile_info)
{
int code = m_videoram[tile_index];
- SET_TILE_INFO_MEMBER(3,
+ tileinfo.set(3,
code & 0x3ff,
code>>12,
TILE_FLIPYX((code & 0xc00)>>10));
diff --git a/src/mame/video/shadfrce.cpp b/src/mame/video/shadfrce.cpp
index 1f356244173..a5023eaadbc 100644
--- a/src/mame/video/shadfrce.cpp
+++ b/src/mame/video/shadfrce.cpp
@@ -11,7 +11,7 @@ TILE_GET_INFO_MEMBER(shadfrce_state::get_fgtile_info)
tileno = (m_fgvideoram[tile_index *2] & 0x00ff) | ((m_fgvideoram[tile_index *2+1] & 0x000f) << 8);
colour = (m_fgvideoram[tile_index *2+1] & 0x00f0) >>4;
- SET_TILE_INFO_MEMBER(0,tileno,colour*4,0);
+ tileinfo.set(0,tileno,colour*4,0);
}
WRITE16_MEMBER(shadfrce_state::fgvideoram_w)
@@ -30,7 +30,7 @@ TILE_GET_INFO_MEMBER(shadfrce_state::get_bg0tile_info)
if (colour & 0x10) colour ^= 0x30; /* skip hole */
fyx = (m_bg0videoram[tile_index *2] & 0x00c0) >>6;
- SET_TILE_INFO_MEMBER(2,tileno,colour,TILE_FLIPYX(fyx));
+ tileinfo.set(2,tileno,colour,TILE_FLIPYX(fyx));
}
WRITE16_MEMBER(shadfrce_state::bg0videoram_w)
@@ -46,7 +46,7 @@ TILE_GET_INFO_MEMBER(shadfrce_state::get_bg1tile_info)
tileno = (m_bg1videoram[tile_index] & 0x0fff);
colour = (m_bg1videoram[tile_index] & 0xf000) >> 12;
- SET_TILE_INFO_MEMBER(2,tileno,colour+64,0);
+ tileinfo.set(2,tileno,colour+64,0);
}
WRITE16_MEMBER(shadfrce_state::bg1videoram_w)
diff --git a/src/mame/video/shangkid.cpp b/src/mame/video/shangkid.cpp
index ca1b5b9a0c9..ebb86364d45 100644
--- a/src/mame/video/shangkid.cpp
+++ b/src/mame/video/shangkid.cpp
@@ -21,7 +21,7 @@ TILE_GET_INFO_MEMBER(shangkid_state::get_bg_tile_info)
*/
color = attributes>>3;
color = (color&0x03)|((color&0x1c)<<1);
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
tile_number,
color,
(attributes&0x04)?TILE_FLIPX:0);
@@ -34,7 +34,7 @@ TILE_GET_INFO_MEMBER(shangkid_state::get_bg_tile_info)
x------- flipx?
*/
color = (attributes>>2)&0x1f;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
tile_number,
color,
(attributes&0x80)?TILE_FLIPX:0);
diff --git a/src/mame/video/shaolins.cpp b/src/mame/video/shaolins.cpp
index 91c7ab8e528..a0b1e117778 100644
--- a/src/mame/video/shaolins.cpp
+++ b/src/mame/video/shaolins.cpp
@@ -131,7 +131,7 @@ TILE_GET_INFO_MEMBER(shaolins_state::get_bg_tile_info)
int color = (attr & 0x0f) + 16 * m_palettebank;
int flags = (attr & 0x20) ? TILE_FLIPY : 0;
- SET_TILE_INFO_MEMBER(0, code, color, flags);
+ tileinfo.set(0, code, color, flags);
}
void shaolins_state::video_start()
diff --git a/src/mame/video/shisen.cpp b/src/mame/video/shisen.cpp
index a92d13d1ef2..44863969db8 100644
--- a/src/mame/video/shisen.cpp
+++ b/src/mame/video/shisen.cpp
@@ -43,7 +43,7 @@ TILE_GET_INFO_MEMBER(shisen_state::get_bg_tile_info)
int code = m_videoram[offs] + ((m_videoram[offs + 1] & 0x0f) << 8) + (m_gfxbank << 12);
int color = (m_videoram[offs + 1] & 0xf0) >> 4;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
void shisen_state::video_start()
diff --git a/src/mame/video/shootout.cpp b/src/mame/video/shootout.cpp
index 47c0db18368..846f1018026 100644
--- a/src/mame/video/shootout.cpp
+++ b/src/mame/video/shootout.cpp
@@ -46,7 +46,7 @@ TILE_GET_INFO_MEMBER(shootout_state::get_bg_tile_info)
int tile_number = m_videoram[tile_index] + 256*(attributes&7);
int color = attributes>>4;
- SET_TILE_INFO_MEMBER(2,
+ tileinfo.set(2,
tile_number,
color,
0);
@@ -58,7 +58,7 @@ TILE_GET_INFO_MEMBER(shootout_state::get_fg_tile_info)
int tile_number = m_textram[tile_index] + 256*(attributes&0x3);
int color = attributes>>4;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
tile_number,
color,
0);
diff --git a/src/mame/video/shuuz.cpp b/src/mame/video/shuuz.cpp
index af83bede0e0..dc62d134373 100644
--- a/src/mame/video/shuuz.cpp
+++ b/src/mame/video/shuuz.cpp
@@ -23,7 +23,7 @@ TILE_GET_INFO_MEMBER(shuuz_state::get_playfield_tile_info)
uint16_t data2 = m_vad->playfield().extmem_read(tile_index) >> 8;
int code = data1 & 0x3fff;
int color = data2 & 0x0f;
- SET_TILE_INFO_MEMBER(0, code, color, (data1 >> 15) & 1);
+ tileinfo.set(0, code, color, (data1 >> 15) & 1);
}
diff --git a/src/mame/video/sidearms.cpp b/src/mame/video/sidearms.cpp
index a444084b32a..d8d31692e1c 100644
--- a/src/mame/video/sidearms.cpp
+++ b/src/mame/video/sidearms.cpp
@@ -102,7 +102,7 @@ TILE_GET_INFO_MEMBER(sidearms_state::get_sidearms_bg_tile_info)
color = attr>>3 & 0x1f;
flags = attr>>1 & 0x03;
- SET_TILE_INFO_MEMBER(1, code, color, flags);
+ tileinfo.set(1, code, color, flags);
}
TILE_GET_INFO_MEMBER(sidearms_state::get_philko_bg_tile_info)
@@ -115,7 +115,7 @@ TILE_GET_INFO_MEMBER(sidearms_state::get_philko_bg_tile_info)
color = attr>>3 & 0x0f;
flags = attr>>1 & 0x03;
- SET_TILE_INFO_MEMBER(1, code, color, flags);
+ tileinfo.set(1, code, color, flags);
}
TILE_GET_INFO_MEMBER(sidearms_state::get_fg_tile_info)
@@ -124,7 +124,7 @@ TILE_GET_INFO_MEMBER(sidearms_state::get_fg_tile_info)
int code = m_videoram[tile_index] + (attr<<2 & 0x300);
int color = attr & 0x3f;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
TILEMAP_MAPPER_MEMBER(sidearms_state::tilemap_scan)
diff --git a/src/mame/video/sidepckt.cpp b/src/mame/video/sidepckt.cpp
index e9673a95572..5512383a5bb 100644
--- a/src/mame/video/sidepckt.cpp
+++ b/src/mame/video/sidepckt.cpp
@@ -54,7 +54,7 @@ void sidepckt_state::sidepckt_palette(palette_device &palette) const
TILE_GET_INFO_MEMBER(sidepckt_state::get_tile_info)
{
uint8_t attr = m_colorram[tile_index];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
m_videoram[tile_index] + ((attr & 0x07) << 8),
((attr & 0x10) >> 3) | ((attr & 0x20) >> 5),
TILE_FLIPX);
diff --git a/src/mame/video/silkroad.cpp b/src/mame/video/silkroad.cpp
index 7c5147c9561..d29cdd0934b 100644
--- a/src/mame/video/silkroad.cpp
+++ b/src/mame/video/silkroad.cpp
@@ -63,7 +63,7 @@ TILE_GET_INFO_MEMBER(silkroad_state::get_tile_info)
code += 0x18000;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code,
color,
TILE_FLIPYX(flipx));
diff --git a/src/mame/video/skullxbo.cpp b/src/mame/video/skullxbo.cpp
index f3497502bab..84432d4ffb7 100644
--- a/src/mame/video/skullxbo.cpp
+++ b/src/mame/video/skullxbo.cpp
@@ -23,7 +23,7 @@ TILE_GET_INFO_MEMBER(skullxbo_state::get_alpha_tile_info)
int code = (data ^ 0x400) & 0x7ff;
int color = (data >> 11) & 0x0f;
int opaque = data & 0x8000;
- SET_TILE_INFO_MEMBER(2, code, color, opaque ? TILE_FORCE_LAYER0 : 0);
+ tileinfo.set(2, code, color, opaque ? TILE_FORCE_LAYER0 : 0);
}
@@ -33,7 +33,7 @@ TILE_GET_INFO_MEMBER(skullxbo_state::get_playfield_tile_info)
uint16_t data2 = m_playfield_tilemap->extmem_read(tile_index) & 0xff;
int code = data1 & 0x7fff;
int color = data2 & 0x0f;
- SET_TILE_INFO_MEMBER(1, code, color, (data1 >> 15) & 1);
+ tileinfo.set(1, code, color, (data1 >> 15) & 1);
}
diff --git a/src/mame/video/skydiver.cpp b/src/mame/video/skydiver.cpp
index d8201c747b5..436e6bbf6b1 100644
--- a/src/mame/video/skydiver.cpp
+++ b/src/mame/video/skydiver.cpp
@@ -25,7 +25,7 @@ void skydiver_state::machine_reset()
TILE_GET_INFO_MEMBER(skydiver_state::get_tile_info)
{
uint8_t code = m_videoram[tile_index];
- SET_TILE_INFO_MEMBER(0, code & 0x3f, code >> 6, 0);
+ tileinfo.set(0, code & 0x3f, code >> 6, 0);
}
diff --git a/src/mame/video/skykid.cpp b/src/mame/video/skykid.cpp
index 94e7c12275e..08bd606a0dc 100644
--- a/src/mame/video/skykid.cpp
+++ b/src/mame/video/skykid.cpp
@@ -79,7 +79,7 @@ TILE_GET_INFO_MEMBER(skykid_state::tx_get_tile_info)
screen is flipped, character flip is done by selecting the 2nd character set.
We reproduce this here, but since the tilemap system automatically flips
characters when screen is flipped, we have to flip them back. */
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code | (flip_screen() ? 0x100 : 0),
attr & 0x3f,
flip_screen() ? (TILE_FLIPY | TILE_FLIPX) : 0);
@@ -91,7 +91,7 @@ TILE_GET_INFO_MEMBER(skykid_state::bg_get_tile_info)
int code = m_videoram[tile_index];
int attr = m_videoram[tile_index+0x800];
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
code + ((attr & 0x01) << 8),
((attr & 0x7e) >> 1) | ((attr & 0x01) << 6),
0);
diff --git a/src/mame/video/slapfght.cpp b/src/mame/video/slapfght.cpp
index 959a2e61110..7a0bb4632ff 100644
--- a/src/mame/video/slapfght.cpp
+++ b/src/mame/video/slapfght.cpp
@@ -24,7 +24,7 @@ TILE_GET_INFO_MEMBER(slapfght_state::get_pf_tile_info)
int tile = m_videoram[tile_index] | ((m_colorram[tile_index] & 0x03) << 8);
int color = (m_colorram[tile_index] >> 3) & 0x0f;
- SET_TILE_INFO_MEMBER(0, tile, color, 0);
+ tileinfo.set(0, tile, color, 0);
}
TILE_GET_INFO_MEMBER(slapfght_state::get_pf1_tile_info)
@@ -32,7 +32,7 @@ TILE_GET_INFO_MEMBER(slapfght_state::get_pf1_tile_info)
int tile = m_videoram[tile_index] | ((m_colorram[tile_index] & 0x0f) << 8);
int color = (m_colorram[tile_index] & 0xf0) >> 4;
- SET_TILE_INFO_MEMBER(1, tile, color, 0);
+ tileinfo.set(1, tile, color, 0);
}
TILE_GET_INFO_MEMBER(slapfght_state::get_fix_tile_info)
@@ -40,7 +40,7 @@ TILE_GET_INFO_MEMBER(slapfght_state::get_fix_tile_info)
int tile = m_fixvideoram[tile_index] | ((m_fixcolorram[tile_index] & 0x03) << 8);
int color = (m_fixcolorram[tile_index] & 0xfc) >> 2;
- SET_TILE_INFO_MEMBER(0, tile, color, 0);
+ tileinfo.set(0, tile, color, 0);
}
diff --git a/src/mame/video/snk.cpp b/src/mame/video/snk.cpp
index fe58fa97438..bfa8bbec500 100644
--- a/src/mame/video/snk.cpp
+++ b/src/mame/video/snk.cpp
@@ -77,7 +77,7 @@ TILE_GET_INFO_MEMBER(snk_state::marvins_get_tx_tile_info)
int code = m_tx_videoram[tile_index];
int color = code >> 5;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
m_tx_tile_offset + code,
color,
tile_index & 0x400 ? TILE_FORCE_LAYER0 : 0);
@@ -87,7 +87,7 @@ TILE_GET_INFO_MEMBER(snk_state::ikari_get_tx_tile_info)
{
int code = m_tx_videoram[tile_index];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
m_tx_tile_offset + code,
0,
tile_index & 0x400 ? TILE_FORCE_LAYER0 : 0);
@@ -97,7 +97,7 @@ TILE_GET_INFO_MEMBER(snk_state::gwar_get_tx_tile_info)
{
int code = m_tx_videoram[tile_index];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
m_tx_tile_offset + code,
0,
0);
@@ -108,7 +108,7 @@ TILE_GET_INFO_MEMBER(snk_state::marvins_get_fg_tile_info)
{
int code = m_fg_videoram[tile_index];
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
code,
0,
0);
@@ -118,7 +118,7 @@ TILE_GET_INFO_MEMBER(snk_state::marvins_get_bg_tile_info)
{
int code = m_bg_videoram[tile_index];
- SET_TILE_INFO_MEMBER(2,
+ tileinfo.set(2,
code,
0,
0);
@@ -129,7 +129,7 @@ TILE_GET_INFO_MEMBER(snk_state::aso_get_bg_tile_info)
{
int code = m_bg_videoram[tile_index];
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
m_bg_tile_offset + code,
0,
0);
@@ -141,7 +141,7 @@ TILE_GET_INFO_MEMBER(snk_state::tnk3_get_bg_tile_info)
int code = m_bg_videoram[2*tile_index] | ((attr & 0x30) << 4);
int color = (attr & 0xf) ^ 8;
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
code,
color,
0);
@@ -153,7 +153,7 @@ TILE_GET_INFO_MEMBER(snk_state::ikari_get_bg_tile_info)
int code = m_bg_videoram[2*tile_index] | ((attr & 0x03) << 8);
int color = (attr & 0x70) >> 4;
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
code,
color,
0);
@@ -168,13 +168,13 @@ TILE_GET_INFO_MEMBER(snk_state::gwar_get_bg_tile_info)
if (m_is_psychos) // psychos has a separate palette bank bit
color &= 7;
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
code,
color,
0);
// bermudat, tdfever use FFFF to blank the background.
- // (still call SET_TILE_INFO_MEMBER, otherwise problems might occur on boot when
+ // (still call tileinfo.set, otherwise problems might occur on boot when
// the tile data hasn't been initialised)
if (code >= m_gfxdecode->gfx(1)->elements())
tileinfo.pen_data = m_empty_tile;
diff --git a/src/mame/video/snk6502.cpp b/src/mame/video/snk6502.cpp
index 345b9b80972..0ce84fc7098 100644
--- a/src/mame/video/snk6502.cpp
+++ b/src/mame/video/snk6502.cpp
@@ -152,7 +152,7 @@ TILE_GET_INFO_MEMBER(snk6502_state::get_bg_tile_info)
int code = m_videoram[tile_index] + 256 * m_charbank;
int color = (m_colorram[tile_index] & 0x38) >> 3;
- SET_TILE_INFO_MEMBER(1, code, color, 0);
+ tileinfo.set(1, code, color, 0);
}
TILE_GET_INFO_MEMBER(snk6502_state::get_fg_tile_info)
@@ -160,7 +160,7 @@ TILE_GET_INFO_MEMBER(snk6502_state::get_fg_tile_info)
int code = m_videoram2[tile_index];
int color = m_colorram[tile_index] & 0x07;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
VIDEO_START_MEMBER(snk6502_state,snk6502)
@@ -276,7 +276,7 @@ TILE_GET_INFO_MEMBER(snk6502_state::satansat_get_bg_tile_info)
int code = m_videoram[tile_index];
int color = (m_colorram[tile_index] & 0x0c) >> 2;
- SET_TILE_INFO_MEMBER(1, code, color, 0);
+ tileinfo.set(1, code, color, 0);
}
TILE_GET_INFO_MEMBER(snk6502_state::satansat_get_fg_tile_info)
@@ -284,7 +284,7 @@ TILE_GET_INFO_MEMBER(snk6502_state::satansat_get_fg_tile_info)
int code = m_videoram2[tile_index];
int color = m_colorram[tile_index] & 0x03;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
VIDEO_START_MEMBER(snk6502_state,satansat)
diff --git a/src/mame/video/snk68.cpp b/src/mame/video/snk68.cpp
index 8b50da0bd53..52be80b15ed 100644
--- a/src/mame/video/snk68.cpp
+++ b/src/mame/video/snk68.cpp
@@ -29,7 +29,7 @@ TILE_GET_INFO_MEMBER(snk68_state::get_tile_info)
int tile = m_fg_tile_offset + (m_fg_videoram[2*tile_index] & 0xff);
int color = m_fg_videoram[2*tile_index+1] & 0x07;
- SET_TILE_INFO_MEMBER(0, tile, color, 0);
+ tileinfo.set(0, tile, color, 0);
}
TILE_GET_INFO_MEMBER(searchar_state::get_tile_info)
@@ -41,7 +41,7 @@ TILE_GET_INFO_MEMBER(searchar_state::get_tile_info)
// used in the ikari3 intro
int flags = (data & 0x8000) ? TILE_FORCE_LAYER0 : 0;
- SET_TILE_INFO_MEMBER(0, tile, color, flags);
+ tileinfo.set(0, tile, color, flags);
}
/***************************************************************************
diff --git a/src/mame/video/snookr10.cpp b/src/mame/video/snookr10.cpp
index 4dcf95c4351..e8a8f6690e0 100644
--- a/src/mame/video/snookr10.cpp
+++ b/src/mame/video/snookr10.cpp
@@ -97,7 +97,7 @@ TILE_GET_INFO_MEMBER(snookr10_state::get_bg_tile_info)
int code = attr & 0xfff;
int color = m_colorram[offs] >> 4;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
@@ -164,7 +164,7 @@ TILE_GET_INFO_MEMBER(snookr10_state::apple10_get_bg_tile_info)
int code = bitswap<16>((attr & 0xfff),15,14,13,12,8,9,10,11,0,1,2,3,4,5,6,7); /* encrypted tile matrix */
int color = m_colorram[offs] >> 4;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
@@ -231,7 +231,7 @@ TILE_GET_INFO_MEMBER(snookr10_state::crystalc_get_bg_tile_info)
int code = bitswap<16>((attr & 0xfff),15,14,13,12,0,10,5,1,7,6,9,4,3,2,8,11); /* encrypted tile matrix */
int color = m_colorram[offs] >> 4;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
diff --git a/src/mame/video/solomon.cpp b/src/mame/video/solomon.cpp
index d2c74323844..49f2d8af33f 100644
--- a/src/mame/video/solomon.cpp
+++ b/src/mame/video/solomon.cpp
@@ -43,7 +43,7 @@ TILE_GET_INFO_MEMBER(solomon_state::get_bg_tile_info)
int color = ((attr & 0x70) >> 4);
int flags = ((attr & 0x80) ? TILE_FLIPX : 0) | ((attr & 0x08) ? TILE_FLIPY : 0);
- SET_TILE_INFO_MEMBER(1, code, color, flags);
+ tileinfo.set(1, code, color, flags);
}
TILE_GET_INFO_MEMBER(solomon_state::get_fg_tile_info)
@@ -52,7 +52,7 @@ TILE_GET_INFO_MEMBER(solomon_state::get_fg_tile_info)
int code = m_videoram[tile_index] + 256 * (attr & 0x07);
int color = (attr & 0x70) >> 4;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
void solomon_state::video_start()
diff --git a/src/mame/video/sonson.cpp b/src/mame/video/sonson.cpp
index d39d031950a..e84519c6874 100644
--- a/src/mame/video/sonson.cpp
+++ b/src/mame/video/sonson.cpp
@@ -123,7 +123,7 @@ TILE_GET_INFO_MEMBER(sonson_state::get_bg_tile_info)
int code = m_videoram[tile_index] + 256 * (attr & 0x03);
int color = attr >> 2;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
void sonson_state::video_start()
diff --git a/src/mame/video/spbactn.cpp b/src/mame/video/spbactn.cpp
index cc8b6231657..7fd78701b5d 100644
--- a/src/mame/video/spbactn.cpp
+++ b/src/mame/video/spbactn.cpp
@@ -16,7 +16,7 @@ TILE_GET_INFO_MEMBER(spbactn_state::get_bg_tile_info)
{
int attr = m_bgvideoram[tile_index];
int tileno = m_bgvideoram[tile_index+0x2000];
- SET_TILE_INFO_MEMBER(1, tileno, ((attr & 0x00f0)>>4), 0);
+ tileinfo.set(1, tileno, ((attr & 0x00f0)>>4), 0);
}
@@ -37,7 +37,7 @@ TILE_GET_INFO_MEMBER(spbactn_state::get_fg_tile_info)
if (attr & 0x0008)
color += 0x0010;
- SET_TILE_INFO_MEMBER(0, tileno, color, 0);
+ tileinfo.set(0, tileno, color, 0);
}
@@ -107,7 +107,7 @@ TILE_GET_INFO_MEMBER(spbactn_state::get_extra_tile_info)
{
int tileno = m_extraram[(tile_index*2)+1];
tileno |= m_extraram[(tile_index*2)] << 8;
- SET_TILE_INFO_MEMBER(3, tileno, 0, 0);
+ tileinfo.set(3, tileno, 0, 0);
}
diff --git a/src/mame/video/spdodgeb.cpp b/src/mame/video/spdodgeb.cpp
index 2dd932b70b5..d834e8645b9 100644
--- a/src/mame/video/spdodgeb.cpp
+++ b/src/mame/video/spdodgeb.cpp
@@ -56,7 +56,7 @@ TILE_GET_INFO_MEMBER(spdodgeb_state::get_bg_tile_info)
{
uint8_t code = m_videoram[tile_index];
uint8_t attr = m_videoram[tile_index + 0x800];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code + ((attr & 0x1f) << 8),
((attr & 0xe0) >> 5) + 8 * m_tile_palbank,
0);
diff --git a/src/mame/video/speedbal.cpp b/src/mame/video/speedbal.cpp
index 2642fed1af8..3bbd6bfecc0 100644
--- a/src/mame/video/speedbal.cpp
+++ b/src/mame/video/speedbal.cpp
@@ -17,7 +17,7 @@ TILE_GET_INFO_MEMBER(speedbal_state::get_tile_info_bg)
int code = m_background_videoram[tile_index*2] + ((m_background_videoram[tile_index*2+1] & 0x30) << 4);
int color = m_background_videoram[tile_index*2+1] & 0x0f;
- SET_TILE_INFO_MEMBER(1, code, color, 0);
+ tileinfo.set(1, code, color, 0);
tileinfo.group = (color == 8);
}
@@ -26,7 +26,7 @@ TILE_GET_INFO_MEMBER(speedbal_state::get_tile_info_fg)
int code = m_foreground_videoram[tile_index*2] + ((m_foreground_videoram[tile_index*2+1] & 0x30) << 4);
int color = m_foreground_videoram[tile_index*2+1] & 0x0f;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
tileinfo.group = (color == 9);
}
diff --git a/src/mame/video/speedspn.cpp b/src/mame/video/speedspn.cpp
index 22d01989145..4fcb756fa25 100644
--- a/src/mame/video/speedspn.cpp
+++ b/src/mame/video/speedspn.cpp
@@ -11,7 +11,7 @@ TILE_GET_INFO_MEMBER(speedspn_state::get_tile_info)
int code = m_vidram[tile_index*2+1] | (m_vidram[tile_index*2] << 8);
int attr = m_attram[tile_index^0x400];
- SET_TILE_INFO_MEMBER(0,code,attr & 0x3f,(attr & 0x80) ? TILE_FLIPX : 0);
+ tileinfo.set(0,code,attr & 0x3f,(attr & 0x80) ? TILE_FLIPX : 0);
}
void speedspn_state::video_start()
diff --git a/src/mame/video/splash.cpp b/src/mame/video/splash.cpp
index c27573c9eee..b65f24a5e06 100644
--- a/src/mame/video/splash.cpp
+++ b/src/mame/video/splash.cpp
@@ -46,7 +46,7 @@ TILE_GET_INFO_MEMBER(splash_state::get_tile_info_tilemap0)
int attr = data >> 8;
int code = data & 0xff;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code + ((0x20 + (attr & 0x0f)) << 8),
(attr & 0xf0) >> 4,
0);
@@ -58,7 +58,7 @@ TILE_GET_INFO_MEMBER(splash_state::get_tile_info_tilemap1)
int attr = data >> 8;
int code = data & 0xff;
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
(code >> 2) + ((0x30 + (attr & 0x0f)) << 6),
(attr & 0xf0) >> 4,
TILE_FLIPXY(code & 0x03));
diff --git a/src/mame/video/sprint2.cpp b/src/mame/video/sprint2.cpp
index 0d24f6bb120..9270826f96d 100644
--- a/src/mame/video/sprint2.cpp
+++ b/src/mame/video/sprint2.cpp
@@ -37,7 +37,7 @@ TILE_GET_INFO_MEMBER(sprint2_state::get_tile_info)
{
uint8_t code = m_video_ram[tile_index];
- SET_TILE_INFO_MEMBER(0, code & 0x3f, code >> 7, 0);
+ tileinfo.set(0, code & 0x3f, code >> 7, 0);
}
diff --git a/src/mame/video/sprint4.cpp b/src/mame/video/sprint4.cpp
index 9aeea51b4ab..4d920f85cb4 100644
--- a/src/mame/video/sprint4.cpp
+++ b/src/mame/video/sprint4.cpp
@@ -40,9 +40,9 @@ TILE_GET_INFO_MEMBER(sprint4_state::tile_info)
uint8_t code = m_videoram[tile_index];
if ((code & 0x30) == 0x30)
- SET_TILE_INFO_MEMBER(0, code & ~0x40, (code >> 6) ^ 3, 0);
+ tileinfo.set(0, code & ~0x40, (code >> 6) ^ 3, 0);
else
- SET_TILE_INFO_MEMBER(0, code, 4, 0);
+ tileinfo.set(0, code, 4, 0);
}
diff --git a/src/mame/video/sprint8.cpp b/src/mame/video/sprint8.cpp
index f04d3ab8e8b..5ab35afe829 100644
--- a/src/mame/video/sprint8.cpp
+++ b/src/mame/video/sprint8.cpp
@@ -79,7 +79,7 @@ TILE_GET_INFO_MEMBER(sprint8_state::get_tile_info1)
}
- SET_TILE_INFO_MEMBER(code >> 7, code, color, (code & 0x40) ? (TILE_FLIPX | TILE_FLIPY) : 0);
+ tileinfo.set(code >> 7, code, color, (code & 0x40) ? (TILE_FLIPX | TILE_FLIPY) : 0);
}
@@ -94,7 +94,7 @@ TILE_GET_INFO_MEMBER(sprint8_state::get_tile_info2)
else
color = 17;
- SET_TILE_INFO_MEMBER(code >> 7, code, color, (code & 0x40) ? (TILE_FLIPX | TILE_FLIPY) : 0);
+ tileinfo.set(code >> 7, code, color, (code & 0x40) ? (TILE_FLIPX | TILE_FLIPY) : 0);
}
diff --git a/src/mame/video/srumbler.cpp b/src/mame/video/srumbler.cpp
index 5a140c5a57c..f718a0f72cb 100644
--- a/src/mame/video/srumbler.cpp
+++ b/src/mame/video/srumbler.cpp
@@ -21,7 +21,7 @@
TILE_GET_INFO_MEMBER(srumbler_state::get_fg_tile_info)
{
uint8_t attr = m_foregroundram[2*tile_index];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
m_foregroundram[2*tile_index + 1] + ((attr & 0x03) << 8),
(attr & 0x3c) >> 2,
(attr & 0x40) ? TILE_FORCE_LAYER0 : 0);
@@ -30,7 +30,7 @@ TILE_GET_INFO_MEMBER(srumbler_state::get_fg_tile_info)
TILE_GET_INFO_MEMBER(srumbler_state::get_bg_tile_info)
{
uint8_t attr = m_backgroundram[2*tile_index];
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
m_backgroundram[2*tile_index + 1] + ((attr & 0x07) << 8),
(attr & 0xe0) >> 5,
((attr & 0x08) ? TILE_FLIPY : 0));
diff --git a/src/mame/video/sslam.cpp b/src/mame/video/sslam.cpp
index 5f29791efea..4ddd4e3d692 100644
--- a/src/mame/video/sslam.cpp
+++ b/src/mame/video/sslam.cpp
@@ -79,7 +79,7 @@ TILE_GET_INFO_MEMBER(sslam_state::get_sslam_tx_tile_info)
int code = m_tx_tileram[tile_index] & 0x0fff;
int colr = m_tx_tileram[tile_index] & 0xf000;
- SET_TILE_INFO_MEMBER(3,code+0xc000 ,colr >> 12,0);
+ tileinfo.set(3,code+0xc000 ,colr >> 12,0);
}
WRITE16_MEMBER(sslam_state::sslam_tx_tileram_w)
@@ -95,7 +95,7 @@ TILE_GET_INFO_MEMBER(sslam_state::get_sslam_md_tile_info)
int code = m_md_tileram[tile_index] & 0x0fff;
int colr = m_md_tileram[tile_index] & 0xf000;
- SET_TILE_INFO_MEMBER(2,code+0x2000 ,colr >> 12,0);
+ tileinfo.set(2,code+0x2000 ,colr >> 12,0);
}
WRITE16_MEMBER(sslam_state::sslam_md_tileram_w)
@@ -111,7 +111,7 @@ TILE_GET_INFO_MEMBER(sslam_state::get_sslam_bg_tile_info)
int code = m_bg_tileram[tile_index] & 0x1fff;
int colr = m_bg_tileram[tile_index] & 0xe000;
- SET_TILE_INFO_MEMBER(1,code ,colr >> 13,0);
+ tileinfo.set(1,code ,colr >> 13,0);
}
WRITE16_MEMBER(sslam_state::sslam_bg_tileram_w)
@@ -128,7 +128,7 @@ TILE_GET_INFO_MEMBER(powerbls_state::get_powerbls_bg_tile_info)
//(m_bg_tileram[tile_index*2] & 0x0f00) == 0xf000 ???
- SET_TILE_INFO_MEMBER(1,code,colr,0);
+ tileinfo.set(1,code,colr,0);
}
WRITE16_MEMBER(powerbls_state::powerbls_bg_tileram_w)
diff --git a/src/mame/video/ssozumo.cpp b/src/mame/video/ssozumo.cpp
index 09cd0b05ed9..c4493b82dd0 100644
--- a/src/mame/video/ssozumo.cpp
+++ b/src/mame/video/ssozumo.cpp
@@ -120,14 +120,14 @@ TILE_GET_INFO_MEMBER(ssozumo_state::get_bg_tile_info)
int color = (m_colorram[tile_index] & 0x30) >> 4;
int flags = ((tile_index % 32) >= 16) ? TILE_FLIPY : 0;
- SET_TILE_INFO_MEMBER(1, code, color, flags);
+ tileinfo.set(1, code, color, flags);
}
TILE_GET_INFO_MEMBER(ssozumo_state::get_fg_tile_info)
{
int code = m_videoram2[tile_index] + 256 * (m_colorram2[tile_index] & 0x07);
- SET_TILE_INFO_MEMBER(0, code, m_color_bank, 0);
+ tileinfo.set(0, code, m_color_bank, 0);
}
void ssozumo_state::video_start()
diff --git a/src/mame/video/ssrj.cpp b/src/mame/video/ssrj.cpp
index 25554f25f82..e6b4119da58 100644
--- a/src/mame/video/ssrj.cpp
+++ b/src/mame/video/ssrj.cpp
@@ -15,7 +15,7 @@ TILE_GET_INFO_MEMBER(ssrj_state::get_tile_info1)
{
int code;
code = m_vram1[tile_index<<1] + (m_vram1[(tile_index<<1)+1]<<8);
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code&0x3ff,
(code>>12)&0x3,
((code & 0x8000) ? TILE_FLIPY:0) |( (code & 0x4000) ? TILE_FLIPX:0) );
@@ -33,7 +33,7 @@ TILE_GET_INFO_MEMBER(ssrj_state::get_tile_info2)
{
int code;
code = m_vram2[tile_index<<1] + (m_vram2[(tile_index<<1)+1]<<8);
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code&0x3ff,
((code>>12)&0x3)+4,
((code & 0x8000) ? TILE_FLIPY:0) |( (code & 0x4000) ? TILE_FLIPX:0) );
@@ -51,7 +51,7 @@ TILE_GET_INFO_MEMBER(ssrj_state::get_tile_info4)
{
int code;
code = m_vram4[tile_index<<1] + (m_vram4[(tile_index<<1)+1]<<8);
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code&0x3ff,
((code>>12)&0x3)+12,
((code & 0x8000) ? TILE_FLIPY:0) |( (code & 0x4000) ? TILE_FLIPX:0) );
diff --git a/src/mame/video/ssv.cpp b/src/mame/video/ssv.cpp
index 19d5d4bcc64..1bbfd96cab8 100644
--- a/src/mame/video/ssv.cpp
+++ b/src/mame/video/ssv.cpp
@@ -227,7 +227,7 @@ TILE_GET_INFO_MEMBER(ssv_state::get_tile_info_0)
{
uint16_t tile = m_gdfs_tmapram[tile_index];
- SET_TILE_INFO_MEMBER(1, tile, 0, TILE_FLIPXY( tile >> 14 ));
+ tileinfo.set(1, tile, 0, TILE_FLIPXY( tile >> 14 ));
}
WRITE16_MEMBER(ssv_state::gdfs_tmapram_w)
diff --git a/src/mame/video/st0020.cpp b/src/mame/video/st0020.cpp
index c0b8ae6341e..779d3704194 100644
--- a/src/mame/video/st0020.cpp
+++ b/src/mame/video/st0020.cpp
@@ -169,7 +169,7 @@ TILE_GET_INFO_MEMBER(st0020_device::get_tile_info)
if (m_is_st0032) color = (color & 0x1ff) * ((color & 0x200) ? 4 : 16);
else color = color * ((m_regs[Layer * 4 + 3] & 0x0100) ? 2 : 8);
- SET_TILE_INFO_MEMBER(0, tile, color, 0);
+ tileinfo.set(0, tile, color, 0);
}
TILEMAP_MAPPER_MEMBER(st0020_device::scan_16x16)
diff --git a/src/mame/video/stadhero.cpp b/src/mame/video/stadhero.cpp
index b8edc446323..a14b73a0cc5 100644
--- a/src/mame/video/stadhero.cpp
+++ b/src/mame/video/stadhero.cpp
@@ -50,7 +50,7 @@ TILE_GET_INFO_MEMBER(stadhero_state::get_pf1_tile_info)
int color=tile >> 12;
tile=tile&0xfff;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
tile,
color,
0);
diff --git a/src/mame/video/starshp1.cpp b/src/mame/video/starshp1.cpp
index c2b8038ef17..617ca771142 100644
--- a/src/mame/video/starshp1.cpp
+++ b/src/mame/video/starshp1.cpp
@@ -46,7 +46,7 @@ TILE_GET_INFO_MEMBER(starshp1_state::get_tile_info)
{
uint8_t code = m_playfield_ram[tile_index];
- SET_TILE_INFO_MEMBER(0, code & 0x3f, 0, 0);
+ tileinfo.set(0, code & 0x3f, 0, 0);
}
diff --git a/src/mame/video/stfight_dev.cpp b/src/mame/video/stfight_dev.cpp
index f1a14375b99..837c228e145 100644
--- a/src/mame/video/stfight_dev.cpp
+++ b/src/mame/video/stfight_dev.cpp
@@ -156,7 +156,7 @@ TILE_GET_INFO_MEMBER(stfight_video_device::get_fg_tile_info)
attr = m_fgmap[0x8000+tile_index];
tile_base = ((attr & 0x80) << 2) | ((attr & 0x20) << 3);
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
tile_base + m_fgmap[tile_index],
attr & 0x07,
0);
@@ -178,7 +178,7 @@ TILE_GET_INFO_MEMBER(stfight_video_device::get_bg_tile_info)
tile_bank = (attr & 0x20) >> 5;
tile_base = (attr & 0x80) << 1;
- SET_TILE_INFO_MEMBER(2+tile_bank,
+ tileinfo.set(2+tile_bank,
tile_base + m_bgmap[tile_index],
attr & 0x07,
0);
@@ -191,7 +191,7 @@ TILE_GET_INFO_MEMBER(stfight_video_device::get_tx_tile_info)
tileinfo.group = color;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
m_txram[tile_index] + ((attr & 0x80) << 1),
attr & 0x0f,
TILE_FLIPYX((attr & 0x60) >> 5));
diff --git a/src/mame/video/sub.cpp b/src/mame/video/sub.cpp
index fe431aca7f2..babdb1b72bf 100644
--- a/src/mame/video/sub.cpp
+++ b/src/mame/video/sub.cpp
@@ -36,7 +36,7 @@ TILE_GET_INFO_MEMBER(sub_state::get_tile_info)
int code = m_vram[tile_index] | ((m_attr[tile_index]&0xe0)<<3);
int color = (m_attr[tile_index]&0x1f)+0x40;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
WRITE8_MEMBER(sub_state::vram_w)
diff --git a/src/mame/video/suna8.cpp b/src/mame/video/suna8.cpp
index e187d56dd6d..c50647e3069 100644
--- a/src/mame/video/suna8.cpp
+++ b/src/mame/video/suna8.cpp
@@ -50,7 +50,7 @@ TILE_GET_INFO_MEMBER(suna8_state::get_tile_info)
code = m_spriteram[ 2 * tile_index + 0 ];
attr = m_spriteram[ 2 * tile_index + 1 ];
}
- SET_TILE_INFO_MEMBER(m_page / 8,
+ tileinfo.set(m_page / 8,
( (attr & 0x03) << 8 ) + code + m_tiles*0x400,
(attr >> 2) & 0xf,
TILE_FLIPYX( (attr >> 6) & 3 ));
diff --git a/src/mame/video/superqix.cpp b/src/mame/video/superqix.cpp
index 17996e3770e..f678c40eb12 100644
--- a/src/mame/video/superqix.cpp
+++ b/src/mame/video/superqix.cpp
@@ -25,7 +25,7 @@ TILE_GET_INFO_MEMBER(hotsmash_state::pb_get_bg_tile_info)
int attr = m_videoram[tile_index + 0x400];
int code = m_videoram[tile_index] + 256 * (attr & 0x7);
int color = (attr & 0xf0) >> 4;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
TILE_GET_INFO_MEMBER(superqix_state_base::sqix_get_bg_tile_info)
@@ -37,7 +37,7 @@ TILE_GET_INFO_MEMBER(superqix_state_base::sqix_get_bg_tile_info)
if (bank) code += 1024 * m_gfxbank;
- SET_TILE_INFO_MEMBER(bank, code, color, 0);
+ tileinfo.set(bank, code, color, 0);
tileinfo.group = (attr & 0x08) >> 3;
}
diff --git a/src/mame/video/suprloco.cpp b/src/mame/video/suprloco.cpp
index be0b991d78a..409f695bcdc 100644
--- a/src/mame/video/suprloco.cpp
+++ b/src/mame/video/suprloco.cpp
@@ -73,7 +73,7 @@ void suprloco_state::suprloco_palette(palette_device &palette) const
TILE_GET_INFO_MEMBER(suprloco_state::get_tile_info)
{
uint8_t attr = m_videoram[2*tile_index+1];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
m_videoram[2*tile_index] | ((attr & 0x03) << 8),
(attr & 0x1c) >> 2,
0);
diff --git a/src/mame/video/suprnova.cpp b/src/mame/video/suprnova.cpp
index f32c7a9e8d7..1062e0b2fa4 100644
--- a/src/mame/video/suprnova.cpp
+++ b/src/mame/video/suprnova.cpp
@@ -282,7 +282,7 @@ TILE_GET_INFO_MEMBER(skns_state::get_tilemap_A_tile_info)
if(m_tilemapA_ram[tile_index] & 0x80000000) flags |= TILE_FLIPX;
if(m_tilemapA_ram[tile_index] & 0x40000000) flags |= TILE_FLIPY;
- SET_TILE_INFO_MEMBER(0+depth,
+ tileinfo.set(0+depth,
code,
0x40+colr,
flags);
@@ -308,7 +308,7 @@ TILE_GET_INFO_MEMBER(skns_state::get_tilemap_B_tile_info)
if(m_tilemapB_ram[tile_index] & 0x80000000) flags |= TILE_FLIPX;
if(m_tilemapB_ram[tile_index] & 0x40000000) flags |= TILE_FLIPY;
- SET_TILE_INFO_MEMBER(1+depth,
+ tileinfo.set(1+depth,
code,
0x40+colr,
flags);
diff --git a/src/mame/video/suprridr.cpp b/src/mame/video/suprridr.cpp
index 645033f85f4..cc8af83b0db 100644
--- a/src/mame/video/suprridr.cpp
+++ b/src/mame/video/suprridr.cpp
@@ -20,14 +20,14 @@
TILE_GET_INFO_MEMBER(suprridr_state::get_tile_info)
{
uint8_t code = m_bgram[tile_index];
- SET_TILE_INFO_MEMBER(0, code, 0, 0);
+ tileinfo.set(0, code, 0, 0);
}
TILE_GET_INFO_MEMBER(suprridr_state::get_tile_info2)
{
uint8_t code = m_fgram[tile_index];
- SET_TILE_INFO_MEMBER(1, code, 0, 0);
+ tileinfo.set(1, code, 0, 0);
}
diff --git a/src/mame/video/suprslam.cpp b/src/mame/video/suprslam.cpp
index 222dfeac954..b17c8f99d2d 100644
--- a/src/mame/video/suprslam.cpp
+++ b/src/mame/video/suprslam.cpp
@@ -24,7 +24,7 @@ TILE_GET_INFO_MEMBER(suprslam_state::get_suprslam_tile_info)
tileno += m_screen_bank;
colour = colour >> 12;
- SET_TILE_INFO_MEMBER(0, tileno, colour, 0);
+ tileinfo.set(0, tileno, colour, 0);
}
@@ -44,7 +44,7 @@ TILE_GET_INFO_MEMBER(suprslam_state::get_suprslam_bg_tile_info)
tileno += m_bg_bank;
colour = colour >> 12;
- SET_TILE_INFO_MEMBER(2, tileno, colour, 0);
+ tileinfo.set(2, tileno, colour, 0);
}
diff --git a/src/mame/video/system1.cpp b/src/mame/video/system1.cpp
index a1be96877c9..9bc83949de7 100644
--- a/src/mame/video/system1.cpp
+++ b/src/mame/video/system1.cpp
@@ -182,7 +182,7 @@ TILE_GET_INFO_MEMBER(system1_state::tile_get_info)
u32 code = ((tiledata >> 4) & 0x800) | (tiledata & 0x7ff);
u32 color = (tiledata >> 5) & 0xff;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
diff --git a/src/mame/video/system16.cpp b/src/mame/video/system16.cpp
index 331f0258cfe..d392ef61e65 100644
--- a/src/mame/video/system16.cpp
+++ b/src/mame/video/system16.cpp
@@ -232,7 +232,7 @@ TILE_GET_INFO_MEMBER(segas1x_bootleg_state::get_bg_tile_info)
int data = source[tile_index & 0x7ff];
int tile_number = (data & 0xfff) | (((data & m_tilebank_switch) ? m_tile_bank[1] : m_tile_bank[0]) << 12);
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
tile_number,
(data >> 6) & 0x7f,
0);
@@ -244,7 +244,7 @@ TILE_GET_INFO_MEMBER(segas1x_bootleg_state::get_fg_tile_info)
int data = source[tile_index & 0x7ff];
int tile_number = (data & 0xfff) | (((data & m_tilebank_switch) ? m_tile_bank[1] : m_tile_bank[0]) << 12);
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
tile_number,
(data >> 6) & 0x7f,
0);
@@ -256,7 +256,7 @@ TILE_GET_INFO_MEMBER(segas1x_bootleg_state::get_bg2_tile_info)
int data = source[tile_index & 0x7ff];
int tile_number = (data & 0xfff) | (m_tile_bank[(data & 0x1000) >> 12] << 12);
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
tile_number,
(data >> 6) & 0x7f,
0);
@@ -268,7 +268,7 @@ TILE_GET_INFO_MEMBER(segas1x_bootleg_state::get_fg2_tile_info)
int data = source[tile_index & 0x7ff];
int tile_number = (data & 0xfff) | (m_tile_bank[(data & 0x1000) >> 12] << 12);
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
tile_number,
(data >> 6) & 0x7f,
0);
@@ -320,14 +320,14 @@ TILE_GET_INFO_MEMBER(segas1x_bootleg_state::get_text_tile_info)
if (!m_shinobl_kludge)
{
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
(tile_number & 0x1ff) | (m_tile_bank[0] << 12),
(tile_number >> 9) % 8,
0);
}
else
{
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
(tile_number & 0xff) | (m_tile_bank[0] << 12),
(tile_number >> 8) % 8,
0);
@@ -478,7 +478,7 @@ TILE_GET_INFO_MEMBER(segas1x_bootleg_state::get_s16a_bootleg_tile_infotxt)
data = m_textram[tile_index];
tile_number = data & 0x1ff;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
tile_number,
((data >> 9) & 0x7),
0);
@@ -492,7 +492,7 @@ TILE_GET_INFO_MEMBER(segas1x_bootleg_state::get_s16a_bootleg_tile_info0)
tile_number = data & 0x1fff;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
tile_number,
(data >> 6) & 0x7f,
0);
@@ -505,7 +505,7 @@ TILE_GET_INFO_MEMBER(segas1x_bootleg_state::get_s16a_bootleg_tile_info1)
data = m_bg1_tileram[tile_index];
tile_number = data & 0x1fff;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
tile_number,
(data >> 6) & 0x7f,
0);
diff --git a/src/mame/video/tagteam.cpp b/src/mame/video/tagteam.cpp
index f46f85a3a27..437f38eba89 100644
--- a/src/mame/video/tagteam.cpp
+++ b/src/mame/video/tagteam.cpp
@@ -132,7 +132,7 @@ TILE_GET_INFO_MEMBER(tagteam_state::get_bg_tile_info)
int code = m_videoram[tile_index] + 256 * m_colorram[tile_index];
int color = m_palettebank << 1;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
void tagteam_state::video_start()
diff --git a/src/mame/video/tail2nos.cpp b/src/mame/video/tail2nos.cpp
index 9c3ab1d4282..101a91bd1b6 100644
--- a/src/mame/video/tail2nos.cpp
+++ b/src/mame/video/tail2nos.cpp
@@ -15,7 +15,7 @@
TILE_GET_INFO_MEMBER(tail2nos_state::get_tile_info)
{
uint16_t code = m_txvideoram[tile_index];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
(code & 0x1fff) + (m_txbank << 13),
((code & 0xe000) >> 13) + m_txpalette * 16,
0);
diff --git a/src/mame/video/taito_f3.cpp b/src/mame/video/taito_f3.cpp
index 458f347ff06..73a5df2a6df 100644
--- a/src/mame/video/taito_f3.cpp
+++ b/src/mame/video/taito_f3.cpp
@@ -384,7 +384,7 @@ TILE_GET_INFO_MEMBER(taito_f3_state::get_tile_info)
// This fixes (at least) the rain in round 6 of Arabian Magic.
const u8 extra_planes = ((tile >> (16 + 10)) & 3); // 0 = 4bpp, 1 = 5bpp, 2 = unused?, 3 = 6bpp
- SET_TILE_INFO_MEMBER(3,
+ tileinfo.set(3,
tile & 0xffff,
(tile >> 16) & 0x1ff & (~extra_planes),
TILE_FLIPYX(tile >> 30));
@@ -402,7 +402,7 @@ TILE_GET_INFO_MEMBER(taito_f3_state::get_tile_info_text)
if (vram_tile & 0x0100) flags |= TILE_FLIPX;
if (vram_tile & 0x8000) flags |= TILE_FLIPY;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
vram_tile & 0xff,
(vram_tile >> 9) & 0x3f,
flags);
@@ -426,7 +426,7 @@ TILE_GET_INFO_MEMBER(taito_f3_state::get_tile_info_pixel)
if (vram_tile & 0x0100) flags |= TILE_FLIPX;
if (vram_tile & 0x8000) flags |= TILE_FLIPY;
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
tile_index,
(vram_tile >> 9) & 0x3f,
flags);
diff --git a/src/mame/video/taito_l.cpp b/src/mame/video/taito_l.cpp
index 6035969cccb..b79a18a976f 100644
--- a/src/mame/video/taito_l.cpp
+++ b/src/mame/video/taito_l.cpp
@@ -21,7 +21,7 @@ TILE_GET_INFO_MEMBER(taitol_state::get_tile_info)
| ((m_bankc[(attr & 0xc) >> 2]) << 10)
| (m_horshoes_gfxbank << 12);
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code,
(attr & 0xf0) >> 4,
0);
@@ -32,7 +32,7 @@ TILE_GET_INFO_MEMBER(taitol_state::get_tx_tile_info)
int attr = m_vram[2 * tile_index + 0xa000 + 1];
int code = m_vram[2 * tile_index + 0xa000] | ((attr & 0x07) << 8);
- SET_TILE_INFO_MEMBER(2,
+ tileinfo.set(2,
code,
(attr & 0xf0) >> 4,
0);
diff --git a/src/mame/video/taitojc.cpp b/src/mame/video/taitojc.cpp
index 018709783d8..ebdbee5dd6f 100644
--- a/src/mame/video/taitojc.cpp
+++ b/src/mame/video/taitojc.cpp
@@ -28,7 +28,7 @@ TILE_GET_INFO_MEMBER(taitojc_state::taitojc_tile_info)
uint32_t val = m_tile_ram[tile_index];
int color = (val >> 22) & 0xff;
int tile = (val >> 2) & 0x7f;
- SET_TILE_INFO_MEMBER(m_gfx_index, tile, color, 0);
+ tileinfo.set(m_gfx_index, tile, color, 0);
}
READ32_MEMBER(taitojc_state::taitojc_palette_r)
diff --git a/src/mame/video/tank8.cpp b/src/mame/video/tank8.cpp
index 8e76fa7d0db..b6eba3a709b 100644
--- a/src/mame/video/tank8.cpp
+++ b/src/mame/video/tank8.cpp
@@ -91,7 +91,7 @@ TILE_GET_INFO_MEMBER(tank8_state::get_tile_info)
color |= 4;
}
- SET_TILE_INFO_MEMBER(code >> 7, code, color, (code & 0x40) ? (TILE_FLIPX | TILE_FLIPY) : 0);
+ tileinfo.set(code >> 7, code, color, (code & 0x40) ? (TILE_FLIPX | TILE_FLIPY) : 0);
}
diff --git a/src/mame/video/tankbatt.cpp b/src/mame/video/tankbatt.cpp
index 067cf00a70b..6447897617a 100644
--- a/src/mame/video/tankbatt.cpp
+++ b/src/mame/video/tankbatt.cpp
@@ -62,7 +62,7 @@ TILE_GET_INFO_MEMBER(tankbatt_state::get_bg_tile_info)
int code = m_videoram[tile_index];
int color = m_videoram[tile_index] | 0x01;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
void tankbatt_state::video_start()
diff --git a/src/mame/video/tankbust.cpp b/src/mame/video/tankbust.cpp
index f79167032c9..9440d3d0c9a 100644
--- a/src/mame/video/tankbust.cpp
+++ b/src/mame/video/tankbust.cpp
@@ -52,7 +52,7 @@ TILE_GET_INFO_MEMBER(tankbust_state::get_bg_tile_info)
/* priority bg/sprites (1 = this bg tile on top of sprites) */
tileinfo.category = (attr & 0x08) >> 3;
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
code,
(color&4) | ((color&2)>>1) | ((color&1)<<1),
0);
@@ -63,7 +63,7 @@ TILE_GET_INFO_MEMBER(tankbust_state::get_txt_tile_info)
int code = m_txtram[tile_index];
int color = ((code>>6) & 0x03);
- SET_TILE_INFO_MEMBER(2,
+ tileinfo.set(2,
code & 0x3f,
((color&2)>>1) | ((color&1)<<1),
0);
diff --git a/src/mame/video/taotaido.cpp b/src/mame/video/taotaido.cpp
index 2da4879bcff..95e1a89fe2a 100644
--- a/src/mame/video/taotaido.cpp
+++ b/src/mame/video/taotaido.cpp
@@ -65,7 +65,7 @@ TILE_GET_INFO_MEMBER(taotaido_state::bg_tile_info)
code |= m_bgbank[bank] << 9;
- SET_TILE_INFO_MEMBER(1, code, col, 0);
+ tileinfo.set(1, code, col, 0);
}
TILEMAP_MAPPER_MEMBER(taotaido_state::tilemap_scan_rows)
diff --git a/src/mame/video/targeth.cpp b/src/mame/video/targeth.cpp
index 5460badc82f..2f7cf54e35e 100644
--- a/src/mame/video/targeth.cpp
+++ b/src/mame/video/targeth.cpp
@@ -41,7 +41,7 @@ TILE_GET_INFO_MEMBER(targeth_state::get_tile_info)
int data2 = m_videoram[(Layer * 0x2000/2) + (tile_index << 1) + 1];
int code = data & 0x3fff;
- SET_TILE_INFO_MEMBER(0, code, data2 & 0x1f, TILE_FLIPXY((data2 >> 5) & 0x03));
+ tileinfo.set(0, code, data2 & 0x1f, TILE_FLIPXY((data2 >> 5) & 0x03));
}
/***************************************************************************
diff --git a/src/mame/video/tatsumi.cpp b/src/mame/video/tatsumi.cpp
index 511e428d716..a21c678b492 100644
--- a/src/mame/video/tatsumi.cpp
+++ b/src/mame/video/tatsumi.cpp
@@ -86,7 +86,7 @@ WRITE16_MEMBER(tatsumi_state::text_w)
TILE_GET_INFO_MEMBER(tatsumi_state::get_text_tile_info)
{
int tile = m_videoram[tile_index];
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
tile & 0xfff,
tile >> 12,
0);
@@ -1109,7 +1109,7 @@ TILE_GET_INFO_MEMBER(cyclwarr_state::get_tile_info_bigfight)
// bit 14: ignore transparency on this tile
int opaque = ((tile >> 14) & 1) == 1;
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
tileno,
color,
opaque ? TILE_FORCE_LAYER0 : 0);
@@ -1132,7 +1132,7 @@ TILE_GET_INFO_MEMBER(cyclwarr_state::get_tile_info_cyclwarr_road)
color |= 4;
int opaque = ((tile >> 14) & 1) == 1;
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
tileno,
color | m_road_color_bank,
opaque ? TILE_FORCE_LAYER0 : 0);
diff --git a/src/mame/video/tbowl.cpp b/src/mame/video/tbowl.cpp
index d060459868c..014cf0d3f9c 100644
--- a/src/mame/video/tbowl.cpp
+++ b/src/mame/video/tbowl.cpp
@@ -18,7 +18,7 @@ TILE_GET_INFO_MEMBER(tbowl_state::get_tx_tile_info)
tileno = m_txvideoram[tile_index] | ((m_txvideoram[tile_index+0x800] & 0x07) << 8);
col = (m_txvideoram[tile_index+0x800] & 0xf0) >> 4;
- SET_TILE_INFO_MEMBER(0,tileno,col,0);
+ tileinfo.set(0,tileno,col,0);
}
WRITE8_MEMBER(tbowl_state::txvideoram_w)
@@ -37,7 +37,7 @@ TILE_GET_INFO_MEMBER(tbowl_state::get_bg_tile_info)
tileno = m_bgvideoram[tile_index] | ((m_bgvideoram[tile_index+0x1000] & 0x0f) << 8);
col = (m_bgvideoram[tile_index+0x1000] & 0xf0) >> 4;
- SET_TILE_INFO_MEMBER(1,tileno,col,0);
+ tileinfo.set(1,tileno,col,0);
}
WRITE8_MEMBER(tbowl_state::bg2videoram_w)
@@ -77,7 +77,7 @@ TILE_GET_INFO_MEMBER(tbowl_state::get_bg2_tile_info)
tileno ^= 0x400;
col = (m_bg2videoram[tile_index+0x1000] & 0xf0) >> 4;
- SET_TILE_INFO_MEMBER(2,tileno,col,0);
+ tileinfo.set(2,tileno,col,0);
}
WRITE8_MEMBER(tbowl_state::bgvideoram_w)
diff --git a/src/mame/video/tc0080vco.cpp b/src/mame/video/tc0080vco.cpp
index 645ab6f36a9..7c56dd25701 100644
--- a/src/mame/video/tc0080vco.cpp
+++ b/src/mame/video/tc0080vco.cpp
@@ -327,7 +327,7 @@ TILE_GET_INFO_MEMBER(tc0080vco_device::get_bg0_tile_info)
tileinfo.category = 0;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
tile,
color,
TILE_FLIPYX((m_bg0_ram_1[tile_index] & 0x00c0) >> 6));
@@ -342,7 +342,7 @@ TILE_GET_INFO_MEMBER(tc0080vco_device::get_bg1_tile_info)
tileinfo.category = 0;
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
tile,
color,
TILE_FLIPYX((m_bg1_ram_1[tile_index] & 0x00c0) >> 6));
@@ -369,7 +369,7 @@ TILE_GET_INFO_MEMBER(tc0080vco_device::get_tx_tile_info)
tileinfo.category = 0;
}
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
tile,
0,
0);
diff --git a/src/mame/video/tc0100scn.cpp b/src/mame/video/tc0100scn.cpp
index 084085b6365..2417b1146e1 100644
--- a/src/mame/video/tc0100scn.cpp
+++ b/src/mame/video/tc0100scn.cpp
@@ -406,7 +406,7 @@ TILE_GET_INFO_MEMBER(tc0100scn_base_device::get_bg_tile_info)
if (!m_tc0100scn_cb.isnull())
m_tc0100scn_cb(&code, &color);
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code,
((color + m_bg_colbank[Colbank]) & 0xff),
TILE_FLIPYX((attr & 0xc000) >> 14));
@@ -417,7 +417,7 @@ TILE_GET_INFO_MEMBER(tc0100scn_base_device::get_tx_tile_info)
{
int attr = m_ram[Offset + tile_index];
- SET_TILE_INFO_MEMBER(Gfx,
+ tileinfo.set(Gfx,
attr & 0x00ff,
((attr & 0x3f00) >> 8) + m_tx_colbank,
TILE_FLIPYX((attr & 0xc000) >> 14));
diff --git a/src/mame/video/tc0180vcu.cpp b/src/mame/video/tc0180vcu.cpp
index d8bc1876061..51f79c715f8 100644
--- a/src/mame/video/tc0180vcu.cpp
+++ b/src/mame/video/tc0180vcu.cpp
@@ -304,7 +304,7 @@ TILE_GET_INFO_MEMBER(tc0180vcu_device::get_bg_tile_info)
int tile = m_vram[tile_index + m_bg_rambank[0]];
int color = m_vram[tile_index + m_bg_rambank[1]];
- SET_TILE_INFO_MEMBER(1, tile,
+ tileinfo.set(1, tile,
m_bg_color_base + (color & 0x3f),
TILE_FLIPYX((color & 0x00c0) >> 6));
}
@@ -314,7 +314,7 @@ TILE_GET_INFO_MEMBER(tc0180vcu_device::get_fg_tile_info)
int tile = m_vram[tile_index + m_fg_rambank[0]];
int color = m_vram[tile_index + m_fg_rambank[1]];
- SET_TILE_INFO_MEMBER(1, tile,
+ tileinfo.set(1, tile,
m_fg_color_base + (color & 0x3f),
TILE_FLIPYX((color & 0x00c0) >> 6));
}
@@ -323,7 +323,7 @@ TILE_GET_INFO_MEMBER(tc0180vcu_device::get_tx_tile_info)
{
int tile = m_vram[tile_index + m_tx_rambank];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
(tile & 0x07ff) | ((m_ctrl[4 + ((tile & 0x800) >> 11)]>>8) << 11),
m_tx_color_base + ((tile >> 12) & 0x0f),
0);
diff --git a/src/mame/video/tc0280grd.cpp b/src/mame/video/tc0280grd.cpp
index 8837a1e9440..ce581642952 100644
--- a/src/mame/video/tc0280grd.cpp
+++ b/src/mame/video/tc0280grd.cpp
@@ -84,7 +84,7 @@ void tc0280grd_device::device_reset()
TILE_GET_INFO_MEMBER(tc0280grd_device::get_tile_info)
{
int attr = m_ram[tile_index];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
attr & 0x3fff,
((attr & 0xc000) >> 14) + m_base_color,
0);
diff --git a/src/mame/video/tc0480scp.cpp b/src/mame/video/tc0480scp.cpp
index 8a52fd5a4e5..d3914e0c4f9 100644
--- a/src/mame/video/tc0480scp.cpp
+++ b/src/mame/video/tc0480scp.cpp
@@ -350,7 +350,7 @@ TILE_GET_INFO_MEMBER(tc0480scp_device::get_bg_tile_info)
{
const u32 code = m_ram[(2 * tile_index) + 1 + Offset] & 0x7fff;
const u16 attr = m_ram[(2 * tile_index) + Offset];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
code,
(attr & 0xff),
TILE_FLIPYX((attr & 0xc000) >> 14));
@@ -359,7 +359,7 @@ TILE_GET_INFO_MEMBER(tc0480scp_device::get_bg_tile_info)
TILE_GET_INFO_MEMBER(tc0480scp_device::get_tx_tile_info)
{
const u16 attr = m_ram[0x6000 + tile_index]; //c000
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
attr & 0xff,
((attr & 0x3f00) >> 8),
TILE_FLIPYX((attr & 0xc000) >> 14));
diff --git a/src/mame/video/tceptor.cpp b/src/mame/video/tceptor.cpp
index 556401437c1..bb0036bcef5 100644
--- a/src/mame/video/tceptor.cpp
+++ b/src/mame/video/tceptor.cpp
@@ -111,7 +111,7 @@ TILE_GET_INFO_MEMBER(tceptor_state::get_tx_tile_info)
tileinfo.group = color;
- SET_TILE_INFO_MEMBER(0, code, color, 0);
+ tileinfo.set(0, code, color, 0);
}
void tceptor_state::tile_mark_dirty(int offset)
@@ -168,7 +168,7 @@ TILE_GET_INFO_MEMBER(tceptor_state::get_bg1_tile_info)
int code = (data & 0x3ff) | 0x000;
int color = (data & 0xfc00) >> 10;
- SET_TILE_INFO_MEMBER(m_bg, code, color, 0);
+ tileinfo.set(m_bg, code, color, 0);
}
TILE_GET_INFO_MEMBER(tceptor_state::get_bg2_tile_info)
@@ -177,7 +177,7 @@ TILE_GET_INFO_MEMBER(tceptor_state::get_bg2_tile_info)
int code = (data & 0x3ff) | 0x400;
int color = (data & 0xfc00) >> 10;
- SET_TILE_INFO_MEMBER(m_bg, code, color, 0);
+ tileinfo.set(m_bg, code, color, 0);
}
WRITE8_MEMBER(tceptor_state::tceptor_bg_ram_w)
diff --git a/src/mame/video/tecmo.cpp b/src/mame/video/tecmo.cpp
index 16af911473c..5a49dc66afe 100644
--- a/src/mame/video/tecmo.cpp
+++ b/src/mame/video/tecmo.cpp
@@ -26,7 +26,7 @@
TILE_GET_INFO_MEMBER(tecmo_state::get_bg_tile_info)
{
uint8_t attr = m_bgvideoram[tile_index+0x200];
- SET_TILE_INFO_MEMBER(3,
+ tileinfo.set(3,
m_bgvideoram[tile_index] + ((attr & 0x07) << 8),
attr >> 4,
0);
@@ -35,7 +35,7 @@ TILE_GET_INFO_MEMBER(tecmo_state::get_bg_tile_info)
TILE_GET_INFO_MEMBER(tecmo_state::get_fg_tile_info)
{
uint8_t attr = m_fgvideoram[tile_index+0x200];
- SET_TILE_INFO_MEMBER(2,
+ tileinfo.set(2,
m_fgvideoram[tile_index] + ((attr & 0x07) << 8),
attr >> 4,
0);
@@ -44,7 +44,7 @@ TILE_GET_INFO_MEMBER(tecmo_state::get_fg_tile_info)
TILE_GET_INFO_MEMBER(tecmo_state::gemini_get_bg_tile_info)
{
uint8_t attr = m_bgvideoram[tile_index+0x200];
- SET_TILE_INFO_MEMBER(3,
+ tileinfo.set(3,
m_bgvideoram[tile_index] + ((attr & 0x70) << 4),
attr & 0x0f,
0);
@@ -53,7 +53,7 @@ TILE_GET_INFO_MEMBER(tecmo_state::gemini_get_bg_tile_info)
TILE_GET_INFO_MEMBER(tecmo_state::gemini_get_fg_tile_info)
{
uint8_t attr = m_fgvideoram[tile_index+0x200];
- SET_TILE_INFO_MEMBER(2,
+ tileinfo.set(2,
m_fgvideoram[tile_index] + ((attr & 0x70) << 4),
attr & 0x0f,
0);
@@ -62,7 +62,7 @@ TILE_GET_INFO_MEMBER(tecmo_state::gemini_get_fg_tile_info)
TILE_GET_INFO_MEMBER(tecmo_state::get_tx_tile_info)
{
uint8_t attr = m_txvideoram[tile_index+0x400];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
m_txvideoram[tile_index] + ((attr & 0x03) << 8),
attr >> 4,
0);
diff --git a/src/mame/video/tecmo16.cpp b/src/mame/video/tecmo16.cpp
index 0dbae63431a..667942d24de 100644
--- a/src/mame/video/tecmo16.cpp
+++ b/src/mame/video/tecmo16.cpp
@@ -36,7 +36,7 @@ TILE_GET_INFO_MEMBER(tecmo16_state::fg_get_tile_info)
/* bit 4 controls blending */
//tileinfo.category = (m_colorram[tile_index] & 0x10) >> 4;
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
tile,
color,
0);
@@ -47,7 +47,7 @@ TILE_GET_INFO_MEMBER(tecmo16_state::bg_get_tile_info)
int tile = m_videoram2[tile_index] & 0x1fff;
int color = (m_colorram2[tile_index] & 0x0f);
- SET_TILE_INFO_MEMBER(1,
+ tileinfo.set(1,
tile,
color,
0);
@@ -56,7 +56,7 @@ TILE_GET_INFO_MEMBER(tecmo16_state::bg_get_tile_info)
TILE_GET_INFO_MEMBER(tecmo16_state::tx_get_tile_info)
{
int tile = m_charram[tile_index];
- SET_TILE_INFO_MEMBER(0,
+ tileinfo.set(0,
tile & 0x0fff,
tile >> 12,
0);
diff --git a/src/mame/video/tecmosys.cpp b/src/mame/video/tecmosys.cpp
index a5947d49b89..eae5ad419f9 100644
--- a/src/mame/video/tecmosys.cpp
+++ b/src/mame/video/tecmosys.cpp
@@ -13,7 +13,7 @@
template<int Layer>
TILE_GET_INFO_MEMBER(tecmosys_state::get_tile_info)
{
- SET_TILE_INFO_MEMBER(Layer,
+ tileinfo.set(Layer,
m_vram[Layer][2*tile_index+1],
(m_vram[Layer][2*tile_index]&0x3f),
TILE_FLIPYX((m_vram[Layer][2*tile_index]&0xc0)>>6));
diff --git a/src/mame/video/tehkanwc.cpp b/src/mame/video/tehkanwc.cpp
index f8d3341c66d..107cd6182f7 100644
--- a/src/mame/video/tehkanwc.cpp
+++ b/src/mame/video/tehkanwc.cpp
@@ -72,7 +72,7 @@ TILE_GET_INFO_MEMBER(tehkanwc_state::get_bg_tile_info)
int color = attr & 0x0f;
int flags = ((attr & 0x40) ? TILE_FLIPX : 0) | ((attr & 0x80) ? TILE_FLIPY : 0);
- SET_TILE_INFO_MEMBER(2, code, color, flags);
+ tileinfo.set(2, code, color, flags);
}
TILE_GET_INFO_MEMBER(tehkanwc_state::get_fg_tile_info)
@@ -84,7 +84,7 @@ TILE_GET_INFO_MEMBER(tehkanwc_state::get_fg_tile_info)
tileinfo.category = (attr & 0x20) ? 0 : 1;
- SET_TILE_INFO_MEMBER(0, code, color, flags);
+ tileinfo.set(0, code, color, flags);
}
void tehkanwc_state::video_start()
diff --git a/src/mame/video/terracre.cpp b/src/mame/video/terracre.cpp
index 6f9c4415d60..d3b17d58bf8 100644
--- a/src/mame/video/terracre.cpp
+++ b/src/mame/video/terracre.cpp
@@ -19,13 +19,13 @@ TILE_GET_INFO_MEMBER(terracre_state::get_bg_tile_info)
* ----.--xx.xxxx.xxxx */
unsigned data = m_bg_videoram[tile_index];
unsigned color = data>>11;
- SET_TILE_INFO_MEMBER(1,data&0x3ff,color,0 );
+ tileinfo.set(1,data&0x3ff,color,0 );
}
TILE_GET_INFO_MEMBER(terracre_state::get_fg_tile_info)
{
unsigned data = m_fg_videoram[tile_index];
- SET_TILE_INFO_MEMBER(0,data&0xff,0,0 );
+ tileinfo.set(0,data&0xff,0,0 );
}
void terracre_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect )
diff --git a/src/mame/vi