Update of /cvsroot/wpdev/wolfpack/muls
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21928/muls
Modified Files:
maps.cpp tilecache.cpp tilecache.h
Log Message:
QT_CLEAN_NAMESPACE
Index: maps.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/muls/maps.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** maps.cpp 13 Aug 2004 08:55:27 -0000 1.7
--- maps.cpp 19 Aug 2004 01:22:55 -0000 1.8
***************
*** 621,625 ****
assert( indexPos < 0x8000000 ); // dam, breaks our assumption
! UINT32 cachePos;
if ( exact )
cachePos = ( x * y ) | 0x80000000;
--- 621,625 ----
assert( indexPos < 0x8000000 ); // dam, breaks our assumption
! Q_UINT32 cachePos;
if ( exact )
cachePos = ( x * y ) | 0x80000000;
Index: tilecache.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/muls/tilecache.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tilecache.h 2 Jun 2004 15:04:09 -0000 1.2
--- tilecache.h 19 Aug 2004 01:22:55 -0000 1.3
***************
*** 155,167 ****
private:
QString path;
! std::map<UINT16, tile_st> staticTiles;
tile_st emptyStaticTile;
! std::map<UINT16, land_st> landTiles;
land_st emptyLandTile;
public:
! land_st getLand( UINT16 tileId );
! tile_st getTile( UINT16 tileId );
signed char tileHeight( ushort tileId );
static signed char tileHeight( const tile_st& );
--- 155,167 ----
private:
QString path;
! std::map<Q_UINT16, tile_st> staticTiles;
tile_st emptyStaticTile;
! std::map<Q_UINT16, land_st> landTiles;
land_st emptyLandTile;
public:
! land_st getLand( Q_UINT16 tileId );
! tile_st getTile( Q_UINT16 tileId );
signed char tileHeight( ushort tileId );
static signed char tileHeight( const tile_st& );
Index: tilecache.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/muls/tilecache.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tilecache.cpp 4 Aug 2004 23:17:38 -0000 1.3
--- tilecache.cpp 19 Aug 2004 01:22:55 -0000 1.4
***************
*** 89,93 ****
// Begin reading in the Land-Tiles
! UINT32 i, j;
for ( i = 0; i < 512; ++i )
--- 89,93 ----
// Begin reading in the Land-Tiles
! Q_UINT32 i, j;
for ( i = 0; i < 512; ++i )
***************
*** 99,103 ****
for ( j = 0; j < 32; ++j )
{
! UINT16 tileId = ( i * 32 ) + j;
land_st landTile;
input.readBlock( ( char * ) &landTile, 26 );
--- 99,103 ----
for ( j = 0; j < 32; ++j )
{
! Q_UINT16 tileId = ( i * 32 ) + j;
land_st landTile;
input.readBlock( ( char * ) &landTile, 26 );
***************
*** 114,118 ****
// NOTE: We are only interested in the REAL static tiles, nothing of
// that ALHPA crap above it
! UINT32 skipLand = 512 * ( 4 + ( 32 * 26 ) );
for ( i = 0; i < 512; ++i )
--- 114,118 ----
// NOTE: We are only interested in the REAL static tiles, nothing of
// that ALHPA crap above it
! Q_UINT32 skipLand = 512 * ( 4 + ( 32 * 26 ) );
for ( i = 0; i < 512; ++i )
***************
*** 124,128 ****
for ( j = 0; j < 32; ++j )
{
! UINT16 tileId = ( i * 32 ) + j;
tile_st staticTile;
input.readBlock( ( char * ) &staticTile, 37 ); // Length of one record: 37
--- 124,128 ----
for ( j = 0; j < 32; ++j )
{
! Q_UINT16 tileId = ( i * 32 ) + j;
tile_st staticTile;
input.readBlock( ( char * ) &staticTile, 37 ); // Length of one record: 37
***************
*** 141,145 ****
if ( input.open( IO_ReadOnly ) )
{
! UINT32 patches;
QDataStream verdata( &input );
verdata.setByteOrder( QDataStream::LittleEndian );
--- 141,145 ----
if ( input.open( IO_ReadOnly ) )
{
! Q_UINT32 patches;
QDataStream verdata( &input );
verdata.setByteOrder( QDataStream::LittleEndian );
***************
*** 148,157 ****
// Seek trough all patches
! for ( UINT32 patchId = 0; patchId < patches; ++patchId )
{
verdata.device()->at( 4 + ( patchId * 21 ) );
// Read the patch
! UINT32 fileId, blockId, offset, length, extra;
verdata >> fileId >> blockId >> offset >> length >> extra;
--- 148,157 ----
// Seek trough all patches
! for ( Q_UINT32 patchId = 0; patchId < patches; ++patchId )
{
verdata.device()->at( 4 + ( patchId * 21 ) );
// Read the patch
! Q_UINT32 fileId, blockId, offset, length, extra;
verdata >> fileId >> blockId >> offset >> length >> extra;
***************
*** 166,170 ****
for ( i = 0; i < 32; ++i )
{
! UINT16 tileId = ( blockId * 32 ) + i;
tile_st tile;
verdata.device()->readBlock( ( char * ) &tile, sizeof( tile_st ) );
--- 166,170 ----
for ( i = 0; i < 32; ++i )
{
! Q_UINT16 tileId = ( blockId * 32 ) + i;
tile_st tile;
verdata.device()->readBlock( ( char * ) &tile, sizeof( tile_st ) );
***************
*** 180,184 ****
for ( i = 0; i < 32; ++i )
{
! UINT16 tileId = ( blockId * 32 ) + i;
land_st tile;
verdata.device()->readBlock( ( char * ) &tile, sizeof( land_st ) );
--- 180,184 ----
for ( i = 0; i < 32; ++i )
{
! Q_UINT16 tileId = ( blockId * 32 ) + i;
land_st tile;
verdata.device()->readBlock( ( char * ) &tile, sizeof( land_st ) );
***************
*** 198,202 ****
// Get's a land-tile out of the cache
! land_st cTileCache::getLand( UINT16 tileId )
{
if ( landTiles.find( tileId ) == landTiles.end() )
--- 198,202 ----
// Get's a land-tile out of the cache
! land_st cTileCache::getLand( Q_UINT16 tileId )
{
if ( landTiles.find( tileId ) == landTiles.end() )
***************
*** 207,211 ****
// The same for static-tiles
! tile_st cTileCache::getTile( UINT16 tileId )
{
if ( staticTiles.find( tileId ) == staticTiles.end() )
--- 207,211 ----
// The same for static-tiles
! tile_st cTileCache::getTile( Q_UINT16 tileId )
{
if ( staticTiles.find( tileId ) == staticTiles.end() )
|