aboutsummaryrefslogtreecommitdiff
path: root/engines/cge2
diff options
context:
space:
mode:
authorD G Turner2018-10-09 18:07:59 +0100
committerD G Turner2018-10-09 18:07:59 +0100
commitf39a9b5563588ad55d73a033ba29feabe53974c4 (patch)
tree9a5654356d7544b1d27d7badd6240431e43fd803 /engines/cge2
parentf0ae36e1d78dbd315e4f898bf3e8bf3684fd1329 (diff)
downloadscummvm-rg350-f39a9b5563588ad55d73a033ba29feabe53974c4.tar.gz
scummvm-rg350-f39a9b5563588ad55d73a033ba29feabe53974c4.tar.bz2
scummvm-rg350-f39a9b5563588ad55d73a033ba29feabe53974c4.zip
CGE2: Add Script Workaround for Clothes Horse Carpet Bug.
This now allows the Carpet to be placed and removed from the Clothes Horse repeatedly, thus avoiding the dead-end when you do not beat the Carpet with the Racket on first attempt. This is bug Trac #6842.
Diffstat (limited to 'engines/cge2')
-rw-r--r--engines/cge2/snail.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/engines/cge2/snail.cpp b/engines/cge2/snail.cpp
index 4913c07e9e..9de908a616 100644
--- a/engines/cge2/snail.cpp
+++ b/engines/cge2/snail.cpp
@@ -846,8 +846,14 @@ void CGE2Engine::feedSnail(Sprite *spr, Action snq, Hero *hero) {
v = s->labVal(snq, v >> 8);
break;
}
- if (v >= 0)
+ if (v >= 0) {
s->_actionCtrl[snq]._ptr = v;
+ if (spr->_ref == 1537 && s->_actionCtrl[snq]._ptr == 26)
+ {
+ debug(1, "Carpet Clothes Horse Rehanging Workaround Triggered!");
+ s->_actionCtrl[snq]._ptr = 8;
+ }
+ }
}
if (s == spr)