aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/engine
diff options
context:
space:
mode:
authorMartin Kiewitz2010-07-15 21:10:50 +0000
committerMartin Kiewitz2010-07-15 21:10:50 +0000
commitd78eba3d187b77b9843c3cc9b583c97ee7697998 (patch)
treeeadbe7962620f0c99a02c94b54985eb596e2b023 /engines/sci/engine
parent6e5b537aaffab8c734cec394e80ee5ba85b5aa86 (diff)
downloadscummvm-rg350-d78eba3d187b77b9843c3cc9b583c97ee7697998.tar.gz
scummvm-rg350-d78eba3d187b77b9843c3cc9b583c97ee7697998.tar.bz2
scummvm-rg350-d78eba3d187b77b9843c3cc9b583c97ee7697998.zip
SCI: solved lsl1 casino door, lsl6 tram disappearing and qfg1 vga gate issue - i hope this won't cause regressions, but calling the method in collision case is definitely wrong
svn-id: r50921
Diffstat (limited to 'engines/sci/engine')
-rw-r--r--engines/sci/engine/kgraphics.cpp8
-rw-r--r--engines/sci/engine/kmovement.cpp2
2 files changed, 1 insertions, 9 deletions
diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp
index 705aaa4ddb..7d5e30ed6e 100644
--- a/engines/sci/engine/kgraphics.cpp
+++ b/engines/sci/engine/kgraphics.cpp
@@ -517,14 +517,6 @@ reg_t kBaseSetter(EngineState *s, int argc, reg_t *argv) {
reg_t object = argv[0];
g_sci->_gfxCompare->kernelBaseSetter(object);
-
- // WORKAROUND for a problem in LSL1VGA. This allows the casino door to be opened,
- // till the actual problem is found
- if (s->currentRoomNumber() == 300 && g_sci->getGameId() == GID_LSL1) {
- int top = readSelectorValue(s->_segMan, object, SELECTOR(brTop));
- writeSelectorValue(s->_segMan, object, SELECTOR(brTop), top + 2);
- }
-
return s->r_acc;
}
diff --git a/engines/sci/engine/kmovement.cpp b/engines/sci/engine/kmovement.cpp
index ccef3d862a..69932efabc 100644
--- a/engines/sci/engine/kmovement.cpp
+++ b/engines/sci/engine/kmovement.cpp
@@ -331,7 +331,7 @@ reg_t kDoBresen(EngineState *s, int argc, reg_t *argv) {
writeSelectorValue(segMan, client, SELECTOR(signal), (signal | kSignalHitObstacle));
debugC(2, kDebugLevelBresen, "Finished mover %04x:%04x by collision", PRINT_REG(mover));
- completed = 1;
+ // we shall not set completed in this case, sierra sci also doesn't do it
}
if ((getSciVersion() >= SCI_VERSION_1_EGA))