Some small Zak256 fixes.

svn-id: r3577

3 files changed, 8 insertions, 7 deletions

diff --git a/boxes.cpp b/boxes.cpp
index 9135ee8498..bdf48944bb 100644
--- a/boxes.cpp
+++ b/boxes.cpp
@@ -459,7 +459,7 @@ int Scumm::findPathTowards(Actor *a, byte box1nr, byte box2nr, byte box3nr) {
 		box2.ll = box2.lr;
 		box2.lr = tmp;
 	}
-	error("findPathTowards: default");
+	warning("findPathTowards: default"); // FIXME: ZAK256
 }
 void Scumm::setBoxFlags(int box, int val) {
 	/* FULL_THROTTLE stuff */
diff --git a/script_v1.cpp b/script_v1.cpp
index 934e922636..e27783b667 100644
--- a/script_v1.cpp
+++ b/script_v1.cpp
@@ -1892,6 +1892,7 @@ void Scumm::o5_wait() {
 			break;
 		return;
 	case 2: /* wait for message */
+		if (_gameId == GID_ZAK256) return;	// FIXME: ZAK256
 		if (_vars[VAR_HAVE_MSG])
 			break;
 		return;
@@ -2098,7 +2099,7 @@ void Scumm::o5_pickupObjectOld() {
 
 	int obj;
 
-	obj = getVarOrDirectByte(0x80);
+        obj = getVarOrDirectWord(0x80);
 
 	if(getObjectIndex(obj) != 1)
 		return;
diff --git a/string.cpp b/string.cpp
index 8b622f1ba8..f57e01dfca 100644
--- a/string.cpp
+++ b/string.cpp
@@ -183,10 +183,7 @@ void Scumm::CHARSET_1() {
 	int s, i, t, c;
 	int frme;
 	Actor *a;
-	byte *buffer;
-
-	if(_gameId==GID_ZAK256)
-		return;
+	byte *buffer;	
 
 #if !defined(FULL_THROTTLE)
 	if (!_haveMsg || (camera._dest.x>>3) != (camera._cur.x>>3) ||
@@ -288,7 +285,10 @@ void Scumm::CHARSET_1() {
 	}
 
 	buffer = charset._buffer + charset._bufPos;
-	
+	if(_gameId==GID_ZAK256) {
+		debug(1, "CHARSET_1: %s", buffer);
+		return;
+	}
 	charset.addLinebreaks(0, buffer,0, t);
 
 	_lastXstart = virtscr[0].xstart;