More changed collision stuff for Urban Runner

svn-id: r35364

6 files changed, 638 insertions, 32 deletions

diff --git a/engines/gob/game.h b/engines/gob/game.h
index b536c8bf86..2a4aae1190 100644
--- a/engines/gob/game.h
+++ b/engines/gob/game.h
@@ -121,7 +121,7 @@ public:
 	virtual void clearCollisions(void) = 0;
 	virtual int16 addNewCollision(int16 id, uint16 left, uint16 top,
 			uint16 right, uint16 bottom, int16 flags, int16 key,
-			uint16 funcEnter, uint16 funcLeave) = 0;
+			uint16 funcEnter, uint16 funcLeave, uint16 funcSub = 0) = 0;
 	virtual void collisionsBlock(void) = 0;
 	virtual int16 multiEdit(int16 time, int16 index, int16 *pCurPos,
 			InputDesc *inpDesc, int16 *collResId, int16 *collIndex) = 0;
@@ -216,7 +216,7 @@ protected:
 
 	GobEngine *_vm;
 
-	int16 adjustKey(int16 key);
+	virtual int16 adjustKey(int16 key);
 
 	byte *loadLocTexts(int32 *dataSize = 0);
 	int32 loadTotFile(const char *path);
@@ -239,7 +239,7 @@ public:
 	virtual void clearCollisions(void);
 	virtual int16 addNewCollision(int16 id, uint16 left, uint16 top,
 			uint16 right, uint16 bottom, int16 flags, int16 key,
-			uint16 funcEnter, uint16 funcLeave);
+			uint16 funcEnter, uint16 funcLeave, uint16 funcSub = 0);
 	virtual void collisionsBlock(void);
 	virtual int16 multiEdit(int16 time, int16 index, int16 *pCurPos,
 			InputDesc *inpDesc, int16 *collResId, int16 *collIndex);
@@ -268,7 +268,7 @@ public:
 	virtual void clearCollisions(void);
 	virtual int16 addNewCollision(int16 id, uint16 left, uint16 top,
 			uint16 right, uint16 bottom, int16 flags, int16 key,
-			uint16 funcEnter, uint16 funcLeave);
+			uint16 funcEnter, uint16 funcLeave, uint16 funcSub = 0);
 	virtual void collisionsBlock(void);
 	virtual int16 multiEdit(int16 time, int16 index, int16 *pCurPos,
 			InputDesc *inpDesc, int16 *collResId, int16 *collIndex);
@@ -302,12 +302,13 @@ class Game_v6 : public Game_v2 {
 public:
 	virtual int16 addNewCollision(int16 id, uint16 left, uint16 top,
 			uint16 right, uint16 bottom, int16 flags, int16 key,
-			uint16 funcEnter, uint16 funcLeave);
+			uint16 funcEnter, uint16 funcLeave, uint16 funcSub = 0);
 
 	virtual void pushCollisions(char all);
 
 	virtual int16 checkCollisions(byte handleMouse, int16 deltaTime,
 			int16 *pResId, int16 *pResIndex);
+	virtual void collisionsBlock(void);
 
 	Game_v6(GobEngine *vm);
 	virtual ~Game_v6() {}
@@ -318,6 +319,8 @@ protected:
 	virtual void setCollisions(byte arg_0 = 1);
 	virtual void collSub(uint16 offset);
 
+	virtual int16 adjustKey(int16 key);
+
 	void sub_1BA78();
 };
 
diff --git a/engines/gob/game_v1.cpp b/engines/gob/game_v1.cpp
index 35fb3d8b23..77c8738d47 100644
--- a/engines/gob/game_v1.cpp
+++ b/engines/gob/game_v1.cpp
@@ -251,7 +251,7 @@ void Game_v1::clearCollisions() {
 
 int16 Game_v1::addNewCollision(int16 id, uint16 left, uint16 top,
 		uint16 right, uint16 bottom, int16 flags, int16 key,
-		uint16 funcEnter, uint16 funcLeave) {
+		uint16 funcEnter, uint16 funcLeave, uint16 funcSub) {
 	Collision *ptr;
 
 	debugC(5, kDebugCollisions, "addNewCollision");
@@ -276,6 +276,7 @@ int16 Game_v1::addNewCollision(int16 id, uint16 left, uint16 top,
 		ptr->key = key;
 		ptr->funcEnter = funcEnter;
 		ptr->funcLeave = funcLeave;
+		ptr->funcSub = funcSub;
 		ptr->totFileData = 0;
 
 		return i;
diff --git a/engines/gob/game_v2.cpp b/engines/gob/game_v2.cpp
index 4220688940..74a4826111 100644
--- a/engines/gob/game_v2.cpp
+++ b/engines/gob/game_v2.cpp
@@ -107,7 +107,10 @@ void Game_v2::playTot(int16 skipPlay) {
 
 			totSize = loadTotFile(_curTotFile);
 
-			_vm->_vidPlayer->primaryClose();
+			if (skipPlay == -2) {
+				_vm->_vidPlayer->primaryClose();
+				skipPlay = 0;
+			}
 
 			if (_totFileData == 0) {
 				_vm->_draw->blitCursor();
@@ -115,9 +118,6 @@ void Game_v2::playTot(int16 skipPlay) {
 				break;
 			}
 
-			if (skipPlay == -2)
-				skipPlay = 0;
-
 			strcpy(_curImaFile, _curTotFile);
 			strcpy(_curExtFile, _curTotFile);
 
@@ -267,7 +267,8 @@ void Game_v2::playTot(int16 skipPlay) {
 				for (int i = 0; i < Sound::kSoundsCount; i++) {
 					SoundDesc *sound = _vm->_sound->sampleGetBySlot(i);
 
-					if (sound && (sound->getType() == SOUND_SND))
+					if (sound &&
+					   ((sound->getType() == SOUND_SND) || (sound->getType() == SOUND_WAV)))
 						_vm->_sound->sampleFree(sound);
 				}
 			}
@@ -309,7 +310,7 @@ void Game_v2::clearCollisions() {
 
 int16 Game_v2::addNewCollision(int16 id, uint16 left, uint16 top,
 		uint16 right, uint16 bottom, int16 flags, int16 key,
-		uint16 funcEnter, uint16 funcLeave) {
+		uint16 funcEnter, uint16 funcLeave, uint16 funcSub) {
 	Collision *ptr;
 
 	debugC(5, kDebugCollisions, "addNewCollision");
@@ -334,7 +335,7 @@ int16 Game_v2::addNewCollision(int16 id, uint16 left, uint16 top,
 		ptr->key = key;
 		ptr->funcEnter = funcEnter;
 		ptr->funcLeave = funcLeave;
-		ptr->funcSub = 0;
+		ptr->funcSub = funcSub;
 		ptr->totFileData = 0;
 
 		return i;
@@ -619,7 +620,6 @@ void Game_v2::collisionsBlock(void) {
 	int16 descIndex;
 	int16 timeVal;
 	int16 offsetIP;
-	int16 collId;
 	char *str;
 	int16 i;
 	int16 counter;
@@ -717,16 +717,15 @@ void Game_v2::collisionsBlock(void) {
 				READ_LE_UINT16(_vm->_global->_inter_execPtr);
 			key = curCmd + 0xA000;
 
-			collId = addNewCollision(curCmd + 0x8000, left, top,
+			addNewCollision(curCmd + 0x8000, left, top,
 					left + width - 1, top + height - 1,
 					cmd + cmdHigh, key, startIP - _totFileData,
-					_vm->_global->_inter_execPtr - _totFileData);
+					_vm->_global->_inter_execPtr - _totFileData, offsetIP);
 
 			_vm->_global->_inter_execPtr += 2;
 			_vm->_global->_inter_execPtr +=
 				READ_LE_UINT16(_vm->_global->_inter_execPtr);
 
-			_collisionAreas[collId].funcSub = offsetIP;
 			break;
 
 		case 1:
@@ -742,16 +741,15 @@ void Game_v2::collisionsBlock(void) {
 			if (key == 0)
 				key = curCmd + 0xA000;
 
-			collId = addNewCollision(curCmd + 0x8000, left, top,
+			addNewCollision(curCmd + 0x8000, left, top,
 					left + width - 1, top + height - 1,
 					(flags << 4) + cmd + cmdHigh, key, startIP - _totFileData,
-					_vm->_global->_inter_execPtr - _totFileData);
+					_vm->_global->_inter_execPtr - _totFileData, offsetIP);
 
 			_vm->_global->_inter_execPtr += 2;
 			_vm->_global->_inter_execPtr +=
 				READ_LE_UINT16(_vm->_global->_inter_execPtr);
 
-			_collisionAreas[collId].funcSub = offsetIP;
 			break;
 
 		case 3:
@@ -843,16 +841,15 @@ void Game_v2::collisionsBlock(void) {
 			array[curCmd] = _vm->_inter->load16();
 			flags = _vm->_inter->load16();
 
-			collId = addNewCollision(curCmd + 0x8000, left, top,
+			addNewCollision(curCmd + 0x8000, left, top,
 					left + width - 1, top + height - 1,
 					(flags << 4) + cmdHigh + 2, key, 0,
-					_vm->_global->_inter_execPtr - _totFileData);
+					_vm->_global->_inter_execPtr - _totFileData, offsetIP);
 
 			_vm->_global->_inter_execPtr += 2;
 			_vm->_global->_inter_execPtr +=
 				READ_LE_UINT16(_vm->_global->_inter_execPtr);
 
-			_collisionAreas[collId].funcSub = offsetIP;
 			break;
 
 		case 21:
@@ -860,16 +857,15 @@ void Game_v2::collisionsBlock(void) {
 			array[curCmd] = _vm->_inter->load16();
 			flags = _vm->_inter->load16() & 3;
 
-			collId = addNewCollision(curCmd + 0x8000, left, top,
+			addNewCollision(curCmd + 0x8000, left, top,
 					left + width - 1, top + height - 1,
 					(flags << 4) + cmdHigh + 2, key,
-					_vm->_global->_inter_execPtr - _totFileData, 0);
+					_vm->_global->_inter_execPtr - _totFileData, 0, offsetIP);
 
 			_vm->_global->_inter_execPtr += 2;
 			_vm->_global->_inter_execPtr +=
 				READ_LE_UINT16(_vm->_global->_inter_execPtr);
 
-			_collisionAreas[collId].funcSub = offsetIP;
 			break;
 		}
 	}
diff --git a/engines/gob/game_v6.cpp b/engines/gob/game_v6.cpp
index 22864007cf..d6c5163eba 100644
--- a/engines/gob/game_v6.cpp
+++ b/engines/gob/game_v6.cpp
@@ -41,7 +41,7 @@ Game_v6::Game_v6(GobEngine *vm) : Game_v2(vm) {
 
 int16 Game_v6::addNewCollision(int16 id, uint16 left, uint16 top,
 		uint16 right, uint16 bottom, int16 flags, int16 key,
-		uint16 funcEnter, uint16 funcLeave) {
+		uint16 funcEnter, uint16 funcLeave, uint16 funcSub) {
 	Collision *ptr;
 
 	debugC(5, kDebugCollisions, "addNewCollision");
@@ -69,7 +69,7 @@ int16 Game_v6::addNewCollision(int16 id, uint16 left, uint16 top,
 		ptr->key = key;
 		ptr->funcEnter = funcEnter;
 		ptr->funcLeave = funcLeave;
-		ptr->funcSub = 0;
+		ptr->funcSub = funcSub;
 		ptr->totFileData = _totFileData;
 
 		return i;
@@ -289,6 +289,569 @@ int16 Game_v6::checkCollisions(byte handleMouse, int16 deltaTime, int16 *pResId,
 	}
 }
 
+void Game_v6::collisionsBlock(void) {
+	InputDesc descArray[20];
+	int16 array[300];
+	byte count;
+	int16 collResId;
+	byte *startIP;
+	int16 curCmd;
+	int16 cmd;
+	int16 cmdHigh;
+	int16 key;
+	int16 flags;
+	uint16 left;
+	uint16 top;
+	uint16 width;
+	uint16 height;
+	int16 deltaTime;
+	int16 stackPos2;
+	int16 descIndex;
+	int16 timeVal;
+	int16 offsetIP;
+	char *str;
+	int16 i;
+	int16 counter;
+	int16 var_24;
+	int16 var_26;
+	int16 collStackPos;
+	Collision *collPtr;
+	Collision *collArea;
+	byte *savedIP;
+	byte collAreaStart;
+	int16 activeCollResId = 0;
+	int16 activeCollIndex = 0;
+
+	if (_shouldPushColls)
+		pushCollisions(0);
+
+	collAreaStart = 0;
+	while (_collisionAreas[collAreaStart].left != 0xFFFF)
+		collAreaStart++;
+	collArea = &_collisionAreas[collAreaStart];
+
+	_shouldPushColls = 0;
+	collResId = -1;
+
+	_vm->_global->_inter_execPtr++;
+	count = *_vm->_global->_inter_execPtr++;
+
+	_handleMouse = _vm->_global->_inter_execPtr[0];
+	deltaTime = 1000 * _vm->_global->_inter_execPtr[1];
+	stackPos2 = _vm->_global->_inter_execPtr[3];
+	descIndex = _vm->_global->_inter_execPtr[4];
+	byte var_42 = _vm->_global->_inter_execPtr[5];
+
+	if ((stackPos2 != 0) || (descIndex != 0)) {
+		deltaTime /= 100;
+		if (_vm->_global->_inter_execPtr[1] == 100)
+			deltaTime = 2;
+	}
+
+	timeVal = deltaTime;
+	_vm->_global->_inter_execPtr += 6;
+
+	startIP = _vm->_global->_inter_execPtr;
+	WRITE_VAR(16, 0);
+
+	byte var_41 = 0;
+	int16 var_46 = 0;
+	int16 var_1C = 0;
+	int16 index = 0;
+	int16 curEditIndex = 0;
+	int right = 0, funcLeave = 0;
+
+	for (curCmd = 0; curCmd < count; curCmd++) {
+		array[curCmd] = 0;
+		cmd = *_vm->_global->_inter_execPtr++;
+
+		if ((cmd & 0x40) != 0) {
+			cmd -= 0x40;
+			cmdHigh = *_vm->_global->_inter_execPtr;
+			_vm->_global->_inter_execPtr++;
+			cmdHigh <<= 8;
+		} else
+			cmdHigh = 0;
+
+		if ((cmd & 0x80) != 0) {
+			offsetIP = _vm->_global->_inter_execPtr - _totFileData;
+			left = _vm->_parse->parseValExpr();
+			top = _vm->_parse->parseValExpr();
+			width = _vm->_parse->parseValExpr();
+			height = _vm->_parse->parseValExpr();
+		} else {
+			offsetIP = 0;
+			left = _vm->_inter->load16();
+			top = _vm->_inter->load16();
+			width = _vm->_inter->load16();
+			height = _vm->_inter->load16();
+		}
+
+		if ((_vm->_draw->_renderFlags & RENDERFLAG_CAPTUREPOP) && (left != 0xFFFF)) {
+			left += _vm->_draw->_backDeltaX;
+			top += _vm->_draw->_backDeltaY;
+		}
+
+		if (left != 0xFFFF) {
+			_vm->_draw->adjustCoords(0, &left, &top);
+			if (((cmd & 0x3F) < 20) && ((cmd & 0x3F) >= 3)) {
+				if (_vm->_draw->_needAdjust != 2)
+					height &= 0xFFFE;
+				_vm->_draw->adjustCoords(0, 0, &width);
+			} else
+				_vm->_draw->adjustCoords(0, &height, &width);
+		}
+
+		cmd &= 0x7F;
+		debugC(1, kDebugCollisions, "collisionsBlock(%d)", cmd);
+
+		switch (cmd) {
+		case 0:
+			_vm->_global->_inter_execPtr += 6;
+			startIP = _vm->_global->_inter_execPtr;
+			_vm->_global->_inter_execPtr += 2;
+			_vm->_global->_inter_execPtr +=
+				READ_LE_UINT16(_vm->_global->_inter_execPtr);
+			key = curCmd + 0xA000;
+
+			addNewCollision(curCmd + 0x8000, left, top,
+					left + width - 1, top + height - 1,
+					cmd + cmdHigh, key, startIP - _totFileData,
+					_vm->_global->_inter_execPtr - _totFileData, offsetIP);
+
+			_vm->_global->_inter_execPtr += 2;
+			_vm->_global->_inter_execPtr +=
+				READ_LE_UINT16(_vm->_global->_inter_execPtr);
+
+			break;
+
+		case 1:
+			key = _vm->_inter->load16();
+			array[curCmd] = _vm->_inter->load16();
+			flags = _vm->_inter->load16();
+
+			startIP = _vm->_global->_inter_execPtr;
+			_vm->_global->_inter_execPtr += 2;
+			_vm->_global->_inter_execPtr +=
+				READ_LE_UINT16(_vm->_global->_inter_execPtr);
+
+			if (key == 0)
+				key = curCmd + 0xA000;
+
+			addNewCollision(curCmd + 0x8000, left, top,
+					left + width - 1, top + height - 1,
+					(flags << 4) + cmd + cmdHigh, key, startIP - _totFileData,
+					_vm->_global->_inter_execPtr - _totFileData, offsetIP);
+
+			_vm->_global->_inter_execPtr += 2;
+			_vm->_global->_inter_execPtr +=
+				READ_LE_UINT16(_vm->_global->_inter_execPtr);
+
+			break;
+
+		case 3:
+		case 4:
+		case 5:
+		case 6:
+		case 7:
+		case 8:
+		case 9:
+		case 10:
+			_vm->_util->clearKeyBuf();
+			var_1C = 1;
+			key = _vm->_parse->parseVarIndex();
+			descArray[index].fontIndex = _vm->_inter->load16();
+			descArray[index].backColor = *_vm->_global->_inter_execPtr++;
+			descArray[index].frontColor = *_vm->_global->_inter_execPtr++;
+
+			if ((cmd >= 5) && (cmd <= 8)) {
+				descArray[index].ptr = _vm->_global->_inter_execPtr + 2;
+				_vm->_global->_inter_execPtr +=
+					READ_LE_UINT16(_vm->_global->_inter_execPtr) + 2;
+			} else
+				descArray[index].ptr = 0;
+
+			if (left == 0xFFFF) {
+				if ((cmd & 1) == 0) {
+					_vm->_global->_inter_execPtr += 2;
+					_vm->_global->_inter_execPtr +=
+						READ_LE_UINT16(_vm->_global->_inter_execPtr);
+				}
+				break;
+			}
+
+			right = left + width - 1;
+			if (!_vm->_draw->_fonts[descArray[index].fontIndex]->extraData)
+				right = left + width * _vm->_draw->_fonts[descArray[index].fontIndex]->itemWidth - 1;
+
+			funcLeave = 0;
+			if (!(cmd & 1))
+				funcLeave = _vm->_global->_inter_execPtr - _totFileData;
+
+			addNewCollision(curCmd + 0x8000, left, top, right,
+					top + height - 1, cmd, key, 0, funcLeave, 0);
+
+			if (!(cmd & 1)) {
+				_vm->_global->_inter_execPtr += 2;
+				_vm->_global->_inter_execPtr +=
+					READ_LE_UINT16(_vm->_global->_inter_execPtr);
+			}
+
+			index++;
+			break;
+
+		case 11:
+			_vm->_global->_inter_execPtr += 6;
+			for (i = 0; i < 150; i++) {
+				if ((_collisionAreas[i].id & 0xF000) == 0xE000) {
+					_collisionAreas[i].id &= 0xBFFF;
+					_collisionAreas[i].funcEnter =
+						_vm->_global->_inter_execPtr - _totFileData;
+					_collisionAreas[i].funcLeave =
+						_vm->_global->_inter_execPtr - _totFileData;
+				}
+			}
+			_vm->_global->_inter_execPtr += 2;
+			_vm->_global->_inter_execPtr +=
+				READ_LE_UINT16(_vm->_global->_inter_execPtr);
+			break;
+
+		case 12:
+			_vm->_global->_inter_execPtr += 6;
+			for (i = 0; i < 150; i++) {
+				if ((_collisionAreas[i].id & 0xF000) == 0xD000) {
+					_collisionAreas[i].id &= 0xBFFF;
+					_collisionAreas[i].funcEnter =
+						_vm->_global->_inter_execPtr - _totFileData;
+					_collisionAreas[i].funcLeave =
+						_vm->_global->_inter_execPtr - _totFileData;
+				}
+			}
+			_vm->_global->_inter_execPtr += 2;
+			_vm->_global->_inter_execPtr +=
+				READ_LE_UINT16(_vm->_global->_inter_execPtr);
+			break;
+
+		case 20:
+			collResId = curCmd;
+			// Fall through to case 2
+
+		case 2:
+			key = _vm->_inter->load16();
+			array[curCmd] = _vm->_inter->load16();
+			flags = _vm->_inter->load16();
+
+			addNewCollision(curCmd + 0x8000, left, top,
+					left + width - 1, top + height - 1,
+					(flags << 4) + cmdHigh + 2, key, 0,
+					_vm->_global->_inter_execPtr - _totFileData, offsetIP);
+
+			_vm->_global->_inter_execPtr += 2;
+			_vm->_global->_inter_execPtr +=
+				READ_LE_UINT16(_vm->_global->_inter_execPtr);
+
+			break;
+
+		case 21:
+			key = _vm->_inter->load16();
+			array[curCmd] = _vm->_inter->load16();
+			flags = _vm->_inter->load16() & 3;
+
+			addNewCollision(curCmd + 0x8000, left, top,
+					left + width - 1, top + height - 1,
+					(flags << 4) + cmdHigh + 2, key,
+					_vm->_global->_inter_execPtr - _totFileData, 0, offsetIP);
+
+			_vm->_global->_inter_execPtr += 2;
+			_vm->_global->_inter_execPtr +=
+				READ_LE_UINT16(_vm->_global->_inter_execPtr);
+
+			break;
+		}
+	}
+
+	if (var_42 != 0)
+		setCollisions(1);
+
+	_forceHandleMouse = 0;
+	_vm->_util->clearKeyBuf();
+
+	do {
+		if (var_1C != 0) {
+			key = multiEdit(deltaTime, index, &curEditIndex, descArray,
+					&activeCollResId, &activeCollIndex);
+
+			WRITE_VAR(55, curEditIndex);
+			if (key == 0x1C0D) {
+				for (i = 0; i < 150; i++) {
+					if (_collisionAreas[i].left == 0xFFFF)
+						break;
+
+					if ((_collisionAreas[i].id & 0xC000) != 0x8000)
+						continue;
+
+					if ((_collisionAreas[i].flags & 1) != 0)
+						continue;
+
+					if ((_collisionAreas[i].flags & 0x0F) <= 2)
+						continue;
+
+					activeCollResId = _collisionAreas[i].id;
+					collResId = _collisionAreas[i].id & 0x7FFF;
+					activeCollIndex = i;
+					break;
+				}
+				break;
+			}
+		} else
+			key = checkCollisions(_handleMouse, -deltaTime,
+					&activeCollResId, &activeCollIndex);
+
+		if (((key & 0xFF) >= ' ') && ((key & 0xFF) <= 0xFF) &&
+		    ((key >> 8) > 1) && ((key >> 8) < 12))
+			key = '0' + (((key >> 8) - 1) % 10) + (key & 0xFF00);
+
+		if (activeCollResId == 0) {
+			if (key != 0) {
+				for (i = 0; i < 150; i++) {
+					if (_collisionAreas[i].left == 0xFFFF)
+						break;
+
+					if ((_collisionAreas[i].id & 0xC000) != 0x8000)
+						continue;
+
+					if ((_collisionAreas[i].key == key) ||
+							(_collisionAreas[i].key == 0x7FFF)) {
+						activeCollResId = _collisionAreas[i].id;
+						activeCollIndex = i;
+						break;
+					}
+				}
+
+				if (activeCollResId == 0) {
+					for (i = 0; i < 150; i++) {
+						if (_collisionAreas[i].left == 0xFFFF)
+							break;
+
+						if ((_collisionAreas[i].id & 0xC000) != 0x8000)
+							continue;
+
+						if ((_collisionAreas[i].key & 0xFF00) != 0)
+							continue;
+
+						if (_collisionAreas[i].key == 0)
+							continue;
+
+						if (adjustKey(key & 0xFF) == adjustKey(_collisionAreas[i].key)) {
+							activeCollResId = _collisionAreas[i].id;
+							activeCollIndex = i;
+							break;
+						}
+					}
+				}
+			} else if (deltaTime != 0) {
+				if (stackPos2 != 0) {
+					collStackPos = 0;
+
+					for (i = 0, collPtr = collArea; collPtr->left != 0xFFFF; i++, collPtr++) {
+						if ((collPtr->id & 0xF000) != 0x8000)
+							continue;
+
+						collStackPos++;
+						if (collStackPos != stackPos2)
+							continue;
+
+						activeCollResId = collPtr->id;
+						activeCollIndex = i + collAreaStart;
+						_vm->_inter->storeMouse();
+						if (VAR(16) != 0)
+							break;
+
+						if ((activeCollResId & 0xF000) == 0x8000)
+							WRITE_VAR(16, array[activeCollResId & 0xFFF]);
+						else
+							WRITE_VAR(16, activeCollResId & 0xFFF);
+
+						if (collPtr->funcLeave != 0) {
+							uint32 timeKey = _vm->_util->getTimeKey();
+							collSub(collPtr->funcLeave);
+
+							if (timeVal != 2) {
+								deltaTime = timeVal - (_vm->_util->getTimeKey() - timeKey);
+
+								if ((deltaTime - var_46) < 3) {
+									var_46 -= (deltaTime - 3);
+									deltaTime = 3;
+								} else if (var_46 != 0) {
+									deltaTime -= var_46;
+									var_46 = 0;
+								}
+
+								if (deltaTime > timeVal)
+									deltaTime = timeVal;
+
+							} else
+								deltaTime = 2;
+
+						}
+
+						if (VAR(16) == 0)
+							activeCollResId = 0;
+						else
+							var_41 = 1;
+
+						break;
+					}
+				} else {
+					if (descIndex != 0) {
+
+						counter = 0;
+						for (i = 0, collPtr = collArea; collPtr->left != 0xFFFF; i++, collPtr++) {
+							if ((collPtr->id & 0xF000) == 0x8000)
+								if (++counter == descIndex) {
+									activeCollResId = collPtr->id;
+									activeCollIndex = i + collAreaStart;
+									break;
+								}
+						}
+
+					} else {
+
+						for (i = 0, collPtr = _collisionAreas; collPtr->left != 0xFFFF; i++, collPtr++) {
+							if ((collPtr->id & 0xF000) == 0x8000) {
+								activeCollResId = collPtr->id;
+								activeCollIndex = i;
+								break;
+							}
+						}
+						if ((_lastCollKey != 0) &&
+								(_collisionAreas[_lastCollAreaIndex].funcLeave != 0))
+							collSub(_collisionAreas[_lastCollAreaIndex].funcLeave);
+
+						_lastCollKey = 0;
+					}
+
+				}
+			}
+		}
+
+		if (var_41 != 0)
+			break;
+
+		if ((activeCollResId == 0) ||
+				(_collisionAreas[activeCollIndex].funcLeave != 0))
+			continue;
+
+		_vm->_inter->storeMouse();
+		if ((activeCollResId & 0xF000) == 0x8000)
+			WRITE_VAR(16, array[activeCollResId & 0xFFF]);
+		else
+			WRITE_VAR(16, activeCollResId & 0xFFF);
+
+		if (_collisionAreas[activeCollIndex].funcEnter != 0)
+			collSub(_collisionAreas[activeCollIndex].funcEnter);
+
+		WRITE_VAR(16, 0);
+		activeCollResId = 0;
+	}
+	while ((activeCollResId == 0) && !_vm->_inter->_terminate && !_vm->shouldQuit());
+
+	if ((activeCollResId & 0xFFF) == collResId) {
+		collStackPos = 0;
+		var_24 = 0;
+		var_26 = 1;
+		for (i = 0; i < 150; i++) {
+			if (_collisionAreas[i].left == 0xFFFF)
+				continue;
+
+			if ((_collisionAreas[i].id & 0xC000) != 0x8000)
+				continue;
+
+			if ((_collisionAreas[i].flags & 0x0F) < 3)
+				continue;
+
+			if ((_collisionAreas[i].flags & 0x0F) > 10)
+				continue;
+
+			if ((_collisionAreas[i].flags & 0x0F) > 8) {
+				char *ptr;
+				strncpy0(_tempStr, GET_VARO_STR(_collisionAreas[i].key), 255);
+				while ((ptr = strchr(_tempStr, ' ')))
+					_vm->_util->cutFromStr(_tempStr, (ptr - _tempStr), 1);
+				if (_vm->_language == 2)
+					while ((ptr = strchr(_tempStr, '.')))
+						*ptr = ',';
+				WRITE_VARO_STR(_collisionAreas[i].key, _tempStr);
+			}
+
+			if (((_collisionAreas[i].flags & 0x0F) >= 5) &&
+			    ((_collisionAreas[i].flags & 0x0F) <= 8)) {
+				str = (char *) descArray[var_24].ptr;
+
+				strncpy0(_tempStr, GET_VARO_STR(_collisionAreas[i].key), 255);
+
+				if ((_collisionAreas[i].flags & 0x0F) < 7)
+					_vm->_util->prepareStr(_tempStr);
+
+				int16 pos = 0;
+				do {
+					strncpy0(_collStr, str, 255);
+					pos += strlen(str) + 1;
+
+					str += strlen(str) + 1;
+
+					if ((_collisionAreas[i].flags & 0x0F) < 7)
+						_vm->_util->prepareStr(_collStr);
+
+					if (strcmp(_tempStr, _collStr) == 0) {
+						WRITE_VAR(17, VAR(17) + 1);
+						WRITE_VAR(17 + var_26, 1);
+						break;
+					}
+				} while (READ_LE_UINT16(descArray[var_24].ptr - 2) > pos);
+				collStackPos++;
+			} else {
+				WRITE_VAR(17 + var_26, 2);
+			}
+			var_24++;
+			var_26++;
+		}
+
+		if (collStackPos != (int16) VAR(17))
+			WRITE_VAR(17, 0);
+		else
+			WRITE_VAR(17, 1);
+	}
+
+	if (_handleMouse == 1)
+		_vm->_draw->blitCursor();
+
+	savedIP = 0;
+	if (!_vm->_inter->_terminate && (var_41 == 0)) {
+		savedIP = _totFileData +
+			_collisionAreas[activeCollIndex].funcLeave;
+
+		_vm->_inter->storeMouse();
+		if (VAR(16) == 0) {
+			if ((activeCollResId & 0xF000) == 0x8000)
+				WRITE_VAR(16, array[activeCollResId & 0xFFF]);
+			else
+				WRITE_VAR(16, activeCollResId & 0xFFF);
+		}
+	}
+
+	for (curCmd = 0; curCmd < count; curCmd++)
+		freeCollision(curCmd + 0x8000);
+
+	for (i = 0; i < 150; i++) {
+		if (((_collisionAreas[i].id & 0xF000) == 0xA000) ||
+				((_collisionAreas[i].id & 0xF000) == 0x9000))
+			_collisionAreas[i].id |= 0x4000;
+	}
+
+	_vm->_global->_inter_execPtr = savedIP;
+}
+
 void Game_v6::setCollisions(byte arg_0) {
 	for (Collision *collArea = _collisionAreas; collArea->left != 0xFFFF; collArea++) {
 		if (((collArea->id & 0xC000) != 0x8000) || (collArea->funcSub == 0))
@@ -375,6 +938,51 @@ void Game_v6::collSub(uint16 offset) {
 		setCollisions(0);
 }
 
+static const byte adjustTable[] = {
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+	0x20, 0x21, 0x21, 0x21, 0x21, 0x21, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+	0x81, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,
+	0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,
+	0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12,
+	0x12, 0x12, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,
+	0x40, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x04,
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
+	0x04, 0x04, 0x04, 0x40, 0x40, 0x40, 0x40, 0x40,
+	0x40, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x08,
+	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
+	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
+	0x08, 0x08, 0x08, 0x40, 0x40, 0x40, 0x40, 0x20,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+int16 Game_v6::adjustKey(int16 key) {
+	if (key == -1)
+		return -1;
+
+	if (adjustTable[key & 0xFF] & 8)
+		return ((key & 0xFF) - 0x20);
+
+	return key & 0xFF;
+}
+
 void Game_v6::sub_1BA78() {
 	int16 lastCollAreaIndex = _lastCollAreaIndex;
 	int16 lastCollId = _lastCollId;
diff --git a/engines/gob/inter_v5.cpp b/engines/gob/inter_v5.cpp
index 0adef25667..fb0bd85c39 100644
--- a/engines/gob/inter_v5.cpp
+++ b/engines/gob/inter_v5.cpp
@@ -717,8 +717,8 @@ void Inter_v5::o5_initScreen() {
 	_vm->_global->_fakeVideoMode = videoMode;
 
 	// Some versions require this
-	if (videoMode == 0xD)
-		videoMode = _vm->_mode;
+	if (videoMode == 0x18)
+		_vm->_global->_fakeVideoMode = 0x37;
 
 	if ((videoMode == _vm->_global->_videoMode) && (width == -1))
 		return;
diff --git a/engines/gob/inter_v6.cpp b/engines/gob/inter_v6.cpp
index 453bbef6f2..fd8c6fcd4d 100644
--- a/engines/gob/inter_v6.cpp
+++ b/engines/gob/inter_v6.cpp
@@ -691,8 +691,6 @@ void Inter_v6::o6_playVmdOrMusic() {
 	} else if (lastFrame == -9) {
 		probe16bitMusic(fileName);
 
-		warning("==> %s", fileName);
-
 		_vm->_sound->bgStop();
 		_vm->_sound->bgPlay(fileName, SOUND_WAV);
 		return;