From 06c64c0d759bf93070609d4e0935c75b9f567afb Mon Sep 17 00:00:00 2001
From: Ludvig Strigeus
Date: Thu, 11 Oct 2001 13:36:25 +0000
Subject: fixed swapped parameters in o_walkActorToActor

svn-id: r3427
---
 script.cpp | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/script.cpp b/script.cpp
index df92f2f0d9..698b09c8bf 100644
--- a/script.cpp
+++ b/script.cpp
@@ -17,8 +17,12 @@
  *
  * Change Log:
  * $Log$
- * Revision 1.1  2001/10/09 14:30:13  strigeus
- * Initial revision
+ * Revision 1.2  2001/10/11 13:36:25  strigeus
+ * fixed swapped parameters in o_walkActorToActor
+ *
+ * Revision 1.1.1.1  2001/10/09 14:30:13  strigeus
+ *
+ * initial revision
  *
  *
  */
@@ -26,6 +30,8 @@
 #include "stdafx.h"
 #include "scumm.h"
 
+#define NO_SOUND_HACK
+
 void Scumm::runScript(int script, int a, int b, int16 *lvarptr) {
 	byte *scriptPtr;
 	uint32 scriptOffs;
@@ -33,6 +39,11 @@ void Scumm::runScript(int script, int a, int b, int16 *lvarptr) {
 	int slot,i;
 	ScriptSlot *s;
 
+#ifdef NO_SOUND_HACK
+	if (script==212 && _currentRoom==50)
+		return;
+#endif
+
 	if (script==0)
 		return;
 
@@ -2462,8 +2473,8 @@ void Scumm::o_walkActorToActor() {
 		b = a2->scalex * a->width / 0xFF;
 		b = b + b/2;
 	}
-	y = a2->x;
-	x = a2->y;
+	x = a2->x;
+	y = a2->y;
 	if (x < a->x)
 		x += b;
 	else
-- 
cgit v1.2.3