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

Check the overridden game object when performing setCursor detection, which properly fixes KQ5CD (thanks waltervn)

Browse Source 
svn-id: r46009
This commit is contained in:
Filippos Karapetis 2009-11-20 15:16:03 +00:00
parent 94c8f77faa
commit 662fc11d67
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
engines/sci/engine/state.cpp
View File

@ -236,34 +236,41 @@ Common::String EngineState::strSplit(const char *str, const char *sep) {
bool EngineState::autoDetectFeature(FeatureDetection featureDetection, int methodNum) {
Common::String objName;
Selector slc;
reg_t objAddr;
// Get address of target script
switch (featureDetection) {
case kDetectGfxFunctions:
objName = "Rm";
objAddr = _segMan->findObjectByName(objName);
slc = _kernel->_selectorCache.overlay;
break;
case kDetectMoveCountType:
objName = "Motion";
objAddr = _segMan->findObjectByName(objName);
slc = _kernel->_selectorCache.doit;
break;
case kDetectSoundType:
objName = "Sound";
objAddr = _segMan->findObjectByName(objName);
slc = _kernel->_selectorCache.play;
break;
case kDetectSetCursorType:
objName = "Game";
// We need to check the overridden game object here. Fixes KQ5CD setCursor detection,
// as KQ5CD overrides the default setCursor selector of the Game object
objAddr = _gameObj;
slc = _kernel->_selectorCache.setCursor;
break;
case kDetectLofsType:
objName = "Game";
objAddr = _segMan->findObjectByName(objName);
break;
default:
break;
}
reg_t addr;
reg_t objAddr = _segMan->findObjectByName(objName);
if (objAddr.isNull()) {
warning("autoDetectFeature: %s object couldn't be found", objName.c_str());
return false;
@ -464,12 +471,6 @@ SciVersion EngineState::detectSetCursorType() {
}
}
if (_gameName == "kq5" && Common::File::exists("audio001.002")) {
// WORKAROUND for KQ5CD: The code of the setCursor selector has not been yet
// rewritten for cursor views, but the game does use cursor views
_setCursorType = SCI_VERSION_1_1;
}
debugC(1, kDebugLevelGraphics, "Detected SetCursor type: %s", getSciVersionDesc(_setCursorType).c_str());
}