libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 05:38:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DM: Fix GCC errors in detection.cpp

Browse Source
This commit is contained in:
Bendegúz Nagy 2016-08-24 11:53:38 +02:00
parent 64b1c4fdf1
commit 36e6eac2f3
2 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
engines/dm/detection.cpp
View File

@ -42,33 +42,38 @@ static const PlainGameDescriptor DMGames[] = {
static const DMADGameDescription gameDescriptions[] = {
{
"dm", "Amiga 2.0v English",
{
{"graphics.dat", 0, "c2205f6225bde728417de29394f97d55", 411960},
{"Dungeon.dat", 0, "43a213da8eda413541dd12f90ce202f6", 25006},
AD_LISTEND
{"dm", "Amiga 2.0v English",
{
{"graphics.dat", 0, "c2205f6225bde728417de29394f97d55", 411960},
{"Dungeon.dat", 0, "43a213da8eda413541dd12f90ce202f6", 25006},
AD_LISTEND
},
Common::EN_ANY, Common::kPlatformAmiga, ADGF_NO_FLAGS, GUIO1(GUIO_NONE)
},
Common::EN_ANY, Common::kPlatformAmiga, ADGF_NO_FLAGS, GUIO1(GUIO_NONE),
k_saveTarget_DM21, k_saveFormat_dm_amiga__2_x_pc98_x68000_fm_towns_csb_atari_st, k_savePlatform_amiga,
{ k_saveTarget_DM21, k_saveTarget_endOfList },
{ k_saveFormat_dm_amiga__2_x_pc98_x68000_fm_towns_csb_atari_st, k_saveFormat_endOfList},
{ k_savePlatform_accept_any}
},
{
"dm", "Atari ???v English",
{
{"graphics.dat", 0, "6ffff2a17e2df0effa9a12fb4b1bf6b6", 271911},
{"Dungeon.dat", 0, "be9468b460515741babec9a70501e2e9", 33286},
AD_LISTEND
},
Common::EN_ANY, Common::kPlatformAtariST, ADGF_NO_FLAGS, GUIO1(GUIO_NONE),
{"dm", "Atari ???v English",
{
{"graphics.dat", 0, "6ffff2a17e2df0effa9a12fb4b1bf6b6", 271911},
{"Dungeon.dat", 0, "be9468b460515741babec9a70501e2e9", 33286},
AD_LISTEND
},
Common::EN_ANY, Common::kPlatformAtariST, ADGF_NO_FLAGS, GUIO1(GUIO_NONE),
},
k_saveTarget_DM21, k_saveFormat_dm_amiga__2_x_pc98_x68000_fm_towns_csb_atari_st, k_savePlatform_atari_st,
{ k_saveTarget_DM21, k_saveTarget_endOfList},
{ k_saveFormat_dm_amiga__2_x_pc98_x68000_fm_towns_csb_atari_st, k_saveFormat_endOfList},
{ k_savePlatform_accept_any }
},
AD_TABLE_END_MARKER
{
AD_TABLE_END_MARKER, k_saveTarget_none, k_saveFormat_none, k_savePlatform_none,
{k_saveTarget_none}, {k_saveFormat_none}, {k_savePlatform_none}
}
};
@ -93,7 +98,7 @@ public:
virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const {
if (desc)
*engine = new DM::DMEngine(syst, (DMADGameDescription*)desc);
*engine = new DM::DMEngine(syst, (const DMADGameDescription*)desc);
return desc != nullptr;
}

3
engines/dm/dm.h
View File

@ -61,6 +61,7 @@ class SoundMan;
enum OriginalSaveFormat {
k_saveFormat_accept_any = -1,
k_saveFormat_endOfList = 0,
k_saveFormat_none = 0,
k_saveFormat_dm_atari_st = 1,
k_saveFormat_dm_amiga__2_x_pc98_x68000_fm_towns_csb_atari_st = 2,
k_saveFormat_dm_apple_iigs = 3,
@ -71,6 +72,7 @@ enum OriginalSaveFormat {
enum OriginalSavePlatform {
k_savePlatform_accept_any = -1,
k_savePlatform_endOfList = 0,
k_savePlatform_none = 0,
k_savePlatform_atari_st = 1, // @ C1_PLATFORM_ATARI_ST
k_savePlatform_apple_iigs = 2, // @ C2_PLATFORM_APPLE_IIGS
k_savePlatform_amiga = 3, // @ C3_PLATFORM_AMIGA
@ -85,6 +87,7 @@ enum OriginalSavePlatform {
enum SaveTarget {
k_saveTarget_accept_any = -1,
k_saveTarget_endOfList = 0,
k_saveTarget_none = 0,
k_saveTarget_DM21 = 1,
k_saveTarget_total
};