Previous 199869 Revisions Next

r33658 Wednesday 3rd December, 2014 at 19:56:13 UTC by Angelo Salese
Merge branch 'master' of https://github.com/mamedev/mame
[src/emu/bus/psx]memcard.h multitap.c
[src/mess/drivers]comp4.c starwbc.c
[src/mess/layout]comp4.lay

trunk/src/emu/bus/psx/memcard.h
r242169r242170
6363   virtual void device_reset();
6464   virtual void device_config_complete();
6565
66   void clock_w(bool state) { if(m_clock && !m_sel && !state && !m_pad) do_card(); m_clock = state; }
66   void clock_w(bool state) { if(!m_clock && !m_sel && state && !m_pad) do_card(); m_clock = state; }
6767   void sel_w(bool state);
6868   bool rx_r() { return m_rx; }
6969   bool ack_r() { return m_ack; }
trunk/src/emu/bus/psx/multitap.c
r242169r242170
7979         dev = m_portd;
8080         break;
8181   }
82   dev->clock_w(0);
83   dev->tx_w(tx);
8284   dev->clock_w(1);
83   dev->tx_w(tx);
84   dev->clock_w(0);
8585}
8686
8787bool psx_multitap_device::get_rx_line(int port)
trunk/src/mess/drivers/comp4.c
r242169r242170
55  Milton Bradley Comp IV
66  * TMC0904NL CP0904A (die labeled 4A0970D-04A)
77 
8  This is a handheld Mastermind game; a code-breaking game where the player
8  This is small tabletop Mastermind game; a code-breaking game where the player
99  needs to find out the correct sequence of colours (numbers in our case).
1010  It is known as Logic 5 in Europe, and as Pythaligoras in Japan.
1111 
trunk/src/mess/drivers/starwbc.c
r242169r242170
9898
9999   /* no video! */
100100
101   /* no sound! */
101   /* sound hardware */
102//   MCFG_SPEAKER_STANDARD_MONO("mono")
102103MACHINE_CONFIG_END
103104
104105
r242169r242170
120121ROM_END
121122
122123
123CONS( 1979, starwbc, 0, 0, starwbc, starwbc, driver_device, 0, "Kenner", "Star Wars: Electronic Battle Command Game", GAME_NOT_WORKING | GAME_SUPPORTS_SAVE | GAME_NO_SOUND_HW )
124CONS( 1979, starwbc, 0, 0, starwbc, starwbc, driver_device, 0, "Kenner", "Star Wars: Electronic Battle Command Game", GAME_NOT_WORKING | GAME_SUPPORTS_SAVE | GAME_NO_SOUND )
trunk/src/mess/layout/comp4.lay
r242169r242170
11<?xml version="1.0"?>
22<mamelayout version="2">
33
4   <element name="lamp_disk_red" defstate="0">
5      <disk state="1"><color red="1.0" green="0.3" blue="0.2" /></disk>
6      <disk state="0"><color red="0.2" green="0.05" blue="0.03" /></disk>
4<!-- define elements -->
5
6   <element name="static_darkred"><rect><color red="0.20" green="0.04" blue="0.01" /></rect></element>
7
8   <element name="cg1"><rect><color red="0.85" green="0.85" blue="0.85" /></rect></element>
9   <element name="cg2"><rect><color red="0.74" green="0.76" blue="0.86" /></rect></element>
10   <element name="cg3"><rect><color red="0.63" green="0.67" blue="0.87" /></rect></element>
11   <element name="cg4"><rect><color red="0.52" green="0.58" blue="0.88" /></rect></element>
12   <element name="cg5"><rect><color red="0.41" green="0.49" blue="0.89" /></rect></element>
13
14   <element name="text_r">
15      <rect><color red="0.20" green="0.04" blue="0.01" /></rect>
16      <text string="R" align="2"><color red="0.87" green="0.87" blue="0.87" /></text>
717   </element>
18   <element name="text_5">
19      <rect><color red="0.20" green="0.04" blue="0.01" /></rect>
20      <text string="5" align="2"><color red="0.87" green="0.87" blue="0.87" /></text>
21   </element>
22   <element name="text_4">
23      <rect><color red="0.20" green="0.04" blue="0.01" /></rect>
24      <text string="4" align="2"><color red="0.87" green="0.87" blue="0.87" /></text>
25   </element>
26   <element name="text_3">
27      <rect><color red="0.20" green="0.04" blue="0.01" /></rect>
28      <text string="3" align="2"><color red="0.87" green="0.87" blue="0.87" /></text>
29   </element>
30   <element name="text_2">
31      <rect><color red="0.20" green="0.04" blue="0.01" /></rect>
32      <text string="2" align="2"><color red="0.87" green="0.87" blue="0.87" /></text>
33   </element>
34   <element name="text_1">
35      <rect><color red="0.20" green="0.04" blue="0.01" /></rect>
36      <text string="1" align="2"><color red="0.87" green="0.87" blue="0.87" /></text>
37   </element>
838
39   <element name="text_num">
40      <rect><color red="0.20" green="0.04" blue="0.01" /></rect>
41      <text string="NUMBER" align="1"><color red="0.85" green="0.85" blue="0.85" /></text>
42   </element>
43   <element name="text_seq">
44      <rect><color red="0.20" green="0.04" blue="0.01" /></rect>
45      <text string="SEQUENCE" align="2"><color red="0.85" green="0.85" blue="0.85" /></text>
46   </element>
47
48   <element name="lamp" defstate="0">
49      <rect><color red="0.85" green="0.85" blue="0.85" /></rect>
50      <rect>
51         <color red="0.20" green="0.04" blue="0.01" />
52         <bounds x="0.1" y="0.12" width="0.8" height="0.76" />
53      </rect>
54      <disk state="1">
55         <color red="1.0" green="0.20" blue="0.15" />
56         <bounds x="0.31" y="0.25" width="0.38" height="0.5" />
57      </disk>
58      <disk state="0">
59         <color red="0.3" green="0.05" blue="0.03" />
60         <bounds x="0.31" y="0.25" width="0.38" height="0.5" />
61      </disk>
62   </element>
63
64
65
66<!-- build screen -->
67
968   <view name="Internal Layout">
10      <bounds left="0" right="180" top="0" bottom="100" />
69      <bounds left="0" right="60" top="0" bottom="42" />
70      <bezel element="static_darkred">
71         <bounds left="0" right="60" top="0" bottom="42" />
72      </bezel>
1173
12      <bezel name="lamp4" element="lamp_disk_red">
13         <bounds x="10" y="50" width="5" height="5" />
74      <bezel element="cg1"><bounds x="17" y="2" width="26" height="35" /></bezel>
75      <bezel element="cg2"><bounds x="19" y="2" width="22" height="35" /></bezel>
76      <bezel element="cg3"><bounds x="21" y="2" width="18" height="35" /></bezel>
77      <bezel element="cg4"><bounds x="23" y="2" width="14" height="35" /></bezel>
78      <bezel element="cg5"><bounds x="25" y="2" width="10" height="35" /></bezel>
79
80      <bezel element="static_darkred"><bounds x="27" y="1" width="6" height="40" /></bezel>
81      <bezel element="static_darkred"><bounds x="32" y="1.5" width="20" height="7" /></bezel>
82
83      <bezel element="static_darkred"><bounds x="16" y="8" width="40" height="1" /></bezel>
84      <bezel element="static_darkred"><bounds x="16" y="15" width="40" height="1" /></bezel>
85      <bezel element="static_darkred"><bounds x="16" y="22" width="40" height="1" /></bezel>
86      <bezel element="static_darkred"><bounds x="16" y="29" width="40" height="1" /></bezel>
87      <bezel element="static_darkred"><bounds x="16" y="36" width="40" height="5" /></bezel>
88
89      <bezel element="text_r"><bounds x="36" y="1.5" width="7" height="7" /></bezel>
90
91      <bezel element="text_5"><bounds x="27" y="1.5" width="5" height="7" /></bezel>
92      <bezel element="text_4"><bounds x="27" y="8.5" width="5" height="7" /></bezel>
93      <bezel element="text_3"><bounds x="27" y="15.5" width="5" height="7" /></bezel>
94      <bezel element="text_2"><bounds x="27" y="22.5" width="5" height="7" /></bezel>
95      <bezel element="text_1"><bounds x="27" y="29.5" width="5" height="7" /></bezel>
96
97      <bezel element="text_num"><bounds x="8" y="36.5" width="22" height="3.5" /></bezel>
98      <bezel element="text_seq"><bounds x="30" y="36.5" width="22" height="3.5" /></bezel>
99
100      <bezel name="lamp4" element="lamp">
101         <bounds x="8" y="2" width="8" height="6" />
14102      </bezel>
15      <bezel name="lamp10" element="lamp_disk_red">
16         <bounds x="10" y="60" width="5" height="5" />
103      <bezel name="lamp10" element="lamp">
104         <bounds x="8" y="9" width="8" height="6" />
17105      </bezel>
18      <bezel name="lamp2" element="lamp_disk_red">
19         <bounds x="10" y="70" width="5" height="5" />
106      <bezel name="lamp2" element="lamp">
107         <bounds x="8" y="16" width="8" height="6" />
20108      </bezel>
21      <bezel name="lamp1" element="lamp_disk_red">
22         <bounds x="10" y="80" width="5" height="5" />
109      <bezel name="lamp1" element="lamp">
110         <bounds x="8" y="23" width="8" height="6" />
23111      </bezel>
24      <bezel name="lamp0" element="lamp_disk_red">
25         <bounds x="10" y="90" width="5" height="5" />
112      <bezel name="lamp0" element="lamp">
113         <bounds x="8" y="30" width="8" height="6" />
26114      </bezel>
27115
28      <bezel name="lamp9" element="lamp_disk_red">
29         <bounds x="30" y="50" width="5" height="5" />
116      <bezel name="lamp9" element="lamp">
117         <bounds x="44" y="2" width="8" height="6" />
30118      </bezel>
31      <bezel name="lamp8" element="lamp_disk_red">
32         <bounds x="30" y="60" width="5" height="5" />
119      <bezel name="lamp8" element="lamp">
120         <bounds x="44" y="9" width="8" height="6" />
33121      </bezel>
34      <bezel name="lamp7" element="lamp_disk_red">
35         <bounds x="30" y="70" width="5" height="5" />
122      <bezel name="lamp7" element="lamp">
123         <bounds x="44" y="16" width="8" height="6" />
36124      </bezel>
37      <bezel name="lamp6" element="lamp_disk_red">
38         <bounds x="30" y="80" width="5" height="5" />
125      <bezel name="lamp6" element="lamp">
126         <bounds x="44" y="23" width="8" height="6" />
39127      </bezel>
40      <bezel name="lamp5" element="lamp_disk_red">
41         <bounds x="30" y="90" width="5" height="5" />
128      <bezel name="lamp5" element="lamp">
129         <bounds x="44" y="30" width="8" height="6" />
42130      </bezel>
43131
44132   </view>

https://github.com/mamedev/mame/commit/b33635fe18d1f07a1fa62e80aa13d2db0bdf8709

Previous 199869 Revisions Next

© 1997-2024 The MAME Team