Skip to content

Commit 4980f88

Browse files
committed
-emu/gamedrv.h: Got rid of the "clickable artwork" system flag.
-formats/wavfile.cpp: Fixed a class memory access warning.
1 parent 8e7af96 commit 4980f88

File tree

162 files changed

+526
-529
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

162 files changed

+526
-529
lines changed

src/emu/gamedrv.h

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,10 @@ struct machine_flags
4545
NO_COCKTAIL = 0x0000'0100, // screen flip support is missing
4646
IS_BIOS_ROOT = 0x0000'0200, // this driver entry is a BIOS root
4747
REQUIRES_ARTWORK = 0x0000'0400, // requires external artwork for key game elements
48-
CLICKABLE_ARTWORK = 0x0000'0800, // artwork is clickable and requires mouse cursor
49-
UNOFFICIAL = 0x0000'1000, // unofficial hardware modification
50-
NO_SOUND_HW = 0x0000'2000, // system has no sound output
51-
MECHANICAL = 0x0000'4000, // contains mechanical parts (pinball, redemption games, ...)
52-
IS_INCOMPLETE = 0x0000'8000 // official system with blatantly incomplete hardware/software
48+
UNOFFICIAL = 0x0000'0800, // unofficial hardware modification
49+
NO_SOUND_HW = 0x0000'1000, // system has no sound output
50+
MECHANICAL = 0x0000'2000, // contains mechanical parts (pinball, redemption games, ...)
51+
IS_INCOMPLETE = 0x0000'4000 // official system with blatantly incomplete hardware/software
5352
};
5453
};
5554

@@ -71,7 +70,6 @@ constexpr u64 MACHINE_SUPPORTS_SAVE = machine_flags::SUPPORTS_SAVE;
7170
constexpr u64 MACHINE_NO_COCKTAIL = machine_flags::NO_COCKTAIL; ///< The system supports screen flipping for use in a cocktail cabinet, but this feature is not properly emulated
7271
constexpr u64 MACHINE_IS_BIOS_ROOT = machine_flags::IS_BIOS_ROOT; ///< The system represents an empty system board of some kind - clones are treated as separate systems rather than variants
7372
constexpr u64 MACHINE_REQUIRES_ARTWORK = machine_flags::REQUIRES_ARTWORK; ///< The system requires external artwork for key functionality
74-
constexpr u64 MACHINE_CLICKABLE_ARTWORK = machine_flags::CLICKABLE_ARTWORK; ///< Enables pointer display for the system to facilitate using clickable artwork
7573
constexpr u64 MACHINE_UNOFFICIAL = machine_flags::UNOFFICIAL; ///< The system represents an after-market or end-user modification to a system
7674
constexpr u64 MACHINE_NO_SOUND_HW = machine_flags::NO_SOUND_HW; ///< The system has no sound output capability
7775
constexpr u64 MACHINE_MECHANICAL = machine_flags::MECHANICAL; ///< The system depends on mechanical features for key functionality

src/lib/formats/wavfile.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,6 @@ static cassette_image::error wavfile_identify(cassette_image *cassette, cassette
170170
static cassette_image::error wavfile_load(cassette_image *cassette)
171171
{
172172
cassette_image::Options opts;
173-
memset(&opts, 0, sizeof(opts));
174173
return wavfile_process(cassette, &opts, true);
175174
}
176175

src/mame/appliedconcepts/boris.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,5 +244,5 @@ ROM_END
244244
*******************************************************************************/
245245

246246
// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY, FULLNAME, FLAGS
247-
SYST( 1978, boris, 0, 0, boris, boris, boris_state, empty_init, "Applied Concepts", "Boris (rev. 01)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW | MACHINE_CLICKABLE_ARTWORK ) // "Boris awaits your move"
248-
SYST( 1978, borisa, boris, 0, boris, boris, boris_state, empty_init, "Applied Concepts", "Boris (rev. 00)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW | MACHINE_CLICKABLE_ARTWORK ) // "Boris plays black"
247+
SYST( 1978, boris, 0, 0, boris, boris, boris_state, empty_init, "Applied Concepts", "Boris (rev. 01)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW ) // "Boris awaits your move"
248+
SYST( 1978, borisa, boris, 0, boris, boris, boris_state, empty_init, "Applied Concepts", "Boris (rev. 00)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW ) // "Boris plays black"

src/mame/appliedconcepts/borisdpl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,4 +222,4 @@ ROM_END
222222
*******************************************************************************/
223223

224224
// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY, FULLNAME, FLAGS
225-
SYST( 1979, borisdpl, 0, 0, borisdpl, borisdpl, borisdpl_state, empty_init, "Applied Concepts", "Boris Diplomat", MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
225+
SYST( 1979, borisdpl, 0, 0, borisdpl, borisdpl, borisdpl_state, empty_init, "Applied Concepts", "Boris Diplomat", MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE )

src/mame/appliedconcepts/ggm.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -616,4 +616,4 @@ ROM_END
616616
*******************************************************************************/
617617

618618
// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY, FULLNAME, FLAGS
619-
SYST( 1980, ggm, 0, 0, ggm, ggm, ggm_state, empty_init, "Applied Concepts", "Great Game Machine", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
619+
SYST( 1980, ggm, 0, 0, ggm, ggm, ggm_state, empty_init, "Applied Concepts", "Great Game Machine", MACHINE_SUPPORTS_SAVE )

src/mame/appliedconcepts/prodigy.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,4 +304,4 @@ ROM_END
304304
*******************************************************************************/
305305

306306
// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY, FULLNAME, FLAGS
307-
SYST( 1982, prodigy, 0, 0, prodigy, prodigy, prodigy_state, empty_init, "Applied Concepts", "Destiny Prodigy", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
307+
SYST( 1982, prodigy, 0, 0, prodigy, prodigy, prodigy_state, empty_init, "Applied Concepts", "Destiny Prodigy", MACHINE_SUPPORTS_SAVE )

src/mame/barcrest/mpu3.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1571,7 +1571,7 @@ ROM_END
15711571

15721572
// search for cmpa (x+$01) in trace logs to find protection accesses
15731573

1574-
#define GAME_FLAGS MACHINE_NOT_WORKING|MACHINE_NO_SOUND|MACHINE_REQUIRES_ARTWORK|MACHINE_MECHANICAL|MACHINE_CLICKABLE_ARTWORK
1574+
#define GAME_FLAGS MACHINE_NOT_WORKING|MACHINE_NO_SOUND|MACHINE_REQUIRES_ARTWORK|MACHINE_MECHANICAL
15751575

15761576

15771577

src/mame/bfm/bfm_sc1.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2615,7 +2615,7 @@ ROM_END
26152615

26162616
/////////////////////////////////////////////////////////////////////////////////////
26172617

2618-
#define GAME_FLAGS MACHINE_SUPPORTS_SAVE|MACHINE_REQUIRES_ARTWORK|MACHINE_NOT_WORKING|MACHINE_MECHANICAL|MACHINE_CLICKABLE_ARTWORK
2618+
#define GAME_FLAGS MACHINE_SUPPORTS_SAVE|MACHINE_REQUIRES_ARTWORK|MACHINE_NOT_WORKING|MACHINE_MECHANICAL
26192619

26202620
//Adder 2
26212621
GAME( 1996, m_tppokr, 0, scorpion1_adder2, toppoker, bfm_sc1_state, init_toppoker, 0, "BFM/ELAM", "Top Poker (Dutch, Game Card 95-750-899)", MACHINE_SUPPORTS_SAVE|MACHINE_NOT_WORKING )

src/mame/bfm/bfm_sc2.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8595,7 +8595,7 @@ ROM_END
85958595

85968596
/* Video Based (Adder 2) */
85978597

8598-
#define GAME_FLAGS MACHINE_SUPPORTS_SAVE|MACHINE_REQUIRES_ARTWORK|MACHINE_NOT_WORKING|MACHINE_MECHANICAL|MACHINE_CLICKABLE_ARTWORK
8598+
#define GAME_FLAGS MACHINE_SUPPORTS_SAVE|MACHINE_REQUIRES_ARTWORK|MACHINE_NOT_WORKING|MACHINE_MECHANICAL
85998599

86008600
GAMEL( 1993, quintoon, 0, scorpion2_vidm, quintoon, bfm_sc2_vid_state, init_quintoon, 0, "BFM", "Quintoon (UK, Game Card 95-750-206)", MACHINE_SUPPORTS_SAVE|MACHINE_IMPERFECT_SOUND,layout_quintoon ) //Current samples need verification
86018601
GAMEL( 1993, quintond, quintoon, scorpion2_vidm, quintoon, bfm_sc2_vid_state, init_quintoon, 0, "BFM", "Quintoon (UK, Game Card 95-751-206, Datapak)", MACHINE_SUPPORTS_SAVE|MACHINE_IMPERFECT_SOUND|MACHINE_NOT_WORKING,layout_quintoon ) //Current samples need verification

src/mame/bfm/bfm_sc4.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1739,7 +1739,7 @@ INPUT_PORTS_START( sc4_base ) // just some fairly generic defaults we map to gam
17391739
PORT_DIPSETTING( 0x0010, DEF_STR( On ) )
17401740
INPUT_PORTS_END
17411741

1742-
#define MACHINE_FLAGS MACHINE_NOT_WORKING|MACHINE_CLICKABLE_ARTWORK
1742+
#define MACHINE_FLAGS MACHINE_NOT_WORKING
17431743
#define MACHINE_FLAGS_NOSOUND MACHINE_FLAGS|MACHINE_NO_SOUND
17441744

17451745
bool compare_mbus(uint16_t* rom)

0 commit comments

Comments
 (0)