[wpdev-commits] wolfpack world.cpp,1.124,1.125 world.h,1.20,1.21

[spddmn <xxx...@us...>]

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

Modified Files:
	world.cpp world.h 
Log Message:
just making world.load() call helper functions instead of using large if blocks.  sorry for the big recompile!

Index: world.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/world.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** world.h	23 Aug 2004 21:37:39 -0000	1.20
--- world.h	8 Sep 2004 18:00:59 -0000	1.21
***************
*** 39,42 ****
--- 39,43 ----
  #include "server.h"
  
+ class PersistentObject;
  class cBufferedReader;
  
***************
*** 102,105 ****
--- 103,108 ----
  	// WorldLoader interface
  	void load();
+ 	void loadBinary(QPtrList<PersistentObject> &objects);
+ 	void loadSQL(QPtrList<PersistentObject> &objects);
  	void unload();
  	void save();

Index: world.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/world.cpp,v
retrieving revision 1.124
retrieving revision 1.125
diff -C2 -d -r1.124 -r1.125
*** world.cpp	4 Sep 2004 21:20:07 -0000	1.124
--- world.cpp	8 Sep 2004 18:00:59 -0000	1.125
***************
*** 422,432 ****
  }
  
! void cWorld::load()
  {
- 	unsigned int loadStart = getNormalizedTime();
- 	QPtrList<PersistentObject> objects;
- 
- 	if ( Config::instance()->databaseDriver() == "binary" )
- 	{
  		QString filename = Config::instance()->binarySavepath();
  
--- 422,427 ----
  }
  
! void cWorld::loadBinary( QPtrList<PersistentObject> &objects )
  {
  		QString filename = Config::instance()->binarySavepath();
  
***************
*** 534,541 ****
  			}
  		}
! 	}
! 	else
! 	{
! 		if ( !PersistentBroker::instance()->openDriver( Config::instance()->databaseDriver() ) )
  		{
  			Console::instance()->log( LOG_ERROR, QString( "Unknown Worldsave Database Driver '%1', check your wolfpack.xml" ).arg( Config::instance()->databaseDriver() ) );
--- 529,537 ----
  			}
  		}
! }
! 
! void cWorld::loadSQL( QPtrList<PersistentObject> &objects )
! {
! 	if ( !PersistentBroker::instance()->openDriver( Config::instance()->databaseDriver() ) )
  		{
  			Console::instance()->log( LOG_ERROR, QString( "Unknown Worldsave Database Driver '%1', check your wolfpack.xml" ).arg( Config::instance()->databaseDriver() ) );
***************
*** 816,819 ****
--- 812,829 ----
  
  		PersistentBroker::instance()->disconnect();
+ }
+ 
+ void cWorld::load()
+ {
+ 	unsigned int loadStart = getNormalizedTime();
+ 	QPtrList<PersistentObject> objects;
+ 
+ 	if ( Config::instance()->databaseDriver() == "binary" )
+ 	{
+ 		loadBinary( objects );
+ 	}
+ 	else
+ 	{
+ 		loadSQL( objects );
  	}