[Scummvm-cvs-logs] CVS: scummvm/sword2 router.cpp,1.31,1.32 router.h,1.12,1.13
Torbj?rn Andersson
eriktorbjorn at users.sourceforge.net
Tue Nov 25 07:19:11 CET 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sword2 function.cpp,1.41,1.42 sword2.cpp,1.86,1.87 sword2.h,1.44,1.45
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sword2 controls.cpp,1.51,1.52 interpreter.cpp,1.27,1.28
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/sword2
In directory sc8-pr-cvs1:/tmp/cvs-serv12965
Modified Files:
router.cpp router.h
Log Message:
Removed extra bars/node stuff since it was never used. From what I
understand the idea was to allow moving objects to take up space in the
scene, thus forcing actors to move around them, or something like that.
However, the number of extra bars/nodes was always zero.
Index: router.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/router.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- router.cpp 16 Nov 2003 14:18:28 -0000 1.31
+++ router.cpp 25 Nov 2003 15:18:47 -0000 1.32
@@ -2601,21 +2601,6 @@
_nnodes += theseNodes;
}
}
-
- // EXTRA GRIDS (moveable grids added by megas)
-
- // Note that these will be checked against allowed max at the time of
- // creating them
-
- // extra lines
-
- memmove((uint8 *) &_bars[_nbars], (uint8 *) &_extraBars[0], _nExtraBars * sizeof(_barData));
- _nbars += _nExtraBars;
-
- // extra nodes
-
- memmove((uint8 *) &_node[_nnodes], (uint8 *) &_extraNode[0], _nExtraNodes * sizeof(_nodeData));
- _nnodes += _nExtraNodes;
}
void Router::clearWalkGridList(void) {
Index: router.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/router.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- router.h 16 Nov 2003 14:18:28 -0000 1.12
+++ router.h 25 Nov 2003 15:18:47 -0000 1.13
@@ -83,7 +83,6 @@
#define O_WALKANIM_SIZE 600 // max number of nodes in router output
#define O_GRID_SIZE 200 // max 200 lines & 200 points
-#define EXTRA_GRID_SIZE 20 // max 20 lines & 20 points
#define O_ROUTE_SIZE 50 // max number of modules in a route
typedef struct {
@@ -108,23 +107,14 @@
// megas (NULL if slot not in use)
mem *_routeSlots[TOTAL_ROUTE_SLOTS];
- // because extra bars will be copied into here afer walkgrid loaded
- _barData _bars[O_GRID_SIZE + EXTRA_GRID_SIZE];
- _nodeData _node[O_GRID_SIZE + EXTRA_GRID_SIZE];
+ _barData _bars[O_GRID_SIZE];
+ _nodeData _node[O_GRID_SIZE];
int32 _walkGridList[MAX_WALKGRIDS];
int32 _nbars;
int32 _nnodes;
- // area for extra route data to block parts of floors and enable
- // routing round mega charaters
-
- int32 _nExtraBars;
- int32 _nExtraNodes;
- _barData _extraBars[EXTRA_GRID_SIZE];
- _nodeData _extraNode[EXTRA_GRID_SIZE];
-
int32 _startX;
int32 _startY;
int32 _startDir;
@@ -215,15 +205,11 @@
void plotCross(int16 x, int16 y, uint8 colour);
public:
- Router(Sword2Engine *vm)
- : _vm(vm), _nExtraBars(0), _nExtraNodes(0), _diagonalx(0),
- _diagonaly(0) {
+ Router(Sword2Engine *vm) : _vm(vm), _diagonalx(0), _diagonaly(0) {
memset(_routeSlots, 0, sizeof(_routeSlots));
memset(_bars, 0, sizeof(_bars));
memset(_node, 0, sizeof(_node));
memset(_walkGridList, 0, sizeof(_walkGridList));
- memset(_extraBars, 0, sizeof(_extraBars));
- memset(_extraNode, 0, sizeof(_extraNode));
memset(_route, 0, sizeof(_route));
memset(_smoothPath, 0, sizeof(_smoothPath));
memset(_modularPath, 0, sizeof(_modularPath));
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sword2 function.cpp,1.41,1.42 sword2.cpp,1.86,1.87 sword2.h,1.44,1.45
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sword2 controls.cpp,1.51,1.52 interpreter.cpp,1.27,1.28
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list