libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-03 07:11:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCI: Add more script patcher checks for games without a selector vocab

Browse Source 
Fixes the LSL1 demo
This commit is contained in:
Filippos Karapetis 2019-09-14 11:39:35 +03:00
parent 3bd9954f9a
commit 9dd63b12b1
4 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
engines/sci/engine/object.cpp
View File

@ -240,25 +240,29 @@ int Object::propertyOffsetToId(SegManager *segMan, int propertyOffset) const {
}
}
void Object::initSpecies(SegManager *segMan, reg_t addr) {
void Object::initSpecies(SegManager *segMan, reg_t addr, bool applyScriptPatches) {
uint16 speciesOffset = getSpeciesSelector().getOffset();
if (speciesOffset == 0xffff) // -1
setSpeciesSelector(NULL_REG); // no species
else
setSpeciesSelector(segMan->getClassAddress(speciesOffset, SCRIPT_GET_LOCK, addr.getSegment()));
else {
reg_t species = segMan->getClassAddress(speciesOffset, SCRIPT_GET_LOCK, addr.getSegment(), applyScriptPatches);
setSpeciesSelector(species);
}
}
void Object::initSuperClass(SegManager *segMan, reg_t addr) {
void Object::initSuperClass(SegManager *segMan, reg_t addr, bool applyScriptPatches) {
uint16 superClassOffset = getSuperClassSelector().getOffset();
if (superClassOffset == 0xffff) // -1
setSuperClassSelector(NULL_REG); // no superclass
else
setSuperClassSelector(segMan->getClassAddress(superClassOffset, SCRIPT_GET_LOCK, addr.getSegment()));
else {
reg_t classAddress = segMan->getClassAddress(superClassOffset, SCRIPT_GET_LOCK, addr.getSegment(), applyScriptPatches);
setSuperClassSelector(classAddress);
}
}
bool Object::initBaseObject(SegManager *segMan, reg_t addr, bool doInitSuperClass) {
bool Object::initBaseObject(SegManager *segMan, reg_t addr, bool doInitSuperClass, bool applyScriptPatches) {
const Object *baseObj = segMan->getObject(getSpeciesSelector());
if (baseObj) {
@ -270,7 +274,7 @@ bool Object::initBaseObject(SegManager *segMan, reg_t addr, bool doInitSuperClas
_baseObj = baseObj->_baseObj;
assert(_baseObj);
if (doInitSuperClass)
initSuperClass(segMan, addr);
initSuperClass(segMan, addr, applyScriptPatches);
if (_variables.size() != originalVarCount) {
// These objects are probably broken.

6
engines/sci/engine/object.h
View File

@ -300,9 +300,9 @@ public:
int propertyOffsetToId(SegManager *segMan, int propertyOffset) const;
void initSpecies(SegManager *segMan, reg_t addr);
void initSuperClass(SegManager *segMan, reg_t addr);
bool initBaseObject(SegManager *segMan, reg_t addr, bool doInitSuperClass = true);
void initSpecies(SegManager *segMan, reg_t addr, bool applyScriptPatches);
void initSuperClass(SegManager *segMan, reg_t addr, bool applyScriptPatches);
bool initBaseObject(SegManager *segMan, reg_t addr, bool doInitSuperClass = true, bool applyScriptPatches = true);
#ifdef ENABLE_SCI32
bool mustSetViewVisible(const int index, const bool fromPropertyOp) const;

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

@ -1068,7 +1068,7 @@ void Script::initializeClasses(SegManager *segMan) {
}
}
void Script::initializeObjectsSci0(SegManager *segMan, SegmentId segmentId) {
void Script::initializeObjectsSci0(SegManager *segMan, SegmentId segmentId, bool applyScriptPatches) {
bool oldScriptHeader = (getSciVersion() == SCI_VERSION_0_EARLY);
// We need to make two passes, as the objects in the script might be in the
@ -1089,10 +1089,10 @@ void Script::initializeObjectsSci0(SegManager *segMan, SegmentId segmentId) {
Object *obj;
if (pass == 1) {
obj = scriptObjInit(addr);
obj->initSpecies(segMan, addr);
obj->initSpecies(segMan, addr, applyScriptPatches);
} else {
obj = getObject(addr.getOffset());
if (!obj->initBaseObject(segMan, addr)) {
if (!obj->initBaseObject(segMan, addr, true, applyScriptPatches)) {
if ((_nr == 202 || _nr == 764) && g_sci->getGameId() == GID_KQ5) {
// WORKAROUND: Script 202 of KQ5 French and German
// (perhaps Spanish too?) has an invalid object.
@ -1203,7 +1203,7 @@ void Script::initializeObjectsSci3(SegManager *segMan, SegmentId segmentId, bool
void Script::initializeObjects(SegManager *segMan, SegmentId segmentId, bool applyScriptPatches) {
if (getSciVersion() <= SCI_VERSION_1_LATE)
initializeObjectsSci0(segMan, segmentId);
initializeObjectsSci0(segMan, segmentId, applyScriptPatches);
else if (getSciVersion() >= SCI_VERSION_1_1 && getSciVersion() <= SCI_VERSION_2_1_LATE)
initializeObjectsSci11(segMan, segmentId, applyScriptPatches);
#ifdef ENABLE_SCI32

3
engines/sci/engine/script.h
View File

@ -332,8 +332,9 @@ private:
* Initializes the script's objects (SCI0)
* @param segMan A reference to the segment manager
* @param segmentId The script's segment id
* @applyScriptPatches Apply patches for the script, if available
*/
void initializeObjectsSci0(SegManager *segMan, SegmentId segmentId);
void initializeObjectsSci0(SegManager *segMan, SegmentId segmentId, bool applyScriptPatches);
/**
* Initializes the script's objects (SCI1.1 - SCI2.1)