From 825c2d21ea90934f98d06060c82d7ef5a32eb67d Mon Sep 17 00:00:00 2001 From: hap Date: Tue, 19 Mar 2024 15:55:23 +0100 Subject: fidel_phantom: update internal artwork color theme --- src/mame/chess/excal_mirage.cpp | 22 +-- src/mame/fidelity/phantom.cpp | 1 - src/mame/layout/excal_mirage.lay | 17 +- src/mame/layout/fidel_cphantom.lay | 321 +++++++++++++++++++------------------ src/mame/layout/fidel_phantom.lay | 316 ++++++++++++++++++------------------ 5 files changed, 341 insertions(+), 336 deletions(-) diff --git a/src/mame/chess/excal_mirage.cpp b/src/mame/chess/excal_mirage.cpp index cf113377731..3d6a420441e 100644 --- a/src/mame/chess/excal_mirage.cpp +++ b/src/mame/chess/excal_mirage.cpp @@ -183,7 +183,7 @@ void mirage_state::clear_board(int state) void mirage_state::init_motors() { - m_motor_period = attotime::from_usec(600); + m_motor_period = attotime::from_usec(800); for (int i = 0; i < 2; i++) { @@ -267,7 +267,7 @@ void mirage_state::update_piece(u8 magnet) if (x < 0) x += 12; - const bool valid_pos = (mx & 2) && (my & 2); + const bool valid_pos = ((mx | my) & 3) == 2; // sensorboard handling is almost the same as fidelity/phantom.cpp if (magnet) @@ -289,21 +289,9 @@ void mirage_state::update_piece(u8 magnet) } else { - int count = 0; - - // check surrounding area for piece - for (int sy = my & ~1; sy <= (my | 1); sy++) - for (int sx = mx & ~1; sx <= (mx | 1); sx++) - if (m_pieces_map[sy][sx] != 0) - { - m_piece_hand = m_pieces_map[sy][sx]; - m_pieces_map[sy][sx] = 0; - count++; - } - - // more than one piece found (shouldn't happen) - if (count > 1) - popmessage("Internal collision!"); + // pick up piece from internal pieces map + m_piece_hand = m_pieces_map[my][mx]; + m_pieces_map[my][mx] = 0; } } else if (m_piece_hand != 0) diff --git a/src/mame/fidelity/phantom.cpp b/src/mame/fidelity/phantom.cpp index 131e4cd77f1..4922f324316 100644 --- a/src/mame/fidelity/phantom.cpp +++ b/src/mame/fidelity/phantom.cpp @@ -35,7 +35,6 @@ and 2 leds to mimic eyes, and the housing color theme is green instead of beige. TODO: - sensorboard undo buffer goes out of control, probably not worth solving this issue -- cphantom artwork should be green instead of beige BTANB: - cphantom: As the manual suggests, the computer's move should be displayed on the diff --git a/src/mame/layout/excal_mirage.lay b/src/mame/layout/excal_mirage.lay index 37f66cb8829..bf242b143b1 100644 --- a/src/mame/layout/excal_mirage.lay +++ b/src/mame/layout/excal_mirage.lay @@ -8,7 +8,7 @@ authors:hap - + @@ -53,7 +53,8 @@ authors:hap - + + @@ -101,9 +102,9 @@ authors:hap - + - + @@ -227,15 +228,15 @@ authors:hap - - + + - + - + diff --git a/src/mame/layout/fidel_cphantom.lay b/src/mame/layout/fidel_cphantom.lay index c4b74128c03..d61b0c165e1 100644 --- a/src/mame/layout/fidel_cphantom.lay +++ b/src/mame/layout/fidel_cphantom.lay @@ -7,13 +7,11 @@ authors:Sandro Ronco, hap - - - - + + + - @@ -24,8 +22,8 @@ authors:Sandro Ronco, hap - - + + @@ -51,62 +49,41 @@ authors:Sandro Ronco, hap - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -118,8 +95,13 @@ authors:Sandro Ronco, hap - - + + + + + + + @@ -161,7 +143,12 @@ authors:Sandro Ronco, hap - + + + + + + @@ -274,35 +261,40 @@ authors:Sandro Ronco, hap + + + - - - - + + + + - - - - + + + + - - - - + + + + - - + + + + - - + + @@ -318,10 +310,10 @@ authors:Sandro Ronco, hap - - - - + + + + @@ -332,10 +324,10 @@ authors:Sandro Ronco, hap - - - - + + + + @@ -346,37 +338,37 @@ authors:Sandro Ronco, hap - - - + + + - - + + - + - + - + - + - - - + + + @@ -424,7 +416,7 @@ authors:Sandro Ronco, hap - + @@ -456,79 +448,97 @@ authors:Sandro Ronco, hap + + + + + + + + + + + + + + + + + + + - - - + + - + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + @@ -541,8 +551,8 @@ authors:Sandro Ronco, hap - - + + @@ -558,7 +568,7 @@ authors:Sandro Ronco, hap - + @@ -578,36 +588,33 @@ authors:Sandro Ronco, hap - + - - - + + - - - + - - + + - - + + - - + + - - + + diff --git a/src/mame/layout/fidel_phantom.lay b/src/mame/layout/fidel_phantom.lay index 79d85b366d1..ab19b2fced4 100644 --- a/src/mame/layout/fidel_phantom.lay +++ b/src/mame/layout/fidel_phantom.lay @@ -7,13 +7,11 @@ authors:Sandro Ronco, hap - - - + + - @@ -51,62 +49,41 @@ authors:Sandro Ronco, hap - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -118,8 +95,13 @@ authors:Sandro Ronco, hap - - + + + + + + + @@ -161,7 +143,12 @@ authors:Sandro Ronco, hap - + + + + + + @@ -274,35 +261,40 @@ authors:Sandro Ronco, hap + + + - - - - + + + + - - - - + + + + - - - - + + + + - - + + + + - - + + @@ -318,10 +310,10 @@ authors:Sandro Ronco, hap - - - - + + + + @@ -332,10 +324,10 @@ authors:Sandro Ronco, hap - - - - + + + + @@ -346,37 +338,37 @@ authors:Sandro Ronco, hap - - - + + + - - + + - + - + - + - + - - - + + + @@ -424,7 +416,7 @@ authors:Sandro Ronco, hap - + @@ -456,79 +448,100 @@ authors:Sandro Ronco, hap + + + + + + + + + + + + + + + + + + + + + + - - + - + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + @@ -539,10 +552,10 @@ authors:Sandro Ronco, hap - - - - + + + + @@ -558,7 +571,7 @@ authors:Sandro Ronco, hap - + @@ -578,33 +591,30 @@ authors:Sandro Ronco, hap - + - - - + + - - - + - - + + - - + + - - + + -- cgit v1.2.3