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

Cleaned up the game ID code:

Browse Source 
- The game ID is now obtained from ScummVM ID directly, not by converting Sierra's internal ID
- Moved the code which reads the internal Sierra ID inside the resource manager
- Moved the code which converts the internal Sierra ID to ScummVM's IDs together with the rest of the detection code

svn-id: r49152
This commit is contained in:
Filippos Karapetis 2010-05-23 10:28:03 +00:00
parent dd9bf70761
commit c874ff15a8
16 changed files with 191 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engines/sci/console.cpp
View File

@ -421,10 +421,9 @@ const char *selector_name(EngineState *s, int selector) {
bool Console::cmdGetVersion(int argc, const char **argv) { bool Console::cmdGetVersion(int argc, const char **argv) {
const char *viewTypeDesc[] = { "Unknown", "EGA", "VGA", "VGA SCI1.1", "Amiga" }; const char *viewTypeDesc[] = { "Unknown", "EGA", "VGA", "VGA SCI1.1", "Amiga" };
EngineState *s = _engine->_gamestate;
bool hasVocab997 = g_sci->getResMan()->testResource(ResourceId(kResourceTypeVocab, VOCAB_RESOURCE_SELECTORS)) ? true : false; bool hasVocab997 = g_sci->getResMan()->testResource(ResourceId(kResourceTypeVocab, VOCAB_RESOURCE_SELECTORS)) ? true : false;
DebugPrintf("Game ID: %s\n", s->_gameId.c_str()); DebugPrintf("Game ID: %s\n", _engine->getGameID());
DebugPrintf("Emulated interpreter version: %s\n", getSciVersionDesc(getSciVersion())); DebugPrintf("Emulated interpreter version: %s\n", getSciVersionDesc(getSciVersion()));
DebugPrintf("\n"); DebugPrintf("\n");
DebugPrintf("Detected features:\n"); DebugPrintf("Detected features:\n");

172
engines/sci/detection.cpp
View File

@ -120,6 +120,140 @@ static const PlainGameDescriptor SciGameTitles[] = {
{0, 0} {0, 0}
}; };
struct OldNewIdTableEntry {
const char *oldId;
const char *newId;
SciVersion version;
};
static const OldNewIdTableEntry s_oldNewTable[] = {
{ "arthur", "camelot", SCI_VERSION_NONE },
{ "brain", "castlebrain", SCI_VERSION_1_MIDDLE }, // Amiga
{ "brain", "castlebrain", SCI_VERSION_1_LATE },
{ "demo", "christmas1988", SCI_VERSION_NONE },
{ "card", "christmas1990", SCI_VERSION_1_EARLY, },
{ "card", "christmas1992", SCI_VERSION_1_1 },
{ "RH Budget", "cnick-longbow", SCI_VERSION_NONE },
// iceman is the same
{ "icedemo", "iceman", SCI_VERSION_NONE },
// longbow is the same
{ "eco", "ecoquest", SCI_VERSION_NONE },
{ "eco2", "ecoquest2", SCI_VERSION_NONE }, // EcoQuest 2 demo
{ "rain", "ecoquest2", SCI_VERSION_NONE }, // EcoQuest 2 full
{ "fp", "freddypharkas", SCI_VERSION_NONE },
{ "emc", "funseeker", SCI_VERSION_NONE },
{ "gk", "gk1", SCI_VERSION_NONE },
{ "hoyledemo", "hoyle1", SCI_VERSION_NONE },
{ "cardgames", "hoyle1", SCI_VERSION_NONE },
{ "solitare", "hoyle2", SCI_VERSION_NONE },
// hoyle3 is the same
// hoyle4 is the same
{ "brain", "islandbrain", SCI_VERSION_1_1 },
{ "demo000", "kq1sci", SCI_VERSION_NONE },
{ "kq1", "kq1sci", SCI_VERSION_NONE },
{ "kq4", "kq4sci", SCI_VERSION_NONE },
{ "mm1", "laurabow", SCI_VERSION_NONE },
{ "cb1", "laurabow", SCI_VERSION_NONE },
{ "lb2", "laurabow2", SCI_VERSION_NONE },
{ "rh", "longbow", SCI_VERSION_NONE },
{ "ll1", "lsl1sci", SCI_VERSION_NONE },
{ "lsl1", "lsl1sci", SCI_VERSION_NONE },
// lsl2 is the same
{ "lsl3", "lsl3", SCI_VERSION_NONE },
{ "ll5", "lsl5", SCI_VERSION_NONE },
// lsl5 is the same
// lsl6 is the same
{ "mg", "mothergoose", SCI_VERSION_NONE },
{ "twisty", "pepper", SCI_VERSION_NONE },
{ "pq1", "pq1sci", SCI_VERSION_NONE },
{ "pq", "pq2", SCI_VERSION_NONE },
// pq3 is the same
// pq4 is the same
{ "tales", "fairytales", SCI_VERSION_NONE },
{ "hq", "qfg1", SCI_VERSION_NONE }, // QFG1 SCI0/EGA
{ "glory", "qfg1", SCI_VERSION_0_LATE }, // QFG1 SCI0/EGA
{ "trial", "qfg2", SCI_VERSION_NONE },
{ "hq2demo", "qfg2", SCI_VERSION_NONE },
{ "thegame", "slater", SCI_VERSION_NONE },
{ "sq1demo", "sq1sci", SCI_VERSION_NONE },
{ "sq1", "sq1sci", SCI_VERSION_NONE },
// sq3 is the same
// sq4 is the same
// sq5 is the same
// torin is the same
// TODO: SCI2.1, SCI3 IDs
{ "", "", SCI_VERSION_NONE }
};
Common::String convertSierraGameId(Common::String sierraId, uint32 *gameFlags, ResourceManager *resMan) {
// Convert the id to lower case, so that we match all upper/lower case variants.
sierraId.toLowercase();
// If the game has less than the expected scripts, it's a demo
uint32 demoThreshold = 100;
// ...but there are some exceptions
if (sierraId == "brain" || sierraId == "lsl1" ||
sierraId == "mg" || sierraId == "pq" ||
sierraId == "jones" ||
sierraId == "cardgames" || sierraId == "solitare" ||
sierraId == "hoyle3" || sierraId == "hoyle4")
demoThreshold = 40;
if (sierraId == "fp" || sierraId == "gk" || sierraId == "pq4")
demoThreshold = 150;
Common::List<ResourceId> *resources = resMan->listResources(kResourceTypeScript, -1);
if (resources->size() < demoThreshold) {
*gameFlags |= ADGF_DEMO;
// Crazy Nick's Picks
if (sierraId == "lsl1" && resources->size() == 34)
return "cnick-lsl";
if (sierraId == "sq4" && resources->size() == 34)
return "cnick-sq";
// TODO: cnick-kq, cnick-laurabow and cnick-longbow (their resources can't be read)
// Handle Astrochicken 1 (SQ3) and 2 (SQ4)
if (sierraId == "sq3" && resources->size() == 20)
return "astrochicken";
if (sierraId == "sq4")
return "msastrochicken";
}
for (const OldNewIdTableEntry *cur = s_oldNewTable; cur->oldId[0]; ++cur) {
if (sierraId == cur->oldId) {
// Distinguish same IDs from the SCI version
if (cur->version != SCI_VERSION_NONE && cur->version != getSciVersion())
continue;
return cur->newId;
}
}
if (sierraId == "glory") {
// This could either be qfg1 VGA, qfg3 or qfg4 demo (all SCI1.1),
// or qfg4 full (SCI2)
// qfg1 VGA doesn't have view 1
if (!resMan->testResource(ResourceId(kResourceTypeView, 1)))
return "qfg1";
// qfg4 full is SCI2
if (getSciVersion() == SCI_VERSION_2)
return "qfg4";
// qfg4 demo has less than 50 scripts
if (resources->size() < 50)
return "qfg4";
// Otherwise it's qfg3
return "qfg3";
}
return sierraId;
}
#include "sci/detection_tables.h" #include "sci/detection_tables.h"
/** /**
@ -205,42 +339,6 @@ Common::Language charToScummVMLanguage(const char c) {
} }
} }
#define READ_UINT16(ptr) (!resMan->isSci11Mac() ? READ_LE_UINT16(ptr) : READ_BE_UINT16(ptr))
// Finds the internal ID of the current game from script 0
Common::String getSierraGameId(ResourceManager *resMan) {
Resource *script = resMan->findResource(ResourceId(kResourceTypeScript, 0), false);
// In SCI0-SCI1, the heap is embedded in the script. In SCI1.1+, it's separated
Resource *heap = 0;
byte *seeker = 0;
// Seek to the name selector of the first export
if (getSciVersion() < SCI_VERSION_1_1) {
const int nameSelector = 3;
int extraSci0EarlyBytes = (getSciVersion() == SCI_VERSION_0_EARLY) ? 2 : 0;
byte *exportPtr = script->data + extraSci0EarlyBytes + 4 + 2;
seeker = script->data + READ_UINT16(script->data + READ_UINT16(exportPtr) + nameSelector * 2);
} else {
const int nameSelector = 5 + 3;
heap = resMan->findResource(ResourceId(kResourceTypeHeap, 0), false);
byte *exportPtr = script->data + 4 + 2 + 2;
seeker = heap->data + READ_UINT16(heap->data + READ_UINT16(exportPtr) + nameSelector * 2);
}
char sierraId[20];
int i = 0;
byte curChar = 0;
do {
curChar = *(seeker + i);
sierraId[i++] = curChar;
} while (curChar != 0);
return sierraId;
}
#undef READ_UINT16
const ADGameDescription *SciMetaEngine::fallbackDetect(const Common::FSList &fslist) const { const ADGameDescription *SciMetaEngine::fallbackDetect(const Common::FSList &fslist) const {
bool foundResMap = false; bool foundResMap = false;
bool foundRes000 = false; bool foundRes000 = false;
@ -352,7 +450,7 @@ const ADGameDescription *SciMetaEngine::fallbackDetect(const Common::FSList &fsl
s_fallbackDesc.platform = Common::kPlatformAmiga; s_fallbackDesc.platform = Common::kPlatformAmiga;
// Determine the game id // Determine the game id
Common::String gameId = convertSierraGameId(getSierraGameId(resMan).c_str(), &s_fallbackDesc.flags, resMan); Common::String gameId = convertSierraGameId(resMan->findSierraGameId(), &s_fallbackDesc.flags, resMan);
strncpy(s_fallbackGameIdBuf, gameId.c_str(), sizeof(s_fallbackGameIdBuf) - 1); strncpy(s_fallbackGameIdBuf, gameId.c_str(), sizeof(s_fallbackGameIdBuf) - 1);
s_fallbackGameIdBuf[sizeof(s_fallbackGameIdBuf) - 1] = 0; // Make sure string is NULL terminated s_fallbackGameIdBuf[sizeof(s_fallbackGameIdBuf) - 1] = 0; // Make sure string is NULL terminated
s_fallbackDesc.gameid = s_fallbackGameIdBuf; s_fallbackDesc.gameid = s_fallbackGameIdBuf;

139
engines/sci/engine/game.cpp
View File

@ -41,141 +41,6 @@
namespace Sci { namespace Sci {
struct OldNewIdTableEntry {
const char *oldId;
const char *newId;
SciVersion version;
};
static const OldNewIdTableEntry s_oldNewTable[] = {
{ "arthur", "camelot", SCI_VERSION_NONE },
{ "brain", "castlebrain", SCI_VERSION_1_MIDDLE }, // Amiga
{ "brain", "castlebrain", SCI_VERSION_1_LATE },
{ "demo", "christmas1988", SCI_VERSION_NONE },
{ "card", "christmas1990", SCI_VERSION_1_EARLY, },
{ "card", "christmas1992", SCI_VERSION_1_1 },
{ "RH Budget", "cnick-longbow", SCI_VERSION_NONE },
// iceman is the same
{ "icedemo", "iceman", SCI_VERSION_NONE },
// longbow is the same
{ "eco", "ecoquest", SCI_VERSION_NONE },
{ "eco2", "ecoquest2", SCI_VERSION_NONE }, // EcoQuest 2 demo
{ "rain", "ecoquest2", SCI_VERSION_NONE }, // EcoQuest 2 full
{ "fp", "freddypharkas", SCI_VERSION_NONE },
{ "emc", "funseeker", SCI_VERSION_NONE },
{ "gk", "gk1", SCI_VERSION_NONE },
{ "hoyledemo", "hoyle1", SCI_VERSION_NONE },
{ "cardgames", "hoyle1", SCI_VERSION_NONE },
{ "solitare", "hoyle2", SCI_VERSION_NONE },
// hoyle3 is the same
// hoyle4 is the same
{ "brain", "islandbrain", SCI_VERSION_1_1 },
{ "demo000", "kq1sci", SCI_VERSION_NONE },
{ "kq1", "kq1sci", SCI_VERSION_NONE },
{ "kq4", "kq4sci", SCI_VERSION_NONE },
{ "mm1", "laurabow", SCI_VERSION_NONE },
{ "cb1", "laurabow", SCI_VERSION_NONE },
{ "lb2", "laurabow2", SCI_VERSION_NONE },
{ "rh", "longbow", SCI_VERSION_NONE },
{ "ll1", "lsl1sci", SCI_VERSION_NONE },
{ "lsl1", "lsl1sci", SCI_VERSION_NONE },
// lsl2 is the same
{ "lsl3", "lsl3", SCI_VERSION_NONE },
{ "ll5", "lsl5", SCI_VERSION_NONE },
// lsl5 is the same
// lsl6 is the same
{ "mg", "mothergoose", SCI_VERSION_NONE },
{ "twisty", "pepper", SCI_VERSION_NONE },
{ "pq1", "pq1sci", SCI_VERSION_NONE },
{ "pq", "pq2", SCI_VERSION_NONE },
// pq3 is the same
// pq4 is the same
{ "tales", "fairytales", SCI_VERSION_NONE },
{ "hq", "qfg1", SCI_VERSION_NONE }, // QFG1 SCI0/EGA
{ "glory", "qfg1", SCI_VERSION_0_LATE }, // QFG1 SCI0/EGA
{ "trial", "qfg2", SCI_VERSION_NONE },
{ "hq2demo", "qfg2", SCI_VERSION_NONE },
{ "thegame", "slater", SCI_VERSION_NONE },
{ "sq1demo", "sq1sci", SCI_VERSION_NONE },
{ "sq1", "sq1sci", SCI_VERSION_NONE },
// sq3 is the same
// sq4 is the same
// sq5 is the same
// torin is the same
// TODO: SCI2.1, SCI3 IDs
{ "", "", SCI_VERSION_NONE }
};
Common::String convertSierraGameId(const char *gameId, uint32 *gameFlags, ResourceManager *resMan) {
// Convert the id to lower case, so that we match all upper/lower case variants.
Common::String sierraId = gameId;
sierraId.toLowercase();
// If the game has less than the expected scripts, it's a demo
uint32 demoThreshold = 100;
// ...but there are some exceptions
if (sierraId == "brain" || sierraId == "lsl1" ||
sierraId == "mg" || sierraId == "pq" ||
sierraId == "jones" ||
sierraId == "cardgames" || sierraId == "solitare" ||
sierraId == "hoyle3" || sierraId == "hoyle4")
demoThreshold = 40;
if (sierraId == "fp" || sierraId == "gk" || sierraId == "pq4")
demoThreshold = 150;
Common::List<ResourceId> *resources = resMan->listResources(kResourceTypeScript, -1);
if (resources->size() < demoThreshold) {
*gameFlags |= ADGF_DEMO;
// Crazy Nick's Picks
if (sierraId == "lsl1" && resources->size() == 34)
return "cnick-lsl";
if (sierraId == "sq4" && resources->size() == 34)
return "cnick-sq";
// TODO: cnick-kq, cnick-laurabow and cnick-longbow (their resources can't be read)
// Handle Astrochicken 1 (SQ3) and 2 (SQ4)
if (sierraId == "sq3" && resources->size() == 20)
return "astrochicken";
if (sierraId == "sq4")
return "msastrochicken";
}
for (const OldNewIdTableEntry *cur = s_oldNewTable; cur->oldId[0]; ++cur) {
if (sierraId == cur->oldId) {
// Distinguish same IDs from the SCI version
if (cur->version != SCI_VERSION_NONE && cur->version != getSciVersion())
continue;
return cur->newId;
}
}
if (sierraId == "glory") {
// This could either be qfg1 VGA, qfg3 or qfg4 demo (all SCI1.1),
// or qfg4 full (SCI2)
// qfg1 VGA doesn't have view 1
if (!resMan->testResource(ResourceId(kResourceTypeView, 1)))
return "qfg1";
// qfg4 full is SCI2
if (getSciVersion() == SCI_VERSION_2)
return "qfg4";
// qfg4 demo has less than 50 scripts
if (resources->size() < 50)
return "qfg4";
// Otherwise it's qfg3
return "qfg3";
}
return sierraId;
}
#ifdef USE_OLD_MUSIC_FUNCTIONS #ifdef USE_OLD_MUSIC_FUNCTIONS
int game_init_sound(EngineState *s, int sound_flags, SciVersion soundVersion) { int game_init_sound(EngineState *s, int sound_flags, SciVersion soundVersion) {
if (getSciVersion() > SCI_VERSION_0_LATE) if (getSciVersion() > SCI_VERSION_0_LATE)
@ -265,10 +130,6 @@ int game_init(EngineState *s) {
// script_dissect(0, s->_selectorNames); // script_dissect(0, s->_selectorNames);
// The first entry in the export table of script 0 points to the game object // The first entry in the export table of script 0 points to the game object
s->_gameObj = s->_segMan->lookupScriptExport(0, 0); s->_gameObj = s->_segMan->lookupScriptExport(0, 0);
uint32 gameFlags = 0; // unused
s->_gameId = convertSierraGameId(s->_segMan->getObjectName(s->_gameObj), &gameFlags, g_sci->getResMan());
debug(2, " \"%s\" at %04x:%04x", s->_gameId.c_str(), PRINT_REG(s->_gameObj));
#ifdef USE_OLD_MUSIC_FUNCTIONS #ifdef USE_OLD_MUSIC_FUNCTIONS
if (s->sfx_init_flags & SFX_STATE_FLAG_NOSOUND) if (s->sfx_init_flags & SFX_STATE_FLAG_NOSOUND)

8
engines/sci/engine/kgraphics.cpp
View File

@ -525,7 +525,7 @@ reg_t kBaseSetter(EngineState *s, int argc, reg_t *argv) {
// WORKAROUND for a problem in LSL1VGA. This allows the casino door to be opened, // WORKAROUND for a problem in LSL1VGA. This allows the casino door to be opened,
// till the actual problem is found // till the actual problem is found
if (s->_gameId == "lsl1sci" && s->currentRoomNumber() == 300) { if (!strcmp(g_sci->getGameID(), "lsl1sci") && s->currentRoomNumber() == 300) {
int top = GET_SEL32V(s->_segMan, object, SELECTOR(brTop)); int top = GET_SEL32V(s->_segMan, object, SELECTOR(brTop));
PUT_SEL32V(s->_segMan, object, SELECTOR(brTop), top + 2); PUT_SEL32V(s->_segMan, object, SELECTOR(brTop), top + 2);
} }
@ -799,7 +799,7 @@ void _k_GenericDrawControl(EngineState *s, reg_t controlObject, bool hilite) {
// ALL other games use a hardcoded -1 (madness!) // ALL other games use a hardcoded -1 (madness!)
// We are detecting jones/talkie as "jones" as well, but the sierra interpreter of talkie doesnt have this // We are detecting jones/talkie as "jones" as well, but the sierra interpreter of talkie doesnt have this
// "hack". Hopefully it wont cause regressions (the code causes regressions if used against kq5/floppy) // "hack". Hopefully it wont cause regressions (the code causes regressions if used against kq5/floppy)
if (s->_gameId == "jones") if (!strcmp(g_sci->getGameID(), "jones"))
priority = GET_SEL32V(s->_segMan, controlObject, SELECTOR(priority)); priority = GET_SEL32V(s->_segMan, controlObject, SELECTOR(priority));
else else
priority = -1; priority = -1;
@ -983,7 +983,7 @@ reg_t kDrawCel(EngineState *s, int argc, reg_t *argv) {
bool hiresMode = (argc > 7) ? true : false; bool hiresMode = (argc > 7) ? true : false;
reg_t upscaledHiresHandle = (argc > 7) ? argv[7] : NULL_REG; reg_t upscaledHiresHandle = (argc > 7) ? argv[7] : NULL_REG;
if ((s->_gameId == "freddypharkas") || (s->_gameId == "freddypharkas-demo")) { if (!strcmp(g_sci->getGameID(), "freddypharkas") || !strcmp(g_sci->getGameID(), "freddypharkas-demo")) {
// WORKAROUND // WORKAROUND
// Script 24 contains code that draws the game menu on screen. It uses a temp variable for setting priority that // Script 24 contains code that draws the game menu on screen. It uses a temp variable for setting priority that
// is not set. in Sierra sci this happens to be 8250h. In our sci temporary variables are initialized thus we would // is not set. in Sierra sci this happens to be 8250h. In our sci temporary variables are initialized thus we would
@ -994,7 +994,7 @@ reg_t kDrawCel(EngineState *s, int argc, reg_t *argv) {
priority = 15; priority = 15;
} }
if (s->_gameId == "laurabow2") { if (!strcmp(g_sci->getGameID(), "laurabow2")) {
// WORKAROUND // WORKAROUND
// see the one above // see the one above
if ((viewId == 995) && (priority == 0)) if ((viewId == 995) && (priority == 0))

4
engines/sci/engine/kmisc.cpp
View File

@ -62,9 +62,9 @@ reg_t kGameIsRestarting(EngineState *s, int argc, reg_t *argv) {
// LSL3 calculates a machinespeed variable during game startup (right after the filthy questions) // LSL3 calculates a machinespeed variable during game startup (right after the filthy questions)
// This one would go through w/o throttling resulting in having to do 1000 pushups or something // This one would go through w/o throttling resulting in having to do 1000 pushups or something
// Another way of handling this would be delaying incrementing of "machineSpeed" selector // Another way of handling this would be delaying incrementing of "machineSpeed" selector
if (s->_gameId == "lsl3" && s->currentRoomNumber() == 290) if (!strcmp(g_sci->getGameID(), "lsl3") && s->currentRoomNumber() == 290)
s->_throttleTrigger = true; s->_throttleTrigger = true;
if (s->_gameId == "iceman" && s->currentRoomNumber() == 27) { if (!strcmp(g_sci->getGameID(), "iceman") && s->currentRoomNumber() == 27) {
s->_throttleTrigger = true; s->_throttleTrigger = true;
neededSleep = 60; neededSleep = 60;
} }

2
engines/sci/engine/kmovement.cpp
View File

@ -334,7 +334,7 @@ reg_t kDoBresen(EngineState *s, int argc, reg_t *argv) {
} }
// FIXME: find out why iceman needs this and we ask for version > SCI01 // FIXME: find out why iceman needs this and we ask for version > SCI01
if ((getSciVersion() > SCI_VERSION_01) || (s->_gameId == "iceman")) if ((getSciVersion() > SCI_VERSION_01) || !strcmp(g_sci->getGameID(), "iceman"))
if (completed) if (completed)
invoke_selector(INV_SEL(s, mover, moveDone, kStopOnInvalidSelector), 0); invoke_selector(INV_SEL(s, mover, moveDone, kStopOnInvalidSelector), 0);

4
engines/sci/engine/kpathing.cpp
View File

@ -1056,7 +1056,7 @@ static Polygon *convert_polygon(EngineState *s, reg_t polygon) {
// WORKAROUND: broken polygon in lsl1sci, room 350, after opening elevator // WORKAROUND: broken polygon in lsl1sci, room 350, after opening elevator
// Polygon has 17 points but size is set to 19 // Polygon has 17 points but size is set to 19
if ((size == 19) && (s->_gameId == "lsl1sci")) { if ((size == 19) && !strcmp(g_sci->getGameID(), "lsl1sci")) {
if ((s->currentRoomNumber() == 350) if ((s->currentRoomNumber() == 350)
&& (read_point(segMan, points, 18) == Common::Point(108, 137))) { && (read_point(segMan, points, 18) == Common::Point(108, 137))) {
debug(1, "Applying fix for broken polygon in lsl1sci, room 350"); debug(1, "Applying fix for broken polygon in lsl1sci, room 350");
@ -1174,7 +1174,7 @@ static PathfindingState *convert_polygon_set(EngineState *s, reg_t poly_list, Co
// WORKAROUND LSL5 room 660. Priority glitch due to us choosing a different path // WORKAROUND LSL5 room 660. Priority glitch due to us choosing a different path
// than SSCI. Happens when Patti walks to the control room. // than SSCI. Happens when Patti walks to the control room.
if ((s->_gameId == "lsl5") && (s->currentRoomNumber() == 660) && (Common::Point(67, 131) == *new_start) && (Common::Point(229, 101) == *new_end)) { if (!strcmp(g_sci->getGameID(), "lsl5") && (s->currentRoomNumber() == 660) && (Common::Point(67, 131) == *new_start) && (Common::Point(229, 101) == *new_end)) {
debug(1, "[avoidpath] Applying fix for priority problem in LSL5, room 660"); debug(1, "[avoidpath] Applying fix for priority problem in LSL5, room 660");
pf_s->_prependPoint = new_start; pf_s->_prependPoint = new_start;
new_start = new Common::Point(77, 107); new_start = new Common::Point(77, 107);

1
engines/sci/engine/savegame.cpp
View File

@ -997,7 +997,6 @@ void gamestate_restore(EngineState *s, Common::SeekableReadStream *fh) {
retval->_voc->parser_base = make_reg(s->sys_strings_segment, SYS_STRING_PARSER_BASE); retval->_voc->parser_base = make_reg(s->sys_strings_segment, SYS_STRING_PARSER_BASE);
retval->successor = NULL; retval->successor = NULL;
retval->_gameId = s->_gameId;
#ifdef USE_OLD_MUSIC_FUNCTIONS #ifdef USE_OLD_MUSIC_FUNCTIONS
retval->_sound._it = NULL; retval->_sound._it = NULL;

2
engines/sci/engine/state.h
View File

@ -105,8 +105,6 @@ public:
SegManager *_segMan; /**< The segment manager */ SegManager *_segMan; /**< The segment manager */
Vocabulary *_voc; Vocabulary *_voc;
Common::String _gameId; /**< Designation of the primary object (which inherits from Game) */
/* Non-VM information */ /* Non-VM information */
SciEvent *_event; // Event handling SciEvent *_event; // Event handling

2
engines/sci/engine/vm.cpp
View File

@ -1732,7 +1732,7 @@ static EngineState *_game_run(EngineState *&s) {
int game_run(EngineState **_s) { int game_run(EngineState **_s) {
EngineState *s = *_s; EngineState *s = *_s;
debugC(2, kDebugLevelVM, "Calling %s::play()", s->_gameId.c_str()); debugC(2, kDebugLevelVM, "Calling %s::play()", g_sci->getGameID());
_init_stack_base_with_selector(s, g_sci->getKernel()->_selectorCache.play); // Call the play selector _init_stack_base_with_selector(s, g_sci->getKernel()->_selectorCache.play); // Call the play selector
// Now: Register the first element on the execution stack- // Now: Register the first element on the execution stack-

2
engines/sci/graphics/gui.cpp
View File

@ -92,7 +92,7 @@ void SciGui::resetEngineState(EngineState *s) {
} }
void SciGui::init(bool usesOldGfxFunctions) { void SciGui::init(bool usesOldGfxFunctions) {
_ports->init(usesOldGfxFunctions, this, _paint16, _text16, _s->_gameId); _ports->init(usesOldGfxFunctions, this, _paint16, _text16);
_paint16->init(_animate, _text16); _paint16->init(_animate, _text16);
} }

3
engines/sci/graphics/ports.cpp
View File

@ -54,7 +54,7 @@ GfxPorts::~GfxPorts() {
delete _menuPort; delete _menuPort;
} }
void GfxPorts::init(bool usesOldGfxFunctions, SciGui *gui, GfxPaint16 *paint16, GfxText16 *text16, Common::String gameId) { void GfxPorts::init(bool usesOldGfxFunctions, SciGui *gui, GfxPaint16 *paint16, GfxText16 *text16) {
int16 offTop = 10; int16 offTop = 10;
_usesOldGfxFunctions = usesOldGfxFunctions; _usesOldGfxFunctions = usesOldGfxFunctions;
@ -88,6 +88,7 @@ void GfxPorts::init(bool usesOldGfxFunctions, SciGui *gui, GfxPaint16 *paint16,
// Jones, Slater and Hoyle 3 were called with parameter -Nw 0 0 200 320. // Jones, Slater and Hoyle 3 were called with parameter -Nw 0 0 200 320.
// Mother Goose (SCI1) uses -Nw 0 0 159 262. The game will later use SetPort so we don't need to set the other fields. // Mother Goose (SCI1) uses -Nw 0 0 159 262. The game will later use SetPort so we don't need to set the other fields.
// This actually meant not skipping the first 10 pixellines in windowMgrPort // This actually meant not skipping the first 10 pixellines in windowMgrPort
Common::String gameId = g_sci->getGameID();
if (gameId == "jones" || gameId == "slater" || gameId == "hoyle3" || (gameId == "mothergoose" && getSciVersion() == SCI_VERSION_1_EARLY)) if (gameId == "jones" || gameId == "slater" || gameId == "hoyle3" || (gameId == "mothergoose" && getSciVersion() == SCI_VERSION_1_EARLY))
offTop = 0; offTop = 0;

2
engines/sci/graphics/ports.h
View File

@ -45,7 +45,7 @@ public:
GfxPorts(SegManager *segMan, GfxScreen *screen); GfxPorts(SegManager *segMan, GfxScreen *screen);
~GfxPorts(); ~GfxPorts();
void init(bool usesOldGfxFunctions, SciGui *gui, GfxPaint16 *paint16, GfxText16 *text16, Common::String gameId); void init(bool usesOldGfxFunctions, SciGui *gui, GfxPaint16 *paint16, GfxText16 *text16);
void kernelSetActive(uint16 portId); void kernelSetActive(uint16 portId);
Common::Rect kernelGetPicWindow(int16 &picTop, int16 &picLeft); Common::Rect kernelGetPicWindow(int16 &picTop, int16 &picLeft);

35
engines/sci/resource.cpp
View File

@ -2329,6 +2329,41 @@ bool ResourceManager::hasSci1Voc900() {
return offset == res->size; return offset == res->size;
} }
#define READ_UINT16(ptr) (!isSci11Mac() ? READ_LE_UINT16(ptr) : READ_BE_UINT16(ptr))
Common::String ResourceManager::findSierraGameId() {
Resource *script = findResource(ResourceId(kResourceTypeScript, 0), false);
// In SCI0-SCI1, the heap is embedded in the script. In SCI1.1+, it's separated
Resource *heap = 0;
byte *seeker = 0;
// Seek to the name selector of the first export
if (getSciVersion() < SCI_VERSION_1_1) {
const int nameSelector = 3;
int extraSci0EarlyBytes = (getSciVersion() == SCI_VERSION_0_EARLY) ? 2 : 0;
byte *exportPtr = script->data + extraSci0EarlyBytes + 4 + 2;
seeker = script->data + READ_UINT16(script->data + READ_UINT16(exportPtr) + nameSelector * 2);
} else {
const int nameSelector = 5 + 3;
heap = findResource(ResourceId(kResourceTypeHeap, 0), false);
byte *exportPtr = script->data + 4 + 2 + 2;
seeker = heap->data + READ_UINT16(heap->data + READ_UINT16(exportPtr) + nameSelector * 2);
}
char sierraId[20];
int i = 0;
byte curChar = 0;
do {
curChar = *(seeker + i);
sierraId[i++] = curChar;
} while (curChar != 0);
return sierraId;
}
#undef READ_UINT16
SoundResource::SoundResource(uint32 resNumber, ResourceManager *resMan, SciVersion soundVersion) : _resMan(resMan), _soundVersion(soundVersion) { SoundResource::SoundResource(uint32 resNumber, ResourceManager *resMan, SciVersion soundVersion) : _resMan(resMan), _soundVersion(soundVersion) {
Resource *resource = _resMan->findResource(ResourceId(kResourceTypeSound, resNumber), true); Resource *resource = _resMan->findResource(ResourceId(kResourceTypeSound, resNumber), true);
int trackNr, channelNr; int trackNr, channelNr;

5
engines/sci/resource.h
View File

@ -273,6 +273,11 @@ public:
// Detects, if standard font of current game includes extended characters (>0x80) // Detects, if standard font of current game includes extended characters (>0x80)
bool detectFontExtended(); bool detectFontExtended();
/**
* Finds the internal Sierra ID of the current game from script 0
*/
Common::String findSierraGameId();
protected: protected:
// Maximum number of bytes to allow being allocated for resources // Maximum number of bytes to allow being allocated for resources
// Note: maxMemory will not be interpreted as a hard limit, only as a restriction // Note: maxMemory will not be interpreted as a hard limit, only as a restriction

2
engines/sci/sci.cpp
View File

@ -222,7 +222,7 @@ Common::Error SciEngine::run() {
} }
// Add the after market GM patches for the specified game, if they exist // Add the after market GM patches for the specified game, if they exist
_resMan->addNewGMPatch(_gamestate->_gameId); _resMan->addNewGMPatch(getGameID());
script_adjust_opcode_formats(_gamestate); script_adjust_opcode_formats(_gamestate);
_kernel->loadKernelNames(getGameID()); _kernel->loadKernelNames(getGameID());