diff options
30 files changed, 1052 insertions, 1133 deletions
diff --git a/src/emu/render.cpp b/src/emu/render.cpp index 3bc0e8ef5db..5a22b919e1c 100644 --- a/src/emu/render.cpp +++ b/src/emu/render.cpp @@ -1686,10 +1686,21 @@ void render_target::load_additional_layout_files(const char *basename, bool have screen_device_iterator iter(m_manager.machine().root_device()); std::vector<screen_info> const screens(std::begin(iter), std::end(iter)); + // need this because views aren't fully set up yet + auto const nth_view = + [this] (unsigned n) -> layout_view * + { + for (layout_file &file : m_filelist) + for (layout_view &view : file.views()) + if (!(m_flags & RENDER_CREATE_NO_ART) || !view.has_art()) + if (n-- == 0) + return &view; + return nullptr; + }; if (screens.empty()) // ensure the fallback view for systems with no screens is loaded if necessary { - if (!view_by_index(0)) + if (!nth_view(0)) { load_layout_file(nullptr, layout_noscreens); if (m_filelist.empty()) @@ -1800,7 +1811,7 @@ void render_target::load_additional_layout_files(const char *basename, bool have { need_tiles = true; int viewindex(0); - for (layout_view *view = view_by_index(viewindex); need_tiles && view; view = view_by_index(++viewindex)) + for (layout_view *view = nth_view(viewindex); need_tiles && view; view = nth_view(++viewindex)) { if (view->screen_count() >= screens.size()) { diff --git a/src/mame/drivers/bfcobra.cpp b/src/mame/drivers/bfcobra.cpp index d50d32661a5..ccbefc4235f 100644 --- a/src/mame/drivers/bfcobra.cpp +++ b/src/mame/drivers/bfcobra.cpp @@ -102,6 +102,9 @@ ******************************************************************************/ #include "emu.h" + +#include "video/bfm_dm01.h" + #include "cpu/m6809/m6809.h" #include "cpu/z80/z80.h" #include "cpu/z180/z180.h" @@ -113,11 +116,12 @@ #include "sound/ay8910.h" #include "sound/upd7759.h" #include "sound/ym2413.h" -#include "video/bfm_dm01.h" #include "video/ramdac.h" + #include "emupal.h" #include "screen.h" #include "speaker.h" + #include "brkball.lh" diff --git a/src/mame/layout/3bagflnz.lay b/src/mame/layout/3bagflnz.lay index 8239ad8c9ab..dfd1c148824 100644 --- a/src/mame/layout/3bagflnz.lay +++ b/src/mame/layout/3bagflnz.lay @@ -241,60 +241,60 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="4" bottom="3" /> </screen> - <bezel name="lamp11" element="COLLECT" inputtag="500d" inputmask="0x04"> + <element name="lamp11" ref="COLLECT" inputtag="500d" inputmask="0x04"> <bounds x="0.67" y="3.02" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp6" element="BET1" inputtag="500e" inputmask="0x01"> + </element> + <element name="lamp6" ref="BET1" inputtag="500e" inputmask="0x01"> <bounds x="1.08" y="3.02" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp5" element="BET2" inputtag="500e" inputmask="0x04"> + </element> + <element name="lamp5" ref="BET2" inputtag="500e" inputmask="0x04"> <bounds x="1.49" y="3.02" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp8" element="BET3" inputtag="500e" inputmask="0x10"> + </element> + <element name="lamp8" ref="BET3" inputtag="500e" inputmask="0x10"> <bounds x="1.91" y="3.02" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp12" element="BET4" inputtag="500d" inputmask="0x01"> + </element> + <element name="lamp12" ref="BET4" inputtag="500d" inputmask="0x01"> <bounds x="2.31" y="3.02" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp7" element="BET5" inputtag="500d" inputmask="0x02"> + </element> + <element name="lamp7" ref="BET5" inputtag="500d" inputmask="0x02"> <bounds x="2.72" y="3.02" width="0.31" height="0.24" /> - </bezel> + </element> - <bezel name="lamp10" element="RESERVE" inputtag="500d" inputmask="0x08"> + <element name="lamp10" ref="RESERVE" inputtag="500d" inputmask="0x08"> <bounds x="0.67" y="3.28" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp1" element="1LINE" inputtag="500e" inputmask="0x02"> + </element> + <element name="lamp1" ref="1LINE" inputtag="500e" inputmask="0x02"> <bounds x="1.08" y="3.28" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp2" element="3LINES" inputtag="500e" inputmask="0x80"> + </element> + <element name="lamp2" ref="3LINES" inputtag="500e" inputmask="0x80"> <bounds x="1.49" y="3.28" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp3" element="5LINES" inputtag="500e" inputmask="0x40"> + </element> + <element name="lamp3" ref="5LINES" inputtag="500e" inputmask="0x40"> <bounds x="1.91" y="3.28" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp9" element="7LINES" inputtag="500e" inputmask="0x20"> + </element> + <element name="lamp9" ref="7LINES" inputtag="500e" inputmask="0x20"> <bounds x="2.31" y="3.28" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp4" element="9LINES" inputtag="500e" inputmask="0x08"> + </element> + <element name="lamp4" ref="9LINES" inputtag="500e" inputmask="0x08"> <bounds x="2.72" y="3.28" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp14" element="light tower1"> + </element> + <element name="lamp14" ref="light tower1"> <bounds x="3.70" y="3.28" width="0.10" height="0.10" /> - </bezel> - <bezel name="lamp15" element="light tower2"> + </element> + <element name="lamp15" ref="light tower2"> <bounds x="3.80" y="3.28" width="0.10" height="0.10" /> - </bezel> - <bezel name="lamp16" element="light tower3"> + </element> + <element name="lamp16" ref="light tower3"> <bounds x="3.70" y="3.38" width="0.10" height="0.10" /> - </bezel> - <bezel name="lamp17" element="light tower4"> + </element> + <element name="lamp17" ref="light tower4"> <bounds x="3.80" y="3.38" width="0.10" height="0.10" /> - </bezel> - <bezel name="lamp19" element="auditkey" inputtag="5002" inputmask="0x10"> + </element> + <element name="lamp19" ref="auditkey" inputtag="5002" inputmask="0x10"> <bounds x="0.26" y="3.09" width="0.31" height="0.12" /> - </bezel> - <bezel name="lamp20" element="jackpotkey" inputtag="5003" inputmask="0x04"> + </element> + <element name="lamp20" ref="jackpotkey" inputtag="5003" inputmask="0x04"> <bounds x="0.26" y="3.34" width="0.31" height="0.12" /> - </bezel> + </element> </view> </mamelayout> diff --git a/src/mame/layout/3bagflvt.lay b/src/mame/layout/3bagflvt.lay index d6bcdafc2b0..e4c538730bd 100644 --- a/src/mame/layout/3bagflvt.lay +++ b/src/mame/layout/3bagflvt.lay @@ -268,66 +268,66 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="4" bottom="3" /> </screen> - <bezel name="lamp11" element="COLLECT" inputtag="500d" inputmask="0x04"> + <element name="lamp11" ref="COLLECT" inputtag="500d" inputmask="0x04"> <bounds x="0.67" y="3.02" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp6" element="BET1" inputtag="500e" inputmask="0x01"> + </element> + <element name="lamp6" ref="BET1" inputtag="500e" inputmask="0x01"> <bounds x="1.08" y="3.02" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp5" element="BET2" inputtag="500e" inputmask="0x04"> + </element> + <element name="lamp5" ref="BET2" inputtag="500e" inputmask="0x04"> <bounds x="1.49" y="3.02" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp8" element="BET3" inputtag="500e" inputmask="0x10"> + </element> + <element name="lamp8" ref="BET3" inputtag="500e" inputmask="0x10"> <bounds x="1.91" y="3.02" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp12" element="BET5" inputtag="500d" inputmask="0x01"> + </element> + <element name="lamp12" ref="BET5" inputtag="500d" inputmask="0x01"> <bounds x="2.31" y="3.02" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp7" element="BET10" inputtag="500d" inputmask="0x02"> + </element> + <element name="lamp7" ref="BET10" inputtag="500d" inputmask="0x02"> <bounds x="2.72" y="3.02" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp18" element="MAXBET" inputtag="500d" inputmask="0x10"> + </element> + <element name="lamp18" ref="MAXBET" inputtag="500d" inputmask="0x10"> <bounds x="3.13" y="3.02" width="0.31" height="0.24" /> - </bezel> + </element> - <bezel name="lamp10" element="RESERVE" inputtag="500d" inputmask="0x08"> + <element name="lamp10" ref="RESERVE" inputtag="500d" inputmask="0x08"> <bounds x="0.67" y="3.28" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp1" element="1LINE" inputtag="500e" inputmask="0x02"> + </element> + <element name="lamp1" ref="1LINE" inputtag="500e" inputmask="0x02"> <bounds x="1.08" y="3.28" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp2" element="3LINES" inputtag="500e" inputmask="0x80"> + </element> + <element name="lamp2" ref="3LINES" inputtag="500e" inputmask="0x80"> <bounds x="1.49" y="3.28" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp3" element="5LINES" inputtag="500e" inputmask="0x40"> + </element> + <element name="lamp3" ref="5LINES" inputtag="500e" inputmask="0x40"> <bounds x="1.91" y="3.28" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp9" element="7LINES" inputtag="500e" inputmask="0x20"> + </element> + <element name="lamp9" ref="7LINES" inputtag="500e" inputmask="0x20"> <bounds x="2.31" y="3.28" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp4" element="9LINES" inputtag="500e" inputmask="0x08"> + </element> + <element name="lamp4" ref="9LINES" inputtag="500e" inputmask="0x08"> <bounds x="2.72" y="3.28" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp13" element="AUTOPLAY" inputtag="500d" inputmask="0x20"> + </element> + <element name="lamp13" ref="AUTOPLAY" inputtag="500d" inputmask="0x20"> <bounds x="3.13" y="3.28" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp14" element="light tower1"> + </element> + <element name="lamp14" ref="light tower1"> <bounds x="3.70" y="3.28" width="0.10" height="0.10" /> - </bezel> - <bezel name="lamp15" element="light tower2"> + </element> + <element name="lamp15" ref="light tower2"> <bounds x="3.80" y="3.28" width="0.10" height="0.10" /> - </bezel> - <bezel name="lamp16" element="light tower3"> + </element> + <element name="lamp16" ref="light tower3"> <bounds x="3.70" y="3.38" width="0.10" height="0.10" /> - </bezel> - <bezel name="lamp17" element="light tower4"> + </element> + <element name="lamp17" ref="light tower4"> <bounds x="3.80" y="3.38" width="0.10" height="0.10" /> - </bezel> - <bezel name="lamp19" element="auditkey" inputtag="5002" inputmask="0x10"> + </element> + <element name="lamp19" ref="auditkey" inputtag="5002" inputmask="0x10"> <bounds x="0.26" y="3.09" width="0.31" height="0.12" /> - </bezel> - <bezel name="lamp20" element="jackpotkey" inputtag="5003" inputmask="0x04"> + </element> + <element name="lamp20" ref="jackpotkey" inputtag="5003" inputmask="0x04"> <bounds x="0.26" y="3.34" width="0.31" height="0.12" /> - </bezel> + </element> </view> </mamelayout> diff --git a/src/mame/layout/7smash.lay b/src/mame/layout/7smash.lay index ca2d9d4b4c0..7bd71faca26 100644 --- a/src/mame/layout/7smash.lay +++ b/src/mame/layout/7smash.lay @@ -64,20 +64,20 @@ license:CC0 <bounds left="0" top="0" right="4" bottom="3" /> </screen> - <bezel name="lamp0" element="start" inputtag="IN0" inputmask="0x01"> + <element name="lamp0" ref="start" inputtag="IN0" inputmask="0x01"> <bounds x="0" y="3.02" width="0.55" height="0.24" /> - </bezel> + </element> - <bezel name="lamp6" element="stop1" inputtag="IN0" inputmask="0x08"> + <element name="lamp6" ref="stop1" inputtag="IN0" inputmask="0x08"> <bounds x="0.65" y="3.02" width="0.55" height="0.24" /> - </bezel> + </element> - <bezel name="lamp4" element="stop2" inputtag="IN0" inputmask="0x04"> + <element name="lamp4" ref="stop2" inputtag="IN0" inputmask="0x04"> <bounds x="1.30" y="3.02" width="0.55" height="0.24" /> - </bezel> + </element> - <bezel name="lamp2" element="stop3" inputtag="IN0" inputmask="0x02"> + <element name="lamp2" ref="stop3" inputtag="IN0" inputmask="0x02"> <bounds x="1.95" y="3.02" width="0.55" height="0.24" /> - </bezel> + </element> </view> </mamelayout> diff --git a/src/mame/layout/abaseb.lay b/src/mame/layout/abaseb.lay index 2d93b3d8865..b57787cbc6b 100644 --- a/src/mame/layout/abaseb.lay +++ b/src/mame/layout/abaseb.lay @@ -50,29 +50,29 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="4" bottom="3" /> </screen> - <bezel name="0.0" element="rswing"> + <element name="0.0" ref="rswing"> <bounds x="0" y="-0.2" width="2" height="0.2" /> - </bezel> - <bezel name="0.1" element="lswing"> + </element> + <element name="0.1" ref="lswing"> <bounds x="0" y="-0.2" width="2" height="0.2" /> - </bezel> - <bezel name="0.2" element="rbunt"> + </element> + <element name="0.2" ref="rbunt"> <bounds x="0" y="-0.2" width="2" height="0.2" /> - </bezel> - <bezel name="0.3" element="lbunt"> + </element> + <element name="0.3" ref="lbunt"> <bounds x="0" y="-0.2" width="2" height="0.2" /> - </bezel> - <bezel name="2.0" element="rswing"> + </element> + <element name="2.0" ref="rswing"> <bounds x="2" y="-0.2" width="2" height="0.2" /> - </bezel> - <bezel name="2.1" element="lswing"> + </element> + <element name="2.1" ref="lswing"> <bounds x="2" y="-0.2" width="2" height="0.2" /> - </bezel> - <bezel name="2.2" element="rbunt"> + </element> + <element name="2.2" ref="rbunt"> <bounds x="2" y="-0.2" width="2" height="0.2" /> - </bezel> - <bezel name="2.3" element="lbunt"> + </element> + <element name="2.3" ref="lbunt"> <bounds x="2" y="-0.2" width="2" height="0.2" /> - </bezel> + </element> </view> </mamelayout> diff --git a/src/mame/layout/acommand.lay b/src/mame/layout/acommand.lay index fcf2bfb7755..7927211539a 100644 --- a/src/mame/layout/acommand.lay +++ b/src/mame/layout/acommand.lay @@ -19,24 +19,26 @@ license:CC0 <!-- build screen --> <view name="Internal Layout"> - <bounds left="55" right="185" top="0" bottom="30" /> <screen index="0"> <bounds x="100" y="0" width="40" height="30" /> </screen> - <bezel element="text_score"><bounds x="55" y="0" width="40" height="5" /></bezel> - <bezel element="static_yellow"><bounds x="55" y="5" width="40" height="25" /></bezel> - <bezel element="static_black"><bounds x="58" y="8" width="34" height="19" /></bezel> - <bezel name="digit2" element="digit"><bounds x="60" y="10" width="10" height="15" /></bezel> - <bezel name="digit1" element="digit"><bounds x="70" y="10" width="10" height="15" /></bezel> - <bezel name="digit0" element="digit"><bounds x="80" y="10" width="10" height="15" /></bezel> - - <bezel element="text_score"><bounds x="145" y="0" width="40" height="5" /></bezel> - <bezel element="static_red"><bounds x="145" y="5" width="40" height="25" /></bezel> - <bezel element="static_black"><bounds x="148" y="8" width="34" height="19" /></bezel> - <bezel name="digit3" element="digit"><bounds x="150" y="10" width="10" height="15" /></bezel> - <bezel name="digit5" element="digit"><bounds x="160" y="10" width="10" height="15" /></bezel> - <bezel name="digit4" element="digit"><bounds x="170" y="10" width="10" height="15" /></bezel> - + <collection name="Left Score"> + <element ref="text_score"><bounds x="55" y="0" width="40" height="5" /></element> + <element ref="static_yellow"><bounds x="55" y="5" width="40" height="25" /></element> + <element ref="static_black"><bounds x="58" y="8" width="34" height="19" /></element> + <element name="digit2" ref="digit"><bounds x="60" y="10" width="10" height="15" /></element> + <element name="digit1" ref="digit"><bounds x="70" y="10" width="10" height="15" /></element> + <element name="digit0" ref="digit"><bounds x="80" y="10" width="10" height="15" /></element> + </collection> + + <collection name="Right Score"> + <element ref="text_score"><bounds x="145" y="0" width="40" height="5" /></element> + <element ref="static_red"><bounds x="145" y="5" width="40" height="25" /></element> + <element ref="static_black"><bounds x="148" y="8" width="34" height="19" /></element> + <element name="digit3" ref="digit"><bounds x="150" y="10" width="10" height="15" /></element> + <element name="digit5" ref="digit"><bounds x="160" y="10" width="10" height="15" /></element> + <element name="digit4" ref="digit"><bounds x="170" y="10" width="10" height="15" /></element> + </collection> </view> </mamelayout> diff --git a/src/mame/layout/adonisce.lay b/src/mame/layout/adonisce.lay index 5806cf6cbb4..207f83c7382 100644 --- a/src/mame/layout/adonisce.lay +++ b/src/mame/layout/adonisce.lay @@ -328,68 +328,62 @@ license:CC0 </screen> <!-- Button lamps --> - <bezel name="lamp8" element="COLLECT" inputtag="P1" inputmask="0x100"> + <element name="lamp8" ref="COLLECT" inputtag="P1" inputmask="0x100"> <bounds x="0.27" y="3.02" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp9" element="BET1" inputtag="P1" inputmask="0x200"> + </element> + <element name="lamp9" ref="BET1" inputtag="P1" inputmask="0x200"> <bounds x="0.68" y="3.02" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp10" element="BET2" inputtag="P1" inputmask="0x400"> + </element> + <element name="lamp10" ref="BET2" inputtag="P1" inputmask="0x400"> <bounds x="1.09" y="3.02" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp11" element="BET3" inputtag="P1" inputmask="0x800"> + </element> + <element name="lamp11" ref="BET3" inputtag="P1" inputmask="0x800"> <bounds x="1.51" y="3.02" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp12" element="BET5" inputtag="P1" inputmask="0x1000"> + </element> + <element name="lamp12" ref="BET5" inputtag="P1" inputmask="0x1000"> <bounds x="1.91" y="3.02" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp13" element="BET10" inputtag="P1" inputmask="0x2000"> + </element> + <element name="lamp13" ref="BET10" inputtag="P1" inputmask="0x2000"> <bounds x="2.32" y="3.02" width="0.3" height="0.3" /> - </bezel> + </element> - <bezel name="lamp7" element="RESERVE" inputtag="P1" inputmask="0x80"> + <element name="lamp7" ref="RESERVE" inputtag="P1" inputmask="0x80"> <bounds x="0.27" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp6" element="1LINE" inputtag="P1" inputmask="0x40"> + </element> + <element name="lamp6" ref="1LINE" inputtag="P1" inputmask="0x40"> <bounds x="0.68" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp5" element="5LINES" inputtag="P1" inputmask="0x20"> + </element> + <element name="lamp5" ref="5LINES" inputtag="P1" inputmask="0x20"> <bounds x="1.09" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp4" element="10LINES" inputtag="P1" inputmask="0x10"> + </element> + <element name="lamp4" ref="10LINES" inputtag="P1" inputmask="0x10"> <bounds x="1.51" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp3" element="15LINES" inputtag="P1" inputmask="0x08"> + </element> + <element name="lamp3" ref="15LINES" inputtag="P1" inputmask="0x08"> <bounds x="1.91" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp2" element="20LINES" inputtag="P1" inputmask="0x04"> + </element> + <element name="lamp2" ref="20LINES" inputtag="P1" inputmask="0x04"> <bounds x="2.32" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp0" element="GAMBLE" inputtag="P1" inputmask="0x01"> + </element> + <element name="lamp0" ref="GAMBLE" inputtag="P1" inputmask="0x01"> <bounds x="2.73" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp1" element="TAKE_WIN" inputtag="P1" inputmask="0x02"> + </element> + <element name="lamp1" ref="TAKE_WIN" inputtag="P1" inputmask="0x02"> <bounds x="3.14" y="3.43" width="0.3" height="0.3" /> - </bezel> + </element> <!-- Tower lamps --> - <bezel name="lamp32" element="REDLAMP"> + <element name="lamp32" ref="REDLAMP"> <bounds x="3.58" y="3.31" width="0.10" height="0.10" /> - </bezel> - <bezel name="lamp33" element="REDLAMP"> + </element> + <element name="lamp33" ref="REDLAMP"> <bounds x="3.58" y="3.43" width="0.10" height="0.10" /> - </bezel> - <bezel name="lamp34" element="REDLAMP"> + </element> + <element name="lamp34" ref="REDLAMP"> <bounds x="3.68" y="3.31" width="0.10" height="0.10" /> - </bezel> - <bezel name="lamp35" element="REDLAMP"> + </element> + <element name="lamp35" ref="REDLAMP"> <bounds x="3.68" y="3.43" width="0.10" height="0.10" /> - </bezel> - </view> - - <view name="Screen"> - <screen index="0"> - <bounds left="0" top="0" right="4" bottom="3" /> - </screen> + </element> </view> </mamelayout> diff --git a/src/mame/layout/adonisu.lay b/src/mame/layout/adonisu.lay index 36b52c4e175..20b8d05d611 100644 --- a/src/mame/layout/adonisu.lay +++ b/src/mame/layout/adonisu.lay @@ -448,57 +448,57 @@ license:CC0 </screen> <!-- Button lamps --> - <bezel name="lamp8" element="CASHOUT" inputtag="P2" inputmask="0x01"> + <element name="lamp8" ref="CASHOUT" inputtag="P2" inputmask="0x01"> <bounds x="0.27" y="3.02" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp9" element="1LINE" inputtag="P2" inputmask="0x02"> + </element> + <element name="lamp9" ref="1LINE" inputtag="P2" inputmask="0x02"> <bounds x="0.68" y="3.02" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp10" element="5LINES" inputtag="P2" inputmask="0x04"> + </element> + <element name="lamp10" ref="5LINES" inputtag="P2" inputmask="0x04"> <bounds x="1.09" y="3.02" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp11" element="10LINES" inputtag="P2" inputmask="0x08"> + </element> + <element name="lamp11" ref="10LINES" inputtag="P2" inputmask="0x08"> <bounds x="1.51" y="3.02" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp12" element="15LINES" inputtag="P2" inputmask="0x10"> + </element> + <element name="lamp12" ref="15LINES" inputtag="P2" inputmask="0x10"> <bounds x="1.91" y="3.02" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp13" element="20LINES" inputtag="P2" inputmask="0x20"> + </element> + <element name="lamp13" ref="20LINES" inputtag="P2" inputmask="0x20"> <bounds x="2.32" y="3.02" width="0.3" height="0.3" /> - </bezel> + </element> - <bezel name="lamp7" element="SERVICE" inputtag="P1" inputmask="0x80"> + <element name="lamp7" ref="SERVICE" inputtag="P1" inputmask="0x80"> <bounds x="0.27" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp6" element="BET1R" inputtag="P1" inputmask="0x40"> + </element> + <element name="lamp6" ref="BET1R" inputtag="P1" inputmask="0x40"> <bounds x="0.68" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp5" element="BET2" inputtag="P1" inputmask="0x20"> + </element> + <element name="lamp5" ref="BET2" inputtag="P1" inputmask="0x20"> <bounds x="1.09" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp4" element="BET3" inputtag="P1" inputmask="0x10"> + </element> + <element name="lamp4" ref="BET3" inputtag="P1" inputmask="0x10"> <bounds x="1.51" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp3" element="BET4" inputtag="P1" inputmask="0x08"> + </element> + <element name="lamp3" ref="BET4" inputtag="P1" inputmask="0x08"> <bounds x="1.91" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp2" element="BET5B" inputtag="P1" inputmask="0x04"> + </element> + <element name="lamp2" ref="BET5B" inputtag="P1" inputmask="0x04"> <bounds x="2.32" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp0" element="GAMBLE" inputtag="P1" inputmask="0x01"> + </element> + <element name="lamp0" ref="GAMBLE" inputtag="P1" inputmask="0x01"> <bounds x="2.73" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp1" element="TAKE_WIN" inputtag="P1" inputmask="0x02"> + </element> + <element name="lamp1" ref="TAKE_WIN" inputtag="P1" inputmask="0x02"> <bounds x="3.14" y="3.43" width="0.3" height="0.3" /> - </bezel> + </element> <!-- Tower lamps --> - <bezel name="lamp17" element="WHITELAMP"> + <element name="lamp17" ref="WHITELAMP"> <bounds x="3.68" y="3.31" width="0.10" height="0.10" /> - </bezel> - <bezel name="lamp16" element="REDLAMP"> + </element> + <element name="lamp16" ref="REDLAMP"> <bounds x="3.68" y="3.43" width="0.10" height="0.10" /> - </bezel> + </element> </view> <view name="Button Lamps - 20 Lines, 10 Credits"> @@ -507,57 +507,57 @@ license:CC0 </screen> <!-- Button lamps --> - <bezel name="lamp8" element="CASHOUT" inputtag="P2" inputmask="0x01"> + <element name="lamp8" ref="CASHOUT" inputtag="P2" inputmask="0x01"> <bounds x="0.27" y="3.02" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp9" element="1LINE" inputtag="P2" inputmask="0x02"> + </element> + <element name="lamp9" ref="1LINE" inputtag="P2" inputmask="0x02"> <bounds x="0.68" y="3.02" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp10" element="5LINES" inputtag="P2" inputmask="0x04"> + </element> + <element name="lamp10" ref="5LINES" inputtag="P2" inputmask="0x04"> <bounds x="1.09" y="3.02" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp11" element="10LINES" inputtag="P2" inputmask="0x08"> + </element> + <element name="lamp11" ref="10LINES" inputtag="P2" inputmask="0x08"> <bounds x="1.51" y="3.02" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp12" element="15LINES" inputtag="P2" inputmask="0x10"> + </element> + <element name="lamp12" ref="15LINES" inputtag="P2" inputmask="0x10"> <bounds x="1.91" y="3.02" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp13" element="20LINES" inputtag="P2" inputmask="0x20"> + </element> + <element name="lamp13" ref="20LINES" inputtag="P2" inputmask="0x20"> <bounds x="2.32" y="3.02" width="0.3" height="0.3" /> - </bezel> + </element> - <bezel name="lamp7" element="SERVICE" inputtag="P1" inputmask="0x80"> + <element name="lamp7" ref="SERVICE" inputtag="P1" inputmask="0x80"> <bounds x="0.27" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp6" element="BET1R" inputtag="P1" inputmask="0x40"> + </element> + <element name="lamp6" ref="BET1R" inputtag="P1" inputmask="0x40"> <bounds x="0.68" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp5" element="BET2" inputtag="P1" inputmask="0x20"> + </element> + <element name="lamp5" ref="BET2" inputtag="P1" inputmask="0x20"> <bounds x="1.09" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp4" element="BET3" inputtag="P1" inputmask="0x10"> + </element> + <element name="lamp4" ref="BET3" inputtag="P1" inputmask="0x10"> <bounds x="1.51" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp3" element="BET5" inputtag="P1" inputmask="0x08"> + </element> + <element name="lamp3" ref="BET5" inputtag="P1" inputmask="0x08"> <bounds x="1.91" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp2" element="BET10B" inputtag="P1" inputmask="0x04"> + </element> + <element name="lamp2" ref="BET10B" inputtag="P1" inputmask="0x04"> <bounds x="2.32" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp0" element="GAMBLE" inputtag="P1" inputmask="0x01"> + </element> + <element name="lamp0" ref="GAMBLE" inputtag="P1" inputmask="0x01"> <bounds x="2.73" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp1" element="TAKE_WIN" inputtag="P1" inputmask="0x02"> + </element> + <element name="lamp1" ref="TAKE_WIN" inputtag="P1" inputmask="0x02"> <bounds x="3.14" y="3.43" width="0.3" height="0.3" /> - </bezel> + </element> <!-- Tower lamps --> - <bezel name="lamp17" element="WHITELAMP"> + <element name="lamp17" ref="WHITELAMP"> <bounds x="3.68" y="3.31" width="0.10" height="0.10" /> - </bezel> - <bezel name="lamp16" element="REDLAMP"> + </element> + <element name="lamp16" ref="REDLAMP"> <bounds x="3.68" y="3.43" width="0.10" height="0.10" /> - </bezel> + </element> </view> <view name="Button Lamps - 20 Lines, 25 Credits"> @@ -566,57 +566,57 @@ license:CC0 </screen> <!-- Button lamps --> - <bezel name="lamp8" element="CASHOUT" inputtag="P2" inputmask="0x01"> + <element name="lamp8" ref="CASHOUT" inputtag="P2" inputmask="0x01"> <bounds x="0.27" y="3.02" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp9" element="1LINE" inputtag="P2" inputmask="0x02"> + </element> + <element name="lamp9" ref="1LINE" inputtag="P2" inputmask="0x02"> <bounds x="0.68" y="3.02" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp10" element="5LINES" inputtag="P2" inputmask="0x04"> + </element> + <element name="lamp10" ref="5LINES" inputtag="P2" inputmask="0x04"> <bounds x="1.09" y="3.02" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp11" element="10LINES" inputtag="P2" inputmask="0x08"> + </element> + <element name="lamp11" ref="10LINES" inputtag="P2" inputmask="0x08"> <bounds x="1.51" y="3.02" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp12" element="15LINES" inputtag="P2" inputmask="0x10"> + </element> + <element name="lamp12" ref="15LINES" inputtag="P2" inputmask="0x10"> <bounds x="1.91" y="3.02" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp13" element="20LINES" inputtag="P2" inputmask="0x20"> + </element> + <element name="lamp13" ref="20LINES" inputtag="P2" inputmask="0x20"> <bounds x="2.32" y="3.02" width="0.3" height="0.3" /> - </bezel> + </element> - <bezel name="lamp7" element="SERVICE" inputtag="P1" inputmask="0x80"> + <element name="lamp7" ref="SERVICE" inputtag="P1" inputmask="0x80"> <bounds x="0.27" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp6" element="BET1R" inputtag="P1" inputmask="0x40"> + </element> + <element name="lamp6" ref="BET1R" inputtag="P1" inputmask="0x40"> <bounds x="0.68" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp5" element="BET2" inputtag="P1" inputmask="0x20"> + </element> + <element name="lamp5" ref="BET2" inputtag="P1" inputmask="0x20"> <bounds x="1.09" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp4" element="BET5" inputtag="P1" inputmask="0x10"> + </element> + <element name="lamp4" ref="BET5" inputtag="P1" inputmask="0x10"> <bounds x="1.51" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp3" element="BET10" inputtag="P1" inputmask="0x08"> + </element> + <element name="lamp3" ref="BET10" inputtag="P1" inputmask="0x08"> <bounds x="1.91" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp2" element="BET25B" inputtag="P1" inputmask="0x04"> + </element> + <element name="lamp2" ref="BET25B" inputtag="P1" inputmask="0x04"> <bounds x="2.32" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp0" element="GAMBLE" inputtag="P1" inputmask="0x01"> + </element> + <element name="lamp0" ref="GAMBLE" inputtag="P1" inputmask="0x01"> <bounds x="2.73" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp1" element="TAKE_WIN" inputtag="P1" inputmask="0x02"> + </element> + <element name="lamp1" ref="TAKE_WIN" inputtag="P1" inputmask="0x02"> <bounds x="3.14" y="3.43" width="0.3" height="0.3" /> - </bezel> + </element> <!-- Tower lamps --> - <bezel name="lamp17" element="WHITELAMP"> + <element name="lamp17" ref="WHITELAMP"> <bounds x="3.68" y="3.31" width="0.10" height="0.10" /> - </bezel> - <bezel name="lamp16" element="REDLAMP"> + </element> + <element name="lamp16" ref="REDLAMP"> <bounds x="3.68" y="3.43" width="0.10" height="0.10" /> - </bezel> + </element> </view> <view name="Button Lamps - 20 Lines, 50 Credits"> @@ -625,62 +625,56 @@ license:CC0 </screen> <!-- Button lamps --> - <bezel name="lamp8" element="CASHOUT" inputtag="P2" inputmask="0x01"> + <element name="lamp8" ref="CASHOUT" inputtag="P2" inputmask="0x01"> <bounds x="0.27" y="3.02" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp9" element="1LINE" inputtag="P2" inputmask="0x02"> + </element> + <element name="lamp9" ref="1LINE" inputtag="P2" inputmask="0x02"> <bounds x="0.68" y="3.02" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp10" element="5LINES" inputtag="P2" inputmask="0x04"> + </element> + <element name="lamp10" ref="5LINES" inputtag="P2" inputmask="0x04"> <bounds x="1.09" y="3.02" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp11" element="10LINES" inputtag="P2" inputmask="0x08"> + </element> + <element name="lamp11" ref="10LINES" inputtag="P2" inputmask="0x08"> <bounds x="1.51" y="3.02" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp12" element="15LINES" inputtag="P2" inputmask="0x10"> + </element> + <element name="lamp12" ref="15LINES" inputtag="P2" inputmask="0x10"> <bounds x="1.91" y="3.02" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp13" element="20LINES" inputtag="P2" inputmask="0x20"> + </element> + <element name="lamp13" ref="20LINES" inputtag="P2" inputmask="0x20"> <bounds x="2.32" y="3.02" width="0.3" height="0.3" /> - </bezel> + </element> - <bezel name="lamp7" element="SERVICE" inputtag="P1" inputmask="0x80"> + <element name="lamp7" ref="SERVICE" inputtag="P1" inputmask="0x80"> <bounds x="0.27" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp6" element="BET1R" inputtag="P1" inputmask="0x40"> + </element> + <element name="lamp6" ref="BET1R" inputtag="P1" inputmask="0x40"> <bounds x="0.68" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp5" element="BET2" inputtag="P1" inputmask="0x20"> + </element> + <element name="lamp5" ref="BET2" inputtag="P1" inputmask="0x20"> <bounds x="1.09" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp4" element="BET5" inputtag="P1" inputmask="0x10"> + </element> + <element name="lamp4" ref="BET5" inputtag="P1" inputmask="0x10"> <bounds x="1.51" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp3" element="BET25" inputtag="P1" inputmask="0x08"> + </element> + <element name="lamp3" ref="BET25" inputtag="P1" inputmask="0x08"> <bounds x="1.91" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp2" element="BET50B" inputtag="P1" inputmask="0x04"> + </element> + <element name="lamp2" ref="BET50B" inputtag="P1" inputmask="0x04"> <bounds x="2.32" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp0" element="GAMBLE" inputtag="P1" inputmask="0x01"> + </element> + <element name="lamp0" ref="GAMBLE" inputtag="P1" inputmask="0x01"> <bounds x="2.73" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp1" element="TAKE_WIN" inputtag="P1" inputmask="0x02"> + </element> + <element name="lamp1" ref="TAKE_WIN" inputtag="P1" inputmask="0x02"> <bounds x="3.14" y="3.43" width="0.3" height="0.3" /> - </bezel> + </element> <!-- Tower lamps --> - <bezel name="lamp17" element="WHITELAMP"> + <element name="lamp17" ref="WHITELAMP"> <bounds x="3.68" y="3.31" width="0.10" height="0.10" /> - </bezel> - <bezel name="lamp16" element="REDLAMP"> + </element> + <element name="lamp16" ref="REDLAMP"> <bounds x="3.68" y="3.43" width="0.10" height="0.10" /> - </bezel> - </view> - - <view name="Screen"> - <screen index="0"> - <bounds left="0" top="0" right="4" bottom="3" /> - </screen> + </element> </view> </mamelayout> diff --git a/src/mame/layout/amiga.lay b/src/mame/layout/amiga.lay index 16be4085655..000ba715f74 100644 --- a/src/mame/layout/amiga.lay +++ b/src/mame/layout/amiga.lay @@ -25,13 +25,13 @@ Basic display of drive LEDs for the Amiga Family <bounds left="0" right="400" top="0" bottom="300" /> </screen> - <bezel name="fdc_led" element="red_led"> + <element name="fdc_led" ref="red_led"> <bounds x="372" y="312" width="14" height="4" /> - </bezel> + </element> - <bezel name="audio_led" element="orange_led"> + <element name="audio_led" ref="orange_led"> <bounds x="372" y="320" width="14" height="4" /> - </bezel> + </element> </view> </mamelayout> diff --git a/src/mame/layout/ampoker2.lay b/src/mame/layout/ampoker2.lay index cc5d2cf5238..6823a6c7a60 100644 --- a/src/mame/layout/ampoker2.lay +++ b/src/mame/layout/ampoker2.lay @@ -111,29 +111,29 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="4" bottom="3" /> </screen> - <bezel name="lamp0" element="L0"> + <element name="lamp0" ref="L0"> <bounds x="0" y="3.13" width="0.40" height="0.24" /> - </bezel> - <bezel name="lamp1" element="L1"> + </element> + <element name="lamp1" ref="L1"> <bounds x="0.5" y="3.13" width="0.40" height="0.24" /> - </bezel> - <bezel name="lamp2" element="L2"> + </element> + <element name="lamp2" ref="L2"> <bounds x="1.0" y="3.13" width="0.40" height="0.24" /> - </bezel> - <bezel name="lamp3" element="L3"> + </element> + <element name="lamp3" ref="L3"> <bounds x="1.6" y="3.13" width="0.40" height="0.24" /> - </bezel> - <bezel name="lamp4" element="L4"> + </element> + <element name="lamp4" ref="L4"> <bounds x="2.1" y="3.13" width="0.40" height="0.24" /> - </bezel> - <bezel name="lamp5" element="L5"> + </element> + <element name="lamp5" ref="L5"> <bounds x="2.6" y="3.13" width="0.40" height="0.24" /> - </bezel> - <bezel name="lamp6" element="L6"> + </element> + <element name="lamp6" ref="L6"> <bounds x="3.1" y="3.13" width="0.40" height="0.24" /> - </bezel> - <bezel name="lamp7" element="L7"> + </element> + <element name="lamp7" ref="L7"> <bounds x="3.6" y="3.13" width="0.40" height="0.24" /> - </bezel> + </element> </view> </mamelayout> diff --git a/src/mame/layout/amusco.lay b/src/mame/layout/amusco.lay index 57f4da8e17d..84adf7470b4 100644 --- a/src/mame/layout/amusco.lay +++ b/src/mame/layout/amusco.lay @@ -102,26 +102,26 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="4" bottom="3" /> </screen> - <bezel name="lamp3" element="hold1"> + <element name="lamp3" ref="hold1"> <bounds x="0.15" y="3.13" width="0.55" height="0.24" /> - </bezel> - <bezel name="lamp4" element="hold2"> + </element> + <element name="lamp4" ref="hold2"> <bounds x="0.80" y="3.13" width="0.55" height="0.24" /> - </bezel> - <bezel name="lamp2" element="hold3"> + </element> + <element name="lamp2" ref="hold3"> <bounds x="1.45" y="3.13" width="0.55" height="0.24" /> - </bezel> - <bezel name="lamp5" element="hold4"> + </element> + <element name="lamp5" ref="hold4"> <bounds x="2.10" y="3.13" width="0.55" height="0.24" /> - </bezel> - <bezel name="lamp1" element="hold5"> + </element> + <element name="lamp1" ref="hold5"> <bounds x="2.75" y="3.13" width="0.55" height="0.24" /> - </bezel> - <bezel name="lamp0" element="bet"> + </element> + <element name="lamp0" ref="bet"> <bounds x="3.45" y="3.02" width="0.55" height="0.24" /> - </bezel> - <bezel name="lamp6" element="startdraw"> + </element> + <element name="lamp6" ref="startdraw"> <bounds x="3.45" y="3.28" width="0.55" height="0.24" /> - </bezel> + </element> </view> </mamelayout> diff --git a/src/mame/layout/arcwins.lay b/src/mame/layout/arcwins.lay index 2cf94ec4925..7d7cb9656b4 100644 --- a/src/mame/layout/arcwins.lay +++ b/src/mame/layout/arcwins.lay @@ -268,66 +268,66 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="4" bottom="3" /> </screen> - <bezel name="lamp11" element="CASHOUT" inputtag="500d" inputmask="0x04"> + <element name="lamp11" ref="CASHOUT" inputtag="500d" inputmask="0x04"> <bounds x="0.67" y="3.02" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp6" element="1LINE" inputtag="500e" inputmask="0x01"> + </element> + <element name="lamp6" ref="1LINE" inputtag="500e" inputmask="0x01"> <bounds x="1.08" y="3.02" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp5" element="2LINES" inputtag="500e" inputmask="0x04"> + </element> + <element name="lamp5" ref="2LINES" inputtag="500e" inputmask="0x04"> <bounds x="1.49" y="3.02" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp8" element="3LINES" inputtag="500e" inputmask="0x10"> + </element> + <element name="lamp8" ref="3LINES" inputtag="500e" inputmask="0x10"> <bounds x="1.91" y="3.02" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp12" element="4LINES" inputtag="500d" inputmask="0x01"> + </element> + <element name="lamp12" ref="4LINES" inputtag="500d" inputmask="0x01"> <bounds x="2.31" y="3.02" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp7" element="5LINES" inputtag="500d" inputmask="0x02"> + </element> + <element name="lamp7" ref="5LINES" inputtag="500d" inputmask="0x02"> <bounds x="2.72" y="3.02" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp18" element="GAMBLE" inputtag="500d" inputmask="0x10"> + </element> + <element name="lamp18" ref="GAMBLE" inputtag="500d" inputmask="0x10"> <bounds x="3.13" y="3.02" width="0.31" height="0.24" /> - </bezel> + </element> - <bezel name="lamp10" element="SERVICE" inputtag="500d" inputmask="0x08"> + <element name="lamp10" ref="SERVICE" inputtag="500d" inputmask="0x08"> <bounds x="0.67" y="3.28" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp1" element="BET1" inputtag="500e" inputmask="0x02"> + </element> + <element name="lamp1" ref="BET1" inputtag="500e" inputmask="0x02"> <bounds x="1.08" y="3.28" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp2" element="BET2" inputtag="500e" inputmask="0x80"> + </element> + <element name="lamp2" ref="BET2" inputtag="500e" inputmask="0x80"> <bounds x="1.49" y="3.28" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp3" element="BET3" inputtag="500e" inputmask="0x40"> + </element> + <element name="lamp3" ref="BET3" inputtag="500e" inputmask="0x40"> <bounds x="1.91" y="3.28" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp9" element="BET4" inputtag="500e" inputmask="0x20"> + </element> + <element name="lamp9" ref="BET4" inputtag="500e" inputmask="0x20"> <bounds x="2.31" y="3.28" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp4" element="BET5" inputtag="500e" inputmask="0x08"> + </element> + <element name="lamp4" ref="BET5" inputtag="500e" inputmask="0x08"> <bounds x="2.72" y="3.28" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp13" element="TAKEWIN" inputtag="500d" inputmask="0x20"> + </element> + <element name="lamp13" ref="TAKEWIN" inputtag="500d" inputmask="0x20"> <bounds x="3.13" y="3.28" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp14" element="light tower1"> + </element> + <element name="lamp14" ref="light tower1"> <bounds x="3.70" y="3.28" width="0.10" height="0.10" /> - </bezel> - <bezel name="lamp15" element="light tower2"> + </element> + <element name="lamp15" ref="light tower2"> <bounds x="3.80" y="3.28" width="0.10" height="0.10" /> - </bezel> - <bezel name="lamp16" element="light tower3"> + </element> + <element name="lamp16" ref="light tower3"> <bounds x="3.70" y="3.38" width="0.10" height="0.10" /> - </bezel> - <bezel name="lamp17" element="light tower4"> + </element> + <element name="lamp17" ref="light tower4"> <bounds x="3.80" y="3.38" width="0.10" height="0.10" /> - </bezel> - <bezel name="lamp19" element="auditkey" inputtag="5002" inputmask="0x10"> + </element> + <element name="lamp19" ref="auditkey" inputtag="5002" inputmask="0x10"> <bounds x="0.26" y="3.09" width="0.31" height="0.12" /> - </bezel> - <bezel name="lamp20" element="jackpotkey" inputtag="5003" inputmask="0x04"> + </element> + <element name="lamp20" ref="jackpotkey" inputtag="5003" inputmask="0x04"> <bounds x="0.26" y="3.34" width="0.31" height="0.12" /> - </bezel> + </element> </view> </mamelayout> diff --git a/src/mame/layout/arimk4nz.lay b/src/mame/layout/arimk4nz.lay index ee1bcb4a461..e153869c72f 100644 --- a/src/mame/layout/arimk4nz.lay +++ b/src/mame/layout/arimk4nz.lay @@ -268,66 +268,66 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="4" bottom="3" /> </screen> - <bezel name="lamp11" element="COLLECT" inputtag="500d" inputmask="0x04"> + <element name="lamp11" ref="COLLECT" inputtag="500d" inputmask="0x04"> <bounds x="0.67" y="3.02" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp6" element="BET1" inputtag="500e" inputmask="0x01"> + </element> + <element name="lamp6" ref="BET1" inputtag="500e" inputmask="0x01"> <bounds x="1.08" y="3.02" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp5" element="BET2" inputtag="500e" inputmask="0x04"> + </element> + <element name="lamp5" ref="BET2" inputtag="500e" inputmask="0x04"> <bounds x="1.49" y="3.02" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp8" element="BET3" inputtag="500e" inputmask="0x10"> + </element> + <element name="lamp8" ref="BET3" inputtag="500e" inputmask="0x10"> <bounds x="1.91" y="3.02" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp12" element="BET4" inputtag="500d" inputmask="0x01"> + </element> + <element name="lamp12" ref="BET4" inputtag="500d" inputmask="0x01"> <bounds x="2.31" y="3.02" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp7" element="BET5" inputtag="500d" inputmask="0x02"> + </element> + <element name="lamp7" ref="BET5" inputtag="500d" inputmask="0x02"> <bounds x="2.72" y="3.02" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp18" element="DOUBLEUP" inputtag="500d" inputmask="0x10"> + </element> + <element name="lamp18" ref="DOUBLEUP" inputtag="500d" inputmask="0x10"> <bounds x="3.13" y="3.02" width="0.31" height="0.24" /> - </bezel> + </element> - <bezel name="lamp10" element="RESERVE" inputtag="500d" inputmask="0x08"> + <element name="lamp10" ref="RESERVE" inputtag="500d" inputmask="0x08"> <bounds x="0.67" y="3.28" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp1" element="1LINE" inputtag="500e" inputmask="0x02"> + </element> + <element name="lamp1" ref="1LINE" inputtag="500e" inputmask="0x02"> <bounds x="1.08" y="3.28" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp2" element="3LINES" inputtag="500e" inputmask="0x80"> + </element> + <element name="lamp2" ref="3LINES" inputtag="500e" inputmask="0x80"> <bounds x="1.49" y="3.28" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp3" element="5LINES" inputtag="500e" inputmask="0x40"> + </element> + <element name="lamp3" ref="5LINES" inputtag="500e" inputmask="0x40"> <bounds x="1.91" y="3.28" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp9" element="7LINES" inputtag="500e" inputmask="0x20"> + </element> + <element name="lamp9" ref="7LINES" inputtag="500e" inputmask="0x20"> <bounds x="2.31" y="3.28" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp4" element="9LINES" inputtag="500e" inputmask="0x08"> + </element> + <element name="lamp4" ref="9LINES" inputtag="500e" inputmask="0x08"> <bounds x="2.72" y="3.28" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp13" element="TAKEWIN" inputtag="500d" inputmask="0x20"> + </element> + <element name="lamp13" ref="TAKEWIN" inputtag="500d" inputmask="0x20"> <bounds x="3.13" y="3.28" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp14" element="light tower1"> + </element> + <element name="lamp14" ref="light tower1"> <bounds x="3.70" y="3.28" width="0.10" height="0.10" /> - </bezel> - <bezel name="lamp15" element="light tower2"> + </element> + <element name="lamp15" ref="light tower2"> <bounds x="3.80" y="3.28" width="0.10" height="0.10" /> - </bezel> - <bezel name="lamp16" element="light tower3"> + </element> + <element name="lamp16" ref="light tower3"> <bounds x="3.70" y="3.38" width="0.10" height="0.10" /> - </bezel> - <bezel name="lamp17" element="light tower4"> + </element> + <element name="lamp17" ref="light tower4"> <bounds x="3.80" y="3.38" width="0.10" height="0.10" /> - </bezel> - <bezel name="lamp19" element="auditkey" inputtag="5002" inputmask="0x10"> + </element> + <element name="lamp19" ref="auditkey" inputtag="5002" inputmask="0x10"> <bounds x="0.26" y="3.09" width="0.31" height="0.12" /> - </bezel> - <bezel name="lamp20" element="jackpotkey" inputtag="5003" inputmask="0x04"> + </element> + <element name="lamp20" ref="jackpotkey" inputtag="5003" inputmask="0x04"> <bounds x="0.26" y="3.34" width="0.31" height="0.12" /> - </bezel> + </element> </view> </mamelayout> diff --git a/src/mame/layout/aristmk4.lay b/src/mame/layout/aristmk4.lay index 64af07c155c..7be29787288 100644 --- a/src/mame/layout/aristmk4.lay +++ b/src/mame/layout/aristmk4.lay @@ -268,66 +268,66 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="4" bottom="3" /> </screen> - <bezel name="lamp11" element="COLLECT" inputtag="500d" inputmask="0x04"> + <element name="lamp11" ref="COLLECT" inputtag="500d" inputmask="0x04"> <bounds x="0.67" y="3.02" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp6" element="BET1" inputtag="500e" inputmask="0x01"> + </element> + <element name="lamp6" ref="BET1" inputtag="500e" inputmask="0x01"> <bounds x="1.08" y="3.02" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp5" element="BET2" inputtag="500e" inputmask="0x04"> + </element> + <element name="lamp5" ref="BET2" inputtag="500e" inputmask="0x04"> <bounds x="1.49" y="3.02" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp8" element="BET3" inputtag="500e" inputmask="0x10"> + </element> + <element name="lamp8" ref="BET3" inputtag="500e" inputmask="0x10"> <bounds x="1.91" y="3.02" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp12" element="BET5" inputtag="500d" inputmask="0x01"> + </element> + <element name="lamp12" ref="BET5" inputtag="500d" inputmask="0x01"> <bounds x="2.31" y="3.02" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp7" element="BET10" inputtag="500d" inputmask="0x02"> + </element> + <element name="lamp7" ref="BET10" inputtag="500d" inputmask="0x02"> <bounds x="2.72" y="3.02" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp18" element="GAMBLE" inputtag="500d" inputmask="0x10"> + </element> + <element name="lamp18" ref="GAMBLE" inputtag="500d" inputmask="0x10"> <bounds x="3.13" y="3.02" width="0.31" height="0.24" /> - </bezel> + </element> - <bezel name="lamp10" element="RESERVE" inputtag="500d" inputmask="0x08"> + <element name="lamp10" ref="RESERVE" inputtag="500d" inputmask="0x08"> <bounds x="0.67" y="3.28" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp1" element="1LINE" inputtag="500e" inputmask="0x02"> + </element> + <element name="lamp1" ref="1LINE" inputtag="500e" inputmask="0x02"> <bounds x="1.08" y="3.28" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp2" element="3LINES" inputtag="500e" inputmask="0x80"> + </element> + <element name="lamp2" ref="3LINES" inputtag="500e" inputmask="0x80"> <bounds x="1.49" y="3.28" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp3" element="5LINES" inputtag="500e" inputmask="0x40"> + </element> + <element name="lamp3" ref="5LINES" inputtag="500e" inputmask="0x40"> <bounds x="1.91" y="3.28" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp9" element="7LINES" inputtag="500e" inputmask="0x20"> + </element> + <element name="lamp9" ref="7LINES" inputtag="500e" inputmask="0x20"> <bounds x="2.31" y="3.28" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp4" element="9LINES" inputtag="500e" inputmask="0x08"> + </element> + <element name="lamp4" ref="9LINES" inputtag="500e" inputmask="0x08"> <bounds x="2.72" y="3.28" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp13" element="TAKEWIN" inputtag="500d" inputmask="0x20"> + </element> + <element name="lamp13" ref="TAKEWIN" inputtag="500d" inputmask="0x20"> <bounds x="3.13" y="3.28" width="0.31" height="0.24" /> - </bezel> - <bezel name="lamp14" element="light tower1"> + </element> + <element name="lamp14" ref="light tower1"> <bounds x="3.70" y="3.28" width="0.10" height="0.10" /> - </bezel> - <bezel name="lamp15" element="light tower2"> + </element> + <element name="lamp15" ref="light tower2"> <bounds x="3.80" y="3.28" width="0.10" height="0.10" /> - </bezel> - <bezel name="lamp16" element="light tower3"> + </element> + <element name="lamp16" ref="light tower3"> <bounds x="3.70" y="3.38" width="0.10" height="0.10" /> - </bezel> - <bezel name="lamp17" element="light tower4"> + </element> + <element name="lamp17" ref="light tower4"> <bounds x="3.80" y="3.38" width="0.10" height="0.10" /> - </bezel> - <bezel name="lamp19" element="auditkey" inputtag="5002" inputmask="0x10"> + </element> + <element name="lamp19" ref="auditkey" inputtag="5002" inputmask="0x10"> <bounds x="0.26" y="3.09" width="0.31" height="0.12" /> - </bezel> - <bezel name="lamp20" element="jackpotkey" inputtag="5003" inputmask="0x04"> + </element> + <element name="lamp20" ref="jackpotkey" inputtag="5003" inputmask="0x04"> <bounds x="0.26" y="3.34" width="0.31" height="0.12" /> - </bezel> + </element> </view> </mamelayout> diff --git a/src/mame/layout/aristmk5.lay b/src/mame/layout/aristmk5.lay index f54b9ff4c5b..b504eddb77a 100644 --- a/src/mame/layout/aristmk5.lay +++ b/src/mame/layout/aristmk5.lay @@ -308,68 +308,62 @@ license:CC0 </screen> <!-- Button lamps --> - <bezel name="lamp8" element="COLLECT" inputtag="P1" inputmask="0x100"> + <element name="lamp8" ref="COLLECT" inputtag="P1" inputmask="0x100"> <bounds x="0.27" y="3.02" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp9" element="BET1" inputtag="P1" inputmask="0x200"> + </element> + <element name="lamp9" ref="BET1" inputtag="P1" inputmask="0x200"> <bounds x="0.68" y="3.02" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp10" element="BET2" inputtag="P1" inputmask="0x400"> + </element> + <element name="lamp10" ref="BET2" inputtag="P1" inputmask="0x400"> <bounds x="1.09" y="3.02" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp11" element="BET3" inputtag="P1" inputmask="0x800"> + </element> + <element name="lamp11" ref="BET3" inputtag="P1" inputmask="0x800"> <bounds x="1.51" y="3.02" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp12" element="BET5" inputtag="P1" inputmask="0x1000"> + </element> + <element name="lamp12" ref="BET5" inputtag="P1" inputmask="0x1000"> <bounds x="1.91" y="3.02" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp13" element="BET10" inputtag="P1" inputmask="0x2000"> + </element> + <element name="lamp13" ref="BET10" inputtag="P1" inputmask="0x2000"> <bounds x="2.32" y="3.02" width="0.3" height="0.3" /> - </bezel> + </element> - <bezel name="lamp7" element="RESERVE" inputtag="P1" inputmask="0x80"> + <element name="lamp7" ref="RESERVE" inputtag="P1" inputmask="0x80"> <bounds x="0.27" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp6" element="1LINE" inputtag="P1" inputmask="0x40"> + </element> + <element name="lamp6" ref="1LINE" inputtag="P1" inputmask="0x40"> <bounds x="0.68" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp5" element="5LINES" inputtag="P1" inputmask="0x20"> + </element> + <element name="lamp5" ref="5LINES" inputtag="P1" inputmask="0x20"> <bounds x="1.09" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp4" element="10LINES" inputtag="P1" inputmask="0x10"> + </element> + <element name="lamp4" ref="10LINES" inputtag="P1" inputmask="0x10"> <bounds x="1.51" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp3" element="15LINES" inputtag="P1" inputmask="0x08"> + </element> + <element name="lamp3" ref="15LINES" inputtag="P1" inputmask="0x08"> <bounds x="1.91" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp2" element="20LINES" inputtag="P1" inputmask="0x04"> + </element> + <element name="lamp2" ref="20LINES" inputtag="P1" inputmask="0x04"> <bounds x="2.32" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp0" element="GAMBLE" inputtag="P1" inputmask="0x01"> + </element> + <element name="lamp0" ref="GAMBLE" inputtag="P1" inputmask="0x01"> <bounds x="2.73" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp1" element="TAKE_WIN" inputtag="P1" inputmask="0x02"> + </element> + <element name="lamp1" ref="TAKE_WIN" inputtag="P1" inputmask="0x02"> <bounds x="3.14" y="3.43" width="0.3" height="0.3" /> - </bezel> + </element> <!-- Tower lamps --> - <bezel name="lamp32" element="REDLAMP"> + <element name="lamp32" ref="REDLAMP"> <bounds x="3.58" y="3.31" width="0.10" height="0.10" /> - </bezel> - <bezel name="lamp33" element="REDLAMP"> + </element> + <element name="lamp33" ref="REDLAMP"> <bounds x="3.58" y="3.43" width="0.10" height="0.10" /> - </bezel> - <bezel name="lamp34" element="REDLAMP"> + </element> + <element name="lamp34" ref="REDLAMP"> <bounds x="3.68" y="3.31" width="0.10" height="0.10" /> - </bezel> - <bezel name="lamp35" element="REDLAMP"> + </element> + <element name="lamp35" ref="REDLAMP"> <bounds x="3.68" y="3.43" width="0.10" height="0.10" /> - </bezel> - </view> - - <view name="Screen"> - <screen index="0"> - <bounds left="0" top="0" right="4" bottom="3" /> - </screen> + </element> </view> </mamelayout> diff --git a/src/mame/layout/aristmk5_us.lay b/src/mame/layout/aristmk5_us.lay index 23f42e5ab58..796f83ddbc8 100644 --- a/src/mame/layout/aristmk5_us.lay +++ b/src/mame/layout/aristmk5_us.lay @@ -306,62 +306,56 @@ license:CC0 </screen> <!-- Button lamps --> - <bezel name="lamp8" element="CASHOUT" inputtag="P2" inputmask="0x01"> + <element name="lamp8" ref="CASHOUT" inputtag="P2" inputmask="0x01"> <bounds x="0.27" y="3.02" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp9" element="1LINE" inputtag="P2" inputmask="0x02"> + </element> + <element name="lamp9" ref="1LINE" inputtag="P2" inputmask="0x02"> <bounds x="0.68" y="3.02" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp10" element="3LINES" inputtag="P2" inputmask="0x04"> + </element> + <element name="lamp10" ref="3LINES" inputtag="P2" inputmask="0x04"> <bounds x="1.09" y="3.02" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp11" element="5LINES" inputtag="P2" inputmask="0x08"> + </element> + <element name="lamp11" ref="5LINES" inputtag="P2" inputmask="0x08"> <bounds x="1.51" y="3.02" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp12" element="7LINES" inputtag="P2" inputmask="0x10"> + </element> + <element name="lamp12" ref="7LINES" inputtag="P2" inputmask="0x10"> <bounds x="1.91" y="3.02" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp13" element="9LINES" inputtag="P2" inputmask="0x20"> + </element> + <element name="lamp13" ref="9LINES" inputtag="P2" inputmask="0x20"> <bounds x="2.32" y="3.02" width="0.3" height="0.3" /> - </bezel> + </element> - <bezel name="lamp7" element="SERVICE" inputtag="P1" inputmask="0x80"> + <element name="lamp7" ref="SERVICE" inputtag="P1" inputmask="0x80"> <bounds x="0.27" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp6" element="BET1R" inputtag="P1" inputmask="0x40"> + </element> + <element name="lamp6" ref="BET1R" inputtag="P1" inputmask="0x40"> <bounds x="0.68" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp5" element="BET2" inputtag="P1" inputmask="0x20"> + </element> + <element name="lamp5" ref="BET2" inputtag="P1" inputmask="0x20"> <bounds x="1.09" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp4" element="BET3" inputtag="P1" inputmask="0x10"> + </element> + <element name="lamp4" ref="BET3" inputtag="P1" inputmask="0x10"> <bounds x="1.51" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp3" element="BET5" inputtag="P1" inputmask="0x08"> + </element> + <element name="lamp3" ref="BET5" inputtag="P1" inputmask="0x08"> <bounds x="1.91" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp2" element="BET10B" inputtag="P1" inputmask="0x04"> + </element> + <element name="lamp2" ref="BET10B" inputtag="P1" inputmask="0x04"> <bounds x="2.32" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp0" element="GAMBLE" inputtag="P1" inputmask="0x01"> + </element> + <element name="lamp0" ref="GAMBLE" inputtag="P1" inputmask="0x01"> <bounds x="2.73" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp1" element="TAKE_WIN" inputtag="P1" inputmask="0x02"> + </element> + <element name="lamp1" ref="TAKE_WIN" inputtag="P1" inputmask="0x02"> <bounds x="3.14" y="3.43" width="0.3" height="0.3" /> - </bezel> + </element> <!-- Tower lamps --> - <bezel name="lamp17" element="WHITELAMP"> + <element name="lamp17" ref="WHITELAMP"> <bounds x="3.68" y="3.31" width="0.10" height="0.10" /> - </bezel> - <bezel name="lamp16" element="REDLAMP"> + </element> + <element name="lamp16" ref="REDLAMP"> <bounds x="3.68" y="3.43" width="0.10" height="0.10" /> - </bezel> - </view> - - <view name="Screen"> - <screen index="0"> - <bounds left="0" top="0" right="4" bottom="3" /> - </screen> + </element> </view> </mamelayout> diff --git a/src/mame/layout/aristmk5_us_200.lay b/src/mame/layout/aristmk5_us_200.lay index 47f22d9bf15..d4bbac76274 100644 --- a/src/mame/layout/aristmk5_us_200.lay +++ b/src/mame/layout/aristmk5_us_200.lay @@ -306,62 +306,56 @@ license:CC0 </screen> <!-- Button lamps --> - <bezel name="lamp8" element="CASHOUT" inputtag="P2" inputmask="0x01"> + <element name="lamp8" ref="CASHOUT" inputtag="P2" inputmask="0x01"> <bounds x="0.27" y="3.02" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp9" element="1LINE" inputtag="P2" inputmask="0x02"> + </element> + <element name="lamp9" ref="1LINE" inputtag="P2" inputmask="0x02"> <bounds x="0.68" y="3.02" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp10" element="5LINES" inputtag="P2" inputmask="0x04"> + </element> + <element name="lamp10" ref="5LINES" inputtag="P2" inputmask="0x04"> <bounds x="1.09" y="3.02" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp11" element="10LINES" inputtag="P2" inputmask="0x08"> + </element> + <element name="lamp11" ref="10LINES" inputtag="P2" inputmask="0x08"> <bounds x="1.51" y="3.02" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp12" element="15LINES" inputtag="P2" inputmask="0x10"> + </element> + <element name="lamp12" ref="15LINES" inputtag="P2" inputmask="0x10"> <bounds x="1.91" y="3.02" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp13" element="20LINES" inputtag="P2" inputmask="0x20"> + </element> + <element name="lamp13" ref="20LINES" inputtag="P2" inputmask="0x20"> <bounds x="2.32" y="3.02" width="0.3" height="0.3" /> - </bezel> + </element> - <bezel name="lamp7" element="SERVICE" inputtag="P1" inputmask="0x80"> + <element name="lamp7" ref="SERVICE" inputtag="P1" inputmask="0x80"> <bounds x="0.27" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp6" element="BET1R" inputtag="P1" inputmask="0x40"> + </element> + <element name="lamp6" ref="BET1R" inputtag="P1" inputmask="0x40"> <bounds x="0.68" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp5" element="BET2" inputtag="P1" inputmask="0x20"> + </element> + <element name="lamp5" ref="BET2" inputtag="P1" inputmask="0x20"> <bounds x="1.09" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp4" element="BET3" inputtag="P1" inputmask="0x10"> + </element> + <element name="lamp4" ref="BET3" inputtag="P1" inputmask="0x10"> <bounds x="1.51" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp3" element="BET5" inputtag="P1" inputmask="0x08"> + </element> + <element name="lamp3" ref="BET5" inputtag="P1" inputmask="0x08"> <bounds x="1.91" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp2" element="BET10B" inputtag="P1" inputmask="0x04"> + </element> + <element name="lamp2" ref="BET10B" inputtag="P1" inputmask="0x04"> <bounds x="2.32" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp0" element="GAMBLE" inputtag="P1" inputmask="0x01"> + </element> + <element name="lamp0" ref="GAMBLE" inputtag="P1" inputmask="0x01"> <bounds x="2.73" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp1" element="TAKE_WIN" inputtag="P1" inputmask="0x02"> + </element> + <element name="lamp1" ref="TAKE_WIN" inputtag="P1" inputmask="0x02"> <bounds x="3.14" y="3.43" width="0.3" height="0.3" /> - </bezel> + </element> <!-- Tower lamps --> - <bezel name="lamp17" element="WHITELAMP"> + <element name="lamp17" ref="WHITELAMP"> <bounds x="3.68" y="3.31" width="0.10" height="0.10" /> - </bezel> - <bezel name="lamp16" element="REDLAMP"> + </element> + <element name="lamp16" ref="REDLAMP"> <bounds x="3.68" y="3.43" width="0.10" height="0.10" /> - </bezel> - </view> - - <view name="Screen"> - <screen index="0"> - <bounds left="0" top="0" right="4" bottom="3" /> - </screen> + </element> </view> </mamelayout> diff --git a/src/mame/layout/atarifb.lay b/src/mame/layout/atarifb.lay index 967fb8fac56..5b603d5292c 100644 --- a/src/mame/layout/atarifb.lay +++ b/src/mame/layout/atarifb.lay @@ -50,29 +50,29 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="4" bottom="3" /> </screen> - <bezel name="0.0" element="sweep"> + <element name="0.0" ref="sweep"> <bounds x="0" y="-0.2" width="2" height="0.2" /> - </bezel> - <bezel name="0.1" element="keeper"> + </element> + <element name="0.1" ref="keeper"> <bounds x="0" y="-0.2" width="2" height="0.2" /> - </bezel> - <bezel name="0.2" element="bomb"> + </element> + <element name="0.2" ref="bomb"> <bounds x="0" y="-0.2" width="2" height="0.2" /> - </bezel> - <bezel name="0.3" element="down"> + </element> + <element name="0.3" ref="down"> <bounds x="0" y="-0.2" width="2" height="0.2" /> - </bezel> - <bezel name="2.0" element="sweep"> + </element> + <element name="2.0" ref="sweep"> <bounds x="2" y="-0.2" width="2" height="0.2" /> - </bezel> - <bezel name="2.1" element="keeper"> + </element> + <element name="2.1" ref="keeper"> <bounds x="2" y="-0.2" width="2" height="0.2" /> - </bezel> - <bezel name="2.2" element="bomb"> + </element> + <element name="2.2" ref="bomb"> <bounds x="2" y="-0.2" width="2" height="0.2" /> - </bezel> - <bezel name="2.3" element="down"> + </element> + <element name="2.3" ref="down"> <bounds x="2" y="-0.2" width="2" height="0.2" /> - </bezel> + </element> </view> </mamelayout> diff --git a/src/mame/layout/atarifb4.lay b/src/mame/layout/atarifb4.lay index f2e9df0f138..0ef8a3657e3 100644 --- a/src/mame/layout/atarifb4.lay +++ b/src/mame/layout/atarifb4.lay @@ -60,35 +60,35 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="4" bottom="3" /> </screen> - <bezel name="0.0" element="out"> + <element name="0.0" ref="out"> <bounds x="0" y="-0.2" width="2" height="0.2" /> - </bezel> - <bezel name="0.1" element="in"> + </element> + <element name="0.1" ref="in"> <bounds x="0" y="-0.2" width="2" height="0.2" /> - </bezel> - <bezel name="0.2" element="bomb"> + </element> + <element name="0.2" ref="bomb"> <bounds x="0" y="-0.2" width="2" height="0.2" /> - </bezel> - <bezel name="0.3" element="down"> + </element> + <element name="0.3" ref="down"> <bounds x="0" y="-0.2" width="2" height="0.2" /> - </bezel> - <bezel name="1.0" element="kick"> + </element> + <element name="1.0" ref="kick"> <bounds x="0" y="-0.2" width="2" height="0.2" /> - </bezel> - <bezel name="2.0" element="out"> + </element> + <element name="2.0" ref="out"> <bounds x="2" y="-0.2" width="2" height="0.2" /> - </bezel> - <bezel name="2.1" element="in"> + </element> + <element name="2.1" ref="in"> <bounds x="2" y="-0.2" width="2" height="0.2" /> - </bezel> - <bezel name="2.2" element="bomb"> + </element> + <element name="2.2" ref="bomb"> <bounds x="2" y="-0.2" width="2" height="0.2" /> - </bezel> - <bezel name="2.3" element="down"> + </element> + <element name="2.3" ref="down"> <bounds x="2" y="-0.2" width="2" height="0.2" /> - </bezel> - <bezel name="1.2" element="kick"> + </element> + <element name="1.2" ref="kick"> <bounds x="2" y="-0.2" width="2" height="0.2" /> - </bezel> + </element> </view> </mamelayout> diff --git a/src/mame/layout/baddog.lay b/src/mame/layout/baddog.lay index 5f79543ccf5..af23fbc612e 100644 --- a/src/mame/layout/baddog.lay +++ b/src/mame/layout/baddog.lay @@ -466,57 +466,57 @@ license:CC0 </screen> <!-- Button lamps --> - <bezel name="lamp8" element="COLLECT" inputtag="P1" inputmask="0x100"> + <element name="lamp8" ref="COLLECT" inputtag="P1" inputmask="0x100"> <bounds x="0.27" y="3.02" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp9" element="B1H1" inputtag="P1" inputmask="0x200"> + </element> + <element name="lamp9" ref="B1H1" inputtag="P1" inputmask="0x200"> <bounds x="0.68" y="3.02" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp10" element="B2H2" inputtag="P1" inputmask="0x400"> + </element> + <element name="lamp10" ref="B2H2" inputtag="P1" inputmask="0x400"> <bounds x="1.09" y="3.02" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp11" element="B5H3" inputtag="P1" inputmask="0x800"> + </element> + <element name="lamp11" ref="B5H3" inputtag="P1" inputmask="0x800"> <bounds x="1.51" y="3.02" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp12" element="B10H4" inputtag="P1" inputmask="0x1000"> + </element> + <element name="lamp12" ref="B10H4" inputtag="P1" inputmask="0x1000"> <bounds x="1.91" y="3.02" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp13" element="HIGH10" inputtag="P1" inputmask="0x2000"> + </element> + <element name="lamp13" ref="HIGH10" inputtag="P1" inputmask="0x2000"> <bounds x="2.32" y="3.02" width="0.3" height="0.3" /> - </bezel> + </element> - <bezel name="lamp7" element="RESERVE" inputtag="P1" inputmask="0x80"> + <element name="lamp7" ref="RESERVE" inputtag="P1" inputmask="0x80"> <bounds x="0.27" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp6" element="RED" inputtag="P1" inputmask="0x40"> + </element> + <element name="lamp6" ref="RED" inputtag="P1" inputmask="0x40"> <bounds x="0.68" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp5" element="GAMBLE" inputtag="P1" inputmask="0x20"> + </element> + <element name="lamp5" ref="GAMBLE" inputtag="P1" inputmask="0x20"> <bounds x="1.09" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp4" element="TAKE_WIN" inputtag="P1" inputmask="0x10"> + </element> + <element name="lamp4" ref="TAKE_WIN" inputtag="P1" inputmask="0x10"> <bounds x="1.51" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp3" element="BLACK" inputtag="P1" inputmask="0x08"> + </element> + <element name="lamp3" ref="BLACK" inputtag="P1" inputmask="0x08"> <bounds x="1.91" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp2" element="DRAW" inputtag="P1" inputmask="0x04"> + </element> + <element name="lamp2" ref="DRAW" inputtag="P1" inputmask="0x04"> <bounds x="2.32" y="3.43" width="0.3" height="0.3" /> - </bezel> + </element> <!-- Tower lamps --> - <bezel name="lamp32" element="REDLAMP"> + <element name="lamp32" ref="REDLAMP"> <bounds x="3.58" y="3.31" width="0.10" height="0.10" /> - </bezel> - <bezel name="lamp33" element="REDLAMP"> + </element> + <element name="lamp33" ref="REDLAMP"> <bounds x="3.58" y="3.43" width="0.10" height="0.10" /> - </bezel> - <bezel name="lamp34" element="REDLAMP"> + </element> + <element name="lamp34" ref="REDLAMP"> <bounds x="3.68" y="3.31" width="0.10" height="0.10" /> - </bezel> - <bezel name="lamp35" element="REDLAMP"> + </element> + <element name="lamp35" ref="REDLAMP"> <bounds x="3.68" y="3.43" width="0.10" height="0.10" /> - </bezel> + </element> </view> <view name="Button Lamps - 50 Credits"> @@ -525,57 +525,57 @@ license:CC0 </screen> <!-- Button lamps --> - <bezel name="lamp8" element="COLLECT" inputtag="P1" inputmask="0x100"> + <element name="lamp8" ref="COLLECT" inputtag="P1" inputmask="0x100"> <bounds x="0.27" y="3.02" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp9" element="B1H1" inputtag="P1" inputmask="0x200"> + </element> + <element name="lamp9" ref="B1H1" inputtag="P1" inputmask="0x200"> <bounds x="0.68" y="3.02" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp10" element="B5H2" inputtag="P1" inputmask="0x400"> + </element> + <element name="lamp10" ref="B5H2" inputtag="P1" inputmask="0x400"> <bounds x="1.09" y="3.02" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp11" element="B25H3" inputtag="P1" inputmask="0x800"> + </element> + <element name="lamp11" ref="B25H3" inputtag="P1" inputmask="0x800"> <bounds x="1.51" y="3.02" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp12" element="B50H4" inputtag="P1" inputmask="0x1000"> + </element> + <element name="lamp12" ref="B50H4" inputtag="P1" inputmask="0x1000"> <bounds x="1.91" y="3.02" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp13" element="HIGH50" inputtag="P1" inputmask="0x2000"> + </element> + <element name="lamp13" ref="HIGH50" inputtag="P1" inputmask="0x2000"> <bounds x="2.32" y="3.02" width="0.3" height="0.3" /> - </bezel> + </element> - <bezel name="lamp7" element="RESERVE" inputtag="P1" inputmask="0x80"> + <element name="lamp7" ref="RESERVE" inputtag="P1" inputmask="0x80"> <bounds x="0.27" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp6" element="RED" inputtag="P1" inputmask="0x40"> + </element> + <element name="lamp6" ref="RED" inputtag="P1" inputmask="0x40"> <bounds x="0.68" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp5" element="GAMBLE" inputtag="P1" inputmask="0x20"> + </element> + <element name="lamp5" ref="GAMBLE" inputtag="P1" inputmask="0x20"> <bounds x="1.09" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp4" element="TAKE_WIN" inputtag="P1" inputmask="0x10"> + </element> + <element name="lamp4" ref="TAKE_WIN" inputtag="P1" inputmask="0x10"> <bounds x="1.51" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp3" element="BLACK" inputtag="P1" inputmask="0x08"> + </element> + <element name="lamp3" ref="BLACK" inputtag="P1" inputmask="0x08"> <bounds x="1.91" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp2" element="DRAW" inputtag="P1" inputmask="0x04"> + </element> + <element name="lamp2" ref="DRAW" inputtag="P1" inputmask="0x04"> <bounds x="2.32" y="3.43" width="0.3" height="0.3" /> - </bezel> + </element> <!-- Tower lamps --> - <bezel name="lamp32" element="REDLAMP"> + <element name="lamp32" ref="REDLAMP"> <bounds x="3.58" y="3.31" width="0.10" height="0.10" /> - </bezel> - <bezel name="lamp33" element="REDLAMP"> + </element> + <element name="lamp33" ref="REDLAMP"> <bounds x="3.58" y="3.43" width="0.10" height="0.10" /> - </bezel> - <bezel name="lamp34" element="REDLAMP"> + </element> + <element name="lamp34" ref="REDLAMP"> <bounds x="3.68" y="3.31" width="0.10" height="0.10" /> - </bezel> - <bezel name="lamp35" element="REDLAMP"> + </element> + <element name="lamp35" ref="REDLAMP"> <bounds x="3.68" y="3.43" width="0.10" height="0.10" /> - </bezel> + </element> </view> <view name="Button Lamps - 200 Credits"> @@ -584,62 +584,56 @@ license:CC0 </screen> <!-- Button lamps --> - <bezel name="lamp8" element="COLLECT" inputtag="P1" inputmask="0x100"> + <element name="lamp8" ref="COLLECT" inputtag="P1" inputmask="0x100"> <bounds x="0.27" y="3.02" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp9" element="B1H1" inputtag="P1" inputmask="0x200"> + </element> + <element name="lamp9" ref="B1H1" inputtag="P1" inputmask="0x200"> <bounds x="0.68" y="3.02" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp10" element="B50H2" inputtag="P1" inputmask="0x400"> + </element> + <element name="lamp10" ref="B50H2" inputtag="P1" inputmask="0x400"> <bounds x="1.09" y="3.02" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp11" element="B100H3" inputtag="P1" inputmask="0x800"> + </element> + <element name="lamp11" ref="B100H3" inputtag="P1" inputmask="0x800"> <bounds x="1.51" y="3.02" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp12" element="B200H4" inputtag="P1" inputmask="0x1000"> + </element> + <element name="lamp12" ref="B200H4" inputtag="P1" inputmask="0x1000"> <bounds x="1.91" y="3.02" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp13" element="HIGH200" inputtag="P1" inputmask="0x2000"> + </element> + <element name="lamp13" ref="HIGH200" inputtag="P1" inputmask="0x2000"> <bounds x="2.32" y="3.02" width="0.3" height="0.3" /> - </bezel> + </element> - <bezel name="lamp7" element="RESERVE" inputtag="P1" inputmask="0x80"> + <element name="lamp7" ref="RESERVE" inputtag="P1" inputmask="0x80"> <bounds x="0.27" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp6" element="RED" inputtag="P1" inputmask="0x40"> + </element> + <element name="lamp6" ref="RED" inputtag="P1" inputmask="0x40"> <bounds x="0.68" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp5" element="GAMBLE" inputtag="P1" inputmask="0x20"> + </element> + <element name="lamp5" ref="GAMBLE" inputtag="P1" inputmask="0x20"> <bounds x="1.09" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp4" element="TAKE_WIN" inputtag="P1" inputmask="0x10"> + </element> + <element name="lamp4" ref="TAKE_WIN" inputtag="P1" inputmask="0x10"> <bounds x="1.51" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp3" element="BLACK" inputtag="P1" inputmask="0x08"> + </element> + <element name="lamp3" ref="BLACK" inputtag="P1" inputmask="0x08"> <bounds x="1.91" y="3.43" width="0.3" height="0.3" /> - </bezel> - <bezel name="lamp2" element="DRAW" inputtag="P1" inputmask="0x04"> + </element> + <element name="lamp2" ref="DRAW" inputtag="P1" inputmask="0x04"> <bounds x="2.32" y="3.43" width="0.3" height="0.3" /> - </bezel> + </element> <!-- Tower lamps --> - <bezel name="lamp32" element="REDLAMP"> + <element name="lamp32" ref="REDLAMP"> <bounds x="3.58" y="3.31" width="0.10" height="0.10" /> - </bezel> - <bezel name="lamp33" element="REDLAMP"> + </element> + <element name="lamp33" ref="REDLAMP"> <bounds x="3.58" y="3.43" width="0.10" height="0.10" /> - </bezel> - <bezel name="lamp34" element="REDLAMP"> + </element> + <element name="lamp34" ref="REDLAMP"> <bounds x="3.68" y="3.31" width="0.10" height="0.10" /> - </bezel> - <bezel name="lamp35" element="REDLAMP"> + </element> + <element name="lamp35" ref="REDLAMP"> <bounds x="3.68" y="3.43" width="0.10" height="0.10" /> - </bezel> - </view> - - <view name="Screen"> - <screen index="0"> - <bounds left="0" top="0" right="4" bottom="3" /> - </screen> + </element> </view> </mamelayout> diff --git a/src/mame/layout/bingo.lay b/src/mame/layout/bingo.lay index 42f469a309f..e1f91f2d8d6 100644 --- a/src/mame/layout/bingo.lay +++ b/src/mame/layout/bingo.lay @@ -69,20 +69,20 @@ license:CC0 <bounds left="0" top="0" right="4" bottom="3" /> </screen> - <bezel name="lamp6" element="changecard"> + <element name="lamp6" ref="changecard"> <bounds x="0.82" y="3.13" width="0.72" height="0.24" /> - </bezel> + </element> - <bezel name="lamp4" element="start"> + <element name="lamp4" ref="start"> <bounds x="1.64" y="3.13" width="0.72" height="0.24" /> - </bezel> + </element> - <bezel name="lamp5" element="changegame"> + <element name="lamp5" ref="changegame"> <bounds x="2.46" y="3.13" width="0.72" height="0.24" /> - </bezel> + </element> - <bezel name="lamp3" element="ante"> + <element name="lamp3" ref="ante"> <bounds x="3.38" y="3.13" width="0.52" height="0.24" /> - </bezel> + </element> </view> </mamelayout> diff --git a/src/mame/layout/bingowng.lay b/src/mame/layout/bingowng.lay index b2f708927af..b3c874e66ca 100644 --- a/src/mame/layout/bingowng.lay +++ b/src/mame/layout/bingowng.lay @@ -95,189 +95,189 @@ license:CC0 <view name="Button Lamps"> <screen index="0"><bounds left="0" top="0" right="4" bottom="3" /></screen> - <bezel element="cpanel"><bounds left="0" right="4" top="3" bottom="3.80" /></bezel> + <element ref="cpanel"><bounds left="0" right="4" top="3" bottom="3.80" /></element> - <bezel element="cpanel1"><bounds left="0" right="4" top="3.01" bottom="3.39" /></bezel> - <bezel element="cpanel2"><bounds left="0" right="4" top="3.02" bottom="3.38" /></bezel> - <bezel element="cpanel3"><bounds left="0" right="4" top="3.03" bottom="3.37" /></bezel> - <bezel element="cpanel4"><bounds left="0" right="4" top="3.04" bottom="3.36" /></bezel> - <bezel element="cpanel"><bounds left="0" right="4" top="3.05" bottom="3.35" /></bezel> + <element ref="cpanel1"><bounds left="0" right="4" top="3.01" bottom="3.39" /></element> + <element ref="cpanel2"><bounds left="0" right="4" top="3.02" bottom="3.38" /></element> + <element ref="cpanel3"><bounds left="0" right="4" top="3.03" bottom="3.37" /></element> + <element ref="cpanel4"><bounds left="0" right="4" top="3.04" bottom="3.36" /></element> + <element ref="cpanel"><bounds left="0" right="4" top="3.05" bottom="3.35" /></element> - <bezel element="cpanel1"><bounds left="0" right="4" top="3.41" bottom="3.79" /></bezel> - <bezel element="cpanel2"><bounds left="0" right="4" top="3.42" bottom="3.78" /></bezel> - <bezel element="cpanel3"><bounds left="0" right="4" top="3.43" bottom="3.77" /></bezel> - <bezel element="cpanel4"><bounds left="0" right="4" top="3.44" bottom="3.76" /></bezel> - <bezel element="cpanel"><bounds left="0" right="4" top="3.45" bottom="3.75" /></bezel> + <element ref="cpanel1"><bounds left="0" right="4" top="3.41" bottom="3.79" /></element> + <element ref="cpanel2"><bounds left="0" right="4" top="3.42" bottom="3.78" /></element> + <element ref="cpanel3"><bounds left="0" right="4" top="3.43" bottom="3.77" /></element> + <element ref="cpanel4"><bounds left="0" right="4" top="3.44" bottom="3.76" /></element> + <element ref="cpanel"><bounds left="0" right="4" top="3.45" bottom="3.75" /></element> - <bezel name="lamp3" element="Bet_B" inputtag="IN0" inputmask="0x20"> + <element name="lamp3" ref="Bet_B" inputtag="IN0" inputmask="0x20"> <bounds x="0.05" y="3.08" width="0.50" height="0.24" /> - </bezel> - <bezel name="lamp3" element="Bet" inputtag="IN0" inputmask="0x20"> + </element> + <element name="lamp3" ref="Bet" inputtag="IN0" inputmask="0x20"> <bounds x="0.07" y="3.10" width="0.46" height="0.20" /> - </bezel> + </element> - <bezel name="lamp5" element="Start_B" inputtag="IN0" inputmask="0x80"> + <element name="lamp5" ref="Start_B" inputtag="IN0" inputmask="0x80"> <bounds x="0.90" y="3.08" width="0.50" height="0.24" /> - </bezel> - <bezel name="lamp5" element="Start" inputtag="IN0" inputmask="0x80"> + </element> + <element name="lamp5" ref="Start" inputtag="IN0" inputmask="0x80"> <bounds x="0.92" y="3.10" width="0.46" height="0.20" /> - </bezel> + </element> - <bezel name="lamp1" element="Dup_B" inputtag="IN0" inputmask="0x08"> + <element name="lamp1" ref="Dup_B" inputtag="IN0" inputmask="0x08"> <bounds x="1.75" y="3.08" width="0.50" height="0.24" /> - </bezel> - <bezel name="lamp1" element="Dup" inputtag="IN0" inputmask="0x08"> + </element> + <element name="lamp1" ref="Dup" inputtag="IN0" inputmask="0x08"> <bounds x="1.77" y="3.10" width="0.46" height="0.20" /> - </bezel> + </element> - <bezel name="lamp2" element="Dup_B" inputtag="IN0" inputmask="0x10"> + <element name="lamp2" ref="Dup_B" inputtag="IN0" inputmask="0x10"> <bounds x="2.40" y="3.08" width="0.50" height="0.24" /> - </bezel> - <bezel name="lamp2" element="Take" inputtag="IN0" inputmask="0x10"> + </element> + <element name="lamp2" ref="Take" inputtag="IN0" inputmask="0x10"> <bounds x="2.42" y="3.10" width="0.46" height="0.20" /> - </bezel> + </element> - <bezel name="lamp4" element="Info_B" inputtag="IN0" inputmask="0x40"> + <element name="lamp4" ref="Info_B" inputtag="IN0" inputmask="0x40"> <bounds x="3.45" y="3.08" width="0.50" height="0.24" /> - </bezel> - <bezel name="lamp4" element="Info" inputtag="IN0" inputmask="0x40"> + </element> + <element name="lamp4" ref="Info" inputtag="IN0" inputmask="0x40"> <bounds x="3.47" y="3.10" width="0.46" height="0.20" /> - </bezel> + </element> - <bezel name="lamp11" element="Bet_B" inputtag="IN1" inputmask="0x20"> + <element name="lamp11" ref="Bet_B" inputtag="IN1" inputmask="0x20"> <bounds x="0.05" y="3.48" width="0.50" height="0.24" /> - </bezel> - <bezel name="lamp11" element="Bet" inputtag="IN1" inputmask="0x20"> + </element> + <element name="lamp11" ref="Bet" inputtag="IN1" inputmask="0x20"> <bounds x="0.07" y="3.50" width="0.46" height="0.20" /> - </bezel> + </element> - <bezel name="lamp13" element="Start_B" inputtag="IN1" inputmask="0x80"> + <element name="lamp13" ref="Start_B" inputtag="IN1" inputmask="0x80"> <bounds x="0.90" y="3.48" width="0.50" height="0.24" /> - </bezel> - <bezel name="lamp13" element="Start" inputtag="IN1" inputmask="0x80"> + </element> + <element name="lamp13" ref="Start" inputtag="IN1" inputmask="0x80"> <bounds x="0.92" y="3.50" width="0.46" height="0.20" /> - </bezel> + </element> - <bezel name="lamp9" element="Dup_B" inputtag="IN1" inputmask="0x08"> + <element name="lamp9" ref="Dup_B" inputtag="IN1" inputmask="0x08"> <bounds x="1.75" y="3.48" width="0.50" height="0.24" /> - </bezel> - <bezel name="lamp9" element="Dup" inputtag="IN1" inputmask="0x08"> + </element> + <element name="lamp9" ref="Dup" inputtag="IN1" inputmask="0x08"> <bounds x="1.77" y="3.50" width="0.46" height="0.20" /> - </bezel> + </element> - <bezel name="lamp10" element="Dup_B" inputtag="IN1" inputmask="0x10"> + <element name="lamp10" ref="Dup_B" inputtag="IN1" inputmask="0x10"> <bounds x="2.40" y="3.48" width="0.50" height="0.24" /> - </bezel> - <bezel name="lamp10" element="Take" inputtag="IN1" inputmask="0x10"> + </element> + <element name="lamp10" ref="Take" inputtag="IN1" inputmask="0x10"> <bounds x="2.42" y="3.50" width="0.46" height="0.20" /> - </bezel> + </element> - <bezel name="lamp12" element="Info_B" inputtag="IN1" inputmask="0x40"> + <element name="lamp12" ref="Info_B" inputtag="IN1" inputmask="0x40"> <bounds x="3.45" y="3.48" width="0.50" height="0.24" /> - </bezel> - <bezel name="lamp12" element="Info" inputtag="IN1" inputmask="0x40"> + </element> + <element name="lamp12" ref="Info" inputtag="IN1" inputmask="0x40"> <bounds x="3.47" y="3.50" width="0.46" height="0.20" /> - </bezel> + </element> </view> <view name="P1 Button Lamps"> <screen index="0"><bounds left="0" top="0" right="4" bottom="3" /></screen> - <bezel element="cpanel"><bounds left="0" right="4" top="3" bottom="3.40" /></bezel> + <element ref="cpanel"><bounds left="0" right="4" top="3" bottom="3.40" /></element> - <bezel element="cpanel1"><bounds left="0" right="4" top="3.01" bottom="3.39" /></bezel> - <bezel element="cpanel2"><bounds left="0" right="4" top="3.02" bottom="3.38" /></bezel> - <bezel element="cpanel3"><bounds left="0" right="4" top="3.03" bottom="3.37" /></bezel> - <bezel element="cpanel4"><bounds left="0" right="4" top="3.04" bottom="3.36" /></bezel> - <bezel element="cpanel"><bounds left="0" right="4" top="3.05" bottom="3.35" /></bezel> + <element ref="cpanel1"><bounds left="0" right="4" top="3.01" bottom="3.39" /></element> + <element ref="cpanel2"><bounds left="0" right="4" top="3.02" bottom="3.38" /></element> + <element ref="cpanel3"><bounds left="0" right="4" top="3.03" bottom="3.37" /></element> + <element ref="cpanel4"><bounds left="0" right="4" top="3.04" bottom="3.36" /></element> + <element ref="cpanel"><bounds left="0" right="4" top="3.05" bottom="3.35" /></element> - <bezel name="lamp3" element="Bet_B" inputtag="IN0" inputmask="0x20"> + <element name="lamp3" ref="Bet_B" inputtag="IN0" inputmask="0x20"> <bounds x="0.05" y="3.08" width="0.50" height="0.24" /> - </bezel> - <bezel name="lamp3" element="Bet" inputtag="IN0" inputmask="0x20"> + </element> + <element name="lamp3" ref="Bet" inputtag="IN0" inputmask="0x20"> <bounds x="0.07" y="3.10" width="0.46" height="0.20" /> - </bezel> + </element> - <bezel name="lamp5" element="Start_B" inputtag="IN0" inputmask="0x80"> + <element name="lamp5" ref="Start_B" inputtag="IN0" inputmask="0x80"> <bounds x="0.90" y="3.08" width="0.50" height="0.24" /> - </bezel> - <bezel name="lamp5" element="Start" inputtag="IN0" inputmask="0x80"> + </element> + <element name="lamp5" ref="Start" inputtag="IN0" inputmask="0x80"> <bounds x="0.92" y="3.10" width="0.46" height="0.20" /> - </bezel> + </element> - <bezel name="lamp1" element="Dup_B" inputtag="IN0" inputmask="0x08"> + <element name="lamp1" ref="Dup_B" inputtag="IN0" inputmask="0x08"> <bounds x="1.75" y="3.08" width="0.50" height="0.24" /> - </bezel> - <bezel name="lamp1" element="Dup" inputtag="IN0" inputmask="0x08"> + </element> + <element name="lamp1" ref="Dup" inputtag="IN0" inputmask="0x08"> <bounds x="1.77" y="3.10" width="0.46" height="0.20" /> - </bezel> + </element> - <bezel name="lamp2" element="Dup_B" inputtag="IN0" inputmask="0x10"> + <element name="lamp2" ref="Dup_B" inputtag="IN0" inputmask="0x10"> <bounds x="2.40" y="3.08" width="0.50" height="0.24" /> - </bezel> - <bezel name="lamp2" element="Take" inputtag="IN0" inputmask="0x10"> + </element> + <element name="lamp2" ref="Take" inputtag="IN0" inputmask="0x10"> <bounds x="2.42" y="3.10" width="0.46" height="0.20" /> - </bezel> + </element> - <bezel name="lamp4" element="Info_B" inputtag="IN0" inputmask="0x40"> + <element name="lamp4" ref="Info_B" inputtag="IN0" inputmask="0x40"> <bounds x="3.45" y="3.08" width="0.50" height="0.24" /> - </bezel> - <bezel name="lamp4" element="Info" inputtag="IN0" inputmask="0x40"> + </element> + <element name="lamp4" ref="Info" inputtag="IN0" inputmask="0x40"> <bounds x="3.47" y="3.10" width="0.46" height="0.20" /> - </bezel> + </element> </view> <view name="P2 Button Lamps"> <screen index="0"><bounds left="0" top="0" right="4" bottom="3" /></screen> - <bezel element="cpanel"><bounds left="0" right="4" top="3" bottom="3.40" /></bezel> + <element ref="cpanel"><bounds left="0" right="4" top="3" bottom="3.40" /></element> - <bezel element="cpanel1"><bounds left="0" right="4" top="3.01" bottom="3.39" /></bezel> - <bezel element="cpanel2"><bounds left="0" right="4" top="3.02" bottom="3.38" /></bezel> - <bezel element="cpanel3"><bounds left="0" right="4" top="3.03" bottom="3.37" /></bezel> - <bezel element="cpanel4"><bounds left="0" right="4" top="3.04" bottom="3.36" /></bezel> - <bezel element="cpanel"><bounds left="0" right="4" top="3.05" bottom="3.35" /></bezel> + <element ref="cpanel1"><bounds left="0" right="4" top="3.01" bottom="3.39" /></element> + <element ref="cpanel2"><bounds left="0" right="4" top="3.02" bottom="3.38" /></element> + <element ref="cpanel3"><bounds left="0" right="4" top="3.03" bottom="3.37" /></element> + <element ref="cpanel4"><bounds left="0" right="4" top="3.04" bottom="3.36" /></element> + <element ref="cpanel"><bounds left="0" right="4" top="3.05" bottom="3.35" /></element> - <bezel name="lamp11" element="Bet_B" inputtag="IN1" inputmask="0x20"> + <element name="lamp11" ref="Bet_B" inputtag="IN1" inputmask="0x20"> <bounds x="0.05" y="3.08" width="0.50" height="0.24" /> - </bezel> - <bezel name="lamp11" element="Bet" inputtag="IN1" inputmask="0x20"> + </element> + <element name="lamp11" ref="Bet" inputtag="IN1" inputmask="0x20"> <bounds x="0.07" y="3.10" width="0.46" height="0.20" /> - </bezel> + </element> - <bezel name="lamp13" element="Start_B" inputtag="IN1" inputmask="0x80"> + <element name="lamp13" ref="Start_B" inputtag="IN1" inputmask="0x80"> <bounds x="0.90" y="3.08" width="0.50" height="0.24" /> - </bezel> - <bezel name="lamp13" element="Start" inputtag="IN1" inputmask="0x80"> + </element> + <element name="lamp13" ref="Start" inputtag="IN1" inputmask="0x80"> <bounds x="0.92" y="3.10" width="0.46" height="0.20" /> - </bezel> + </element> - <bezel name="lamp9" element="Dup_B" inputtag="IN1" inputmask="0x08"> + <element name="lamp9" ref="Dup_B" inputtag="IN1" inputmask="0x08"> <bounds x="1.75" y="3.08" width="0.50" height="0.24" /> - </bezel> - <bezel name="lamp9" element="Dup" inputtag="IN1" inputmask="0x08"> + </element> + <element name="lamp9" ref="Dup" inputtag="IN1" inputmask="0x08"> <bounds x="1.77" y="3.10" width="0.46" height="0.20" /> - </bezel> + </element> - <bezel name="lamp10" element="Dup_B" inputtag="IN1" inputmask="0x10"> + <element name="lamp10" ref="Dup_B" inputtag="IN1" inputmask="0x10"> <bounds x="2.40" y="3.08" width="0.50" height="0.24" /> - </bezel> - <bezel name="lamp10" element="Take" inputtag="IN1" inputmask="0x10"> + </element> + <element name="lamp10" ref="Take" inputtag="IN1" inputmask="0x10"> <bounds x="2.42" y="3.10" width="0.46" height="0.20" /> - </bezel> + </element> - <bezel name="lamp12" element="Info_B" inputtag="IN1" inputmask="0x40"> + <element name="lamp12" ref="Info_B" inputtag="IN1" inputmask="0x40"> <bounds x="3.45" y="3.08" width="0.50" height="0.24" /> - </bezel> - <bezel name="lamp12" element="Info" inputtag="IN1" inputmask="0x40"> + </element> + <element name="lamp12" ref="Info" inputtag="IN1" inputmask="0x40"> <bounds x="3.47" y="3.10" width="0.46" height="0.20" /> - </bezel> + </element> </view> </mamelayout> diff --git a/src/mame/layout/blckjack.lay b/src/mame/layout/blckjack.lay index 3b6041a69e6..e7a66b9fe7a 100644 --- a/src/mame/layout/blckjack.lay +++ b/src/mame/layout/blckjack.lay @@ -56,85 +56,85 @@ license:CC0 <screen index="0"> <bounds left="0" top="0" right="4" bottom="3" /> </screen> - <bezel name="lamp1" element="L0"> + <element name="lamp1" ref="L0"> <bounds x="0.5694" y="3.12" width="0.5" height="0.30" /> - </bezel> - <bezel name="lamp2" element="L1"> + </element> + <element name="lamp2" ref="L1"> <bounds x="1.508" y="3.12" width="0.35" height="0.30" /> - </bezel> - <bezel name="lamp3" element="L2"> + </element> + <element name="lamp3" ref="L2"> <bounds x="2.3" y="3.12" width="0.35" height="0.30" /> - </bezel> - <bezel name="lamp0" element="L7"> + </element> + <element name="lamp0" ref="L7"> <bounds x="3.093" y="3.12" width="0.5" height="0.30" /> - </bezel> - <bezel name="" element="BX"> + </element> + <element name="" ref="BX"> <bounds x="3.99" y="3.00" width="0.01" height="0.45" /> - </bezel> - <bezel name="digit0" element="Dig1"> + </element> + <element name="digit0" ref="Dig1"> <bounds x="3.92" y="3.12" width="0.05" height="0.06" /> - </bezel> - <bezel name="digit1" element="Dig1"> + </element> + <element name="digit1" ref="Dig1"> <bounds x="3.87" y="3.12" width="0.05" height="0.06" /> - </bezel> - <bezel name="digit2" element="Dig1"> + </element> + <element name="digit2" ref="Dig1"> <bounds x="3.82" y="3.12" width="0.05" height="0.06" /> - </bezel> - <bezel name="digit3" element="Dig1"> + </element> + <element name="digit3" ref="Dig1"> <bounds x="3.77" y="3.12" width="0.05" height="0.06" /> - </bezel> - <bezel name="digit4" element="Dig1"> + </element> + <element name="digit4" ref="Dig1"> <bounds x="3.72" y="3.12" width="0.05" height="0.06" /> - </bezel> - <bezel name="digit5" element="Dig1"> + </element> + <element name="digit5" ref="Dig1"> <bounds x="3.67" y="3.12" width="0.05" height="0.06" /> - </bezel> - <bezel name="digit6" element="Dig1"> + </element> + <element name="digit6" ref="Dig1"> <bounds x="3.62" y="3.12" width="0.05" height="0.06" /> - </bezel> + </element> - <bezel name="digit7" element="Dig1"> + <element name="digit7" ref="Dig1"> <bounds x="3.92" y="3.2" width="0.05" height="0.06" /> - </bezel> - <bezel name="digit8" element="Dig1"> + </element> + <element name="digit8" ref="Dig1"> <bounds x="3.87" y="3.2" width="0.05" height="0.06" /> - </bezel> - <bezel name="digit9" element="Dig1"> + </element> + <element name="digit9" ref="Dig1"> <bounds x="3.82" y="3.2" width="0.05" height="0.06" /> - </bezel> - <bezel name="digit10" element="Dig1"> + </element> + <element name="digit10" ref="Dig1"> <bounds x="3.77" y="3.2" width="0.05" height="0.06" /> - </bezel> - <bezel name="digit11" element="Dig1"> + </element> + <element name="digit11" ref="Dig1"> <bounds x="3.72" y="3.2" width="0.05" height="0.06" /> - </bezel> - <bezel name="digit12" element="Dig1"> + </element> + <element name="digit12" ref="Dig1"> <bounds x="3.67" y="3.2" width="0.05" height="0.06" /> - </bezel> - <bezel name="digit13" element="Dig1"> + </element> + <element name="digit13" ref="Dig1"> <bounds x="3.62" y="3.2" width="0.05" height="0.06" /> - </bezel> + </element> - <bezel name="digit14" element="Dig1"> + <element name="digit14" ref="Dig1"> <bounds x="3.92" y="3.28" width="0.05" height="0.06" /> - </bezel> - <bezel name="digit15" element="Dig1"> + </element> + <element name="digit15" ref="Dig1"> <bounds x="3.87" y="3.28" width="0.05" height="0.06" /> - </bezel> - <bezel name="digit16" element="Dig1"> + </element> + <element name="digit16" ref="Dig1"> <bounds x="3.82" y="3.28" width="0.05" height="0.06" /> - </bezel> - <bezel name="digit17" element="Dig1"> + </element> + <element name="digit17" ref="Dig1"> <bounds x="3.77" y="3.28" width="0.05" height="0.06" /> - </bezel> - <bezel name="digit18" element="Dig1"> + </element> + <element name="digit18" ref="Dig1"> <bounds x="3.72" y="3.28" width="0.05" height="0.06" /> - </bezel> - <bezel name="digit19" element="Dig1"> + </element> + <element name="digit19" ref="Dig1"> <bounds x="3.67" y="3.28" width="0.05" height="0.06" /> - </bezel> - <bezel name="digit20" element="Dig1"> + </element> + <element name="digit20" ref="Dig1"> <bounds x="3.62" y="3.28" width="0.05" height="0.06" /> - </bezel> + </element> </view> </mamelayout> diff --git a/src/mame/layout/bmiidx.lay b/src/mame/layout/bmiidx.lay index ec8f2c0010d..f4573c0e4da 100644 --- a/src/mame/layout/bmiidx.lay +++ b/src/mame/layout/bmiidx.lay @@ -64,91 +64,91 @@ license:CC0 <bounds left="0" top="0" right="426" bottom="240"/> </screen> - <bezel name="1p" element="1p"><bounds x="0" y="240" width="48" height="16"/></bezel> - <bezel name="2p" element="2p"><bounds x="0" y="256" width="48" height="16"/></bezel> - <bezel name="effect" element="effect"><bounds x="0" y="272" width="48" height="16"/></bezel> - <bezel name="vefx" element="vefx"><bounds x="0" y="288" width="48" height="16"/></bezel> + <element name="1p" ref="1p"><bounds x="0" y="240" width="48" height="16"/></element> + <element name="2p" ref="2p"><bounds x="0" y="256" width="48" height="16"/></element> + <element name="effect" ref="effect"><bounds x="0" y="272" width="48" height="16"/></element> + <element name="vefx" ref="vefx"><bounds x="0" y="288" width="48" height="16"/></element> - <bezel name="credit" element="credit"><bounds x="64" y="240" width="48" height="16"/></bezel> - <bezel name="neonlamp" element="neonlamp"><bounds x="64" y="256" width="48" height="16"/></bezel> - <bezel name="unknown1" element="neonlamp"><bounds x="64" y="272" width="48" height="16"/></bezel> - <bezel name="unknown2" element="neonlamp"><bounds x="64" y="288" width="48" height="16"/></bezel> + <element name="credit" ref="credit"><bounds x="64" y="240" width="48" height="16"/></element> + <element name="neonlamp" ref="neonlamp"><bounds x="64" y="256" width="48" height="16"/></element> + <element name="unknown1" ref="neonlamp"><bounds x="64" y="272" width="48" height="16"/></element> + <element name="unknown2" ref="neonlamp"><bounds x="64" y="288" width="48" height="16"/></element> - <bezel name="spotlight0" element="spotlight0"><bounds x="128" y="240" width="48" height="16"/></bezel> - <bezel name="spotlight1" element="spotlight1"><bounds x="128" y="256" width="48" height="16"/></bezel> - <bezel name="spotlight2" element="spotlight2"><bounds x="128" y="272" width="48" height="16"/></bezel> - <bezel name="spotlight3" element="spotlight3"><bounds x="128" y="288" width="48" height="16"/></bezel> + <element name="spotlight0" ref="spotlight0"><bounds x="128" y="240" width="48" height="16"/></element> + <element name="spotlight1" ref="spotlight1"><bounds x="128" y="256" width="48" height="16"/></element> + <element name="spotlight2" ref="spotlight2"><bounds x="128" y="272" width="48" height="16"/></element> + <element name="spotlight3" ref="spotlight3"><bounds x="128" y="288" width="48" height="16"/></element> - <bezel name="spotlight4" element="spotlight4"><bounds x="192" y="240" width="48" height="16"/></bezel> - <bezel name="spotlight5" element="spotlight5"><bounds x="192" y="256" width="48" height="16"/></bezel> - <bezel name="spotlight6" element="spotlight6"><bounds x="192" y="272" width="48" height="16"/></bezel> - <bezel name="spotlight7" element="spotlight7"><bounds x="192" y="288" width="48" height="16"/></bezel> + <element name="spotlight4" ref="spotlight4"><bounds x="192" y="240" width="48" height="16"/></element> + <element name="spotlight5" ref="spotlight5"><bounds x="192" y="256" width="48" height="16"/></element> + <element name="spotlight6" ref="spotlight6"><bounds x="192" y="272" width="48" height="16"/></element> + <element name="spotlight7" ref="spotlight7"><bounds x="192" y="288" width="48" height="16"/></element> - <bezel name="led0" element="led" state="0"> + <element name="led0" ref="led" state="0"> <bounds x="0" y="304" width="32" height="64"/> - </bezel> - <bezel name="led1" element="led" state="0"> + </element> + <element name="led1" ref="led" state="0"> <bounds x="32" y="304" width="32" height="64"/> - </bezel> - <bezel name="led2" element="led" state="0"> + </element> + <element name="led2" ref="led" state="0"> <bounds x="64" y="304" width="32" height="64"/> - </bezel> - <bezel name="led3" element="led" state="0"> + </element> + <element name="led3" ref="led" state="0"> <bounds x="96" y="304" width="32" height="64"/> - </bezel> - <bezel name="led4" element="led" state="0"> + </element> + <element name="led4" ref="led" state="0"> <bounds x="128" y="304" width="32" height="64"/> - </bezel> - <bezel name="led5" element="led" state="0"> + </element> + <element name="led5" ref="led" state="0"> <bounds x="160" y="304" width="32" height="64"/> - </bezel> - <bezel name="led6" element="led" state="0"> + </element> + <element name="led6" ref="led" state="0"> <bounds x="192" y="304" width="32" height="64"/> - </bezel> - <bezel name="led7" element="led" state="0"> + </element> + <element name="led7" ref="led" state="0"> <bounds x="224" y="304" width="32" height="64"/> - </bezel> - <bezel name="led8" element="led" state="0"> + </element> + <element name="led8" ref="led" state="0"> <bounds x="256" y="304" width="32" height="64"/> - </bezel> + </element> - <bezel name="key1-1" element="key1-1"><bounds x="0" y="368" width="48" height="16"/></bezel> - <bezel name="key1-2" element="key1-2"><bounds x="0" y="384" width="48" height="16"/></bezel> - <bezel name="key1-3" element="key1-3"><bounds x="0" y="400" width="48" height="16"/></bezel> - <bezel name="key1-4" element="key1-4"><bounds x="0" y="416" width="48" height="16"/></bezel> + <element name="key1-1" ref="key1-1"><bounds x="0" y="368" width="48" height="16"/></element> + <element name="key1-2" ref="key1-2"><bounds x="0" y="384" width="48" height="16"/></element> + <element name="key1-3" ref="key1-3"><bounds x="0" y="400" width="48" height="16"/></element> + <element name="key1-4" ref="key1-4"><bounds x="0" y="416" width="48" height="16"/></element> - <bezel name="key1-5" element="key1-5"><bounds x="64" y="368" width="48" height="16"/></bezel> - <bezel name="key1-6" element="key1-6"><bounds x="64" y="384" width="48" height="16"/></bezel> - <bezel name="key1-7" element="key1-7"><bounds x="64" y="400" width="48" height="16"/></bezel> - <bezel name="key2-1" element="key2-1"><bounds x="64" y="416" width="48" height="16"/></bezel> + <element name="key1-5" ref="key1-5"><bounds x="64" y="368" width="48" height="16"/></element> + <element name="key1-6" ref="key1-6"><bounds x="64" y="384" width="48" height="16"/></element> + <element name="key1-7" ref="key1-7"><bounds x="64" y="400" width="48" height="16"/></element> + <element name="key2-1" ref="key2-1"><bounds x="64" y="416" width="48" height="16"/></element> - <bezel name="key2-2" element="key2-2"><bounds x="128" y="368" width="48" height="16"/></bezel> - <bezel name="key2-3" element="key2-3"><bounds x="128" y="384" width="48" height="16"/></bezel> - <bezel name="key2-4" element="key2-4"><bounds x="128" y="400" width="48" height="16"/></bezel> - <bezel name="key2-5" element="key2-5"><bounds x="128" y="416" width="48" height="16"/></bezel> + <element name="key2-2" ref="key2-2"><bounds x="128" y="368" width="48" height="16"/></element> + <element name="key2-3" ref="key2-3"><bounds x="128" y="384" width="48" height="16"/></element> + <element name="key2-4" ref="key2-4"><bounds x="128" y="400" width="48" height="16"/></element> + <element name="key2-5" ref="key2-5"><bounds x="128" y="416" width="48" height="16"/></element> - <bezel name="key2-6" element="key2-6"><bounds x="192" y="368" width="48" height="16"/></bezel> - <bezel name="key2-7" element="key2-7"><bounds x="192" y="384" width="48" height="16"/></bezel> - <bezel name="unknown3" element="unknown3"><bounds x="192" y="400" width="48" height="16"/></bezel> - <bezel name="unknown4" element="unknown4"><bounds x="192" y="416" width="48" height="16"/></bezel> + <element name="key2-6" ref="key2-6"><bounds x="192" y="368" width="48" height="16"/></element> + <element name="key2-7" ref="key2-7"><bounds x="192" y="384" width="48" height="16"/></element> + <element name="unknown3" ref="unknown3"><bounds x="192" y="400" width="48" height="16"/></element> + <element name="unknown4" ref="unknown4"><bounds x="192" y="416" width="48" height="16"/></element> - <bezel name="main_led0" element="main_led0"><bounds x="0" y="432" width="24" height="16"/></bezel> - <bezel name="main_led1" element="main_led1"><bounds x="32" y="432" width="24" height="16"/></bezel> - <bezel name="main_led2" element="main_led2"><bounds x="64" y="432" width="24" height="16"/></bezel> - <bezel name="main_led3" element="main_led3"><bounds x="96" y="432" width="24" height="16"/></bezel> - <bezel name="main_led4" element="main_led4"><bounds x="128" y="432" width="24" height="16"/></bezel> - <bezel name="main_led5" element="main_led5"><bounds x="160" y="432" width="24" height="16"/></bezel> - <bezel name="main_led6" element="main_led6"><bounds x="192" y="432" width="24" height="16"/></bezel> - <bezel name="main_led7" element="main_led7"><bounds x="224" y="432" width="24" height="16"/></bezel> - <bezel name="main_led8" element="main_led8"><bounds x="256" y="432" width="24" height="16"/></bezel> + <element name="main_led0" ref="main_led0"><bounds x="0" y="432" width="24" height="16"/></element> + <element name="main_led1" ref="main_led1"><bounds x="32" y="432" width="24" height="16"/></element> + <element name="main_led2" ref="main_led2"><bounds x="64" y="432" width="24" height="16"/></element> + <element name="main_led3" ref="main_led3"><bounds x="96" y="432" width="24" height="16"/></element> + <element name="main_led4" ref="main_led4"><bounds x="128" y="432" width="24" height="16"/></element> + <element name="main_led5" ref="main_led5"><bounds x="160" y="432" width="24" height="16"/></element> + <element name="main_led6" ref="main_led6"><bounds x="192" y="432" width="24" height="16"/></element> + <element name="main_led7" ref="main_led7"><bounds x="224" y="432" width="24" height="16"/></element> + <element name="main_led8" ref="main_led8"><bounds x="256" y="432" width="24" height="16"/></element> - <bezel name="spu_led0" element="spu_led0"><bounds x="0" y="448" width="24" height="16"/></bezel> - <bezel name="spu_led1" element="spu_led1"><bounds x="32" y="448" width="24" height="16"/></bezel> - <bezel name="spu_led2" element="spu_led2"><bounds x="64" y="448" width="24" height="16"/></bezel> - <bezel name="spu_led3" element="spu_led3"><bounds x="96" y="448" width="24" height="16"/></bezel> - <bezel name="spu_led4" element="spu_led4"><bounds x="128" y="448" width="24" height="16"/></bezel> - <bezel name="spu_led5" element="spu_led5"><bounds x="160" y="448" width="24" height="16"/></bezel> - <bezel name="spu_led6" element="spu_led6"><bounds x="192" y="448" width="24" height="16"/></bezel> - <bezel name="spu_led7" element="spu_led7"><bounds x="224" y="448" width="24" height="16"/></bezel> + <element name="spu_led0" ref="spu_led0"><bounds x="0" y="448" width="24" height="16"/></element> + <element name="spu_led1" ref="spu_led1"><bounds x="32" y="448" width="24" height="16"/></element> + <element name="spu_led2" ref="spu_led2"><bounds x="64" y="448" width="24" height="16"/></element> + <element name="spu_led3" ref="spu_led3"><bounds x="96" y="448" width="24" height="16"/></element> + <element name="spu_led4" ref="spu_led4"><bounds x="128" y="448" width="24" height="16"/></element> + <element name="spu_led5" ref="spu_led5"><bounds x="160" y="448" width="24" height="16"/></element> + <element name="spu_led6" ref="spu_led6"><bounds x="192" y="448" width="24" height="16"/></element> + <element name="spu_led7" ref="spu_led7"><bounds x="224" y="448" width="24" height="16"/></element> </view> </mamelayout> diff --git a/src/mame/layout/brkball.lay b/src/mame/layout/brkball.lay index 1771a0ee61f..6b82d77232d 100644 --- a/src/mame/layout/brkball.lay +++ b/src/mame/layout/brkball.lay @@ -1,10 +1,5 @@ <?xml version="1.0"?> <mamelayout version="2"> - <element name="dotmatrixdot"> - <dotmatrixdot> - <color red="0" green="0" blue="0" /> - </dotmatrixdot> - </element> <element name="dmd_background"> <rect> <color red="0.2" green="0.0" blue="0"/> @@ -12,30 +7,14 @@ </element> <view name="main"> - <repeat count="21"> - <param name="y" start="0" increment="1" /> - <param name="base" start="0" increment="65" /> - <repeat count="65"> - <param name="x" start="0" increment="1" /> - <param name="dot" start="~base~" increment="1" /> - <backdrop name="dotmatrix~dot~" element="dotmatrixdot" state="0"> - <bounds x="~x~" y="~y~" width="1" height="1" /> - </backdrop> - </repeat> - </repeat> - <backdrop element="dmd_background"> + <screen tag="dm01:dmd"> <bounds x="149" y="0" width="102" height="42"/> - </backdrop> - <screen index="0"> - <bounds x="0" y="42" width="400" height="300" /> </screen> - <screen index="1"> + <element ref="dmd_background" blend="add"> <bounds x="149" y="0" width="102" height="42"/> - </screen> - </view> - <view name="no led"> - <screen index="0"> - <bounds x="0" y="0" width="400" height="300" /> + </element> + <screen tag="screen"> + <bounds x="0" y="42" width="400" height="300" /> </screen> </view> </mamelayout> diff --git a/src/mame/layout/cops.lay b/src/mame/layout/cops.lay index 1de9afac907..019d96e87ed 100644 --- a/src/mame/layout/cops.lay +++ b/src/mame/layout/cops.lay @@ -4,63 +4,22 @@ license:CC0 --> <mamelayout version="2"> <element name="led"> - <led14segsc> + <led14segsc> <color red="1" green="0" blue="0" /> - </led14segsc> + </led14segsc> </element> - <view name="cops"> + <view name="LED Overlay"> <screen index="0"> <bounds left="0" top="0" right="256" bottom="256" /> </screen> - <backdrop name="digit0" element="led" state="0"> - <bounds x="60" y="240" width="9" height="9"/> - </backdrop> - <backdrop name="digit1" element="led" state="0"> - <bounds x="69" y="240" width="9" height="9"/> - </backdrop> - <backdrop name="digit2" element="led" state="0"> - <bounds x="78" y="240" width="9" height="9"/> - </backdrop> - <backdrop name="digit3" element="led" state="0"> - <bounds x="87" y="240" width="9" height="9"/> - </backdrop> - <backdrop name="digit4" element="led" state="0"> - <bounds x="96" y="240" width="9" height="9"/> - </backdrop> - <backdrop name="digit5" element="led" state="0"> - <bounds x="105" y="240" width="9" height="9"/> - </backdrop> - <backdrop name="digit6" element="led" state="0"> - <bounds x="114" y="240" width="9" height="9"/> - </backdrop> - <backdrop name="digit7" element="led" state="0"> - <bounds x="123" y="240" width="9" height="9"/> - </backdrop> - <backdrop name="digit8" element="led" state="0"> - <bounds x="132" y="240" width="9" height="9"/> - </backdrop> - <backdrop name="digit9" element="led" state="0"> - <bounds x="141" y="240" width="9" height="9"/> - </backdrop> - <backdrop name="digit10" element="led" state="0"> - <bounds x="150" y="240" width="9" height="9"/> - </backdrop> - <backdrop name="digit11" element="led" state="0"> - <bounds x="159" y="240" width="9" height="9"/> - </backdrop> - <backdrop name="digit12" element="led" state="0"> - <bounds x="168" y="240" width="9" height="9"/> - </backdrop> - <backdrop name="digit13" element="led" state="0"> - <bounds x="177" y="240" width="9" height="9"/> - </backdrop> - <backdrop name="digit14" element="led" state="0"> - <bounds x="186" y="240" width="9" height="9"/> - </backdrop> - <backdrop name="digit15" element="led" state="0"> - <bounds x="195" y="240" width="9" height="9"/> - </backdrop> + <repeat count="16"> + <param name="digit" start="0" increment="1" /> + <param name="x" start="60" increment="9" /> + <element name="digit~digit~" ref="led" blend="add" state="0"> + <bounds x="~x~" y="240" width="9" height="9"/> + </element> + </repeat> </view> </mamelayout> diff --git a/src/mame/layout/polyplay.lay b/src/mame/layout/polyplay.lay index 5e3a47e7882..e3e33774e66 100644 --- a/src/mame/layout/polyplay.lay +++ b/src/mame/layout/polyplay.lay @@ -83,36 +83,33 @@ license:CC0 <color red="0.1" green="1.0" blue="0.1" /> </text> </element> - <view name="Screen only"> - <screen index="0"> - <bounds x="0" y="0" width="4" height="3" /> - </screen> - </view> <view name="Screen + Lights"> - <backdrop name="lamp1" element="red1" state="0"> - <bounds x="7" y="0" width="1" height="1"/> - </backdrop> - <backdrop name="lamp2" element="blue1" state="0"> - <bounds x="6" y="0" width="1" height="1"/> - </backdrop> - <backdrop name="lamp3" element="yellow1" state="0"> - <bounds x="5" y="0" width="1" height="1"/> - </backdrop> - <backdrop name="lamp4" element="green1" state="0"> - <bounds x="4" y="0" width="1" height="1"/> - </backdrop> - <backdrop name="lamp1" element="red2" state="0"> - <bounds x="3" y="0" width="1" height="1"/> - </backdrop> - <backdrop name="lamp2" element="blue2" state="0"> - <bounds x="2" y="0" width="1" height="1"/> - </backdrop> - <backdrop name="lamp3" element="yellow2" state="0"> - <bounds x="1" y="0" width="1" height="1"/> - </backdrop> - <backdrop name="lamp4" element="green2" state="0"> - <bounds x="0" y="0" width="1" height="1"/> - </backdrop> + <collection name="Marquee" visible="no"> + <element name="lamp1" ref="red1" state="0"> + <bounds x="7" y="0" width="1" height="1"/> + </element> + <element name="lamp2" ref="blue1" state="0"> + <bounds x="6" y="0" width="1" height="1"/> + </element> + <element name="lamp3" ref="yellow1" state="0"> + <bounds x="5" y="0" width="1" height="1"/> + </element> + <element name="lamp4" ref="green1" state="0"> + <bounds x="4" y="0" width="1" height="1"/> + </element> + <element name="lamp1" ref="red2" state="0"> + <bounds x="3" y="0" width="1" height="1"/> + </element> + <element name="lamp2" ref="blue2" state="0"> + <bounds x="2" y="0" width="1" height="1"/> + </element> + <element name="lamp3" ref="yellow2" state="0"> + <bounds x="1" y="0" width="1" height="1"/> + </element> + <element name="lamp4" ref="green2" state="0"> + <bounds x="0" y="0" width="1" height="1"/> + </element> + </collection> <screen index="0"> <bounds x="0" y="1" width="8" height="6" /> </screen> diff --git a/src/mame/layout/videopin.lay b/src/mame/layout/videopin.lay index a67c1506437..76c304936f3 100644 --- a/src/mame/layout/videopin.lay +++ b/src/mame/layout/videopin.lay @@ -12,92 +12,92 @@ license:CC0 <screen index="0"> <bounds x="0" y="0" width="300" height="400" /> </screen> - <backdrop name="LED01" element="lamp"> - <bounds x="34" y="36" width="7" height="7" /> - </backdrop> - <backdrop name="LED02" element="lamp"> - <bounds x="15" y="43" width="7" height="7" /> - </backdrop> - <backdrop name="LED03" element="lamp"> - <bounds x="12" y="65" width="7" height="7" /> - </backdrop> - <backdrop name="LED04" element="lamp"> - <bounds x="50" y="73" width="7" height="7" /> - </backdrop> - <backdrop name="LED05" element="lamp"> - <bounds x="103" y="48" width="7" height="7" /> - </backdrop> - <backdrop name="LED06" element="lamp"> - <bounds x="131" y="33" width="7" height="7" /> - </backdrop> - <backdrop name="LED07" element="lamp"> - <bounds x="158" y="47" width="7" height="7" /> - </backdrop> - <backdrop name="LED08" element="lamp"> - <bounds x="222" y="102" width="7" height="7" /> - </backdrop> - <backdrop name="LED09" element="lamp"> - <bounds x="18" y="117" width="7" height="7" /> - </backdrop> - <backdrop name="LED10" element="lamp"> - <bounds x="7" y="140" width="7" height="7" /> - </backdrop> - <backdrop name="LED11" element="lamp"> - <bounds x="21" y="163" width="7" height="7" /> - </backdrop> - <backdrop name="LED12" element="lamp"> - <bounds x="126" y="132" width="7" height="7" /> - </backdrop> - <backdrop name="LED13" element="lamp"> - <bounds x="190" y="133" width="7" height="7" /> - </backdrop> - <backdrop name="LED14" element="lamp"> - <bounds x="8" y="252" width="7" height="7" /> - </backdrop> - <backdrop name="LED15" element="lamp"> - <bounds x="38" y="251" width="7" height="7" /> - </backdrop> - <backdrop name="LED16" element="lamp"> - <bounds x="67" y="229" width="7" height="7" /> - </backdrop> - <backdrop name="LED17" element="lamp"> - <bounds x="125" y="246" width="7" height="7" /> - </backdrop> - <backdrop name="LED18" element="lamp"> - <bounds x="125" y="256" width="7" height="7" /> - </backdrop> - <backdrop name="LED19" element="lamp"> - <bounds x="125" y="265" width="7" height="7" /> - </backdrop> - <backdrop name="LED20" element="lamp"> - <bounds x="125" y="275" width="7" height="7" /> - </backdrop> - <backdrop name="LED21" element="lamp"> - <bounds x="125" y="285" width="7" height="7" /> - </backdrop> - <backdrop name="LED22" element="lamp"> - <bounds x="125" y="295" width="7" height="7" /> - </backdrop> - <backdrop name="LED23" element="lamp"> - <bounds x="125" y="304" width="7" height="7" /> - </backdrop> - <backdrop name="LED24" element="lamp"> - <bounds x="125" y="314" width="7" height="7" /> - </backdrop> - <backdrop name="LED25" element="lamp"> - <bounds x="125" y="324" width="7" height="7" /> - </backdrop> - <backdrop name="LED26" element="lamp"> - <bounds x="125" y="334" width="7" height="7" /> - </backdrop> - <backdrop name="LED27" element="lamp"> - <bounds x="186" y="229" width="7" height="7" /> - </backdrop> - <backdrop name="LED28" element="lamp"> - <bounds x="197" y="288" width="7" height="7" /> - </backdrop> - <backdrop name="LED29" element="lamp"> - <bounds x="141" y="366" width="7" height="7" /> - </backdrop> + <element name="LED01" ref="lamp" blend="add"> + <bounds x="34" y="36" width="7" height="7" /> + </element> + <element name="LED02" ref="lamp" blend="add"> + <bounds x="15" y="43" width="7" height="7" /> + </element> + <element name="LED03" ref="lamp" blend="add"> + <bounds x="12" y="65" width="7" height="7" /> + </element> + <element name="LED04" ref="lamp" blend="add"> + <bounds x="50" y="73" width="7" height="7" /> + </element> + <element name="LED05" ref="lamp" blend="add"> + <bounds x="103" y="48" width="7" height="7" /> + </element> + <element name="LED06" ref="lamp" blend="add"> + <bounds x="131" y="33" width="7" height="7" /> + </element> + <element name="LED07" ref="lamp" blend="add"> + <bounds x="158" y="47" width="7" height="7" /> + </element> + <element name="LED08" ref="lamp" blend="add"> + <bounds x="222" y="102" width="7" height="7" /> + </element> + <element name="LED09" ref="lamp" blend="add"> + <bounds x="18" y="117" width="7" height="7" /> + </element> + <element name="LED10" ref="lamp" blend="add"> + <bounds x="7" y="140" width="7" height="7" /> + </element> + <element name="LED11" ref="lamp" blend="add"> + <bounds x="21" y="163" width="7" height="7" /> + </element> + <element name="LED12" ref="lamp" blend="add"> + <bounds x="126" y="132" width="7" height="7" /> + </element> + <element name="LED13" ref="lamp" blend="add"> + <bounds x="190" y="133" width="7" height="7" /> + </element> + <element name="LED14" ref="lamp" blend="add"> + <bounds x="8" y="252" width="7" height="7" /> + </element> + <element name="LED15" ref="lamp" blend="add"> + <bounds x="38" y="251" width="7" height="7" /> + </element> + <element name="LED16" ref="lamp" blend="add"> + <bounds x="67" y="229" width="7" height="7" /> + </element> + <element name="LED17" ref="lamp" blend="add"> + <bounds x="125" y="246" width="7" height="7" /> + </element> + <element name="LED18" ref="lamp" blend="add"> + <bounds x="125" y="256" width="7" height="7" /> + </element> + <element name="LED19" ref="lamp" blend="add"> + <bounds x="125" y="265" width="7" height="7" /> + </element> + <element name="LED20" ref="lamp" blend="add"> + <bounds x="125" y="275" width="7" height="7" /> + </element> + <element name="LED21" ref="lamp" blend="add"> + <bounds x="125" y="285" width="7" height="7" /> + </element> + <element name="LED22" ref="lamp" blend="add"> + <bounds x="125" y="295" width="7" height="7" /> + </element> + <element name="LED23" ref="lamp" blend="add"> + <bounds x="125" y="304" width="7" height="7" /> + </element> + <element name="LED24" ref="lamp" blend="add"> + <bounds x="125" y="314" width="7" height="7" /> + </element> + <element name="LED25" ref="lamp" blend="add"> + <bounds x="125" y="324" width="7" height="7" /> + </element> + <element name="LED26" ref="lamp" blend="add"> + <bounds x="125" y="334" width="7" height="7" /> + </element> + <element name="LED27" ref="lamp" blend="add"> + <bounds x="186" y="229" width="7" height="7" /> + </element> + <element name="LED28" ref="lamp" blend="add"> + <bounds x="197" y="288" width="7" height="7" /> + </element> + <element name="LED29" ref="lamp" blend="add"> + <bounds x="141" y="366" width="7" height="7" /> + </element> </view> </mamelayout> diff --git a/src/mame/video/bfm_dm01.cpp b/src/mame/video/bfm_dm01.cpp index c495cf67c41..6ff69ebdfc5 100644 --- a/src/mame/video/bfm_dm01.cpp +++ b/src/mame/video/bfm_dm01.cpp @@ -35,9 +35,11 @@ Standard dm01 memorymap ***************************************************************************/ #include "emu.h" -#include "cpu/m6809/m6809.h" #include "bfm_dm01.h" +#include "cpu/m6809/m6809.h" + + // local vars ///////////////////////////////////////////////////////////// #define DM_MAXLINES 21 @@ -49,13 +51,14 @@ Standard dm01 memorymap #define VERBOSE 0 #endif -#define LOG(x) do { if (VERBOSE) logerror x; } while (0) +#include "logmacro.h" + DEFINE_DEVICE_TYPE(BFM_DM01, bfm_dm01_device, "bfm_dm01", "BFM Dotmatrix 01") -bfm_dm01_device::bfm_dm01_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : device_t(mconfig, BFM_DM01, tag, owner, clock), +bfm_dm01_device::bfm_dm01_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : + device_t(mconfig, BFM_DM01, tag, owner, clock), m_matrixcpu(*this, "matrix"), m_screen(*this, "dmd"), m_palette(*this, "palette_lcd"), @@ -67,10 +70,10 @@ bfm_dm01_device::bfm_dm01_device(const machine_config &mconfig, const char *tag, m_busy_cb(*this) { for (auto & elem : m_segbuffer) - elem = 0; + elem = 0; for (auto & elem : m_scanline) - elem = 0; + elem = 0; } //------------------------------------------------- |