aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorFilippos Karapetis2010-06-13 22:01:10 +0000
committerFilippos Karapetis2010-06-13 22:01:10 +0000
commit01d53a62165d229b88db11647ffe40ff2502d7b4 (patch)
treecbd953d4e54f3520a54c191c24c8108bbdbad4a9 /engines
parenta4ac9347d4bbac0ee8bef8786c9e23831ad60636 (diff)
downloadscummvm-rg350-01d53a62165d229b88db11647ffe40ff2502d7b4.tar.gz
scummvm-rg350-01d53a62165d229b88db11647ffe40ff2502d7b4.tar.bz2
scummvm-rg350-01d53a62165d229b88db11647ffe40ff2502d7b4.zip
Disabled two cases of findObjectByName() in SCI0 early games
svn-id: r49639
Diffstat (limited to 'engines')
-rw-r--r--engines/sci/engine/vm.cpp2
-rw-r--r--engines/sci/graphics/animate.cpp8
2 files changed, 6 insertions, 4 deletions
diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp
index 1db9649a54..95ed13a3d3 100644
--- a/engines/sci/engine/vm.cpp
+++ b/engines/sci/engine/vm.cpp
@@ -201,7 +201,7 @@ static void validate_write_var(reg_t *r, reg_t *stack_base, int type, int max, i
// stopGroop object, which points to ego, to the new ego object. If this is not
// done, ego's movement will not be updated properly, so the result is
// unpredictable (for example in LSL5, Patti spins around instead of walking).
- if (index == 0 && type == VAR_GLOBAL) { // global 0 is ego
+ if (index == 0 && type == VAR_GLOBAL && getSciVersion() > SCI_VERSION_0_EARLY) { // global 0 is ego
reg_t stopGroopPos = segMan->findObjectByName("stopGroop");
if (!stopGroopPos.isNull()) { // does the game have a stopGroop object?
// Find the "client" member variable of the stopGroop object, and update it
diff --git a/engines/sci/graphics/animate.cpp b/engines/sci/graphics/animate.cpp
index 48715af53e..598724f2be 100644
--- a/engines/sci/graphics/animate.cpp
+++ b/engines/sci/graphics/animate.cpp
@@ -63,9 +63,11 @@ void GfxAnimate::init() {
if (getSciVersion() <= SCI_VERSION_01)
_ignoreFastCast = true;
// Also if fastCast object exists at gamestartup, we can assume that the interpreter doesnt do kAnimate aborts
- // (found in larry 1)
- if (!_s->_segMan->findObjectByName("fastCast").isNull())
- _ignoreFastCast = true;
+ // (found in Larry 1)
+ if (getSciVersion() > SCI_VERSION_0_EARLY) {
+ if (!_s->_segMan->findObjectByName("fastCast").isNull())
+ _ignoreFastCast = true;
+ }
}
void GfxAnimate::disposeLastCast() {