Skip to content

Commit 41a62d1

Browse files
committed
Systems promoted to working
--------------------------- Grand Master (Milton Bradley) [hap, Berger]
1 parent 54b44b5 commit 41a62d1

7 files changed

Lines changed: 271 additions & 48 deletions

File tree

src/devices/machine/gmboard.cpp

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Hardware notes:
1919
2020
Concept/design by Milton Bradley, for use in the Grand Master. Fidelity licensed
2121
or bought the design, and applied it nearly unchanged to Fidelity Phantom. Years
22-
later, the ex chief engineer of by then defunct Fidelity used the same technology
22+
later, the ex chief engineer of Fidelity (by then defunct) used the same technology
2323
while working for Excalibur.
2424
2525
TODO:
@@ -99,8 +99,6 @@ void gmboard_device::device_start()
9999
void gmboard_device::device_reset()
100100
{
101101
memset(m_motor_drift, 0, sizeof(m_motor_drift));
102-
m_magnet = 0;
103-
104102
output_magnet_pos();
105103
}
106104

@@ -207,7 +205,7 @@ void gmboard_device::magnet_w(int state)
207205
return;
208206
m_magnet = state;
209207

210-
if (m_piece_hand != 0)
208+
if (m_piece_hand)
211209
realign_magnet_pos();
212210
output_magnet_pos();
213211

@@ -229,8 +227,6 @@ void gmboard_device::magnet_w(int state)
229227

230228
if (state)
231229
{
232-
bool found = false;
233-
234230
if (valid_pos)
235231
{
236232
// pick up piece, unless it was picked up by the user
@@ -239,16 +235,15 @@ void gmboard_device::magnet_w(int state)
239235
{
240236
m_piece_hand = m_board->read_piece(x, y);
241237

242-
if (m_piece_hand != 0)
238+
if (m_piece_hand)
243239
{
244-
found = true;
245240
m_board->write_piece(x, y, 0);
246241
m_board->refresh();
247242
}
248243
}
249244
}
250245

251-
if (!found)
246+
if (!m_piece_hand)
252247
{
253248
int count = 0;
254249

@@ -273,6 +268,7 @@ void gmboard_device::magnet_w(int state)
273268
{
274269
LOGMASKED(LOG_MAGNET, "%s piece %2d @ %2d,%2d (%2d,%2d)\n", state ? "grab" : "drop", m_piece_hand, x, y, gx, gy);
275270

271+
// drop piece
276272
if (!state)
277273
{
278274
if (valid_pos)

src/mame/fidelity/phantom.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ u8 phantom_state::motors_r(offs_t offset)
318318
{
319319
u8 data = 0x3f;
320320

321-
// IRQ F/F output
321+
// IRQ F/F Q
322322
if (offset)
323323
{
324324
data |= m_irq_ff[1]->output_r() << 6;

src/mame/layout/fidel_cphantom.lay

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ authors:Sandro Ronco, hap
88
<!-- define elements -->
99

1010
<element name="blackb"><rect><color red="0" green="0" blue="0" /></rect></element>
11-
<element name="greenb"><rect><color red="0.1" green="0.8" blue="0.35" /></rect></element>
1211
<element name="blackbd"><disk><color red="0" green="0" blue="0" /></disk></element>
1312
<element name="whited"><disk><color red="0.99" green="0.99" blue="0.99" /></disk></element>
1413
<element name="lcd_bg"><rect><color red="0.54" green="0.57" blue="0.58" /></rect></element>
@@ -490,6 +489,17 @@ authors:Sandro Ronco, hap
490489
</rect>
491490
</element>
492491

492+
<element name="outline3">
493+
<rect>
494+
<bounds xc="0" yc="0" width="6" height="4.5" />
495+
<color red="0.1" green="0.8" blue="0.35" />
496+
</rect>
497+
<rect>
498+
<bounds xc="0" yc="0" width="5.6" height="4.1" />
499+
<color red="0" green="0" blue="0" />
500+
</rect>
501+
</element>
502+
493503
<element name="text_u1"><text string="VERIFY"><color red="0.01" green="0.01" blue="0.01" /></text></element>
494504
<element name="text_u2"><text string="OPTION"><color red="0.01" green="0.01" blue="0.01" /></text></element>
495505
<element name="text_u3"><text string="LEVEL"><color red="0.01" green="0.01" blue="0.01" /></text></element>
@@ -533,9 +543,9 @@ authors:Sandro Ronco, hap
533543
<group name="panel">
534544
<bounds x="-3" y="0" width="125" height="17" />
535545

536-
<element ref="greenb"><bounds x="51" y="4" width="6" height="4.5" /></element>
537-
<element ref="blackb"><bounds x="51.5" y="4.5" width="5" height="3.5" /></element>
546+
<element ref="outline3"><bounds x="51" y="4" width="6" height="4.5" /></element>
538547
<element name="0.8" ref="led"><bounds x="53.2" y="5.5" width="1.5" height="1.5" /></element>
548+
539549
<element ref="cwhite"><bounds x="51" y="9.5" width="6" height="4.5" /></element>
540550
<element ref="text_shift"><bounds x="51" y="10.9" width="6" height="1.5" /></element>
541551
<element ref="hlr" inputtag="IN.0" inputmask="0x100"><bounds x="51" y="9.5" width="6" height="4.5" /><color alpha="0.3" /></element>

src/mame/layout/fidel_phantom.lay

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ authors:Sandro Ronco, hap
88
<!-- define elements -->
99

1010
<element name="blackb"><rect><color red="0" green="0" blue="0" /></rect></element>
11-
<element name="redb"><rect><color red="0.81" green="0.3" blue="0.29" /></rect></element>
1211
<element name="blackbd"><disk><color red="0" green="0" blue="0" /></disk></element>
1312
<element name="whited"><disk><color red="0.99" green="0.99" blue="0.99" /></disk></element>
1413
<element name="lcd_bg"><rect><color red="0.54" green="0.57" blue="0.58" /></rect></element>
@@ -490,6 +489,17 @@ authors:Sandro Ronco, hap
490489
</rect>
491490
</element>
492491

492+
<element name="outline3">
493+
<rect>
494+
<bounds xc="0" yc="0" width="6" height="4.5" />
495+
<color red="0.81" green="0.3" blue="0.29" />
496+
</rect>
497+
<rect>
498+
<bounds xc="0" yc="0" width="5.6" height="4.1" />
499+
<color red="0" green="0" blue="0" />
500+
</rect>
501+
</element>
502+
493503
<element name="text_u1"><text string="VERIFY"><color red="0.01" green="0.01" blue="0.01" /></text></element>
494504
<element name="text_u2"><text string="OPTION"><color red="0.01" green="0.01" blue="0.01" /></text></element>
495505
<element name="text_u3"><text string="LEVEL"><color red="0.01" green="0.01" blue="0.01" /></text></element>
@@ -533,9 +543,9 @@ authors:Sandro Ronco, hap
533543
<group name="panel">
534544
<bounds x="-3" y="0" width="125" height="17" />
535545

536-
<element ref="redb"><bounds x="51" y="4" width="6" height="4.5" /></element>
537-
<element ref="blackb"><bounds x="51.5" y="4.5" width="5" height="3.5" /></element>
546+
<element ref="outline3"><bounds x="51" y="4" width="6" height="4.5" /></element>
538547
<element name="0.8" ref="led"><bounds x="53.2" y="5.5" width="1.5" height="1.5" /></element>
548+
539549
<element ref="cwhite"><bounds x="51" y="9.5" width="6" height="4.5" /></element>
540550
<element ref="text_shift"><bounds x="51" y="10.9" width="6" height="1.5" /></element>
541551
<element ref="hlr" inputtag="IN.0" inputmask="0x100"><bounds x="51" y="9.5" width="6" height="4.5" /><color alpha="0.3" /></element>

0 commit comments

Comments
 (0)