From f39a9b5563588ad55d73a033ba29feabe53974c4 Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Tue, 9 Oct 2018 18:07:59 +0100
Subject: 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.
---
 engines/cge2/snail.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'engines/cge2')

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)
-- 
cgit v1.2.3