Modified collision init functions for Urban Runner

svn-id: r35341

6 files changed, 188 insertions, 8 deletions

diff --git a/engines/gob/game.h b/engines/gob/game.h
index 1f19a64f7a..b66fbc8edf 100644
--- a/engines/gob/game.h
+++ b/engines/gob/game.h
@@ -46,6 +46,7 @@ public:
 		uint16 funcEnter;
 		uint16 funcLeave;
 		uint16 funcSub;
+		byte *totFileData;
 	} PACKED_STRUCT;
 
 #define szGame_TotTextItem (2 + 2)
@@ -132,6 +133,9 @@ public:
 
 	virtual void prepareStart(void) = 0;
 
+	virtual void pushCollisions(char all) = 0;
+	virtual void popCollisions(void) = 0;
+
 protected:
 #include "common/pack-start.h"	// START STRUCT PACKING
 
@@ -224,8 +228,6 @@ protected:
 	void collAreaSub(int16 index, int8 enter);
 	int16 openLocTextFile(char *locTextFile, int language);
 
-	virtual void pushCollisions(char all) = 0;
-	virtual void popCollisions(void) = 0;
 	virtual int16 checkMousePoint(int16 all, int16 *resId, int16 *resIndex) = 0;
 };
 
@@ -248,12 +250,13 @@ public:
 
 	virtual void prepareStart(void);
 
+	virtual void pushCollisions(char all);
+	virtual void popCollisions(void);
+
 	Game_v1(GobEngine *vm);
 	virtual ~Game_v1() {}
 
 protected:
-	virtual void pushCollisions(char all);
-	virtual void popCollisions(void);
 	virtual int16 checkMousePoint(int16 all, int16 *resId, int16 *resIndex);
 };
 
@@ -276,6 +279,9 @@ public:
 
 	virtual void prepareStart(void);
 
+	virtual void pushCollisions(char all);
+	virtual void popCollisions(void);
+
 	Game_v2(GobEngine *vm);
 	virtual ~Game_v2() {}
 
@@ -288,11 +294,21 @@ protected:
 
 	CollLast _collLasts[5];
 
-	virtual void pushCollisions(char all);
-	virtual void popCollisions(void);
 	virtual int16 checkMousePoint(int16 all, int16 *resId, int16 *resIndex);
 };
 
+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);
+
+	virtual void pushCollisions(char all);
+
+	Game_v6(GobEngine *vm);
+	virtual ~Game_v6() {}
+};
+
 } // End of namespace Gob
 
 #endif // GOB_GAME_H
diff --git a/engines/gob/game_v6.cpp b/engines/gob/game_v6.cpp
new file mode 100644
index 0000000000..a75e6c9f5e
--- /dev/null
+++ b/engines/gob/game_v6.cpp
@@ -0,0 +1,126 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#include "common/endian.h"
+#include "common/stream.h"
+
+#include "gob/gob.h"
+#include "gob/game.h"
+#include "gob/inter.h"
+
+namespace Gob {
+
+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) {
+	Collision *ptr;
+
+	debugC(5, kDebugCollisions, "addNewCollision");
+	debugC(5, kDebugCollisions, "id = %X", id);
+	debugC(5, kDebugCollisions, "left = %d, top = %d, right = %d, bottom = %d",
+			left, top, right, bottom);
+	debugC(5, kDebugCollisions, "flags = %X, key = %X", flags, key);
+	debugC(5, kDebugCollisions, "funcEnter = %d, funcLeave = %d",
+			funcEnter, funcLeave);
+
+	for (int i = 0; i < 150; i++) {
+		if ((_collisionAreas[i].left != 0xFFFF) && (_collisionAreas[i].id != id))
+			continue;
+
+		ptr = &_collisionAreas[i];
+
+		if ((ptr->id & 0xBFFF) != (id & 0xBFFF))
+			ptr->id = id;
+
+		ptr->left = left;
+		ptr->top = top;
+		ptr->right = right;
+		ptr->bottom = bottom;
+		ptr->flags = flags;
+		ptr->key = key;
+		ptr->funcEnter = funcEnter;
+		ptr->funcLeave = funcLeave;
+		ptr->funcSub = 0;
+		ptr->totFileData = _totFileData;
+
+		return i;
+	}
+	error("Game_v6::addNewCollision(): Collision array full!\n");
+	return 0;
+}
+
+void Game_v6::pushCollisions(char all) {
+	Collision *srcPtr;
+	Collision *destPtr;
+	int16 size;
+
+	debugC(1, kDebugCollisions, "pushCollisions");
+	for (size = 0, srcPtr = _collisionAreas; srcPtr->left != 0xFFFF; srcPtr++) {
+		if ( (all == 1) ||
+		    ((all == 0) && (((uint16) srcPtr->id) >= 20)) ||
+		    ((all == 2) && (((srcPtr->id & 0xF000) == 0xD000) ||
+		                    ((srcPtr->id & 0xF000) == 0x4000) ||
+		                    ((srcPtr->id & 0xF000) == 0xE000))))
+			size++;
+	}
+
+	destPtr = new Collision[size];
+	_collStack[_collStackSize] = destPtr;
+
+	if (_vm->_inter->_terminate)
+		return;
+
+	_collStackElemSizes[_collStackSize] = size;
+
+	if (_shouldPushColls != 0)
+		_collStackElemSizes[_collStackSize] |= 0x8000;
+
+	_shouldPushColls = 0;
+	_collLasts[_collStackSize].key = _lastCollKey;
+	_collLasts[_collStackSize].id = _lastCollId;
+	_collLasts[_collStackSize].areaIndex = _lastCollAreaIndex;
+	_lastCollKey = 0;
+	_lastCollId = 0;
+	_lastCollAreaIndex = 0;
+	_collStackSize++;
+
+	for (srcPtr = _collisionAreas; srcPtr->left != 0xFFFF; srcPtr++) {
+		if ( (all == 1) ||
+		    ((all == 0) && (((uint16) srcPtr->id) >= 20)) ||
+		    ((all == 2) && (((srcPtr->id & 0xF000) == 0xD000) ||
+		                    ((srcPtr->id & 0xF000) == 0x4000) ||
+		                    ((srcPtr->id & 0xF000) == 0xE000)))) {
+
+			memcpy(destPtr, srcPtr, sizeof(Collision));
+			srcPtr->left = 0xFFFF;
+			destPtr++;
+		}
+	}
+}
+
+} // End of namespace Gob
diff --git a/engines/gob/gob.cpp b/engines/gob/gob.cpp
index dcee6ff1e0..a053ff2ea3 100644
--- a/engines/gob/gob.cpp
+++ b/engines/gob/gob.cpp
@@ -407,7 +407,7 @@ bool GobEngine::initGameParts() {
 			_parse = new Parse_v2(this);
 			_mult = new Mult_v2(this);
 			_draw = new Draw_v2(this);
-			_game = new Game_v2(this);
+			_game = new Game_v6(this);
 			_map = new Map_v4(this);
 			_goblin = new Goblin_v4(this);
 			_scenery = new Scenery_v2(this);
diff --git a/engines/gob/inter.h b/engines/gob/inter.h
index 66feddcab3..59a914b2fd 100644
--- a/engines/gob/inter.h
+++ b/engines/gob/inter.h
@@ -627,6 +627,7 @@ protected:
 	bool o6_loadCursor(OpFuncParams &params);
 	bool o6_evaluateStore(OpFuncParams &params);
 	bool o6_palLoad(OpFuncParams &params);
+	bool o6_freeCollision(OpFuncParams &params);
 };
 
 } // End of namespace Gob
diff --git a/engines/gob/inter_v6.cpp b/engines/gob/inter_v6.cpp
index ad4512e216..59c406f7bb 100644
--- a/engines/gob/inter_v6.cpp
+++ b/engines/gob/inter_v6.cpp
@@ -405,7 +405,7 @@ void Inter_v6::setupOpcodes() {
 		OPCODE(o2_animPalInit),
 		/* 18 */
 		OPCODE(o2_addCollision),
-		OPCODE(o2_freeCollision),
+		OPCODE(o6_freeCollision),
 		OPCODE(o3_getTotTextItemPart),
 		{NULL, ""},
 		/* 1C */
@@ -794,4 +794,40 @@ bool Inter_v6::o6_palLoad(OpFuncParams &params) {
 	return false;
 }
 
+bool Inter_v6::o6_freeCollision(OpFuncParams &params) {
+	int16 id;
+
+	id = _vm->_parse->parseValExpr();
+
+	switch (id + 5) {
+	case 0:
+		_vm->_game->pushCollisions(1);
+		break;
+	case 1:
+		_vm->_game->popCollisions();
+		break;
+	case 2:
+		_vm->_game->pushCollisions(2);
+		break;
+	case 3:
+		for (int i = 0; i < 150; i++) {
+			if (((_vm->_game->_collisionAreas[i].id & 0xF000) == 0xD000) ||
+					((_vm->_game->_collisionAreas[i].id & 0xF000) == 0x4000))
+				_vm->_game->_collisionAreas[i].left = 0xFFFF;
+		}
+		break;
+	case 4:
+		for (int i = 0; i < 150; i++) {
+			if ((_vm->_game->_collisionAreas[i].id & 0xF000) == 0xE000)
+				_vm->_game->_collisionAreas[i].left = 0xFFFF;
+		}
+		break;
+	default:
+		_vm->_game->freeCollision(0xE000 + id);
+		break;
+	}
+
+	return false;
+}
+
 } // End of namespace Gob
diff --git a/engines/gob/module.mk b/engines/gob/module.mk
index 2abf89a010..e02eddc866 100644
--- a/engines/gob/module.mk
+++ b/engines/gob/module.mk
@@ -11,6 +11,7 @@ MODULE_OBJS := \
 	game.o \
 	game_v1.o \
 	game_v2.o \
+	game_v6.o \
 	global.o \
 	gob.o \
 	goblin.o \