[wpdev-commits] wolfpack world.cpp,1.59,1.60

[<dr...@pr...>]

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

Modified Files:
	world.cpp 
Log Message:
Tweaked the tables to be `table` so it works better.
Also, vchar(255) NOT NULL default NULL didn't work, so default ''
and mysql doesn't have float(11) it's just float


Index: world.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/world.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** world.cpp	30 Jan 2004 14:08:36 -0000	1.59
--- world.cpp	30 Jan 2004 19:21:48 -0000	1.60
***************
*** 64,68 ****
  #include <list>
  
! // UNCOMMENT THIS IF YOU WANT TO USE A HASHMAP 
  //#define WP_USE_HASH_MAP
  
--- 64,68 ----
  #include <list>
  
! // UNCOMMENT THIS IF YOU WANT TO USE A HASHMAP
  //#define WP_USE_HASH_MAP
  
***************
*** 87,335 ****
  } tableInfo[] =
  {
! 	{ "settings", "CREATE TABLE settings ( \
!   option varchar(255) NOT NULL default NULL, \
!   value varchar(255) NOT NULL default NULL, \
!   PRIMARY KEY (option) \
! );" },
  
! 	{ "boats", "CREATE TABLE boats ( \
!   serial int(11) NOT NULL default '0', \
!   autosail tinyint(1) NOT NULL default '0', \
!   boatdir tinyint(1) NOT NULL default '0', \
!   itemserial1 int(11) NOT NULL default '-1', \
!   itemserial2 int(11) NOT NULL default '-1', \
!   itemserial3 int(11) NOT NULL default '-1', \
!   itemserial4 int(11) NOT NULL default '-1', \
!   multi1 smallint(6) default '0', \
!   multi2 smallint(6) default '0', \
!   multi3 smallint(6) default '0', \
!   multi4 smallint(6) default '0', \
!   PRIMARY KEY (serial) \
! );" },
  
! 	{ "boats_itemids", "CREATE TABLE boats_itemids ( \
!   serial int(11) NOT NULL default '0', \
!   a tinyint(1)  NOT NULL default '0', \
!   b tinyint(1)  NOT NULL default '0', \
!   id smallint(6)  default '0', \
!   PRIMARY KEY (serial) \
! );" },
  
! 	{ "boats_itemoffsets", "CREATE TABLE boats_itemoffsets (\
!   serial int(11) NOT NULL default '0',\
!   a tinyint(1)  NOT NULL default '0',\
!   b tinyint(1)  NOT NULL default '0',\
!   c tinyint(1)  NOT NULL default '0',\
!   offset smallint(6) default '0',\
!   PRIMARY KEY (serial)\
! );" },
  
! 	{ "characters", "CREATE TABLE characters (\
!   serial int(11) NOT NULL default '0',\
!   name varchar(255) default NULL,\
!   title varchar(255) default NULL,\
!   creationdate varchar(255) default NULL,\
!   body smallint(5)  NOT NULL default '0',\
!   orgbody smallint(5)  NOT NULL default '0',\
!   skin smallint(5)  NOT NULL default '0',\
!   orgskin smallint(5)  NOT NULL default '0',\
!   saycolor smallint(5)  NOT NULL default '0',\
!   emotecolor smallint(5)  NOT NULL default '0',\
!   strength smallint(6) NOT NULL default '0',\
!   strengthmod smallint(6) NOT NULL default '0',\
!   dexterity smallint(6) NOT NULL default '0',\
!   dexteritymod smallint(6) NOT NULL default '0',\
!   intelligence smallint(6) NOT NULL default '0',\
!   intelligencemod smallint(6) NOT NULL default '0',\
!   maxhitpoints smallint(6) NOT NULL default '0',\
!   hitpoints smallint(6) NOT NULL default '0',\
!   maxstamina smallint(6) NOT NULL default '0',\
!   stamina smallint(6) NOT NULL default '0',\
!   maxmana smallint(6) default NULL,\
!   mana smallint(6) default NULL,\
!   karma int(11) NOT NULL default '0',\
!   fame int(11) NOT NULL default '0',\
!   kills int(10)  NOT NULL default '0',\
!   deaths int(10)  NOT NULL default '0',\
!   def int(10)  NOT NULL default '0',\
!   hunger int(11) NOT NULL default '0',\
!   poison int(11) NOT NULL default '0',\
!   poisoned int(10)  NOT NULL default '0',\
!   murderertime int(11)  NOT NULL default '0',\
!   criminaltime int(11)  NOT NULL default '0',\
!   nutriment int(10)  NOT NULL default '0',\
!   gender tinyint(1)  NOT NULL default '0',\
!   propertyflags int(11)  NOT NULL default '0',\
!   attacker int(11) NOT NULL default '-1',\
!   combattarget int(11) NOT NULL default '-1',\
!   murderer int(11) NOT NULL default '-1',\
!   guarding int(11) NOT NULL default '-1',\
!   PRIMARY KEY (serial)\
!   );" },
  
! 	{ "corpses", "CREATE TABLE corpses (\
!   serial int(11) NOT NULL default '0',\
!   bodyid smallint(6)  NOT NULL default '0',\
!   hairstyle smallint(6)  NOT NULL default '0',\
!   haircolor smallint(6)  NOT NULL default '0',\
!   beardstyle smallint(6)  NOT NULL default '0',\
!   beardcolor smallint(6)  NOT NULL default '0',\
!   PRIMARY KEY (serial)\
! );" },
  
! 	{ "corpses_equipment", "CREATE TABLE corpses_equipment (\
!   serial int(11) NOT NULL default '0',\
!   layer tinyint(3)  NOT NULL default '0',\
!   item int(11) NOT NULL default '-1',  \
!   PRIMARY KEY (serial,layer)\
! );" },
  
! 	{ "houses", "CREATE TABLE houses (\
!   serial int(11) NOT NULL default '0',\
!   nokey tinyint(1) NOT NULL default '0',\
!   charpos_x smallint(6) NOT NULL default '0',\
!   charpos_y smallint(6) NOT NULL default '0',\
!   charpos_z smallint(6) NOT NULL default '0',\
!   PRIMARY KEY (serial)\
! );" },
  
! 	{ "items", "CREATE TABLE items (\
!   serial int(11) NOT NULL default '0',\
!   id smallint(5)  NOT NULL default '0',\
!   color smallint(5)  NOT NULL default '0',\
!   cont int(11) NOT NULL default '-1',\
!   layer tinyint(3)  NOT NULL default '0',\
!   type smallint(5)  NOT NULL default '0',\
!   type2 smallint(5)  NOT NULL default '0',\
!   amount smallint(5)  NOT NULL default '0',\
!   decaytime int(10)  NOT NULL default '0',\
!   def int(10)  NOT NULL default '0',\
!   hidamage smallint(6) NOT NULL default '0',\
!   lodamage smallint(6) NOT NULL default '0',\
!   weight float(11) NOT NULL default '0',\
!   hp smallint(6) NOT NULL default '0',\
!   maxhp smallint(6) NOT NULL default '0',\
!   speed int(11) NOT NULL default '0',\
!   magic tinyint(3)  NOT NULL default '0',\
!   owner int(11) NOT NULL default '-1',\
!   visible tinyint(3)  NOT NULL default '0',\
!   spawnregion varchar(255) default NULL,\
!   priv tinyint(3)  NOT NULL default '0',\
!   sellprice int(11) NOT NULL default '0',\
!   buyprice int(11) NOT NULL default '0',\
!   restock smallint(5)  NOT NULL default '0',\
!   baseid varchar(32) NOT NULL default '',\
!   PRIMARY KEY (serial)\
! );" },
  
! 	{ "multis", "CREATE TABLE multis (\
!   serial int(11) NOT NULL default '0',\
!   coowner int(11) NOT NULL default '-1',\
!   deedsection varchar(255) NOT NULL default '',\
!   PRIMARY KEY (serial)\
! );" },
  
! 	{ "multis_bans", "CREATE TABLE multis_bans (\
!   serial int(11) NOT NULL default '0',\
!   ban int(11) NOT NULL default '-1',\
!   PRIMARY KEY (serial,ban)\
! );" },
  
! 	{ "multis_friends", "CREATE TABLE multis_friends (\
!   serial int(11) NOT NULL default '0',\
!   friend int(11) NOT NULL default '-1',\
!   PRIMARY KEY (serial,friend)\
! );" },
  
! 	{ "npcs", "CREATE TABLE npcs (\
!   serial int(11) NOT NULL default '0',\
!   mindamage smallint(6)  NOT NULL default '0',\
!   maxdamage smallint(6)  NOT NULL default '0',\
!   tamingminskill smallint(6)  NOT NULL default '0',\
!   summontime int(11)  NOT NULL default '0',\
!   additionalflags int(11)  NOT NULL default '0',\
!   owner int(11) NOT NULL default '-1',\
!   carve varchar(255) default NULL,\
!   spawnregion varchar(255) default NULL,\
!   stablemaster int(11) NOT NULL default '-1',\
!   lootlist varchar(255) default NULL,\
!   ai varchar(255) default NULL,\
!   wandertype smallint(3) NOT NULL default '0',\
!   wanderx1 smallint(6) NOT NULL default '0',\
!   wanderx2 smallint(6) NOT NULL default '0',\
!   wandery1 smallint(6) NOT NULL default '0',\
!   wandery2 smallint(6) NOT NULL default '0',\
!   wanderradius smallint(6) NOT NULL default '0',\
!   fleeat smallint(3)  NOT NULL default '10',\
!   spellslow int(11)  NOT NULL default '0',\
!   spellshigh int(11)  NOT NULL default '0',\
!   PRIMARY KEY (serial)\
! );" },
  
! 	{ "players", "CREATE TABLE players (\
!   serial int(11) NOT NULL default '0',\
!   account varchar(255) default NULL,\
!   additionalflags int(10)  NOT NULL default '0',\
!   visualrange tinyint(3)  NOT NULL default '0',\
!   profile longtext,\
!   fixedlight tinyint(3)  NOT NULL default '0',\
!   PRIMARY KEY (serial)\
! );" },
  
! 	{ "skills", "CREATE TABLE skills (\
!   serial int(11) NOT NULL default '0',\
!   skill tinyint(3)  NOT NULL default '0',\
!   value smallint(6) NOT NULL default '0',\
!   locktype tinyint(4) default '0',\
!   cap smallint(6) default '0',\
!   PRIMARY KEY (serial,skill)\
! );" },
  
! 	{ "tags", "CREATE TABLE tags (\
!   serial int(11) NOT NULL default '0',\
!   name varchar(64) NOT NULL default '',\
!   type varchar(6) NOT NULL default '',\
!   value longtext NOT NULL,\
!   PRIMARY KEY (serial,name)\
! );" },
  
! 	{ "uobject", "CREATE TABLE uobject (\
!   name varchar(255) default NULL,\
!   serial int(11) NOT NULL default '0',\
!   multis int(11) NOT NULL default '-1',\
!   direction char(1) NOT NULL default '0',\
!   pos_x smallint(6)  NOT NULL default '0',\
!   pos_y smallint(6)  NOT NULL default '0',\
!   pos_z smallint(6) NOT NULL default '0',\
!   pos_map tinyint(4) NOT NULL default '0',  \
!   events varchar(255) default NULL,\
!   bindmenu varchar(255) default NULL,\
!   havetags tinyint(1) NOT NULL default '0',\
!   PRIMARY KEY (serial)\
! );" },
  
! 	{ "uobjectmap", "CREATE TABLE uobjectmap (\
!   serial int(11) NOT NULL default '0',\
!   type varchar(80)  NOT NULL default '',\
!   PRIMARY KEY (serial)\
! );" },
  
! 	{ "effects", "CREATE TABLE effects (\
!   id int NOT NULL,\
!   objectid varchar(64) NOT NULL,\
!   expiretime int NOT NULL,\
!   dispellable tinyint NOT NULL default '0',\
!   source int NOT NULL default '-1',\
!   destination int NOT NULL default '-1',\
!   PRIMARY KEY (id)\
! );" },
  
! 	{ "effects_properties", "CREATE TABLE effects_properties (\
!   id int NOT NULL,\
!   keyname varchar(64) NOT NULL,\
!   type varchar(64) NOT NULL,\
!   value text NOT NULL,\
!   PRIMARY KEY (id,keyname)\
! );" },
  
  	{ NULL, NULL }
--- 87,335 ----
  } tableInfo[] =
  {
! 	{ "settings", "CREATE TABLE `settings` ( \
! 	`option` varchar(255) NOT NULL default '', \
! 	`value` varchar(255) NOT NULL default '', \
! 	PRIMARY KEY (`option`) \
! 	);" },
  
! 	{ "boats", "CREATE TABLE `boats` ( \
! 	`serial` int(11) NOT NULL default '0', \
! 	`autosail` tinyint(1) NOT NULL default '0', \
! 	`boatdir` tinyint(1) NOT NULL default '0', \
! 	`itemserial1` int(11) NOT NULL default '-1', \
! 	`itemserial2` int(11) NOT NULL default '-1', \
! 	`itemserial3` int(11) NOT NULL default '-1', \
! 	`itemserial4` int(11) NOT NULL default '-1', \
! 	`multi1` smallint(6) default '0', \
! 	`multi2` smallint(6) default '0', \
! 	`multi3` smallint(6) default '0', \
! 	`multi4` smallint(6) default '0', \
! 	PRIMARY KEY (`serial`) \
! 	);" },
  
! 	{ "boats_itemids", "CREATE TABLE `boats_itemids` ( \
! 	`serial` int(11) NOT NULL default '0', \
! 	`a` tinyint(1)  NOT NULL default '0', \
! 	`b` tinyint(1)  NOT NULL default '0', \
! 	`id` smallint(6)  default '0', \
! 	PRIMARY KEY (`serial`) \
! 	);" },
  
! 	{ "boats_itemoffsets", "CREATE TABLE `boats_itemoffsets` (\
! 	`serial` int(11) NOT NULL default '0',\
! 	`a` tinyint(1)  NOT NULL default '0',\
! 	`b` tinyint(1)  NOT NULL default '0',\
! 	`c` tinyint(1)  NOT NULL default '0',\
! 	`offset` smallint(6) default '0',\
! 	PRIMARY KEY (`serial`)\
! 	);" },
  
! 	{ "characters", "CREATE TABLE `characters` (\
! 	`serial` int(11) NOT NULL default '0',\
! 	`name` varchar(255) default NULL,\
! 	`title` varchar(255) default NULL,\
! 	`creationdate` varchar(255) default NULL,\
! 	`body` smallint(5)  NOT NULL default '0',\
! 	`orgbody` smallint(5)  NOT NULL default '0',\
! 	`skin` smallint(5)  NOT NULL default '0',\
! 	`orgskin` smallint(5)  NOT NULL default '0',\
! 	`saycolor` smallint(5)  NOT NULL default '0',\
! 	`emotecolor` smallint(5)  NOT NULL default '0',\
! 	`strength` smallint(6) NOT NULL default '0',\
! 	`strengthmod` smallint(6) NOT NULL default '0',\
! 	`dexterity` smallint(6) NOT NULL default '0',\
! 	`dexteritymod` smallint(6) NOT NULL default '0',\
! 	`intelligence` smallint(6) NOT NULL default '0',\
! 	`intelligencemod` smallint(6) NOT NULL default '0',\
! 	`maxhitpoints` smallint(6) NOT NULL default '0',\
! 	`hitpoints` smallint(6) NOT NULL default '0',\
! 	`maxstamina` smallint(6) NOT NULL default '0',\
! 	`stamina` smallint(6) NOT NULL default '0',\
! 	`maxmana` smallint(6) default NULL,\
! 	`mana` smallint(6) default NULL,\
! 	`karma` int(11) NOT NULL default '0',\
! 	`fame` int(11) NOT NULL default '0',\
! 	`kills` int(10)  NOT NULL default '0',\
! 	`deaths` int(10)  NOT NULL default '0',\
! 	`def` int(10)  NOT NULL default '0',\
! 	`hunger` int(11) NOT NULL default '0',\
! 	`poison` int(11) NOT NULL default '0',\
! 	`poisoned` int(10)  NOT NULL default '0',\
! 	`murderertime` int(11)  NOT NULL default '0',\
! 	`criminaltime` int(11)  NOT NULL default '0',\
! 	`nutriment` int(10)  NOT NULL default '0',\
! 	`gender` tinyint(1)  NOT NULL default '0',\
! 	`propertyflags` int(11)  NOT NULL default '0',\
! 	`attacker` int(11) NOT NULL default '-1',\
! 	`combattarget` int(11) NOT NULL default '-1',\
! 	`murderer` int(11) NOT NULL default '-1',\
! 	`guarding` int(11) NOT NULL default '-1',\
! 	PRIMARY KEY (`serial`)\
! 	);" },
  
! 	{ "corpses", "CREATE TABLE `corpses` (\
! 	`serial` int(11) NOT NULL default '0',\
! 	`bodyid` smallint(6)  NOT NULL default '0',\
! 	`hairstyle` smallint(6)  NOT NULL default '0',\
! 	`haircolor` smallint(6)  NOT NULL default '0',\
! 	`beardstyle` smallint(6)  NOT NULL default '0',\
! 	`beardcolor` smallint(6)  NOT NULL default '0',\
! 	PRIMARY KEY (`serial`)\
! 	);" },
  
! 	{ "corpses_equipment", "CREATE TABLE `corpses_equipment` (\
! 	`serial` int(11) NOT NULL default '0',\
! 	`layer` tinyint(3)  NOT NULL default '0',\
! 	`item` int(11) NOT NULL default '-1',  \
! 	PRIMARY KEY (`serial`,`layer`)\
! 	);" },
  
! 	{ "houses", "CREATE TABLE `houses` (\
! 	`serial` int(11) NOT NULL default '0',\
! 	`nokey` tinyint(1) NOT NULL default '0',\
! 	`charpos_x` smallint(6) NOT NULL default '0',\
! 	`charpos_y` smallint(6) NOT NULL default '0',\
! 	`charpos_z` smallint(6) NOT NULL default '0',\
! 	PRIMARY KEY (`serial`)\
! 	);" },
  
! 	{ "items", "CREATE TABLE `items` (\
! 	`serial` int(11) NOT NULL default '0',\
! 	`id` smallint(5)  NOT NULL default '0',\
! 	`color` smallint(5)  NOT NULL default '0',\
! 	`cont` int(11) NOT NULL default '-1',\
! 	`layer` tinyint(3)  NOT NULL default '0',\
! 	`type` smallint(5)  NOT NULL default '0',\
! 	`type2` smallint(5)  NOT NULL default '0',\
! 	`amount` smallint(5)  NOT NULL default '0',\
! 	`decaytime` int(10)  NOT NULL default '0',\
! 	`def` int(10)  NOT NULL default '0',\
! 	`hidamage` smallint(6) NOT NULL default '0',\
! 	`lodamage` smallint(6) NOT NULL default '0',\
! 	`weight` float NOT NULL default '0',\
! 	`hp` smallint(6) NOT NULL default '0',\
! 	`maxhp` smallint(6) NOT NULL default '0',\
! 	`speed` int(11) NOT NULL default '0',\
! 	`magic` tinyint(3)  NOT NULL default '0',\
! 	`owner` int(11) NOT NULL default '-1',\
! 	`visible` tinyint(3)  NOT NULL default '0',\
! 	`spawnregion` varchar(255) default NULL,\
! 	`priv` tinyint(3)  NOT NULL default '0',\
! 	`sellprice` int(11) NOT NULL default '0',\
! 	`buyprice` int(11) NOT NULL default '0',\
! 	`restock` smallint(5)  NOT NULL default '0',\
! 	`baseid` varchar(32) NOT NULL default '',\
! 	PRIMARY KEY (`serial`)\
! 	);" },
  
! 	{ "multis", "CREATE TABLE `multis` (\
! 	`serial` int(11) NOT NULL default '0',\
! 	`coowner` int(11) NOT NULL default '-1',\
! 	`deedsection` varchar(255) NOT NULL default '',\
! 	PRIMARY KEY (`serial`)\
! 	);" },
  
! 	{ "multis_bans", "CREATE TABLE `multis_bans` (\
! 	`serial` int(11) NOT NULL default '0',\
! 	`ban` int(11) NOT NULL default '-1',\
! 	PRIMARY KEY (`serial`,`ban`)\
! 	);" },
  
! 	{ "multis_friends", "CREATE TABLE `multis_friends` (\
! 	`serial` int(11) NOT NULL default '0',\
! 	`friend` int(11) NOT NULL default '-1',\
! 	PRIMARY KEY (`serial`,`friend`)\
! 	);" },
  
! 	{ "npcs", "CREATE TABLE `npcs` (\
! 	`serial` int(11) NOT NULL default '0',\
! 	`mindamage` smallint(6)  NOT NULL default '0',\
! 	`maxdamage` smallint(6)  NOT NULL default '0',\
! 	`tamingminskill` smallint(6)  NOT NULL default '0',\
! 	`summontime` int(11)  NOT NULL default '0',\
! 	`additionalflags` int(11)  NOT NULL default '0',\
! 	`owner` int(11) NOT NULL default '-1',\
! 	`carve` varchar(255) default NULL,\
! 	`spawnregion varchar(255) default NULL,\
! 	`stablemaster` int(11) NOT NULL default '-1',\
! 	`lootlist` varchar(255) default NULL,\
! 	`ai` varchar(255) default NULL,\
! 	`wandertype` smallint(3) NOT NULL default '0',\
! 	`wanderx1` smallint(6) NOT NULL default '0',\
! 	`wanderx2` smallint(6) NOT NULL default '0',\
! 	`wandery1` smallint(6) NOT NULL default '0',\
! 	`wandery2` smallint(6) NOT NULL default '0',\
! 	`wanderradius` smallint(6) NOT NULL default '0',\
! 	`fleeat` smallint(3)  NOT NULL default '10',\
! 	`spellslow` int(11)  NOT NULL default '0',\
! 	`spellshigh` int(11)  NOT NULL default '0',\
! 	PRIMARY KEY (`serial`)\
! 	);" },
  
! 	{ "players", "CREATE TABLE `players` (\
! 	`serial` int(11) NOT NULL default '0',\
! 	`account` varchar(255) default NULL,\
! 	`additionalflags` int(10)  NOT NULL default '0',\
! 	`visualrange` tinyint(3)  NOT NULL default '0',\
! 	`profile` longtext,\
! 	`fixedlight` tinyint(3)  NOT NULL default '0',\
! 	PRIMARY KEY (`serial`)\
! 	);" },
  
! 	{ "skills", "CREATE TABLE `skills` (\
! 	`serial` int(11) NOT NULL default '0',\
! 	`skill` tinyint(3)  NOT NULL default '0',\
! 	`value` smallint(6) NOT NULL default '0',\
! 	`locktype` tinyint(4) default '0',\
! 	`cap` smallint(6) default '0',\
! 	PRIMARY KEY (`serial`,`skill`)\
! 	);" },
  
! 	{ "tags", "CREATE TABLE `tags` (\
! 	`serial` int(11) NOT NULL default '0',\
! 	`name` varchar(64) NOT NULL default '',\
! 	`type` varchar(6) NOT NULL default '',\
! 	`value` longtext NOT NULL,\
! 	PRIMARY KEY (`serial`,`name`)\
! 	);" },
  
! 	{ "uobject", "CREATE TABLE `uobject` (\
! 	`name` varchar(255) default NULL,\
! 	`serial` int(11) NOT NULL default '0',\
! 	`multis` int(11) NOT NULL default '-1',\
! 	`direction` char(1) NOT NULL default '0',\
! 	`pos_x` smallint(6)  NOT NULL default '0',\
! 	`pos_y` smallint(6)  NOT NULL default '0',\
! 	`pos_z` smallint(6) NOT NULL default '0',\
! 	`pos_map` tinyint(4) NOT NULL default '0',  \
! 	`events` varchar(255) default NULL,\
! 	`bindmenu` varchar(255) default NULL,\
! 	`havetags` tinyint(1) NOT NULL default '0',\
! 	PRIMARY KEY (`serial`)\
! 	);" },
  
! 	{ "uobjectmap", "CREATE TABLE `uobjectmap` (\
! 	`serial` int(11) NOT NULL default '0',\
! 	`type` varchar(80)  NOT NULL default '',\
! 	PRIMARY KEY (`serial`)\
! 	);" },
  
! 	{ "effects", "CREATE TABLE `effects` (\
! 	`id` int NOT NULL,\
! 	`objectid` varchar(64) NOT NULL,\
! 	`expiretime` int NOT NULL,\
! 	`dispellable` tinyint NOT NULL default '0',\
! 	`source` int NOT NULL default '-1',\
! 	`destination` int NOT NULL default '-1',\
! 	PRIMARY KEY (`id`)\
! 	);" },
  
! 	{ "effects_properties", "CREATE TABLE `effects_properties` (\
! 	`id` int NOT NULL,\
! 	`keyname` varchar(64) NOT NULL,\
! 	`type` varchar(64) NOT NULL,\
! 	`value` text NOT NULL,\
! 	PRIMARY KEY (`id`,`keyname`)\
! 	);" },
  
  	{ NULL, NULL }
***************
*** 348,360 ****
  	ItemMap items;
  	CharMap chars;
!     
  	// Pending for deletion
  	std::list< cUObject* > pendingObjects;
  
! 	void purgePendingObjects() 
  	{
  		std::list< cUObject* >::const_iterator it;
  		for( it = pendingObjects.begin(); it != pendingObjects.end(); ++it )
! 		{	
  			World::instance()->unregisterObject( *it );
  			delete *it;
--- 348,360 ----
  	ItemMap items;
  	CharMap chars;
! 
  	// Pending for deletion
  	std::list< cUObject* > pendingObjects;
  
! 	void purgePendingObjects()
  	{
  		std::list< cUObject* >::const_iterator it;
  		for( it = pendingObjects.begin(); it != pendingObjects.end(); ++it )
! 		{
  			World::instance()->unregisterObject( *it );
  			delete *it;
***************
*** 472,476 ****
  	{
  		QString type = types[j];
! 		
  		cDBResult res = persistentBroker->query( QString( "SELECT COUNT(*) FROM uobjectmap WHERE type = '%1'" ).arg( type ) );
  
--- 472,476 ----
  	{
  		QString type = types[j];
! 
  		cDBResult res = persistentBroker->query( QString( "SELECT COUNT(*) FROM uobjectmap WHERE type = '%1'" ).arg( type ) );
  
***************
*** 490,494 ****
  		res = persistentBroker->query( UObjectFactory::instance()->findSqlQuery( type ) );
  
! 		// Error Checking		
  		if( !res.isValid() )
  			throw persistentBroker->lastError();
--- 490,494 ----
  		res = persistentBroker->query( UObjectFactory::instance()->findSqlQuery( type ) );
  
! 		// Error Checking
  		if( !res.isValid() )
  			throw persistentBroker->lastError();
***************
*** 506,510 ****
  
  			// do something with data
! 			object = UObjectFactory::instance()->createObject( type );			
  			object->load( row, offset );
  
--- 506,510 ----
  
  			// do something with data
! 			object = UObjectFactory::instance()->createObject( type );
  			object->load( row, offset );
  
***************
*** 605,609 ****
  		{
  			SERIAL owner = pNPC->owner()->serial();
! 			
  			P_PLAYER pOwner = dynamic_cast<P_PLAYER>(FindCharBySerial( owner ));
  			if( pOwner )
--- 605,609 ----
  		{
  			SERIAL owner = pNPC->owner()->serial();
! 
  			P_PLAYER pOwner = dynamic_cast<P_PLAYER>(FindCharBySerial( owner ));
  			if( pOwner )
***************
*** 677,681 ****
  	uoTime.setTime_t( db_time.toInt() );
  	Console::instance()->ProgressDone();
! 	
  	Console::instance()->send(QString("Worldtime is %1 on %3. %4 in year %5").arg(uoTime.time().toString()).arg(uoTime.date().day()).arg(QDate::monthName(uoTime.date().month())).arg(uoTime.date().year() - 1970) + ".\n" );
  
--- 677,681 ----
  	uoTime.setTime_t( db_time.toInt() );
  	Console::instance()->ProgressDone();
! 
  	Console::instance()->send(QString("Worldtime is %1 on %3. %4 in year %5").arg(uoTime.time().toString()).arg(uoTime.date().day()).arg(QDate::monthName(uoTime.date().month())).arg(uoTime.date().year() - 1970) + ".\n" );
  
***************
*** 727,731 ****
  	// Flush old items
  	persistentBroker->flushDeleteQueue();
! 	
  	p->purgePendingObjects();
  
--- 727,731 ----
  	// Flush old items
  	persistentBroker->flushDeleteQueue();
! 
  	p->purgePendingObjects();
  
***************
*** 768,772 ****
  
  	uiCurrentTime = getNormalizedTime();
! 	
  	Console::instance()->ChangeColor( WPC_GREEN );
  	Console::instance()->send( " Done" );
--- 768,772 ----
  
  	uiCurrentTime = getNormalizedTime();
! 
  	Console::instance()->ChangeColor( WPC_GREEN );
  	Console::instance()->send( " Done" );
***************
*** 900,904 ****
  		p->items.insert( std::make_pair( serial - ITEM_SPACE, pItem ) );
  		_itemCount++;
! 		
  		if( serial > _lastItemSerial )
  			_lastItemSerial = serial;
--- 900,904 ----
  		p->items.insert( std::make_pair( serial - ITEM_SPACE, pItem ) );
  		_itemCount++;
! 
  		if( serial > _lastItemSerial )
  			_lastItemSerial = serial;