HYPNO: code formatting in arguments, detection tables and others

This commit is contained in:
neuromancer 2021-10-06 18:19:46 +02:00 committed by Eugene Sandulenko
parent a87c50f498
commit 28e84c94e5
4 changed files with 16 additions and 15 deletions

View File

@ -34,13 +34,13 @@ static const DebugChannelDef debugFlagList[] = {
namespace Hypno {
static const PlainGameDescriptor hypnoGames[] = {
{"sinister-six", "Marvel Comics Spider-Man: The Sinister Six"},
{"sinistersix", "Marvel Comics Spider-Man: The Sinister Six"},
{"wetlands", "Wetlands"},
{"soldier-boyz", "Soldier Boyz"},
{"soldierboyz", "Soldier Boyz"},
{0, 0}};
static const ADGameDescription gameDescriptions[] = {
{"sinister-six", // Demo from the US release
{"sinistersix", // Demo from the US release
"Demo",
AD_ENTRY2s("DATA.Z", "2a9c7cf8920ec794482f0a5873102da5", 1285960,
"DCINE1.SMK", "1ff3db09d148e8dd8b56d2e87e7296b8", 493752),
@ -48,7 +48,7 @@ static const ADGameDescription gameDescriptions[] = {
Common::kPlatformDOS,
ADGF_TESTING | ADGF_DEMO,
GUIO1(GUIO_NOMIDI)},
{"sinister-six", // US release
{"sinistersix", // US release
_s("Missing game code"),
AD_ENTRY2s("DATA.Z", "a1f71005a45e6ee454bb0bf3868dff54", 8766307,
"MISSIONS.LIB", "585704e26094cbaf14fbee90798e8d5d", 119945),
@ -56,7 +56,7 @@ static const ADGameDescription gameDescriptions[] = {
Common::kPlatformDOS,
ADGF_UNSTABLE | ADGF_UNSUPPORTED,
GUIO1(GUIO_NOMIDI)},
{"sinister-six", // ES release
{"sinistersix", // ES release
_s("Missing game code"),
AD_ENTRY2s("SPIDER.EXE", "dbd912d6f6724c6d44775fc19cfa8ca0", 483871,
"MISSIONS.LIB", "585704e26094cbaf14fbee90798e8d5d", 119945),
@ -114,7 +114,7 @@ static const ADGameDescription gameDescriptions[] = {
Common::kPlatformDOS,
ADGF_UNSTABLE,
GUIO1(GUIO_NOMIDI)},
{"soldier-boyz", // Solidier Boyz (US)
{"soldierboyz", // Solidier Boyz (US)
_s("Missing game code"),
AD_ENTRY2s("boyz.exe", "bac1d734f2606dbdd0816dfa7a5cf518", 263347,
"setup.exe", "bac1d734f2606dbdd0816dfa7a5cf518", 160740),

View File

@ -46,14 +46,14 @@ Hotspots *g_parsedHots;
ArcadeShooting g_parsedArc;
HypnoEngine *g_hypno;
MVideo::MVideo(Common::String _path, Common::Point _position, bool _transparent, bool _scaled, bool _loop) {
MVideo::MVideo(Common::String path_, Common::Point position_, bool transparent_, bool scaled_, bool loop_) {
decoder = nullptr;
currentFrame = nullptr;
path = _path;
position = _position;
scaled = _scaled;
transparent = _transparent;
loop = _loop;
path = path_;
position = position_;
scaled = scaled_;
transparent = transparent_;
loop = loop_;
}
HypnoEngine::HypnoEngine(OSystem *syst, const ADGameDescription *gd)

View File

@ -36,9 +36,9 @@ public:
Common::Error HypnoMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const {
if (Common::String(desc->gameId) == "wetlands") {
*engine = (Engine *)new Hypno::WetEngine(syst, desc);
} else if (Common::String(desc->gameId) == "sinister-six") {
} else if (Common::String(desc->gameId) == "sinistersix") {
*engine = (Engine *)new Hypno::SpiderEngine(syst, desc);
} else if (Common::String(desc->gameId) == "soldier-boyz") {
} else if (Common::String(desc->gameId) == "soldierboyz") {
*engine = (Engine *)new Hypno::BoyzEngine(syst, desc);
} else
return Common::kUnsupportedGameidError;

View File

@ -57,7 +57,8 @@ const static char *sceneVariables[] = {
"GS_COMBATJSON",
"GS_COMBATLEVEL",
"GS_PUZZLELEVEL",
NULL};
NULL
};
void HypnoEngine::parseScene(const Common::String &prefix, const Common::String &filename) {
debugC(1, kHypnoDebugParser, "Parsing %s", filename.c_str());