[wpdev-commits] wolfpack/muls maps.cpp,1.4,1.5 multiscache.cpp,1.3,1.4 tilecache.cpp,1.2,1.3

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

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

Modified Files:
	maps.cpp multiscache.cpp tilecache.cpp 
Log Message:
config.h and config.cpp moved to serverconfig.h and serverconfig.cpp
This is to prevent a conflict with Automake.


Index: maps.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/muls/maps.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** maps.cpp	21 Jul 2004 17:05:22 -0000	1.4
--- maps.cpp	4 Aug 2004 23:17:38 -0000	1.5
***************
*** 32,36 ****
  #include "../defines.h"
  #include "../items.h"
! #include "../config.h"
  
  // Library Includes
--- 32,36 ----
  #include "../defines.h"
  #include "../items.h"
! #include "../serverconfig.h"
  
  // Library Includes
***************
*** 144,149 ****
  	stadifdata.open( IO_ReadOnly );
  
! 	QFile stadiflist( basepath + QString( "stadifl%1.mul" ).arg( id ) );	
! 	QFile stadifindex( basepath + QString( "stadifi%1.mul" ).arg( id ) );	
  
  	if (stadifindex.open(IO_ReadOnly) && stadiflist.open(IO_ReadOnly)) {
--- 144,149 ----
  	stadifdata.open( IO_ReadOnly );
  
! 	QFile stadiflist( basepath + QString( "stadifl%1.mul" ).arg( id ) );
! 	QFile stadifindex( basepath + QString( "stadifi%1.mul" ).arg( id ) );
  
  	if (stadifindex.open(IO_ReadOnly) && stadiflist.open(IO_ReadOnly)) {
***************
*** 157,161 ****
  			unsigned int id;
  			listinput >> id;
!             
  			indexinput >> record.offset;
  			indexinput >> record.blocklength;
--- 157,161 ----
  			unsigned int id;
  			listinput >> id;
! 
  			indexinput >> record.offset;
  			indexinput >> record.blocklength;
***************
*** 165,169 ****
                  staticpatches.insert( id, record );
  			}
! 		}		
  	}
  
--- 165,169 ----
                  staticpatches.insert( id, record );
  			}
! 		}
  	}
  
***************
*** 623,627 ****
  	QValueVector<staticrecord>* p = mapRecord->staticsCache.find( cachePos );
  
! #if !defined(_DEBUG)	
  	if ( !p )
  #else
--- 623,627 ----
  	QValueVector<staticrecord>* p = mapRecord->staticsCache.find( cachePos );
  
! #if !defined(_DEBUG)
  	if ( !p )
  #else
***************
*** 647,651 ****
  		else
  		{
! 			stIndexRecord indexStructure; 
  			mapRecord->idxfile.at( indexPos );
  			mapRecord->idxfile.readBlock( ( char * ) &indexStructure, sizeof( indexStructure ) );
--- 647,651 ----
  		else
  		{
! 			stIndexRecord indexStructure;
  			mapRecord->idxfile.at( indexPos );
  			mapRecord->idxfile.readBlock( ( char * ) &indexStructure, sizeof( indexStructure ) );

Index: multiscache.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/muls/multiscache.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** multiscache.cpp	19 Jun 2004 02:06:51 -0000	1.3
--- multiscache.cpp	4 Aug 2004 23:17:38 -0000	1.4
***************
*** 29,33 ****
  #include "../defines.h"
  #include "../exceptions.h"
! #include "../config.h"
  
  // Library Includes
--- 29,33 ----
  #include "../defines.h"
  #include "../exceptions.h"
! #include "../serverconfig.h"
  
  // Library Includes

Index: tilecache.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/muls/tilecache.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tilecache.cpp	2 Jun 2004 15:04:09 -0000	1.2
--- tilecache.cpp	4 Aug 2004 23:17:38 -0000	1.3
***************
*** 32,36 ****
  #include "../defines.h"
  #include "../exceptions.h"
! #include "../config.h"
  
  #include <qfile.h>
--- 32,36 ----
  #include "../defines.h"
  #include "../exceptions.h"
! #include "../serverconfig.h"
  
  #include <qfile.h>