wpdev-commits

[Thiago A C. <thi...@us...>]

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

Modified Files:
	coord.cpp corpse.cpp defines.h items.cpp targetrequest.h 
	targetrequests.h world.cpp 
Log Message:
Should fix some bugs related to loading items from inside containers introduced by the change in INVALID_SERIAL

Index: targetrequests.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/targetrequests.h,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** targetrequests.h	10 Jun 2004 00:27:12 -0000	1.67
--- targetrequests.h	2 Jul 2004 06:01:18 -0000	1.68
***************
*** 608,612 ****
  	}
  
! 	virtual bool responsed( cUOSocket* socket, cUORxTarget* target )
  	{
  		if ( m_npc )
--- 608,612 ----
  	}
  
! 	virtual bool responsed( cUOSocket*, cUORxTarget* target )
  	{
  		if ( m_npc )

Index: defines.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/defines.h,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** defines.h	14 Jun 2004 22:32:25 -0000	1.54
--- defines.h	2 Jul 2004 06:01:16 -0000	1.55
***************
*** 133,137 ****
  
  #define MY_CLOCKS_PER_SEC 1000
! #define INVALID_SERIAL static_cast<unsigned int>(~0)
  
  #define CONN_MAIN 1
--- 133,137 ----
  
  #define MY_CLOCKS_PER_SEC 1000
! #define INVALID_SERIAL 0
  
  #define CONN_MAIN 1

Index: targetrequest.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/targetrequest.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** targetrequest.h	2 Jun 2004 15:04:07 -0000	1.2
--- targetrequest.h	2 Jul 2004 06:01:18 -0000	1.3
***************
*** 57,61 ****
  		The target request timed out after the given timeout.
  	*/
! 	virtual void timedout( cUOSocket* socket )
  	{
  	}
--- 57,61 ----
  		The target request timed out after the given timeout.
  	*/
! 	virtual void timedout( cUOSocket* )
  	{
  	}
***************
*** 64,68 ****
  		The target request has been canceled by the client.
  	*/
! 	virtual void canceled( cUOSocket* socket )
  	{
  	}
--- 64,68 ----
  		The target request has been canceled by the client.
  	*/
! 	virtual void canceled( cUOSocket* )
  	{
  	}

Index: world.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/world.cpp,v
retrieving revision 1.101
retrieving revision 1.102
diff -C2 -d -r1.101 -r1.102
*** world.cpp	2 Jul 2004 00:52:55 -0000	1.101
--- world.cpp	2 Jul 2004 06:01:19 -0000	1.102
***************
*** 91,95 ****
  {
  	{ "guilds", "CREATE TABLE guilds ( \
! 		serial int(11) unsigned NOT NULL default '0', \
  		name varchar(255) NOT NULL default '', \
  		abbreviation varchar(6) NOT NULL default '', \
--- 91,95 ----
  {
  	{ "guilds", "CREATE TABLE guilds ( \
! 		serial unsigned int(11) NOT NULL default '0', \
  		name varchar(255) NOT NULL default '', \
  		abbreviation varchar(6) NOT NULL default '', \
***************
*** 97,121 ****
  		website varchar(255) NOT NULL default 'http://www.wpdev.org', \
  		alignment int(2) NOT NULL default '0', \
! 		leader int(11) unsigned NOT NULL default '4294967295', \
  		founded int(11) NOT NULL default '0', \
! 		guildstone int(11) unsigned NOT NULL default '4294967295', \
  		PRIMARY KEY(serial) \
! 	);" }, { "guilds_members",	"CREATE TABLE guilds_members ( \
! 		guild int(11) unsigned NOT NULL default '0', \
! 		player int(11) unsigned NOT NULL default '0', \
  		showsign int(1) NOT NULL default '0', \
  		guildtitle varchar(255) NOT NULL default '', \
  		joined int(11) NOT NULL default '0', \
  		PRIMARY KEY(guild,player) \
! 	);"}, { "guilds_canidates", "CREATE TABLE guilds_canidates ( \
! 		guild int(11) unsigned NOT NULL default '0', \
! 		player int(11) unsigned NOT NULL default '0', \
  		PRIMARY KEY(guild,player) \
! 	);"}, { "settings", "CREATE TABLE settings ( \
  		option varchar(255) NOT NULL default '', \
  		value varchar(255) NOT NULL default '', \
  		PRIMARY KEY (option) \
! 	);" }, { "characters", "CREATE TABLE characters (\
! 		serial int(11) unsigned NOT NULL default '0',\
  		name varchar(255) default NULL,\
  		title varchar(255) default NULL,\
--- 97,125 ----
  		website varchar(255) NOT NULL default 'http://www.wpdev.org', \
  		alignment int(2) NOT NULL default '0', \
! 		leader unsigned int(11) NOT NULL default '0', \
  		founded int(11) NOT NULL default '0', \
! 		guildstone unsigned int(11) NOT NULL default '0', \
  		PRIMARY KEY(serial) \
! 	);" }, 
! 	{ "guilds_members",	"CREATE TABLE guilds_members ( \
! 		guild unsigned int(11) NOT NULL default '0', \
! 		player unsigned int(11) NOT NULL default '0', \
  		showsign int(1) NOT NULL default '0', \
  		guildtitle varchar(255) NOT NULL default '', \
  		joined int(11) NOT NULL default '0', \
  		PRIMARY KEY(guild,player) \
! 	);"}, 
! 	{ "guilds_canidates", "CREATE TABLE guilds_canidates ( \
! 		guild unsigned int(11) NOT NULL default '0', \
! 		player unsigned int(11) NOT NULL default '0', \
  		PRIMARY KEY(guild,player) \
! 	);"}, 
! 	{ "settings", "CREATE TABLE settings ( \
  		option varchar(255) NOT NULL default '', \
  		value varchar(255) NOT NULL default '', \
  		PRIMARY KEY (option) \
! 	);" }, 
! 	{ "characters", "CREATE TABLE characters (\
! 		serial unsigned int(11) NOT NULL default '0',\
  		name varchar(255) default NULL,\
  		title varchar(255) default NULL,\
***************
*** 149,154 ****
  		gender tinyint(1)  NOT NULL default '0',\
  		propertyflags int(11)  NOT NULL default '0',\
! 		murderer int(11) unsigned NOT NULL default '4294967295',\
! 		guarding int(11) unsigned NOT NULL default '4294967295',\
  		hitpointsbonus smallint(6) NOT NULL default '0',\
  		staminabonus smallint(6) NOT NULL default '0',\
--- 153,158 ----
  		gender tinyint(1)  NOT NULL default '0',\
  		propertyflags int(11)  NOT NULL default '0',\
! 		murderer unsigned int(11) NOT NULL default '0',\
! 		guarding unsigned int(11) NOT NULL default '0',\
  		hitpointsbonus smallint(6) NOT NULL default '0',\
  		staminabonus smallint(6) NOT NULL default '0',\
***************
*** 161,166 ****
  		direction char(1) NOT NULL default '0',\
  		PRIMARY KEY (serial)\
! 	);" }, { "corpses", "CREATE TABLE corpses (\
! 		serial int(11) unsigned NOT NULL default '0',\
  		bodyid smallint(6)  NOT NULL default '0',\
  		hairstyle smallint(6)  NOT NULL default '0',\
--- 165,171 ----
  		direction char(1) NOT NULL default '0',\
  		PRIMARY KEY (serial)\
! 	);" }, 
! 	{ "corpses", "CREATE TABLE corpses (\
! 		serial unsigned int(11) NOT NULL default '0',\
  		bodyid smallint(6)  NOT NULL default '0',\
  		hairstyle smallint(6)  NOT NULL default '0',\
***************
*** 170,186 ****
  		direction char(1) NOT NULL default '0',\
  		charbaseid varchar(64) NOT NULL default '',\
! 		murderer int(11) unsigned NOT NULL default '4294967295',\
  		murdertime int(11) NOT NULL default '0',\
  		PRIMARY KEY (serial)\
! 	);" }, { "corpses_equipment", "CREATE TABLE corpses_equipment (\
! 		serial int(11) unsigned NOT NULL default '0',\
  		layer tinyint(3)  NOT NULL default '0',\
! 		item int(11) unsigned NOT NULL default '4294967295',  \
  		PRIMARY KEY (serial,layer)\
! 	);" }, { "items", "CREATE TABLE items (\
! 		serial int(11) unsigned 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',\
  		amount smallint(5)  NOT NULL default '0',\
--- 175,193 ----
  		direction char(1) NOT NULL default '0',\
  		charbaseid varchar(64) NOT NULL default '',\
! 		murderer unsigned int(11) NOT NULL default '0',\
  		murdertime int(11) NOT NULL default '0',\
  		PRIMARY KEY (serial)\
! 	);" }, 
! 	{ "corpses_equipment", "CREATE TABLE corpses_equipment (\
! 		serial unsigned int(11) NOT NULL default '0',\
  		layer tinyint(3)  NOT NULL default '0',\
! 		item unsigned int(11) NOT NULL default '0',  \
  		PRIMARY KEY (serial,layer)\
! 	);" }, 
! 	{ "items", "CREATE TABLE items (\
! 		serial unsigned int(11) NOT NULL default '0',\
  		id smallint(5)  NOT NULL default '0',\
  		color smallint(5)  NOT NULL default '0',\
! 		cont unsigned int(11) NOT NULL default '0',\
  		layer tinyint(3)  NOT NULL default '0',\
  		amount smallint(5)  NOT NULL default '0',\
***************
*** 188,202 ****
  		maxhp smallint(6) NOT NULL default '0',\
  		magic tinyint(3)  NOT NULL default '0',\
! 		owner int(11) unsigned NOT NULL default '4294967295',\
  		visible tinyint(3)  NOT NULL default '0',\
  		priv tinyint(3)  NOT NULL default '0',\
  		baseid varchar(64) NOT NULL default '',\
  		PRIMARY KEY (serial)\
! 	);" }, { "npcs", "CREATE TABLE npcs (\
! 		serial int(11) unsigned NOT NULL default '0',\
  		summontime int(11)  NOT NULL default '0',\
  		additionalflags int(11)  NOT NULL default '0',\
! 		owner int(11) unsigned NOT NULL default '4294967295',\
! 		stablemaster int(11) unsigned NOT NULL default '4294967295',\
  		ai varchar(255) default NULL,\
  		wandertype smallint(3) NOT NULL default '0',\
--- 195,210 ----
  		maxhp smallint(6) NOT NULL default '0',\
  		magic tinyint(3)  NOT NULL default '0',\
! 		owner unsigned int(11) NOT NULL default '0',\
  		visible tinyint(3)  NOT NULL default '0',\
  		priv tinyint(3)  NOT NULL default '0',\
  		baseid varchar(64) NOT NULL default '',\
  		PRIMARY KEY (serial)\
! 	);" },
! 	{ "npcs", "CREATE TABLE npcs (\
! 		serial unsigned int(11) NOT NULL default '0',\
  		summontime int(11)  NOT NULL default '0',\
  		additionalflags int(11)  NOT NULL default '0',\
! 		owner unsigned int(11) NOT NULL default '0',\
! 		stablemaster unsigned int(11) NOT NULL default '0',\
  		ai varchar(255) default NULL,\
  		wandertype smallint(3) NOT NULL default '0',\
***************
*** 207,212 ****
  		wanderradius smallint(6) NOT NULL default '0',\
  		PRIMARY KEY (serial)\
! 	);" }, { "players", "CREATE TABLE players (\
! 		serial int(11) unsigned NOT NULL default '0',\
  		account varchar(255) default NULL,\
  		additionalflags int(10)  NOT NULL default '0',\
--- 215,221 ----
  		wanderradius smallint(6) NOT NULL default '0',\
  		PRIMARY KEY (serial)\
! 	);" },
! 	{ "players", "CREATE TABLE players (\
! 		serial unsigned int(11) NOT NULL default '0',\
  		account varchar(255) default NULL,\
  		additionalflags int(10)  NOT NULL default '0',\
***************
*** 218,223 ****
  		intlock tinyint(4)  NOT NULL default '0',\
  		PRIMARY KEY (serial)\
! 	);" }, { "skills", "CREATE TABLE skills (\
! 		serial int(11) unsigned NOT NULL default '0',\
  		skill tinyint(3)  NOT NULL default '0',\
  		value smallint(6) NOT NULL default '0',\
--- 227,233 ----
  		intlock tinyint(4)  NOT NULL default '0',\
  		PRIMARY KEY (serial)\
! 	);" }, 
! 	{ "skills", "CREATE TABLE skills (\
! 		serial unsigned int(11) NOT NULL default '0',\
  		skill tinyint(3)  NOT NULL default '0',\
  		value smallint(6) NOT NULL default '0',\
***************
*** 225,238 ****
  		cap smallint(6) default '0',\
  		PRIMARY KEY (serial,skill)\
! 	);" }, { "tags", "CREATE TABLE tags (\
! 		serial int(11) unsigned 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) unsigned NOT NULL default '0',\
! 		multis int(11) unsigned NOT NULL default '4294967295',\
  		pos_x smallint(6)  NOT NULL default '0',\
  		pos_y smallint(6)  NOT NULL default '0',\
--- 235,250 ----
  		cap smallint(6) default '0',\
  		PRIMARY KEY (serial,skill)\
! 	);" }, 
! 	{ "tags", "CREATE TABLE tags (\
! 		serial unsigned 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 unsigned int(11) NOT NULL default '0',\
! 		multis unsigned int(11) NOT NULL default '0',\
  		pos_x smallint(6)  NOT NULL default '0',\
  		pos_y smallint(6)  NOT NULL default '0',\
***************
*** 242,268 ****
  		havetags tinyint(1) NOT NULL default '0',\
  		PRIMARY KEY (serial)\
! 	);" }, { "uobjectmap", "CREATE TABLE uobjectmap (\
! 		serial int(11) unsigned NOT NULL default '0',\
  		type varchar(80)  NOT NULL default '',\
  		PRIMARY KEY (serial)\
! 	);" }, { "effects", "CREATE TABLE effects (\
! 		id int(11) unsigned NOT NULL default '0',\
  		objectid varchar(64) NOT NULL,\
  		expiretime int(11) NOT NULL,\
  		dispellable tinyint(4) NOT NULL default '0',\
! 		source int(11) unsigned NOT NULL default '4294967295',\
! 		destination int(11) unsigned NOT NULL default '4294967295',\
  		PRIMARY KEY (id)\
! 	);" }, { "effects_properties", "CREATE TABLE effects_properties (\
! 		id int(11) unsigned NOT NULL default '0',\
  		keyname varchar(64) NOT NULL,\
  		type varchar(64) NOT NULL,\
  		value text NOT NULL,\
  		PRIMARY KEY (id,keyname)\
! 	);" }, { "spawnregions", "CREATE TABLE spawnregions (\
  		spawnregion varchar(64) NOT NULL,\
! 		serial int(11) unsigned NOT NULL default '0',\
  		PRIMARY KEY (spawnregion, serial)\
! 	);" }, { NULL, NULL }
  };
  
--- 254,285 ----
  		havetags tinyint(1) NOT NULL default '0',\
  		PRIMARY KEY (serial)\
! 	);" },
! 	{ "uobjectmap", "CREATE TABLE uobjectmap (\
! 		serial unsigned int(11) NOT NULL default '0',\
  		type varchar(80)  NOT NULL default '',\
  		PRIMARY KEY (serial)\
! 	);" },
! 	{ "effects", "CREATE TABLE effects (\
! 		id unsigned int(11) NOT NULL default '0',\
  		objectid varchar(64) NOT NULL,\
  		expiretime int(11) NOT NULL,\
  		dispellable tinyint(4) NOT NULL default '0',\
! 		source unsigned int(11) NOT NULL default '0',\
! 		destination unsigned int(11) NOT NULL default '0',\
  		PRIMARY KEY (id)\
! 	);" },
! 	{ "effects_properties", "CREATE TABLE effects_properties (\
! 		id unsigned int(11) NOT NULL default '0',\
  		keyname varchar(64) NOT NULL,\
  		type varchar(64) NOT NULL,\
  		value text NOT NULL,\
  		PRIMARY KEY (id,keyname)\
! 	);" },
! 	{ "spawnregions", "CREATE TABLE spawnregions (\
  		spawnregion varchar(64) NOT NULL,\
! 		serial unsigned int(11) NOT NULL default '0',\
  		PRIMARY KEY (spawnregion, serial)\
! 	);" },
! 	{ NULL, NULL }
  };
  

Index: coord.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/coord.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** coord.cpp	19 Jun 2004 07:37:53 -0000	1.48
--- coord.cpp	2 Jul 2004 06:01:15 -0000	1.49
***************
*** 780,784 ****
  
  		map_st map1, map2;
- 		SI32 j;
  
  		bool posHigherThanMap;
--- 780,783 ----

Index: items.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/items.cpp,v
retrieving revision 1.420
retrieving revision 1.421
diff -C2 -d -r1.420 -r1.421
*** items.cpp	15 Jun 2004 02:44:44 -0000	1.420
--- items.cpp	2 Jul 2004 06:01:16 -0000	1.421
***************
*** 479,483 ****
    color.
  */
! static int ContainerCountItems( const int serial, short id, short color )
  {
  	int total = 0;
--- 479,483 ----
    color.
  */
! static int ContainerCountItems( SERIAL serial, short id, short color )
  {
  	int total = 0;

Index: corpse.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/corpse.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** corpse.cpp	2 Jun 2004 15:04:04 -0000	1.55
--- corpse.cpp	2 Jul 2004 06:01:16 -0000	1.56
***************
*** 323,328 ****
  	else
  		SET_STR_PROPERTY( "charbaseid", charbaseid_ )
! 	else
! 		return cItem::setProperty( name, value );
  }
  
--- 323,328 ----
  	else
  		SET_STR_PROPERTY( "charbaseid", charbaseid_ )
! 
! 	return cItem::setProperty( name, value );
  }