diff options
| author | Matthew Hoops | 2010-01-05 01:51:09 +0000 |
|---|---|---|
| committer | Matthew Hoops | 2010-01-05 01:51:09 +0000 |
| commit | e87cc86665b49da7edfab35588a9d7645a3f5610 (patch) | |
| tree | 0cacdc5813aa6a2bc8de47bad01f72ce9a61b921 | |
| parent | e72e1300488e8124d94ea8c9a8df52650f7d97bb (diff) | |
| download | scummvm-rg350-e87cc86665b49da7edfab35588a9d7645a3f5610.tar.gz scummvm-rg350-e87cc86665b49da7edfab35588a9d7645a3f5610.tar.bz2 scummvm-rg350-e87cc86665b49da7edfab35588a9d7645a3f5610.zip | |
Fix walking in SCI32. Gabriel now will walk and DrMcCoy can now hear his precious 'Gabriel is a lout' line :P
svn-id: r47011
| -rw-r--r-- | engines/sci/engine/kernel32.cpp | 4 | ||||
| -rw-r--r-- | engines/sci/engine/state.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/sci/engine/kernel32.cpp b/engines/sci/engine/kernel32.cpp index 6350ac1565..44d67cb5df 100644 --- a/engines/sci/engine/kernel32.cpp +++ b/engines/sci/engine/kernel32.cpp @@ -142,7 +142,7 @@ static const char *sci2_default_knames[] = { /*0x68*/ "Platform", /*0x69*/ "BaseSetter", /*0x6a*/ "DirLoop", - /*0x6b*/ "CanBeHere", + /*0x6b*/ "CantBeHere", /*0x6c*/ "InitBresen", /*0x6d*/ "DoBresen", /*0x6e*/ "SetJump", @@ -296,7 +296,7 @@ static const char *sci21_default_knames[] = { /*0x5d*/ "FileIO", /*0x5e*/ "BaseSetter", /*0x5f*/ "DirLoop", - /*0x60*/ "CanBeHere", + /*0x60*/ "CantBeHere", /*0x61*/ "InitBresen", /*0x62*/ "DoBresen", /*0x63*/ "SetJump", diff --git a/engines/sci/engine/state.cpp b/engines/sci/engine/state.cpp index 0cef76836f..255a8e0f36 100644 --- a/engines/sci/engine/state.cpp +++ b/engines/sci/engine/state.cpp @@ -375,9 +375,9 @@ bool EngineState::autoDetectFeature(FeatureDetection featureDetection, int metho break; case kDetectMoveCountType: // Games which ignore move count call kAbs before calling kDoBresen - if (kFuncNum == 61) { // kAbs (SCI1) + if (_kernel->getKernelName(kFuncNum) == "Abs") { foundTarget = true; - } else if (kFuncNum == 80) { // kDoBresen (SCI1) + } else if (_kernel->getKernelName(kFuncNum) == "DoBresen") { _moveCountType = foundTarget ? kIgnoreMoveCount : kIncrementMoveCount; return true; } |