[Scummvm-cvs-logs] SF.net SVN: scummvm:[35341] scummvm/trunk/engines/gob
drmccoy at users.sourceforge.net
drmccoy at users.sourceforge.net
Sat Dec 13 17:35:14 CET 2008
Revision: 35341
http://scummvm.svn.sourceforge.net/scummvm/?rev=35341&view=rev
Author: drmccoy
Date: 2008-12-13 16:35:14 +0000 (Sat, 13 Dec 2008)
Log Message:
-----------
Modified collision init functions for Urban Runner
Modified Paths:
--------------
scummvm/trunk/engines/gob/game.h
scummvm/trunk/engines/gob/gob.cpp
scummvm/trunk/engines/gob/inter.h
scummvm/trunk/engines/gob/inter_v6.cpp
scummvm/trunk/engines/gob/module.mk
Added Paths:
-----------
scummvm/trunk/engines/gob/game_v6.cpp
Modified: scummvm/trunk/engines/gob/game.h
===================================================================
--- scummvm/trunk/engines/gob/game.h 2008-12-13 14:53:33 UTC (rev 35340)
+++ scummvm/trunk/engines/gob/game.h 2008-12-13 16:35:14 UTC (rev 35341)
@@ -46,6 +46,7 @@
uint16 funcEnter;
uint16 funcLeave;
uint16 funcSub;
+ byte *totFileData;
} PACKED_STRUCT;
#define szGame_TotTextItem (2 + 2)
@@ -132,6 +133,9 @@
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 @@
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 @@
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 @@
virtual void prepareStart(void);
+ virtual void pushCollisions(char all);
+ virtual void popCollisions(void);
+
Game_v2(GobEngine *vm);
virtual ~Game_v2() {}
@@ -288,11 +294,21 @@
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
Added: scummvm/trunk/engines/gob/game_v6.cpp
===================================================================
--- scummvm/trunk/engines/gob/game_v6.cpp (rev 0)
+++ scummvm/trunk/engines/gob/game_v6.cpp 2008-12-13 16:35:14 UTC (rev 35341)
@@ -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
Property changes on: scummvm/trunk/engines/gob/game_v6.cpp
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Date Rev Author URL Id
Added: svn:eol-style
+ native
Modified: scummvm/trunk/engines/gob/gob.cpp
===================================================================
--- scummvm/trunk/engines/gob/gob.cpp 2008-12-13 14:53:33 UTC (rev 35340)
+++ scummvm/trunk/engines/gob/gob.cpp 2008-12-13 16:35:14 UTC (rev 35341)
@@ -407,7 +407,7 @@
_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);
Modified: scummvm/trunk/engines/gob/inter.h
===================================================================
--- scummvm/trunk/engines/gob/inter.h 2008-12-13 14:53:33 UTC (rev 35340)
+++ scummvm/trunk/engines/gob/inter.h 2008-12-13 16:35:14 UTC (rev 35341)
@@ -627,6 +627,7 @@
bool o6_loadCursor(OpFuncParams ¶ms);
bool o6_evaluateStore(OpFuncParams ¶ms);
bool o6_palLoad(OpFuncParams ¶ms);
+ bool o6_freeCollision(OpFuncParams ¶ms);
};
} // End of namespace Gob
Modified: scummvm/trunk/engines/gob/inter_v6.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_v6.cpp 2008-12-13 14:53:33 UTC (rev 35340)
+++ scummvm/trunk/engines/gob/inter_v6.cpp 2008-12-13 16:35:14 UTC (rev 35341)
@@ -405,7 +405,7 @@
OPCODE(o2_animPalInit),
/* 18 */
OPCODE(o2_addCollision),
- OPCODE(o2_freeCollision),
+ OPCODE(o6_freeCollision),
OPCODE(o3_getTotTextItemPart),
{NULL, ""},
/* 1C */
@@ -794,4 +794,40 @@
return false;
}
+bool Inter_v6::o6_freeCollision(OpFuncParams ¶ms) {
+ 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
Modified: scummvm/trunk/engines/gob/module.mk
===================================================================
--- scummvm/trunk/engines/gob/module.mk 2008-12-13 14:53:33 UTC (rev 35340)
+++ scummvm/trunk/engines/gob/module.mk 2008-12-13 16:35:14 UTC (rev 35341)
@@ -11,6 +11,7 @@
game.o \
game_v1.o \
game_v2.o \
+ game_v6.o \
global.o \
gob.o \
goblin.o \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list