[wpdev-commits] wolfpack/muls maps.cpp,1.6,1.7 maps.h,1.2,1.3

[Richard M. <dr...@us...>]

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

Modified Files:
	maps.cpp maps.h 
Log Message:
I actually fixed most of the conversion warnings, and Wolfpack didn't break for me... so I'll commit. This removes quite a bit of warning garbage. :)


Index: maps.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/muls/maps.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** maps.cpp	10 Aug 2004 03:20:29 -0000	1.6
--- maps.cpp	13 Aug 2004 08:55:27 -0000	1.7
***************
*** 460,466 ****
  }
  
! bool cMaps::canFit( int x, int y, int z, int map, int height ) const
  {
! 	if ( x < 0 || y < 0 || x >= mapTileWidth( map ) * 8 || y >= mapTileHeight( map ) * 8 )
  		return false;
  
--- 460,466 ----
  }
  
! bool cMaps::canFit( int x, int y, int z, uint map ) const
  {
! 	if ( x < 0 || y < 0 || x >= ( int ) mapTileWidth( map ) * 8 || y >= ( int ) mapTileHeight( map ) * 8 )
  		return false;
  

Index: maps.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/muls/maps.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** maps.h	2 Jun 2004 15:04:09 -0000	1.2
--- maps.h	13 Aug 2004 08:55:27 -0000	1.3
***************
*** 130,134 ****
  	uint mapTileHeight( uint ) const;
  	signed char staticTop( const Coord_cl& pos ) const;
! 	bool canFit( int x, int y, int z, int map, int height ) const;
  	StaticsIterator staticsIterator( uint id, ushort x, ushort y, bool exact = true ) const throw( wpException );
  	StaticsIterator staticsIterator( const Coord_cl&, bool exact = true ) const throw( wpException );
--- 130,134 ----
  	uint mapTileHeight( uint ) const;
  	signed char staticTop( const Coord_cl& pos ) const;
! 	bool canFit( int x, int y, int z, uint map ) const;
  	StaticsIterator staticsIterator( uint id, ushort x, ushort y, bool exact = true ) const throw( wpException );
  	StaticsIterator staticsIterator( const Coord_cl&, bool exact = true ) const throw( wpException );