[wpdev-commits] wolfpack/muls maps.cpp,1.8,1.9

[Correa <thi...@us...>]

Update of /cvsroot/wpdev/wolfpack/muls
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26553/muls

Modified Files:
	maps.cpp 
Log Message:
QT_CLEAN_NAMESPACE

Index: maps.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/muls/maps.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** maps.cpp	19 Aug 2004 01:22:55 -0000	1.8
--- maps.cpp	19 Aug 2004 01:55:56 -0000	1.9
***************
*** 416,424 ****
  	{
  		// get three other nearby titles to decide on an average z?
! 		INT8 map2z = mapElevation( p + Coord_cl( 1, 0, 0 ) );
! 		INT8 map3z = mapElevation( p + Coord_cl( 0, 1, 0 ) );
! 		INT8 map4z = mapElevation( p + Coord_cl( 1, 1, 0 ) );
  
! 		INT8 testz = 0;
  		if ( abs( map1.z - map4z ) <= abs( map2z - map3z ) )
  		{
--- 416,424 ----
  	{
  		// get three other nearby titles to decide on an average z?
! 		Q_INT8 map2z = mapElevation( p + Coord_cl( 1, 0, 0 ) );
! 		Q_INT8 map3z = mapElevation( p + Coord_cl( 0, 1, 0 ) );
! 		Q_INT8 map4z = mapElevation( p + Coord_cl( 1, 1, 0 ) );
  
! 		Q_INT8 testz = 0;
  		if ( abs( map1.z - map4z ) <= abs( map2z - map3z ) )
  		{
***************
*** 521,525 ****
  			if ( ( mapitem->pos().x == pos.x ) && ( mapitem->pos().y == pos.y ) && ( !mapitem->isMulti() ) )
  			{
! 				const INT8 ztemp = mapitem->pos().z + TileCache::instance()->tileHeight( mapitem->id() );
  				if ( ( ztemp <= pos.z + MaxZstep ) && ( ztemp > z ) )
  				{
--- 521,525 ----
  			if ( ( mapitem->pos().x == pos.x ) && ( mapitem->pos().y == pos.y ) && ( !mapitem->isMulti() ) )
  			{
! 				const Q_INT8 ztemp = mapitem->pos().z + TileCache::instance()->tileHeight( mapitem->id() );
  				if ( ( ztemp <= pos.z + MaxZstep ) && ( ztemp > z ) )
  				{