[wpdev-commits] wolfpack srvparams.cpp,1.85,1.86 wolf.dsp,1.205,1.206 wolfpack.cpp,1.438,1.439 world.cpp,1.27,1.28

[<dar...@us...>]

Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1:/tmp/cvs-serv3182/src

Modified Files:
	srvparams.cpp wolf.dsp wolfpack.cpp world.cpp 
Log Message:
Implemented SQLite support.
driver=sqlite
database name is the filename

Index: srvparams.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/srvparams.cpp,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -d -r1.85 -r1.86
*** srvparams.cpp	26 Aug 2003 15:01:05 -0000	1.85
--- srvparams.cpp	26 Aug 2003 15:05:38 -0000	1.86
***************
*** 119,123 ****
  	databaseUsername_		= getString("Database", "username", "", true);
  	databaseHost_			= getString("Database", "host", "", true);
! 	databaseHost_			= getString("Database", "driver", "sqlite", true);
  	databaseName_			= getString("Database", "name", "world.db", true);
  
--- 119,123 ----
  	databaseUsername_		= getString("Database", "username", "", true);
  	databaseHost_			= getString("Database", "host", "", true);
! 	databaseDriver_			= getString("Database", "driver", "sqlite", true);
  	databaseName_			= getString("Database", "name", "world.db", true);
  

Index: wolf.dsp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/wolf.dsp,v
retrieving revision 1.205
retrieving revision 1.206
diff -C2 -d -r1.205 -r1.206
*** wolf.dsp	26 Aug 2003 15:01:06 -0000	1.205
--- wolf.dsp	26 Aug 2003 15:05:38 -0000	1.206
***************
*** 52,56 ****
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
! # ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib $(QTDIR)\lib\qt-mt312.lib libmysql.lib flatstore.lib /nologo /subsystem:console /map /machine:I386 /nodefaultlib:"libcmt MSVCRTD" /out:"D:\wolfpack\wolfpack.exe" /libpath:"lib\ZThread\lib" /libpath:"lib\Python\lib" /libpath:"lib\bugreport\lib" /libpath:"flatstore\Release" /opt:ref /opt:nowin98
  # SUBTRACT LINK32 /pdb:none
  
--- 52,56 ----
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
! # ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib $(QTDIR)\lib\qt-mt312.lib libmysql.lib /nologo /subsystem:console /map /machine:I386 /nodefaultlib:"libcmt MSVCRTD" /out:"D:\wolfpack\wolfpack.exe" /libpath:"lib\ZThread\lib" /libpath:"lib\Python\lib" /libpath:"lib\bugreport\lib" /libpath:"flatstore\Release" /opt:ref /opt:nowin98
  # SUBTRACT LINK32 /pdb:none
  
***************
*** 77,81 ****
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib $(QTDIR)\lib\qt-mt312.lib libmysql.lib flatstore.lib /nologo /version:12.9 /subsystem:console /map /debug /machine:I386 /out:"..\Wolfpack.exe" /pdbtype:sept /libpath:"lib\bugreport\lib" /libpath:"flatstore\Debug"
  # SUBTRACT LINK32 /pdb:none
  
--- 77,81 ----
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib $(QTDIR)\lib\qt-mt312.lib libmysql.lib /nologo /version:12.9 /subsystem:console /map /debug /machine:I386 /out:"..\Wolfpack.exe" /pdbtype:sept /libpath:"lib\bugreport\lib" /libpath:"flatstore\Debug"
  # SUBTRACT LINK32 /pdb:none
  
***************
*** 115,122 ****
  # Begin Source File
  
- SOURCE=.\basechar_flatstore.cpp
- # End Source File
- # Begin Source File
- 
  SOURCE=.\basics.cpp
  # End Source File
--- 115,118 ----
***************
*** 203,210 ****
  # Begin Source File
  
- SOURCE=.\item_flatstore.cpp
- # End Source File
- # Begin Source File
- 
  SOURCE=.\itemid.cpp
  # End Source File
--- 199,202 ----
***************
*** 243,250 ****
  # Begin Source File
  
- SOURCE=.\npc_flatstore.cpp
- # End Source File
- # Begin Source File
- 
  SOURCE=.\persistentbroker.cpp
  # End Source File
--- 235,238 ----
***************
*** 263,270 ****
  # Begin Source File
  
- SOURCE=.\player_flatstore.cpp
- # End Source File
- # Begin Source File
- 
  SOURCE=.\preferences.cpp
  # End Source File
--- 251,254 ----
***************
*** 356,363 ****
  
  SOURCE=.\uobject.cpp
- # End Source File
- # Begin Source File
- 
- SOURCE=.\uobject_flatstore.cpp
  # End Source File
  # Begin Source File
--- 340,343 ----

Index: wolfpack.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/wolfpack.cpp,v
retrieving revision 1.438
retrieving revision 1.439
diff -C2 -d -r1.438 -r1.439
*** wolfpack.cpp	26 Aug 2003 15:01:06 -0000	1.438
--- wolfpack.cpp	26 Aug 2003 15:05:38 -0000	1.439
***************
*** 711,715 ****
  	// Try to open our driver
  	if( !persistentBroker->openDriver( SrvParams->databaseDriver() ) )
! 	{
  		exit( -1 );
  	}
--- 711,715 ----
  	// Try to open our driver
  	if( !persistentBroker->openDriver( SrvParams->databaseDriver() ) )
! 	{		
  		exit( -1 );
  	}

Index: world.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/world.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** world.cpp	26 Aug 2003 15:01:06 -0000	1.27
--- world.cpp	26 Aug 2003 15:05:38 -0000	1.28
***************
*** 182,194 ****
  	clConsole.send( "Loading World...\n" );
  
! 	try
! 	{
! 		persistentBroker->connect( SrvParams->databaseHost(), SrvParams->databaseName(), SrvParams->databaseUsername(), SrvParams->databasePassword() );
! 	}
! 	catch( QString &e )
! 	{
! 		clConsole.log( LOG_FATAL, QString( "An error occured while connecting to the database: %1\n" ).arg( e ) );
! 		return;
! 	}
  
  	ISerialization* archive = cPluginFactory::serializationArchiver( "xml" );
--- 182,186 ----
  	clConsole.send( "Loading World...\n" );
  
! 	persistentBroker->connect( SrvParams->databaseHost(), SrvParams->databaseName(), SrvParams->databaseUsername(), SrvParams->databasePassword() );
  
  	ISerialization* archive = cPluginFactory::serializationArchiver( "xml" );