Skip to content

Commit 825c2d2

Browse files
committed
fidel_phantom: update internal artwork color theme
1 parent c4b4da6 commit 825c2d2

File tree

5 files changed

+341
-336
lines changed

5 files changed

+341
-336
lines changed

src/mame/chess/excal_mirage.cpp

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ void mirage_state::clear_board(int state)
183183

184184
void mirage_state::init_motors()
185185
{
186-
m_motor_period = attotime::from_usec(600);
186+
m_motor_period = attotime::from_usec(800);
187187

188188
for (int i = 0; i < 2; i++)
189189
{
@@ -267,7 +267,7 @@ void mirage_state::update_piece(u8 magnet)
267267
if (x < 0)
268268
x += 12;
269269

270-
const bool valid_pos = (mx & 2) && (my & 2);
270+
const bool valid_pos = ((mx | my) & 3) == 2;
271271

272272
// sensorboard handling is almost the same as fidelity/phantom.cpp
273273
if (magnet)
@@ -289,21 +289,9 @@ void mirage_state::update_piece(u8 magnet)
289289
}
290290
else
291291
{
292-
int count = 0;
293-
294-
// check surrounding area for piece
295-
for (int sy = my & ~1; sy <= (my | 1); sy++)
296-
for (int sx = mx & ~1; sx <= (mx | 1); sx++)
297-
if (m_pieces_map[sy][sx] != 0)
298-
{
299-
m_piece_hand = m_pieces_map[sy][sx];
300-
m_pieces_map[sy][sx] = 0;
301-
count++;
302-
}
303-
304-
// more than one piece found (shouldn't happen)
305-
if (count > 1)
306-
popmessage("Internal collision!");
292+
// pick up piece from internal pieces map
293+
m_piece_hand = m_pieces_map[my][mx];
294+
m_pieces_map[my][mx] = 0;
307295
}
308296
}
309297
else if (m_piece_hand != 0)

src/mame/fidelity/phantom.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ and 2 leds to mimic eyes, and the housing color theme is green instead of beige.
3535
3636
TODO:
3737
- sensorboard undo buffer goes out of control, probably not worth solving this issue
38-
- cphantom artwork should be green instead of beige
3938
4039
BTANB:
4140
- cphantom: As the manual suggests, the computer's move should be displayed on the

src/mame/layout/excal_mirage.lay

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

1010
<element name="blackb"><rect><color red="0" green="0" blue="0" /></rect></element>
11-
<element name="red"><rect><color red="0.4" green="0.0" blue="0.15" /></rect></element>
11+
<element name="red"><rect><color red="0.3" green="0.0" blue="0.05" /></rect></element>
1212
<element name="lcdm"><rect><color red="0.7" green="0.71" blue="0.72" /></rect></element>
1313

1414
<element name="text_1"><text string="1"><color red="0.81" green="0.8" blue="0.79" /></text></element>
@@ -53,7 +53,8 @@ authors:hap
5353

5454
<element name="cblack"><rect><color red="0.41" green="0.4" blue="0.39" /></rect></element>
5555
<element name="cwhite"><rect><color red="0.81" green="0.8" blue="0.79" /></rect></element>
56-
<element name="whitem"><rect><color red="0.4" green="0.4" blue="0.4" /></rect></element>
56+
<element name="dgray"><rect><color red="0.21" green="0.2" blue="0.19" /></rect></element>
57+
<element name="whitem"><rect><color red="0.6" green="0.6" blue="0.6" /></rect></element>
5758

5859
<element name="text_black"><text string="BLACK"><color red="0.81" green="0.8" blue="0.79" /></text></element>
5960
<element name="text_white"><text string="WHITE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
@@ -101,9 +102,9 @@ authors:hap
101102
<bounds x="-20" y="-2.5" width="120" height="85.0" />
102103
<element ref="blackb"><bounds x="-20" y="-2.5" width="120" height="85.0" /></element>
103104
<element ref="red"><bounds x="-19.7" y="-2.5" width="119.4" height="85.0" /></element>
104-
<element ref="cblack"><bounds x="-19.4" y="-2.2" width="118.8" height="84.4" /></element>
105+
<element ref="dgray"><bounds x="-19.4" y="-2.2" width="118.8" height="84.4" /></element>
105106
<element ref="red"><bounds x="-0.6" y="-0.6" width="81.2" height="81.2" /></element>
106-
<element ref="cblack"><bounds x="-0.3" y="-0.3" width="80.6" height="80.6" /></element>
107+
<element ref="dgray"><bounds x="-0.3" y="-0.3" width="80.6" height="80.6" /></element>
107108

108109
<!-- squares (avoid seams) -->
109110
<element ref="cwhite"><bounds x="0" y="0" width="11" height="11" /></element>
@@ -227,15 +228,15 @@ authors:hap
227228

228229
<element ref="whitem" blend="multiply"><bounds xc="-10" yc="40" width="17" height="80" /></element>
229230
<element ref="whitem" blend="multiply"><bounds xc="90" yc="40" width="17" height="80" /></element>
230-
<element ref="cblack" blend="add"><bounds xc="-10" yc="40" width="17" height="80" /></element>
231-
<element ref="cblack" blend="add"><bounds xc="90" yc="40" width="17" height="80" /></element>
231+
<element ref="dgray" blend="add"><bounds xc="-10" yc="40" width="17" height="80" /></element>
232+
<element ref="dgray" blend="add"><bounds xc="90" yc="40" width="17" height="80" /></element>
232233

233234
<element ref="cwhite"><bounds xc="-10" yc="-0.4" width="10" height="2.8" /></element>
234-
<element ref="cblack"><bounds xc="-10" yc="-0.4" width="9.4" height="2.2" /></element>
235+
<element ref="dgray"><bounds xc="-10" yc="-0.4" width="9.4" height="2.2" /></element>
235236
<element ref="text_black"><bounds xc="-10" yc="-0.5" width="10" height="2.3" /></element>
236237

237238
<element ref="cwhite"><bounds xc="90" yc="-0.4" width="10" height="2.8" /></element>
238-
<element ref="cblack"><bounds xc="90" yc="-0.4" width="9.4" height="2.2" /></element>
239+
<element ref="dgray"><bounds xc="90" yc="-0.4" width="9.4" height="2.2" /></element>
239240
<element ref="text_white"><bounds xc="90" yc="-0.5" width="10" height="2.3" /></element>
240241

241242
<!-- sensors, pieces -->

0 commit comments

Comments
 (0)