[Scummvm-cvs-logs] CVS: scummvm/saga isomap.cpp,1.59,1.60 isomap.h,1.25,1.26

[Andrew Kurushin]

Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13573

Modified Files:
	isomap.cpp isomap.h 
Log Message:
fix 1257536 Dragon walks in the air
some memory allocation minimization

Index: isomap.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/isomap.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- isomap.cpp	10 Aug 2005 14:53:17 -0000	1.59
+++ isomap.cpp	3 Sep 2005 14:49:43 -0000	1.60
@@ -1364,8 +1364,8 @@
 
 	memset( &_dragonSearchArray, 0, sizeof(_dragonSearchArray));
 
-	for (u = 0; u < SAGA_DRAGON_SEARCH_CENTER; u++) {
-		for (v = 0; v < SAGA_DRAGON_SEARCH_CENTER; v++) {
+	for (u = 0; u < SAGA_DRAGON_SEARCH_DIAMETER; u++) {
+		for (v = 0; v < SAGA_DRAGON_SEARCH_DIAMETER; v++) {
 
 			pcell = _dragonSearchArray.getPathCell(u, v);
 
@@ -1380,8 +1380,8 @@
 			tile = getTile(u1, v1, _platformHeight );
 			if (tile != NULL) {
 				mask = tile->terrainMask;
-				if ( ((tile->terrainMask != 0) && (tile->GetFGDAttr() >= kTerrBlock)) ||
-					((tile->terrainMask != 0xFFFF) && (tile->GetBGDAttr() >= kTerrBlock)) ) {
+				if ( ((mask != 0) && (tile->GetFGDAttr() >= kTerrBlock)) ||
+					((mask != 0xFFFF) && (tile->GetBGDAttr() >= kTerrBlock)) ) {
 					pcell->visited = 1;
 				}
 			} else {

Index: isomap.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/isomap.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- isomap.h	30 Jul 2005 21:11:21 -0000	1.25
+++ isomap.h	3 Sep 2005 14:49:43 -0000	1.26
@@ -232,11 +232,11 @@
 	uint16 _platformHeight;
 
 	struct DragonPathCell {
-		uint16 visited:1,direction:3;
+		uint8 visited:1,direction:3;
 	};
 	struct DragonTilePoint {
 		int8 u, v;
-		uint16 direction:4;
+		uint8 direction:4;
 	};
 	struct PathCell {
 		uint16 visited:1,direction:3,cost:12;