[Scummvm-git-logs] scummvm master -> 110a1e3df5ea2b63544f3c95d1a7b48c0995e07d

[digitall]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
f39a9b5563 CGE2: Add Script Workaround for Clothes Horse Carpet Bug.
110a1e3df5 CGE2: Allow Triggering of Carpet Workaround from Debug Console.


Commit: f39a9b5563588ad55d73a033ba29feabe53974c4
    https://github.com/scummvm/scummvm/commit/f39a9b5563588ad55d73a033ba29feabe53974c4
Author: D G Turner (digitall at scummvm.org)
Date: 2018-10-09T18:07:59+01:00

Commit Message:
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.

Changed paths:
    engines/cge2/snail.cpp


diff --git a/engines/cge2/snail.cpp b/engines/cge2/snail.cpp
index 4913c07..9de908a 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)


Commit: 110a1e3df5ea2b63544f3c95d1a7b48c0995e07d
    https://github.com/scummvm/scummvm/commit/110a1e3df5ea2b63544f3c95d1a7b48c0995e07d
Author: D G Turner (digitall at scummvm.org)
Date: 2018-10-09T18:10:40+01:00

Commit Message:
CGE2: Allow Triggering of Carpet Workaround from Debug Console.

This allows the recovery of saved games with the dead-end condition from
bug Trac #6842.

Changed paths:
    engines/cge2/console.cpp
    engines/cge2/console.h


diff --git a/engines/cge2/console.cpp b/engines/cge2/console.cpp
index c67c7ab..9bf22eb 100644
--- a/engines/cge2/console.cpp
+++ b/engines/cge2/console.cpp
@@ -22,12 +22,27 @@
 
 #include "cge2/console.h"
 
+#include "cge2/vga13h.h"
+
 namespace CGE2 {
 
-CGE2Console::CGE2Console(CGE2Engine *vm) : GUI::Debugger() {
+CGE2Console::CGE2Console(CGE2Engine *vm) : _vm(vm), GUI::Debugger() {
+	registerCmd("do_carpet_workaround", WRAP_METHOD(CGE2Console, doCarpetWorkaround));
 }
 
 CGE2Console::~CGE2Console() {
 }
 
+bool CGE2Console::doCarpetWorkaround(int argc, const char **argv) {
+	Sprite *spr = _vm->_vga->_showQ->locate(1537); // 1537 is Carpet
+
+	if (spr) {
+		if (spr->_actionCtrl[1]._ptr == 26) {
+			spr->_actionCtrl[1]._ptr = 8;
+		}
+	}
+
+	return true;
+}
+
 } // End of namespace CGE
diff --git a/engines/cge2/console.h b/engines/cge2/console.h
index 15956bf..8e8b683 100644
--- a/engines/cge2/console.h
+++ b/engines/cge2/console.h
@@ -33,6 +33,11 @@ class CGE2Console : public GUI::Debugger {
 public:
 	CGE2Console(CGE2Engine *vm);
 	virtual ~CGE2Console();
+
+private:
+	bool doCarpetWorkaround(int argc, const char **argv);
+
+	CGE2Engine *_vm;
 };
 
 } // End of namespace CGE