diff options
author | 2020-09-17 12:23:21 +1000 | |
---|---|---|
committer | 2020-09-17 12:23:21 +1000 | |
commit | 7270ef632c9a713937314bdd2ee31270a8923894 (patch) | |
tree | 97e0c06b31aee933d89b8009094d25c44e688b74 | |
parent | 937bb188b2ff6f09c11976dcd8dc858ae928e469 (diff) |
Fix some layouts that were depending on emergent behaviour rather than specifying state="0" on components explicitly.
-rw-r--r-- | src/emu/layout/exorterm155.lay | 9 | ||||
-rw-r--r-- | src/emu/layout/ie15.lay | 2 | ||||
-rw-r--r-- | src/mame/layout/apollo.lay | 6 | ||||
-rw-r--r-- | src/mame/layout/apollo_15i.lay | 6 | ||||
-rw-r--r-- | src/mame/layout/apollo_dsp.lay | 6 | ||||
-rw-r--r-- | src/mame/layout/gp_1.lay | 101 | ||||
-rw-r--r-- | src/mame/layout/gp_2.lay | 101 | ||||
-rw-r--r-- | src/mame/layout/h8.lay | 3 | ||||
-rw-r--r-- | src/mame/layout/megacd.lay | 4 | ||||
-rw-r--r-- | src/mame/layout/mgavegas.lay | 2 | ||||
-rw-r--r-- | src/mame/layout/micropin.lay | 2 | ||||
-rw-r--r-- | src/mame/layout/savia84.lay | 3 | ||||
-rw-r--r-- | src/mame/layout/super80.lay | 1 | ||||
-rw-r--r-- | src/mame/layout/vk100.lay | 2 | ||||
-rw-r--r-- | src/mame/layout/vt100.lay | 2 | ||||
-rw-r--r-- | src/mame/layout/x68000.lay | 6 |
16 files changed, 78 insertions, 178 deletions
diff --git a/src/emu/layout/exorterm155.lay b/src/emu/layout/exorterm155.lay index 6a47f6869e7..9da2b5ed7ef 100644 --- a/src/emu/layout/exorterm155.lay +++ b/src/emu/layout/exorterm155.lay @@ -8,7 +8,7 @@ LEDs for the Motorola EXORterm 155 <mamelayout version="2"> <element name="red_led"> - <disk> + <disk state="0"> <color red="1.0" green="0.0" blue="0.0" /> </disk> </element> @@ -35,12 +35,13 @@ LEDs for the Motorola EXORterm 155 </element> <element name="background"> <rect> - <bounds left="0" top="0" right="1" bottom="1" /> <color red="0.0" green="0.0" blue="0.0" /> </rect> </element> <view name="Keyboard LEDs"> + <bounds left="0" top="0" right="720" bottom="544" /> + <screen index="0"> <bounds x="0" y="0" width="720" height="512" /> </screen> @@ -71,10 +72,6 @@ LEDs for the Motorola EXORterm 155 <element name="insert_char_led" ref="red_led"> <bounds left="312" right="320" top="532" bottom="540" /> </element> - - <element ref="background"> - <bounds left="0" top="540" right="720" bottom="544" /> - </element> </view> </mamelayout> diff --git a/src/emu/layout/ie15.lay b/src/emu/layout/ie15.lay index 90ed8816edb..255e2022ef8 100644 --- a/src/emu/layout/ie15.lay +++ b/src/emu/layout/ie15.lay @@ -5,7 +5,7 @@ license:CC0 <mamelayout version="2"> <element name="e_led"> - <disk> + <disk state="0"> <color red="1.0" green="0.0" blue="0.0" /> </disk> </element> diff --git a/src/mame/layout/apollo.lay b/src/mame/layout/apollo.lay index 6aa352bd05f..4af2a34dcec 100644 --- a/src/mame/layout/apollo.lay +++ b/src/mame/layout/apollo.lay @@ -7,9 +7,9 @@ license:CC0 <mamelayout version="2"> - <element name="internal_led"> <disk> <color red="1.0" green="1.0" blue="1.0" /> </disk> </element> - <element name="external_led"> <disk> <color red="0.666" green="0.555" blue="0.0" /> </disk> </element> - <element name="power_led"> <disk> <color red="0.0" green="1.0" blue="0.0" /> </disk> </element> + <element name="internal_led"> <disk state="0"> <color red="1.0" green="1.0" blue="1.0" /> </disk> </element> + <element name="external_led"> <disk state="0"> <color red="0.666" green="0.555" blue="0.0" /> </disk> </element> + <element name="power_led"> <disk state="0"> <color red="0.0" green="1.0" blue="0.0" /> </disk> </element> <element name="label_a"> <text string="A"> <color red="1.0" green="1.0" blue="1.0" /> </text> </element> <element name="label_b"> <text string="B"> <color red="1.0" green="1.0" blue="1.0" /> </text> </element> diff --git a/src/mame/layout/apollo_15i.lay b/src/mame/layout/apollo_15i.lay index 8e01d548d81..f984555aae8 100644 --- a/src/mame/layout/apollo_15i.lay +++ b/src/mame/layout/apollo_15i.lay @@ -7,9 +7,9 @@ license:CC0 <mamelayout version="2"> - <element name="internal_led"> <disk> <color red="1.0" green="1.0" blue="1.0" /> </disk> </element> - <element name="external_led"> <disk> <color red="0.666" green="0.555" blue="0.0" /> </disk> </element> - <element name="power_led"> <disk> <color red="0.0" green="1.0" blue="0.0" /> </disk> </element> + <element name="internal_led"> <disk state="0"> <color red="1.0" green="1.0" blue="1.0" /> </disk> </element> + <element name="external_led"> <disk state="0"> <color red="0.666" green="0.555" blue="0.0" /> </disk> </element> + <element name="power_led"> <disk state="0"> <color red="0.0" green="1.0" blue="0.0" /> </disk> </element> <element name="label_a"> <text string="A"> <color red="1.0" green="1.0" blue="1.0" /> </text> </element> <element name="label_b"> <text string="B"> <color red="1.0" green="1.0" blue="1.0" /> </text> </element> diff --git a/src/mame/layout/apollo_dsp.lay b/src/mame/layout/apollo_dsp.lay index 97f6559b2bb..28be2b30f32 100644 --- a/src/mame/layout/apollo_dsp.lay +++ b/src/mame/layout/apollo_dsp.lay @@ -7,9 +7,9 @@ terminal display for the Apollo DSP3x00 <mamelayout version="2"> - <element name="internal_led"> <disk> <color red="1.0" green="1.0" blue="1.0" /> </disk> </element> - <element name="external_led"> <disk> <color red="0.666" green="0.555" blue="0.0" /> </disk> </element> - <element name="power_led"> <disk> <color red="0.0" green="1.0" blue="0.0" /> </disk> </element> + <element name="internal_led"> <disk state="0"> <color red="1.0" green="1.0" blue="1.0" /> </disk> </element> + <element name="external_led"> <disk state="0"> <color red="0.666" green="0.555" blue="0.0" /> </disk> </element> + <element name="power_led"> <disk state="0"> <color red="0.0" green="1.0" blue="0.0" /> </disk> </element> <element name="label_a"> <text string="A"> <color red="1.0" green="1.0" blue="1.0" /> </text> </element> <element name="label_b"> <text string="B"> <color red="1.0" green="1.0" blue="1.0" /> </text> </element> <element name="label_c"> <text string="C"> <color red="1.0" green="1.0" blue="1.0" /> </text> </element> diff --git a/src/mame/layout/gp_1.lay b/src/mame/layout/gp_1.lay index fc38651352d..307a2f3866e 100644 --- a/src/mame/layout/gp_1.lay +++ b/src/mame/layout/gp_1.lay @@ -11,7 +11,7 @@ copyright-holders:Robbbert </led7seg> </element> <element name="red_led"> - <disk><color red="1.0" green="0.0" blue="0.0" /></disk> + <disk state="0"><color red="1.0" green="0.0" blue="0.0" /></disk> </element> <element name="P0"><text string="Ball / Match"><color red="1.0" green="1.0" blue="1.0" /></text></element> <element name="P1"><text string="Credits"><color red="1.0" green="1.0" blue="1.0" /></text></element> @@ -21,91 +21,44 @@ copyright-holders:Robbbert <element name="P5"><text string="Player 3"><color red="1.0" green="1.0" blue="1.0" /></text></element> <element name="P6"><text string="Player 4"><color red="1.0" green="1.0" blue="1.0" /></text></element> + <group name="score"> + <repeat count="6"> + <param name="n" start="~s~" increment="-1" /> + <param name="x" start="0" increment="44" /> + <element name="digit~n~" ref="digit"> + <bounds x="~x~" y="0" width="34" height="39" /> + </element> + </repeat> + </group> + <view name="Default Layout"> <bounds left="0" top="20" right="274" bottom="394" /> <!-- LEDs --> <!-- Player 1 Score --> - - <element name="digit5" ref="digit"> - <bounds left="10" top="45" right="44" bottom="84" /> - </element> - <element name="digit4" ref="digit"> - <bounds left="54" top="45" right="88" bottom="84" /> - </element> - <element name="digit3" ref="digit"> - <bounds left="98" top="45" right="132" bottom="84" /> - </element> - <element name="digit2" ref="digit"> - <bounds left="142" top="45" right="176" bottom="84" /> - </element> - <element name="digit1" ref="digit"> - <bounds left="186" top="45" right="220" bottom="84" /> - </element> - <element name="digit0" ref="digit"> - <bounds left="230" top="45" right="264" bottom="84" /> - </element> + <param name="s" value="5" /> + <group ref="score"> + <bounds left="10" top="45" right="264" bottom="84" /> + </group> <!-- Player 2 Score --> - <element name="digit13" ref="digit"> - <bounds left="10" top="105" right="44" bottom="144" /> - </element> - <element name="digit12" ref="digit"> - <bounds left="54" top="105" right="88" bottom="144" /> - </element> - <element name="digit11" ref="digit"> - <bounds left="98" top="105" right="132" bottom="144" /> - </element> - <element name="digit10" ref="digit"> - <bounds left="142" top="105" right="176" bottom="144" /> - </element> - <element name="digit9" ref="digit"> - <bounds left="186" top="105" right="220" bottom="144" /> - </element> - <element name="digit8" ref="digit"> - <bounds left="230" top="105" right="264" bottom="144" /> - </element> + <param name="s" value="13" /> + <group ref="score"> + <bounds left="10" top="105" right="264" bottom="144" /> + </group> <!-- Player 3 Score --> - <element name="digit21" ref="digit"> - <bounds left="10" top="165" right="44" bottom="204" /> - </element> - <element name="digit20" ref="digit"> - <bounds left="54" top="165" right="88" bottom="204" /> - </element> - <element name="digit19" ref="digit"> - <bounds left="98" top="165" right="132" bottom="204" /> - </element> - <element name="digit18" ref="digit"> - <bounds left="142" top="165" right="176" bottom="204" /> - </element> - <element name="digit17" ref="digit"> - <bounds left="186" top="165" right="220" bottom="204" /> - </element> - <element name="digit16" ref="digit"> - <bounds left="230" top="165" right="264" bottom="204" /> - </element> + <param name="s" value="21" /> + <group ref="score"> + <bounds left="10" top="165" right="264" bottom="204" /> + </group> <!-- Player 4 Score --> - <element name="digit29" ref="digit"> - <bounds left="10" top="225" right="44" bottom="264" /> - </element> - <element name="digit28" ref="digit"> - <bounds left="54" top="225" right="88" bottom="264" /> - </element> - <element name="digit27" ref="digit"> - <bounds left="98" top="225" right="132" bottom="264" /> - </element> - <element name="digit26" ref="digit"> - <bounds left="142" top="225" right="176" bottom="264" /> - </element> - <element name="digit25" ref="digit"> - <bounds left="186" top="225" right="220" bottom="264" /> - </element> - <element name="digit24" ref="digit"> - <bounds left="230" top="225" right="264" bottom="264" /> - </element> + <param name="s" value="29" /> + <group ref="score"> + <bounds left="10" top="225" right="264" bottom="264" /> + </group> <!-- Credits and Balls --> <element name="digit14" ref="digit"> diff --git a/src/mame/layout/gp_2.lay b/src/mame/layout/gp_2.lay index ab508a9b6e1..6ea287e5e4e 100644 --- a/src/mame/layout/gp_2.lay +++ b/src/mame/layout/gp_2.lay @@ -11,7 +11,7 @@ copyright-holders:Robbbert </led7seg> </element> <element name="red_led"> - <disk><color red="1.0" green="0.0" blue="0.0" /></disk> + <disk state="0"><color red="1.0" green="0.0" blue="0.0" /></disk> </element> <element name="P0"><text string="Ball"><color red="1.0" green="1.0" blue="1.0" /></text></element> <element name="P1"><text string="Credits"><color red="1.0" green="1.0" blue="1.0" /></text></element> @@ -21,91 +21,44 @@ copyright-holders:Robbbert <element name="P5"><text string="Player 3"><color red="1.0" green="1.0" blue="1.0" /></text></element> <element name="P6"><text string="Player 4"><color red="1.0" green="1.0" blue="1.0" /></text></element> + <group name="score"> + <repeat count="6"> + <param name="n" start="~s~" increment="-1" /> + <param name="x" start="0" increment="44" /> + <element name="digit~n~" ref="digit"> + <bounds x="~x~" y="0" width="34" height="39" /> + </element> + </repeat> + </group> + <view name="Default Layout"> <bounds left="0" top="20" right="274" bottom="394" /> <!-- LEDs --> <!-- Player 1 Score --> - - <element name="digit5" ref="digit"> - <bounds left="10" top="45" right="44" bottom="84" /> - </element> - <element name="digit4" ref="digit"> - <bounds left="54" top="45" right="88" bottom="84" /> - </element> - <element name="digit3" ref="digit"> - <bounds left="98" top="45" right="132" bottom="84" /> - </element> - <element name="digit2" ref="digit"> - <bounds left="142" top="45" right="176" bottom="84" /> - </element> - <element name="digit1" ref="digit"> - <bounds left="186" top="45" right="220" bottom="84" /> - </element> - <element name="digit0" ref="digit"> - <bounds left="230" top="45" right="264" bottom="84" /> - </element> + <param name="s" value="5" /> + <group ref="score"> + <bounds left="10" top="45" right="264" bottom="84" /> + </group> <!-- Player 2 Score --> - <element name="digit13" ref="digit"> - <bounds left="10" top="105" right="44" bottom="144" /> - </element> - <element name="digit12" ref="digit"> - <bounds left="54" top="105" right="88" bottom="144" /> - </element> - <element name="digit11" ref="digit"> - <bounds left="98" top="105" right="132" bottom="144" /> - </element> - <element name="digit10" ref="digit"> - <bounds left="142" top="105" right="176" bottom="144" /> - </element> - <element name="digit9" ref="digit"> - <bounds left="186" top="105" right="220" bottom="144" /> - </element> - <element name="digit8" ref="digit"> - <bounds left="230" top="105" right="264" bottom="144" /> - </element> + <param name="s" value="13" /> + <group ref="score"> + <bounds left="10" top="105" right="264" bottom="144" /> + </group> <!-- Player 3 Score --> - <element name="digit21" ref="digit"> - <bounds left="10" top="165" right="44" bottom="204" /> - </element> - <element name="digit20" ref="digit"> - <bounds left="54" top="165" right="88" bottom="204" /> - </element> - <element name="digit19" ref="digit"> - <bounds left="98" top="165" right="132" bottom="204" /> - </element> - <element name="digit18" ref="digit"> - <bounds left="142" top="165" right="176" bottom="204" /> - </element> - <element name="digit17" ref="digit"> - <bounds left="186" top="165" right="220" bottom="204" /> - </element> - <element name="digit16" ref="digit"> - <bounds left="230" top="165" right="264" bottom="204" /> - </element> + <param name="s" value="21" /> + <group ref="score"> + <bounds left="10" top="165" right="264" bottom="204" /> + </group> <!-- Player 4 Score --> - <element name="digit29" ref="digit"> - <bounds left="10" top="225" right="44" bottom="264" /> - </element> - <element name="digit28" ref="digit"> - <bounds left="54" top="225" right="88" bottom="264" /> - </element> - <element name="digit27" ref="digit"> - <bounds left="98" top="225" right="132" bottom="264" /> - </element> - <element name="digit26" ref="digit"> - <bounds left="142" top="225" right="176" bottom="264" /> - </element> - <element name="digit25" ref="digit"> - <bounds left="186" top="225" right="220" bottom="264" /> - </element> - <element name="digit24" ref="digit"> - <bounds left="230" top="225" right="264" bottom="264" /> - </element> + <param name="s" value="29" /> + <group ref="score"> + <bounds left="10" top="225" right="264" bottom="264" /> + </group> <!-- Credits and Balls --> <element name="digit36" ref="digit"> diff --git a/src/mame/layout/h8.lay b/src/mame/layout/h8.lay index c36e95a9c9f..9499df6d20d 100644 --- a/src/mame/layout/h8.lay +++ b/src/mame/layout/h8.lay @@ -9,13 +9,12 @@ license:CC0 </led7seg> </element> <element name="red_led"> - <disk> + <disk state="0"> <color red="1.0" green="0.0" blue="0.0" /> </disk> </element> <element name="background"> <rect> - <bounds left="0" top="0" right="1" bottom="1" /> <color red="0.0" green="0.0" blue="0.0" /> </rect> </element> diff --git a/src/mame/layout/megacd.lay b/src/mame/layout/megacd.lay index 822efd2f6dc..5a4dd934450 100644 --- a/src/mame/layout/megacd.lay +++ b/src/mame/layout/megacd.lay @@ -8,12 +8,12 @@ Basic display of CD-ROM drive LEDs for the Sega MegaCD <mamelayout version="2"> <element name="red_led"> - <rect> + <rect state="0"> <color red="1.0" green="0.0" blue="0.0" /> </rect> </element> <element name="green_led"> - <rect> + <rect state="0"> <color red="0.0" green="1.0" blue="0.0" /> </rect> </element> diff --git a/src/mame/layout/mgavegas.lay b/src/mame/layout/mgavegas.lay index 3e8b21ab026..aa7f7377346 100644 --- a/src/mame/layout/mgavegas.lay +++ b/src/mame/layout/mgavegas.lay @@ -6,7 +6,7 @@ license:CC0 <mamelayout version="2"> <element name="red_led"> - <rect> + <rect state="0"> <color red="1.0" green="0.0" blue="0.0" /> </rect> </element> diff --git a/src/mame/layout/micropin.lay b/src/mame/layout/micropin.lay index 6d9918dbc5b..c710de1ea62 100644 --- a/src/mame/layout/micropin.lay +++ b/src/mame/layout/micropin.lay @@ -13,7 +13,7 @@ copyright-holders:Robbbert </element> <element name="red_led"> - <disk><color red="1.0" green="0.0" blue="0.0" /></disk> + <disk state="0"><color red="1.0" green="0.0" blue="0.0" /></disk> </element> <element name="P0"><text string="BALL"><color red="1.0" green="1.0" blue="1.0" /></text></element> diff --git a/src/mame/layout/savia84.lay b/src/mame/layout/savia84.lay index 10a18dbf5ea..f9f9a5a93a4 100644 --- a/src/mame/layout/savia84.lay +++ b/src/mame/layout/savia84.lay @@ -9,13 +9,12 @@ license:CC0 </led7seg> </element> <element name="red_led"> - <disk> + <disk state="0"> <color red="1.0" green="0.0" blue="0.0" /> </disk> </element> <element name="background"> <rect> - <bounds left="0" top="0" right="1" bottom="1" /> <color red="0.0" green="0.0" blue="0.0" /> </rect> </element> diff --git a/src/mame/layout/super80.lay b/src/mame/layout/super80.lay index f27044e3b01..25b07626448 100644 --- a/src/mame/layout/super80.lay +++ b/src/mame/layout/super80.lay @@ -6,7 +6,6 @@ license:CC0 <element name="red_led" defstate="0"> <disk state="0"><color red="1.0" green="0.0" blue="0.0" /></disk> - <disk state="1"><color red="0.0" green="0.0" blue="0.0" /></disk> </element> <element name="CASSETTE"> diff --git a/src/mame/layout/vk100.lay b/src/mame/layout/vk100.lay index 0561f203475..61bd520006f 100644 --- a/src/mame/layout/vk100.lay +++ b/src/mame/layout/vk100.lay @@ -8,7 +8,7 @@ Basic display of LEDs for the DEC VK100, based on VT100 layout <mamelayout version="2"> <element name="red_led"> - <disk> + <disk state="0"> <color red="1.0" green="0.0" blue="0.0" /> </disk> </element> diff --git a/src/mame/layout/vt100.lay b/src/mame/layout/vt100.lay index 7790bf7d7bf..e3b0241e7f8 100644 --- a/src/mame/layout/vt100.lay +++ b/src/mame/layout/vt100.lay @@ -8,7 +8,7 @@ Basic display of LEDs for the DEC VT100 <mamelayout version="2"> <element name="red_led"> - <disk> + <disk state="0"> <color red="1.0" green="0.0" blue="0.0" /> </disk> </element> diff --git a/src/mame/layout/x68000.lay b/src/mame/layout/x68000.lay index cc5f5846cce..c716a716e22 100644 --- a/src/mame/layout/x68000.lay +++ b/src/mame/layout/x68000.lay @@ -8,17 +8,17 @@ Basic display of disk drive LEDs for the Sharp X680x0 <mamelayout version="2"> <element name="access_led"> - <disk> + <disk state="0"> <color red="1.0" green="0.0" blue="0.0" /> </disk> </element> <element name="ctrl_led"> - <disk> + <disk state="0"> <color red="0.0" green="1.0" blue="0.0" /> </disk> </element> <element name="eject_led"> - <disk> + <disk state="0"> <color red="0.5" green="0.0" blue="0.0" /> </disk> </element> |