summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author hap <happppp@users.noreply.github.com>2021-04-16 21:08:31 +0200
committer hap <happppp@users.noreply.github.com>2021-04-16 21:08:31 +0200
commit27d77ba19727356cd446f3c2818949aaec98bdb5 (patch)
treea46859691affe60d32244c8780a482d9e857918e
parent1823a1e6609a663a9e3f1748440a4802f3f8de5f (diff)
undo the rest of <collection> shifter options
-rw-r--r--src/mame/layout/buggyboy.lay138
-rw-r--r--src/mame/layout/contcirc.lay48
-rw-r--r--src/mame/layout/enforceja.lay48
-rw-r--r--src/mame/layout/outrun.lay87
4 files changed, 64 insertions, 257 deletions
diff --git a/src/mame/layout/buggyboy.lay b/src/mame/layout/buggyboy.lay
index 68a8a664813..c1d2328c1ab 100644
--- a/src/mame/layout/buggyboy.lay
+++ b/src/mame/layout/buggyboy.lay
@@ -3,9 +3,6 @@
license:CC0
-->
<mamelayout version="2">
-
-<!-- define elements -->
-
<element name="shifter" defstate="0">
<rect>
<bounds left="0" right="32" top="0" bottom="64" />
@@ -54,10 +51,7 @@ license:CC0
</disk>
</element>
-
-<!-- build screen -->
-
- <view name="Triple-Screen + Shifter">
+ <view name="Triple-Screen Shifter-R">
<screen index="0">
<bounds x="0" y="0" width="640" height="480" />
</screen>
@@ -68,109 +62,45 @@ license:CC0
<bounds x="1280" y="0" width="640" height="480" />
</screen>
- <!-- shifter options -->
- <collection name="Shifter-R Overlay" visible="yes">
- <element ref="shifter" inputtag="soundbrd:PPI_PORTA" inputmask="0x40">
- <bounds x="1886" y="414" width="32" height="64" />
- <color alpha="0.6" />
- </element>
- <collection name="Opaque Shifter" visible="no">
- <element ref="shifter" inputtag="soundbrd:PPI_PORTA" inputmask="0x40">
- <bounds x="1886" y="414" width="32" height="64" />
- </element>
- </collection>
- </collection>
-
- <collection name="Shifter-R Off-screen" visible="no">
- <element ref="shifter" inputtag="soundbrd:PPI_PORTA" inputmask="0x40">
- <bounds x="1928" y="414" width="32" height="64" />
- <color alpha="0.6" />
- </element>
- <collection name="Opaque Shifter " visible="no">
- <element ref="shifter" inputtag="soundbrd:PPI_PORTA" inputmask="0x40">
- <bounds x="1928" y="414" width="32" height="64" />
- </element>
- </collection>
- </collection>
-
- <collection name="Shifter-L Overlay" visible="no">
- <element ref="shifter" inputtag="soundbrd:PPI_PORTA" inputmask="0x40">
- <bounds x="2" y="414" width="32" height="64" />
- <color alpha="0.6" />
- </element>
- <collection name="Opaque Shifter " visible="no">
- <element ref="shifter" inputtag="soundbrd:PPI_PORTA" inputmask="0x40">
- <bounds x="2" y="414" width="32" height="64" />
- </element>
- </collection>
- </collection>
-
- <collection name="Shifter-L Off-screen" visible="no">
- <element ref="shifter" inputtag="soundbrd:PPI_PORTA" inputmask="0x40">
- <bounds x="-40" y="414" width="32" height="64" />
- <color alpha="0.6" />
- </element>
- <collection name="Opaque Shifter " visible="no">
- <element ref="shifter" inputtag="soundbrd:PPI_PORTA" inputmask="0x40">
- <bounds x="-40" y="414" width="32" height="64" />
- </element>
- </collection>
- </collection>
+ <element ref="shifter" inputtag="soundbrd:PPI_PORTA" inputmask="0x40">
+ <bounds x="1886" y="414" width="32" height="64" />
+ <color alpha="0.6" />
+ </element>
</view>
+ <view name="Triple-Screen Shifter-L">
+ <screen index="0">
+ <bounds x="0" y="0" width="640" height="480" />
+ </screen>
+ <screen index="1">
+ <bounds x="640" y="0" width="640" height="480" />
+ </screen>
+ <screen index="2">
+ <bounds x="1280" y="0" width="640" height="480" />
+ </screen>
- <view name="Single-Screen + Shifter">
+ <element ref="shifter" inputtag="soundbrd:PPI_PORTA" inputmask="0x40">
+ <bounds x="2" y="414" width="32" height="64" />
+ <color alpha="0.6" />
+ </element>
+ </view>
+ <view name="Single-Screen Shifter-R">
<screen index="1">
<bounds x="0" y="0" width="640" height="480" />
</screen>
- <!-- shifter options -->
- <collection name="Shifter-R Overlay" visible="yes">
- <element ref="shifter" inputtag="soundbrd:PPI_PORTA" inputmask="0x40">
- <bounds x="606" y="414" width="32" height="64" />
- <color alpha="0.6" />
- </element>
- <collection name="Opaque Shifter" visible="no">
- <element ref="shifter" inputtag="soundbrd:PPI_PORTA" inputmask="0x40">
- <bounds x="606" y="414" width="32" height="64" />
- </element>
- </collection>
- </collection>
-
- <collection name="Shifter-R Off-screen" visible="no">
- <element ref="shifter" inputtag="soundbrd:PPI_PORTA" inputmask="0x40">
- <bounds x="648" y="414" width="32" height="64" />
- <color alpha="0.6" />
- </element>
- <collection name="Opaque Shifter " visible="no">
- <element ref="shifter" inputtag="soundbrd:PPI_PORTA" inputmask="0x40">
- <bounds x="648" y="414" width="32" height="64" />
- </element>
- </collection>
- </collection>
-
- <collection name="Shifter-L Overlay" visible="no">
- <element ref="shifter" inputtag="soundbrd:PPI_PORTA" inputmask="0x40">
- <bounds x="2" y="414" width="32" height="64" />
- <color alpha="0.6" />
- </element>
- <collection name="Opaque Shifter " visible="no">
- <element ref="shifter" inputtag="soundbrd:PPI_PORTA" inputmask="0x40">
- <bounds x="2" y="414" width="32" height="64" />
- </element>
- </collection>
- </collection>
-
- <collection name="Shifter-L Off-screen" visible="no">
- <element ref="shifter" inputtag="soundbrd:PPI_PORTA" inputmask="0x40">
- <bounds x="-40" y="414" width="32" height="64" />
- <color alpha="0.6" />
- </element>
- <collection name="Opaque Shifter " visible="no">
- <element ref="shifter" inputtag="soundbrd:PPI_PORTA" inputmask="0x40">
- <bounds x="-40" y="414" width="32" height="64" />
- </element>
- </collection>
- </collection>
+ <element ref="shifter" inputtag="soundbrd:PPI_PORTA" inputmask="0x40">
+ <bounds x="606" y="414" width="32" height="64" />
+ <color alpha="0.6" />
+ </element>
</view>
+ <view name="Single-Screen Shifter-L">
+ <screen index="1">
+ <bounds x="0" y="0" width="640" height="480" />
+ </screen>
+ <element ref="shifter" inputtag="soundbrd:PPI_PORTA" inputmask="0x40">
+ <bounds x="2" y="414" width="32" height="64" />
+ <color alpha="0.6" />
+ </element>
+ </view>
</mamelayout>
diff --git a/src/mame/layout/contcirc.lay b/src/mame/layout/contcirc.lay
index 3a4cc3ef5e7..d2e76694f6f 100644
--- a/src/mame/layout/contcirc.lay
+++ b/src/mame/layout/contcirc.lay
@@ -103,16 +103,6 @@ license:CC0
<screen index="0"><bounds x="644" y="0" width="640" height="480" /></screen>
<element name="shutter0" ref="shutter"><bounds x="644" y="0" width="640" height="480" /></element>
-
- <!-- shifter options (off-screen shifter is not possible here) -->
- <collection name="Shifter-R" visible="no">
- <element ref="shifter" inputtag="IN1" inputmask="0x10"><bounds x="606" y="414" width="32" height="64" /><color alpha="0.6" /></element>
- <element ref="shifter" inputtag="IN1" inputmask="0x10"><bounds x="1250" y="414" width="32" height="64" /><color alpha="0.6" /></element>
- </collection>
- <collection name="Shifter-L" visible="no">
- <element ref="shifter" inputtag="IN1" inputmask="0x10"><bounds x="2" y="414" width="32" height="64" /><color alpha="0.6" /></element>
- <element ref="shifter" inputtag="IN1" inputmask="0x10"><bounds x="646" y="414" width="32" height="64" /><color alpha="0.6" /></element>
- </collection>
</view>
<view name="3D Scope Cross View">
@@ -122,54 +112,16 @@ license:CC0
<screen index="0"><bounds x="644" y="0" width="640" height="480" /></screen>
<element name="shutter1" ref="shutter"><bounds x="644" y="0" width="640" height="480" /></element>
-
- <!-- shifter options (off-screen shifter is not possible here) -->
- <collection name="Shifter-R" visible="no">
- <element ref="shifter" inputtag="IN1" inputmask="0x10"><bounds x="606" y="414" width="32" height="64" /><color alpha="0.6" /></element>
- <element ref="shifter" inputtag="IN1" inputmask="0x10"><bounds x="1250" y="414" width="32" height="64" /><color alpha="0.6" /></element>
- </collection>
- <collection name="Shifter-L" visible="no">
- <element ref="shifter" inputtag="IN1" inputmask="0x10"><bounds x="2" y="414" width="32" height="64" /><color alpha="0.6" /></element>
- <element ref="shifter" inputtag="IN1" inputmask="0x10"><bounds x="646" y="414" width="32" height="64" /><color alpha="0.6" /></element>
- </collection>
</view>
<view name="3D Scope Left">
<screen index="0"><bounds x="0" y="0" width="640" height="480" /></screen>
<element name="shutter1" ref="shutter"><bounds x="0" y="0" width="640" height="480" /></element>
-
- <!-- shifter options -->
- <collection name="Shifter-R" visible="no">
- <element ref="shifter" inputtag="IN1" inputmask="0x10"><bounds x="606" y="414" width="32" height="64" /><color alpha="0.6" /></element>
- </collection>
- <collection name="Shifter-L" visible="no">
- <element ref="shifter" inputtag="IN1" inputmask="0x10"><bounds x="2" y="414" width="32" height="64" /><color alpha="0.6" /></element>
- </collection>
- <collection name="Widescreen Shifter-R" visible="no">
- <element ref="shifter" inputtag="IN1" inputmask="0x10"><bounds x="648" y="414" width="32" height="64" /></element>
- </collection>
- <collection name="Widescreen Shifter-L" visible="no">
- <element ref="shifter" inputtag="IN1" inputmask="0x10"><bounds x="-40" y="414" width="32" height="64" /></element>
- </collection>
</view>
<view name="3D Scope Right">
<screen index="0"><bounds x="0" y="0" width="640" height="480" /></screen>
<element name="shutter0" ref="shutter"><bounds x="0" y="0" width="640" height="480" /></element>
-
- <!-- shifter options -->
- <collection name="Shifter-R" visible="no">
- <element ref="shifter" inputtag="IN1" inputmask="0x10"><bounds x="606" y="414" width="32" height="64" /><color alpha="0.6" /></element>
- </collection>
- <collection name="Shifter-L" visible="no">
- <element ref="shifter" inputtag="IN1" inputmask="0x10"><bounds x="2" y="414" width="32" height="64" /><color alpha="0.6" /></element>
- </collection>
- <collection name="Widescreen Shifter-R" visible="no">
- <element ref="shifter" inputtag="IN1" inputmask="0x10"><bounds x="648" y="414" width="32" height="64" /></element>
- </collection>
- <collection name="Widescreen Shifter-L" visible="no">
- <element ref="shifter" inputtag="IN1" inputmask="0x10"><bounds x="-40" y="414" width="32" height="64" /></element>
- </collection>
</view>
</mamelayout>
diff --git a/src/mame/layout/enforceja.lay b/src/mame/layout/enforceja.lay
index b1614932736..f5c087225ed 100644
--- a/src/mame/layout/enforceja.lay
+++ b/src/mame/layout/enforceja.lay
@@ -103,16 +103,6 @@ license:CC0
<screen index="0"><bounds x="644" y="0" width="640" height="480" /></screen>
<element name="shutter0" ref="shutter"><bounds x="644" y="0" width="640" height="480" /></element>
-
- <!-- shifter options (off-screen shifter is not possible here) -->
- <collection name="Shifter-R" visible="no">
- <element ref="shifter" inputtag="IN2" inputmask="0x01"><bounds x="606" y="414" width="32" height="64" /><color alpha="0.6" /></element>
- <element ref="shifter" inputtag="IN2" inputmask="0x01"><bounds x="1250" y="414" width="32" height="64" /><color alpha="0.6" /></element>
- </collection>
- <collection name="Shifter-L" visible="no">
- <element ref="shifter" inputtag="IN2" inputmask="0x01"><bounds x="2" y="414" width="32" height="64" /><color alpha="0.6" /></element>
- <element ref="shifter" inputtag="IN2" inputmask="0x01"><bounds x="646" y="414" width="32" height="64" /><color alpha="0.6" /></element>
- </collection>
</view>
<view name="3D Scope Cross View">
@@ -122,54 +112,16 @@ license:CC0
<screen index="0"><bounds x="644" y="0" width="640" height="480" /></screen>
<element name="shutter1" ref="shutter"><bounds x="644" y="0" width="640" height="480" /></element>
-
- <!-- shifter options (off-screen shifter is not possible here) -->
- <collection name="Shifter-R" visible="no">
- <element ref="shifter" inputtag="IN2" inputmask="0x01"><bounds x="606" y="414" width="32" height="64" /><color alpha="0.6" /></element>
- <element ref="shifter" inputtag="IN2" inputmask="0x01"><bounds x="1250" y="414" width="32" height="64" /><color alpha="0.6" /></element>
- </collection>
- <collection name="Shifter-L" visible="no">
- <element ref="shifter" inputtag="IN2" inputmask="0x01"><bounds x="2" y="414" width="32" height="64" /><color alpha="0.6" /></element>
- <element ref="shifter" inputtag="IN2" inputmask="0x01"><bounds x="646" y="414" width="32" height="64" /><color alpha="0.6" /></element>
- </collection>
</view>
<view name="3D Scope Left">
<screen index="0"><bounds x="0" y="0" width="640" height="480" /></screen>
<element name="shutter1" ref="shutter"><bounds x="0" y="0" width="640" height="480" /></element>
-
- <!-- shifter options -->
- <collection name="Shifter-R" visible="no">
- <element ref="shifter" inputtag="IN2" inputmask="0x01"><bounds x="606" y="414" width="32" height="64" /><color alpha="0.6" /></element>
- </collection>
- <collection name="Shifter-L" visible="no">
- <element ref="shifter" inputtag="IN2" inputmask="0x01"><bounds x="2" y="414" width="32" height="64" /><color alpha="0.6" /></element>
- </collection>
- <collection name="Widescreen Shifter-R" visible="no">
- <element ref="shifter" inputtag="IN2" inputmask="0x01"><bounds x="648" y="414" width="32" height="64" /></element>
- </collection>
- <collection name="Widescreen Shifter-L" visible="no">
- <element ref="shifter" inputtag="IN2" inputmask="0x01"><bounds x="-40" y="414" width="32" height="64" /></element>
- </collection>
</view>
<view name="3D Scope Right">
<screen index="0"><bounds x="0" y="0" width="640" height="480" /></screen>
<element name="shutter0" ref="shutter"><bounds x="0" y="0" width="640" height="480" /></element>
-
- <!-- shifter options -->
- <collection name="Shifter-R" visible="no">
- <element ref="shifter" inputtag="IN2" inputmask="0x01"><bounds x="606" y="414" width="32" height="64" /><color alpha="0.6" /></element>
- </collection>
- <collection name="Shifter-L" visible="no">
- <element ref="shifter" inputtag="IN2" inputmask="0x01"><bounds x="2" y="414" width="32" height="64" /><color alpha="0.6" /></element>
- </collection>
- <collection name="Widescreen Shifter-R" visible="no">
- <element ref="shifter" inputtag="IN2" inputmask="0x01"><bounds x="648" y="414" width="32" height="64" /></element>
- </collection>
- <collection name="Widescreen Shifter-L" visible="no">
- <element ref="shifter" inputtag="IN2" inputmask="0x01"><bounds x="-40" y="414" width="32" height="64" /></element>
- </collection>
</view>
</mamelayout>
diff --git a/src/mame/layout/outrun.lay b/src/mame/layout/outrun.lay
index f02ddb3a4b0..a44fafdb3cb 100644
--- a/src/mame/layout/outrun.lay
+++ b/src/mame/layout/outrun.lay
@@ -3,9 +3,6 @@
license:CC0
-->
<mamelayout version="2">
-
-<!-- define elements -->
-
<element name="shifter" defstate="0">
<rect>
<bounds left="0" right="32" top="0" bottom="64" />
@@ -54,62 +51,38 @@ license:CC0
</disk>
</element>
-
-<!-- build screen -->
-
- <view name="Shifter">
+ <view name="Shifter-R">
<screen index="0">
<bounds x="0" y="0" width="640" height="480" />
</screen>
-
- <!-- shifter options -->
- <collection name="Shifter-R Overlay" visible="yes">
- <element ref="shifter" inputtag="SERVICE" inputmask="0x10">
- <bounds x="606" y="414" width="32" height="64" />
- <color alpha="0.6" />
- </element>
- <collection name="Opaque Shifter" visible="no">
- <element ref="shifter" inputtag="SERVICE" inputmask="0x10">
- <bounds x="606" y="414" width="32" height="64" />
- </element>
- </collection>
- </collection>
-
- <collection name="Shifter-R Off-screen" visible="no">
- <element ref="shifter" inputtag="SERVICE" inputmask="0x10">
- <bounds x="648" y="414" width="32" height="64" />
- <color alpha="0.6" />
- </element>
- <collection name="Opaque Shifter " visible="no">
- <element ref="shifter" inputtag="SERVICE" inputmask="0x10">
- <bounds x="648" y="414" width="32" height="64" />
- </element>
- </collection>
- </collection>
-
- <collection name="Shifter-L Overlay" visible="no">
- <element ref="shifter" inputtag="SERVICE" inputmask="0x10">
- <bounds x="2" y="414" width="32" height="64" />
- <color alpha="0.6" />
- </element>
- <collection name="Opaque Shifter " visible="no">
- <element ref="shifter" inputtag="SERVICE" inputmask="0x10">
- <bounds x="2" y="414" width="32" height="64" />
- </element>
- </collection>
- </collection>
-
- <collection name="Shifter-L Off-screen" visible="no">
- <element ref="shifter" inputtag="SERVICE" inputmask="0x10">
- <bounds x="-40" y="414" width="32" height="64" />
- <color alpha="0.6" />
- </element>
- <collection name="Opaque Shifter " visible="no">
- <element ref="shifter" inputtag="SERVICE" inputmask="0x10">
- <bounds x="-40" y="414" width="32" height="64" />
- </element>
- </collection>
- </collection>
-
+ <element ref="shifter" inputtag="SERVICE" inputmask="0x10">
+ <bounds x="606" y="414" width="32" height="64" />
+ <color alpha="0.6" />
+ </element>
+ </view>
+ <view name="Shifter-L">
+ <screen index="0">
+ <bounds x="0" y="0" width="640" height="480" />
+ </screen>
+ <element ref="shifter" inputtag="SERVICE" inputmask="0x10">
+ <bounds x="2" y="414" width="32" height="64" />
+ <color alpha="0.6" />
+ </element>
+ </view>
+ <view name="Widescreen Shifter-R">
+ <screen index="0">
+ <bounds x="0" y="0" width="640" height="480" />
+ </screen>
+ <element ref="shifter" inputtag="SERVICE" inputmask="0x10">
+ <bounds x="648" y="414" width="32" height="64" />
+ </element>
+ </view>
+ <view name="Widescreen Shifter-L">
+ <screen index="0">
+ <bounds x="0" y="0" width="640" height="480" />
+ </screen>
+ <element ref="shifter" inputtag="SERVICE" inputmask="0x10">
+ <bounds x="-40" y="414" width="32" height="64" />
+ </element>
</view>
</mamelayout>