wpdev-commits — Wolfpack CVS commit info

[wpdev-commits] wolfpack items.cpp,1.431,1.432 items.h,1.210,1.211 world.cpp,1.109,1.110

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

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

Modified Files:
	items.cpp items.h world.cpp 
Log Message:
items.magic is now items.movable like it should be...
I'm sure this is going to cause some headaches for people, but there is a Database Version constant that I increased. We should have a conversion patch ready for the release if we need it, but CVS users should be aware.


Index: items.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/items.cpp,v
retrieving revision 1.431
retrieving revision 1.432
diff -C2 -d -r1.431 -r1.432
*** items.cpp	12 Aug 2004 03:02:50 -0000	1.431
--- items.cpp	14 Aug 2004 03:40:36 -0000	1.432
***************
*** 204,208 ****
  	this->free = false;
  	this->hp_ = src.hp_;
! 	this->magic_ = src.magic_;
  	this->maxhp_ = src.maxhp_;
  	this->priv_ = src.priv_;
--- 204,208 ----
  	this->free = false;
  	this->hp_ = src.hp_;
! 	this->movable_ = src.movable_;
  	this->maxhp_ = src.maxhp_;
  	this->priv_ = src.priv_;
***************
*** 470,474 ****
  	writer.writeShort( hp_ );
  	writer.writeShort( maxhp_ );
! 	writer.writeByte( magic_ );
  	writer.writeInt( ownserial_ );
  	writer.writeByte( visible_ );
--- 470,474 ----
  	writer.writeShort( hp_ );
  	writer.writeShort( maxhp_ );
! 	writer.writeByte( movable_ );
  	writer.writeInt( ownserial_ );
  	writer.writeByte( visible_ );
***************
*** 493,497 ****
  	hp_ = reader.readShort();
  	maxhp_ = reader.readShort();
! 	magic_ = reader.readByte();
  	ownserial_ = reader.readInt();
  	visible_ = reader.readByte();
--- 493,497 ----
  	hp_ = reader.readShort();
  	maxhp_ = reader.readShort();
! 	movable_ = reader.readByte();
  	ownserial_ = reader.readInt();
  	visible_ = reader.readByte();
***************
*** 536,540 ****
  		addField( "hp", hp_ );
  		addField( "maxhp", maxhp_ );
! 		addField( "magic", magic_ );
  		addField( "owner", ownserial_ );
  		addField( "visible", visible_ );
--- 536,540 ----
  		addField( "hp", hp_ );
  		addField( "maxhp", maxhp_ );
! 		addField( "movable", movable_ );
  		addField( "owner", ownserial_ );
  		addField( "visible", visible_ );
***************
*** 625,629 ****
  	this->hp_ = 0; //Number of hit points an item has.
  	this->maxhp_ = 0; // Max number of hit points an item can have.
! 	this->magic_ = 0; // 0=Default as stored in client, 1=Always movable, 2=Never movable, 3=Owner movable.
  	this->setOwnSerialOnly( -1 );
  	this->visible_ = 0; // 0=Normally Visible, 1=Owner & GM Visible, 2=GM Visible
--- 625,629 ----
  	this->hp_ = 0; //Number of hit points an item has.
  	this->maxhp_ = 0; // Max number of hit points an item can have.
! 	this->movable_ = 0; // 0=Default as stored in client, 1=Always movable, 2=Never movable, 3=Owner movable.
  	this->setOwnSerialOnly( -1 );
  	this->visible_ = 0; // 0=Normally Visible, 1=Owner & GM Visible, 2=GM Visible
***************
*** 855,863 ****
  	// <immovable />
  	else if ( TagName == "movable" )
! 		this->magic_ = 1;
  	else if ( TagName == "immovable" )
! 		this->magic_ = 2;
  	else if ( TagName == "ownermovable" )
! 		this->magic_ = 3;
  
  	// <decay />
--- 855,863 ----
  	// <immovable />
  	else if ( TagName == "movable" )
! 		this->movable_ = 1;
  	else if ( TagName == "immovable" )
! 		this->movable_ = 2;
  	else if ( TagName == "ownermovable" )
! 		this->movable_ = 3;
  
  	// <decay />
***************
*** 963,970 ****
  		else
  		{
! 			/*int offset = Value.find( "%1" );
! 									QString left = Value.left( offset );
! 									QString right = Value.right( Value.length() - ( offset + 2 ) );
! 									name_ = left + name_ + right;*/
  			name_ = Value.arg( name_ );
  		}
--- 963,972 ----
  		else
  		{
! 			/*
! 			int offset = Value.find( "%1" );
! 			QString left = Value.left( offset );
! 			QString right = Value.right( Value.length() - ( offset + 2 ) );
! 			name_ = left + name_ + right;
! 			*/
  			name_ = Value.arg( name_ );
  		}
***************
*** 1283,1300 ****
  	switch ( type )
  	{
! 	case 0x01:
! 		speechType = cUOTxUnicodeSpeech::Broadcast; break;
! 	case 0x06:
! 		speechType = cUOTxUnicodeSpeech::System; break;
! 	case 0x09:
! 		speechType = cUOTxUnicodeSpeech::Yell; break;
! 	case 0x02:
! 		speechType = cUOTxUnicodeSpeech::Emote; break;
! 	case 0x08:
! 		speechType = cUOTxUnicodeSpeech::Whisper; break;
! 	case 0x0A:
! 		speechType = cUOTxUnicodeSpeech::Spell; break;
! 	default:
! 		speechType = cUOTxUnicodeSpeech::Regular; break;
  	};
  
--- 1285,1302 ----
  	switch ( type )
  	{
! 		case 0x01:
! 			speechType = cUOTxUnicodeSpeech::Broadcast; break;
! 		case 0x06:
! 			speechType = cUOTxUnicodeSpeech::System; break;
! 		case 0x09:
! 			speechType = cUOTxUnicodeSpeech::Yell; break;
! 		case 0x02:
! 			speechType = cUOTxUnicodeSpeech::Emote; break;
! 		case 0x08:
! 			speechType = cUOTxUnicodeSpeech::Whisper; break;
! 		case 0x0A:
! 			speechType = cUOTxUnicodeSpeech::Spell; break;
! 		default:
! 			speechType = cUOTxUnicodeSpeech::Regular; break;
  	};
  
***************
*** 1464,1468 ****
  	hp_ = atoi( result[offset++] );
  	maxhp_ = atoi( result[offset++] );
! 	magic_ = atoi( result[offset++] );
  	ownserial_ = atoi( result[offset++] );
  	visible_ = atoi( result[offset++] );
--- 1466,1470 ----
  	hp_ = atoi( result[offset++] );
  	maxhp_ = atoi( result[offset++] );
! 	movable_ = atoi( result[offset++] );
  	ownserial_ = atoi( result[offset++] );
  	visible_ = atoi( result[offset++] );
***************
*** 1489,1493 ****
  {
  	cUObject::buildSqlString( fields, tables, conditions );
! 	fields.push_back( "items.id,items.color,items.cont,items.layer,items.amount,items.hp,items.maxhp,items.magic,items.owner,items.visible,items.priv,items.baseid" );
  	tables.push_back( "items" );
  	conditions.push_back( "uobjectmap.serial = items.serial" );
--- 1491,1495 ----
  {
  	cUObject::buildSqlString( fields, tables, conditions );
! 	fields.push_back( "items.id,items.color,items.cont,items.layer,items.amount,items.hp,items.maxhp,items.movable,items.owner,items.visible,items.priv,items.baseid" );
  	tables.push_back( "items" );
  	conditions.push_back( "uobjectmap.serial = items.serial" );
***************
*** 1865,1869 ****
  		*/
  	else
! 		SET_INT_PROPERTY( "movable", magic_ )
  
  		// Flags
--- 1867,1871 ----
  		*/
  	else
! 		SET_INT_PROPERTY( "movable", movable_ )
  
  		// Flags
***************
*** 2029,2033 ****
  	PY_PROPERTY( "visible", visible_ == 0 ? 1 : 0 )
  	PY_PROPERTY( "ownervisible", visible_ == 1 ? 1 : 0 )
- 	PY_PROPERTY( "magic", magic_ )
  	// Flags
  	PY_PROPERTY( "dye", dye() ? 1 : 0 )
--- 2031,2034 ----
***************
*** 2045,2049 ****
  	PY_PROPERTY( "visible", visible_ == 0 ? 1 : 0 )
  	PY_PROPERTY( "ownervisible", visible_ == 1 ? 1 : 0 )
! 	PY_PROPERTY( "movable", magic_ )
  	/*
  	\rproperty item.watersource This property indicates that this type of item is a source of
--- 2046,2050 ----
  	PY_PROPERTY( "visible", visible_ == 0 ? 1 : 0 )
  	PY_PROPERTY( "ownervisible", visible_ == 1 ? 1 : 0 )
! 	PY_PROPERTY( "movable", movable_ )
  	/*
  	\rproperty item.watersource This property indicates that this type of item is a source of

Index: items.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/items.h,v
retrieving revision 1.210
retrieving revision 1.211
diff -C2 -d -r1.210 -r1.211
*** items.h	12 Aug 2004 03:02:50 -0000	1.210
--- items.h	14 Aug 2004 03:40:36 -0000	1.211
***************
*** 287,293 ****
  	}
  
! 	uchar magic() const
  	{
! 		return magic_;
  	}
  	uchar visible() const
--- 287,293 ----
  	}
  
! 	uchar movable() const
  	{
! 		return movable_;
  	}
  	uchar visible() const
***************
*** 420,424 ****
  	void setMagic( uchar data )
  	{
! 		magic_ = data; flagChanged(); changed( TOOLTIP );
  	}
  	void setVisible( uchar d )
--- 420,424 ----
  	void setMagic( uchar data )
  	{
! 		movable_ = data; flagChanged(); changed( TOOLTIP );
  	}
  	void setVisible( uchar d )
***************
*** 482,514 ****
  	void setAllMovable()
  	{
! 		this->magic_ = 1; flagChanged();
  	} // set it all movable..
  	bool isAllMovable()
  	{
! 		return ( magic_ == 1 );
  	}
  	void setGMMovable()
  	{
! 		this->magic_ = 2; flagChanged();
  	} // set it GM movable.
  	bool isGMMovable()
  	{
! 		return ( magic_ == 2 );
  	}
  	void setOwnerMovable()
  	{
! 		this->magic_ = 3; flagChanged();
  	} // set it owner movable.
  	bool isOwnerMovable()
  	{
! 		return ( magic_ == 3 );
  	}
  	void setLockedDown()
  	{
! 		this->magic_ = 4; flagChanged();
  	} // set it locked down.
  	bool isLockedDown()
  	{
! 		return ( magic_ == 4 );
  	}
  
--- 482,514 ----
  	void setAllMovable()
  	{
! 		this->movable_ = 1; flagChanged();
  	} // set it all movable..
  	bool isAllMovable()
  	{
! 		return ( movable_ == 1 );
  	}
  	void setGMMovable()
  	{
! 		this->movable_ = 2; flagChanged();
  	} // set it GM movable.
  	bool isGMMovable()
  	{
! 		return ( movable_ == 2 );
  	}
  	void setOwnerMovable()
  	{
! 		this->movable_ = 3; flagChanged();
  	} // set it owner movable.
  	bool isOwnerMovable()
  	{
! 		return ( movable_ == 3 );
  	}
  	void setLockedDown()
  	{
! 		this->movable_ = 4; flagChanged();
  	} // set it locked down.
  	bool isLockedDown()
  	{
! 		return ( movable_ == 4 );
  	}
  
***************
*** 573,577 ****
  		4: This item has been locked down
  	*/
! 	unsigned char magic_ : 3;
  
  	SERIAL ownserial_; // This property specifies the owner of this item. If it is INVALID_SERIAL, this item has no owner
--- 573,577 ----
  		4: This item has been locked down
  	*/
! 	unsigned char movable_ : 3;
  
  	SERIAL ownserial_; // This property specifies the owner of this item. If it is INVALID_SERIAL, this item has no owner

Index: world.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/world.cpp,v
retrieving revision 1.109
retrieving revision 1.110
diff -C2 -d -r1.109 -r1.110
*** world.cpp	10 Aug 2004 03:15:57 -0000	1.109
--- world.cpp	14 Aug 2004 03:40:36 -0000	1.110
***************
*** 81,86 ****
  //
  // ONCE AGAIN, DON'T FORGET TO INCREASE THIS VALUE
! #define DATABASE_VERSION 6
! #define WP_DATABASE_VERSION "6"
  
  // This is used for autocreating the tables
--- 81,86 ----
  //
  // ONCE AGAIN, DON'T FORGET TO INCREASE THIS VALUE
! #define DATABASE_VERSION 7
! #define WP_DATABASE_VERSION "7"
  
  // This is used for autocreating the tables
***************
*** 195,199 ****
  hp smallint(6) NOT NULL default '0',\
  maxhp smallint(6) NOT NULL default '0',\
! magic tinyint(3)  NOT NULL default '0',\
  owner unsigned int(10) NOT NULL default '0',\
  visible tinyint(3)  NOT NULL default '0',\
--- 195,199 ----
  hp smallint(6) NOT NULL default '0',\
  maxhp smallint(6) NOT NULL default '0',\
! movable tinyint(3)  NOT NULL default '0',\
  owner unsigned int(10) NOT NULL default '0',\
  visible tinyint(3)  NOT NULL default '0',\

[wpdev-commits] wolfpack spawnregions.h,1.27,1.28

[Correa <thi...@us...>]

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

Modified Files:
	spawnregions.h 
Log Message:
little better standard conformance

Index: spawnregions.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/spawnregions.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** spawnregions.h	10 Aug 2004 03:15:57 -0000	1.27
--- spawnregions.h	13 Aug 2004 19:51:04 -0000	1.28
***************
*** 166,170 ****
  		while ( it != this->end() )
  		{
! 			numNpcs += it->second->npcs();
  			++it;
  		}
--- 166,170 ----
  		while ( it != this->end() )
  		{
! 			numNpcs += (*it).second->npcs();
  			++it;
  		}
***************
*** 178,182 ****
  		while ( it != this->end() )
  		{
! 			numItems += it->second->items();
  			++it;
  		}
--- 178,182 ----
  		while ( it != this->end() )
  		{
! 			numItems += (*it).second->items();
  			++it;
  		}
***************
*** 190,194 ****
  		while ( it != this->end() )
  		{
! 			numNpcs += it->second->maxNpcs();
  			++it;
  		}
--- 190,194 ----
  		while ( it != this->end() )
  		{
! 			numNpcs += (*it).second->maxNpcs();
  			++it;
  		}
***************
*** 202,206 ****
  		while ( it != this->end() )
  		{
! 			numItems += it->second->maxItems();
  			++it;
  		}
--- 202,206 ----
  		while ( it != this->end() )
  		{
! 			numItems += (*it).second->maxItems();
  			++it;
  		}

[wpdev-commits] xmlscripts/scripts/system players.py,1.4,1.5

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

Update of /cvsroot/wpdev/xmlscripts/scripts/system
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12693/system

Modified Files:
	players.py 
Log Message:
remove before setting invis stuff.


Index: players.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/players.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** players.py	13 Aug 2004 08:53:19 -0000	1.4
--- players.py	13 Aug 2004 17:56:49 -0000	1.5
***************
*** 13,18 ****
  def onLogout( player ):
  	socket = player.socket
- 	player.hidden = 1
  	player.removefromview()
  	player.update()
  	return True
--- 13,18 ----
  def onLogout( player ):
  	socket = player.socket
  	player.removefromview()
+ 	player.hidden = 1
  	player.update()
  	return True

[wpdev-commits] xmlscripts/scripts/commands invis.py,1.2,1.3

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

Update of /cvsroot/wpdev/xmlscripts/scripts/commands
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12693/commands

Modified Files:
	invis.py 
Log Message:
remove before setting invis stuff.


Index: invis.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/invis.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** invis.py	13 Aug 2004 04:31:27 -0000	1.2
--- invis.py	13 Aug 2004 17:56:49 -0000	1.3
***************
*** 19,24 ****
  def commandInvis( socket, cmd, args ):
  	char = socket.player
- 	char.invisible = booleantoggle( char.invisible )
  	char.removefromview()
  	char.update()
  	socket.sysmessage( "Invisible is now '%i'." % char.invisible )
--- 19,24 ----
  def commandInvis( socket, cmd, args ):
  	char = socket.player
  	char.removefromview()
+ 	char.invisible = booleantoggle( char.invisible )
  	char.update()
  	socket.sysmessage( "Invisible is now '%i'." % char.invisible )

[wpdev-commits] wolfpack ChangeLog,1.4,1.5

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

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

Modified Files:
	ChangeLog 
Log Message:
Compile warning fixes


Index: ChangeLog
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ChangeLog	10 Aug 2004 02:00:16 -0000	1.4
--- ChangeLog	13 Aug 2004 08:57:30 -0000	1.5
***************
*** 5,18 ****
  
  Wolfpack 12.9.8 Beta (4. August 2004)
! 	- Gump Responses are now passed on as Unicode rather than in
! 		the local codepage.
  	- Floating point tags are now saved correctly.
! 	- Removed commands: tags, addevent, removeevent, account, resurrect, password,
! 		tele, invis, kill, fix, resend, allskills, remove, move, who.
! 	- Region Updates/Fixes:
! 			Added flags: noentermessage and noguardmessage
! 			Fixed guardowner messages
! 	- Removed <gold></gold> support:
! 			Item baseid 'eed' should be used instead.
  	- Documentation Updates
  	- More warning fixes
--- 5,20 ----
  
  Wolfpack 12.9.8 Beta (4. August 2004)
! 	- Cleanups and general fixes.
! 	- Gump Responses are now passed on as Unicode rather than in the
! 		local codepage.
  	- Floating point tags are now saved correctly.
! 	- Removed commands: tags, addevent, removeevent, account,
! 		resurrect, password, tele, invis, kill, fix, resend,
! 		allskills, remove, move, who
! 	- Region Updates/Fixes.
! 		Added flags: noentermessage and noguardmessage
! 		Fixed guardowner messages
! 	- Removed <gold></gold> support.
! 		Item baseid 'eed' should be used instead.
  	- Documentation Updates
  	- More warning fixes
***************
*** 20,31 ****
  	- Added status on MySQL/SQLite modules.
  	- New Python getProperty method.
! 	- Fixed a possible bug with the Python interface:
! 		( possibly source of crashing bugs )
  	- Property item.magic is now item.movable
! 	- New Config Option: Speedhack Countermeasure
  		(See Anti Speed Hack settings in the General group)
- 	- New Windows Release builds should now include MySQL support by default.
  	- Added some additional checking to wolfpack.pro
! 	- Began binary save feature (Incomplete)
  
  Wolfpack 12.9.7 Beta (4. July 2004)
--- 22,34 ----
  	- Added status on MySQL/SQLite modules.
  	- New Python getProperty method.
! 	- Fixed a possible bug with the Python interface
! 		( Possibly source of crashing bugs )
  	- Property item.magic is now item.movable
! 	- (Configurable) Speedhack Countermeasure
  		(See Anti Speed Hack settings in the General group)
  	- Added some additional checking to wolfpack.pro
! 	- Began binary save feature. (Incomplete)
! 	- Fixes for mul and diff files.
! 		Haven should now work.
  
  Wolfpack 12.9.7 Beta (4. July 2004)

[wpdev-commits] wolfpack/network uosocket.cpp,1.391,1.392 uotxpackets.cpp,1.100,1.101

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

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

Modified Files:
	uosocket.cpp uotxpackets.cpp 
Log Message:
I actually fixed most of the conversion warnings, and Wolfpack didn't break for me... so I'll commit. This removes quite a bit of warning garbage. :)


Index: uosocket.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v
retrieving revision 1.391
retrieving revision 1.392
diff -C2 -d -r1.391 -r1.392
*** uosocket.cpp	13 Aug 2004 02:53:53 -0000	1.391
--- uosocket.cpp	13 Aug 2004 08:55:27 -0000	1.392
***************
*** 106,110 ****
  PyObject* cUOSocket::handlers[255] =
  {
! 0, 
  };
  
--- 106,110 ----
  PyObject* cUOSocket::handlers[255] =
  {
! 0,
  };
  
***************
*** 2403,2407 ****
  		sendStats.setDexterity( _player->dexterity() );
  		sendStats.setIntelligence( _player->intelligence() );
! 		sendStats.setWeight( _player->weight() );
  		sendStats.setGold( _player->countBankGold() + _player->countGold() );
  		sendStats.setSex( _player->gender() );
--- 2403,2407 ----
  		sendStats.setDexterity( _player->dexterity() );
  		sendStats.setIntelligence( _player->intelligence() );
! 		sendStats.setWeight( ( short unsigned int ) _player->weight() );
  		sendStats.setGold( _player->countBankGold() + _player->countGold() );
  		sendStats.setSex( _player->gender() );

Index: uotxpackets.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uotxpackets.cpp,v
retrieving revision 1.100
retrieving revision 1.101
diff -C2 -d -r1.100 -r1.101
*** uotxpackets.cpp	10 Aug 2004 03:24:29 -0000	1.100
--- uotxpackets.cpp	13 Aug 2004 08:55:27 -0000	1.101
***************
*** 209,213 ****
  	setShort( 1, size + 8 );
  	setInt( size, staticpatches );
! 	setInt( size + 4, mappatches );	
  	setInt( 5, num + 1 );
  }
--- 209,213 ----
  	setShort( 1, size + 8 );
  	setInt( size, staticpatches );
! 	setInt( size + 4, mappatches );
  	setInt( 5, num + 1 );
  }
***************
*** 366,370 ****
  	bool layers[0x20] =
  	{
! 	0, 
  	};
  
--- 366,370 ----
  	bool layers[0x20] =
  	{
! 	0,
  	};
  
***************
*** 819,821 ****
  		setShort( 48 + data.length() * 2, 0 );
  	}
! }
\ No newline at end of file
--- 819,821 ----
  		setShort( 48 + data.length() * 2, 0 );
  	}
! }

[wpdev-commits] wolfpack basechar.cpp,1.128,1.129 basechar.h,1.78,1.79 commands.cpp,1.253,1.254 console.cpp,1.22,1.23 console.h,1.16,1.17 coord.cpp,1.50,1.51 coord.h,1.20,1.21 customtags.cpp,1.52,1.53 dbdriver.cpp,1.39,1.40 definitions.cpp,1.13,1.14 dragdrop.cpp,1.240,1.241 gumps.cpp,1.169,1.170 gumps.h,1.41,1.42 npc.cpp,1.104,1.105 npc.h,1.54,1.55 serverconfig.cpp,1.3,1.4 skills.cpp,1.229,1.230 timers.cpp,1.8,1.9 timing.cpp,1.11,1.12 trade.cpp,1.7,1.8 walking.cpp,1.132,1.133

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

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

Modified Files:
	basechar.cpp basechar.h commands.cpp console.cpp console.h 
	coord.cpp coord.h customtags.cpp dbdriver.cpp definitions.cpp 
	dragdrop.cpp gumps.cpp gumps.h npc.cpp npc.h serverconfig.cpp 
	skills.cpp timers.cpp timing.cpp trade.cpp walking.cpp 
Log Message:
I actually fixed most of the conversion warnings, and Wolfpack didn't break for me... so I'll commit. This removes quite a bit of warning garbage. :)


Index: trade.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/trade.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** trade.cpp	12 Aug 2004 03:02:51 -0000	1.7
--- trade.cpp	13 Aug 2004 08:55:26 -0000	1.8
***************
*** 315,319 ****
  				continue;
  
! 			if ( ( *it )->id() == pItem->id() && ( *it )->color() == pItem->color() && 
  				//					(*it)->amount() >= pItem->amount() &&
  				( *it )->eventList() == pItem->eventList() )
--- 315,319 ----
  				continue;
  
! 			if ( ( *it )->id() == pItem->id() && ( *it )->color() == pItem->color() &&
  				//					(*it)->amount() >= pItem->amount() &&
  				( *it )->eventList() == pItem->eventList() )

Index: gumps.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/gumps.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** gumps.h	5 Jul 2004 14:03:16 -0000	1.41
--- gumps.h	13 Aug 2004 08:55:25 -0000	1.42
***************
*** 252,278 ****
  };
  
- class cWhoMenuGump : public cGump
- {
- private:
- 	UINT32 page_;
- 	std::vector<cUOSocket*> sockets_;
- 
- public:
- 	cWhoMenuGump( UINT32 page );
- 
- 	virtual void handleResponse( cUOSocket* socket, const gumpChoice_st& choice );
- };
- 
- class cSocketInfoGump : public cGump
- {
- private:
- 	cUOSocket* socket_;
- 
- public:
- 	cSocketInfoGump( cUOSocket* socket_ );
- 
- 	virtual void handleResponse( cUOSocket* socket, const gumpChoice_st& choice );
- };
- 
  class cPagesGump : public cGump
  {
--- 252,255 ----

Index: serverconfig.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/serverconfig.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** serverconfig.cpp	10 Aug 2004 03:15:57 -0000	1.3
--- serverconfig.cpp	13 Aug 2004 08:55:25 -0000	1.4
***************
*** 63,67 ****
  	// we do a dns lookup on this
  
! 	Q_INT32 uiValue = inet_addr( ( char* ) data.latin1() ) ;
  	if ( uiValue == INADDR_NONE )
  	{
--- 63,67 ----
  	// we do a dns lookup on this
  
! 	Q_UINT32 uiValue = inet_addr( ( char* ) data.latin1() ) ;
  	if ( uiValue == INADDR_NONE )
  	{
***************
*** 357,363 ****
  static stGroupDoc group_doc[] =
  {
! {"AI", "This group configures the NPC AI."}, 
! {"Accounts", "This group configures the account management."}, 
! {"Database", "This group configures access to the worldsave database."}, 
  {0, 0}
  };
--- 357,363 ----
  static stGroupDoc group_doc[] =
  {
! {"AI", "This group configures the NPC AI."},
! {"Accounts", "This group configures the account management."},
! {"Database", "This group configures access to the worldsave database."},
  {0, 0}
  };
***************
*** 391,395 ****
  {"Accounts", "Auto Create", "If active login attempts with non-existing login names will create a new account automatically\n"
  "This is very usefull for new shards without account policy\n"},
! {"Accounts", "Database Driver", "Possible values are: sqlite, mysql"}, 
  {"Accounts", "Maximum Number of Characters", "Should not be more than 6, due to client restrictions"},
  {"Accounts", "Use MD5 Hashed Passwords", "This will store hashed passwords, increasing password security."},
--- 391,395 ----
  {"Accounts", "Auto Create", "If active login attempts with non-existing login names will create a new account automatically\n"
  "This is very usefull for new shards without account policy\n"},
! {"Accounts", "Database Driver", "Possible values are: sqlite, mysql"},
  {"Accounts", "Maximum Number of Characters", "Should not be more than 6, due to client restrictions"},
  {"Accounts", "Use MD5 Hashed Passwords", "This will store hashed passwords, increasing password security."},

Index: basechar.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/basechar.cpp,v
retrieving revision 1.128
retrieving revision 1.129
diff -C2 -d -r1.128 -r1.129
*** basechar.cpp	12 Aug 2004 19:01:14 -0000	1.128
--- basechar.cpp	13 Aug 2004 08:55:24 -0000	1.129
***************
*** 2204,2211 ****
  }
  
! void cBaseChar::setStamina( INT16 data, bool notify /* = true */ )
  {
  	stamina_ = data;
! 	changed_ = true;
  }
  
--- 2204,2211 ----
  }
  
! void cBaseChar::setStamina( INT16 data, bool notify )
  {
  	stamina_ = data;
! 	changed_ = notify;
  }
  
***************
*** 2798,2802 ****
  
  	// Fame is reduced by 10% upon death
! 	fame_ = (int)( (float)fame_ * 0.90 );
  
  	// Create the corpse
--- 2798,2802 ----
  
  	// Fame is reduced by 10% upon death
! 	fame_ = ( int ) ( ( float ) fame_ * 0.90 );
  
  	// Create the corpse
***************
*** 3331,3339 ****
  	if ( !isDead() )
  	{
! 		double chance = ( double ) stamina() / maxStamina();
  		double value = sqrt( skillValue( FOCUS ) * 0.0005 );
  		chance *= ( 1.0 - value );
  		chance += value;
! 		checkSkill( FOCUS, floor( ( 1.0 - chance ) * 1200 ), 1200 );
  	}
  
--- 3331,3339 ----
  	if ( !isDead() )
  	{
! 		double chance = ( double ) stamina() / ( double ) maxStamina();
  		double value = sqrt( skillValue( FOCUS ) * 0.0005 );
  		chance *= ( 1.0 - value );
  		chance += value;
! 		checkSkill( FOCUS, ( int ) floor( ( 1.0 - chance ) * 1200 ), 1200 );
  	}
  
***************
*** 3359,3363 ****
  		chance *= ( 1.0 - value );
  		chance += value;
! 		checkSkill( FOCUS, floor( ( 1.0 - chance ) * 1200 ), 1200 );
  	}
  
--- 3359,3363 ----
  		chance *= ( 1.0 - value );
  		chance += value;
! 		checkSkill( FOCUS, ( int ) floor( ( 1.0 - chance ) * 1200 ), 1200 );
  	}
  

Index: timers.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/timers.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** timers.cpp	12 Aug 2004 03:02:51 -0000	1.8
--- timers.cpp	13 Aug 2004 08:55:26 -0000	1.9
***************
*** 306,310 ****
  		cTimer* effect = *it;
  
! 		if ( ( !onlyDispellable || effect->dispellable ) && effect->getDest() == pc_dest->serial() && effect->objectID() == type )
  		{
  			pc_dest->removeTimer( effect );
--- 306,310 ----
  		cTimer* effect = *it;
  
! 		if ( ( !onlyDispellable || effect->dispellable ) && ( uint )effect->getDest() == ( uint )pc_dest->serial() && effect->objectID() == type )
  		{
  			pc_dest->removeTimer( effect );
***************
*** 348,352 ****
  	std::vector<cTimer*>::iterator i = teffects.begin();
  	for ( i = teffects.begin(); i != teffects.end(); i++ )
! 		if ( ( *i ) != NULL && ( *i )->dispellable && ( *i )->getDest() == pc_dest->serial() )
  		{
  			if ( isCharSerial( ( *i )->getDest() ) )
--- 348,352 ----
  	std::vector<cTimer*>::iterator i = teffects.begin();
  	for ( i = teffects.begin(); i != teffects.end(); i++ )
! 		if ( ( *i ) != NULL && ( *i )->dispellable && ( uint )( *i )->getDest() == ( uint )pc_dest->serial() )
  		{
  			if ( isCharSerial( ( *i )->getDest() ) )
***************
*** 465,469 ****
  }
  
! cDelayedOnCreateCall::cDelayedOnCreateCall( cUObject* obj, const QString& definition ) : 
  	obj_(obj), def_(definition)
  {
--- 465,469 ----
  }
  
! cDelayedOnCreateCall::cDelayedOnCreateCall( cUObject* obj, const QString& definition ) :
  	obj_(obj), def_(definition)
  {

Index: definitions.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/definitions.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** definitions.cpp	10 Aug 2004 03:15:56 -0000	1.13
--- definitions.cpp	13 Aug 2004 08:55:25 -0000	1.14
***************
*** 679,683 ****
  
  				if ( min.contains( "." ) || max.contains( "." ) )
! 					Value += QString::number( RandomNum( min.toFloat(), max.toFloat() ) );
  				else
  					Value += QString::number( RandomNum( min.toInt(), max.toInt() ) );
--- 679,683 ----
  
  				if ( min.contains( "." ) || max.contains( "." ) )
! 					Value += QString::number( RandomNum( ( int ) min.toFloat(), ( int ) max.toFloat() ) );
  				else
  					Value += QString::number( RandomNum( min.toInt(), max.toInt() ) );
***************
*** 706,710 ****
  
  					if ( max.contains( "." ) || min.contains( "." ) )
! 						Value += QString::number( RandomNum( min.toFloat(), max.toFloat() ) );
  					else
  						Value += QString::number( RandomNum( min.toInt(), max.toInt() ) );
--- 706,710 ----
  
  					if ( max.contains( "." ) || min.contains( "." ) )
! 						Value += QString::number( RandomNum( ( int ) min.toFloat(), ( int ) max.toFloat() ) );
  					else
  						Value += QString::number( RandomNum( min.toInt(), max.toInt() ) );

Index: console.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/console.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** console.cpp	4 Aug 2004 23:17:35 -0000	1.22
--- console.cpp	13 Aug 2004 08:55:25 -0000	1.23
***************
*** 104,108 ****
  }
  
! bool cConsole::handleCommand( const QString& command, bool silentFail )
  {
  	cUOSocket* mSock;
--- 104,108 ----
  }
  
! bool cConsole::handleCommand( const QString& command )
  {
  	cUOSocket* mSock;

Index: coord.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/coord.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** coord.cpp	10 Aug 2004 03:15:56 -0000	1.50
--- coord.cpp	13 Aug 2004 08:55:25 -0000	1.51
***************
*** 141,147 ****
  
  // Calculates the direction from one location to another
! unsigned char Coord_cl::direction( const Coord_cl& dest ) const
  {
! 	unsigned char dir;
  	short xdif, ydif;
  
--- 141,147 ----
  
  // Calculates the direction from one location to another
! unsigned int Coord_cl::direction( const Coord_cl& dest ) const
  {
! 	unsigned int dir;
  	short xdif, ydif;
  
***************
*** 166,170 ****
  		dir = 7;
  	else
! 		dir = -1;
  
  	return dir;
--- 166,170 ----
  		dir = 7;
  	else
! 		dir = 8;
  
  	return dir;
***************
*** 877,882 ****
  				//Console::instance()->send( QString( "z1_up:%1,z2_up:%2,z1_down:%3,z2_down:%4\n" ).arg( z1_up ).arg( z2_up ).arg( z1_down ).arg( z2_down ) );
  
! 				zmax = QMAX( ceil( z1_up ), ceil( z2_up ) );
! 				zmin = QMIN( floor( z1_down ), floor( z2_down ) );
  
  				//Console::instance()->send( QString( "y:zmin:%1,zmax:%2\n" ).arg( zmin ).arg( zmax ) );
--- 877,882 ----
  				//Console::instance()->send( QString( "z1_up:%1,z2_up:%2,z1_down:%3,z2_down:%4\n" ).arg( z1_up ).arg( z2_up ).arg( z1_down ).arg( z2_down ) );
  
! 				zmax = ( signed char ) QMAX( ceil( z1_up ), ceil( z2_up ) );
! 				zmin = ( signed char ) QMIN( floor( z1_down ), floor( z2_down ) );
  
  				//Console::instance()->send( QString( "y:zmin:%1,zmax:%2\n" ).arg( zmin ).arg( zmax ) );
***************
*** 964,969 ****
  				//Console::instance()->send( QString( "z1_up:%1,z2_up:%2,z1_down:%3,z2_down:%4\n" ).arg( z1_up ).arg( z2_up ).arg( z1_down ).arg( z2_down ) );
  
! 				zmax = QMAX( ceil( z1_up ), ceil( z2_up ) );
! 				zmin = QMIN( floor( z1_down ), floor( z2_down ) );
  
  				if ( dz_up > 0 )
--- 964,969 ----
  				//Console::instance()->send( QString( "z1_up:%1,z2_up:%2,z1_down:%3,z2_down:%4\n" ).arg( z1_up ).arg( z2_up ).arg( z1_down ).arg( z2_down ) );
  
! 				zmax = ( signed char ) QMAX( ceil( z1_up ), ceil( z2_up ) );
! 				zmin = ( signed char ) QMIN( floor( z1_down ), floor( z2_down ) );
  
  				if ( dz_up > 0 )
***************
*** 1116,1126 ****
  				if ( z2_up == -300 )
  				{
! 					zmin = floor( z1_down );
! 					zmax = ceil( z1_up );
  				}
  				else
  				{
! 					zmin = QMIN( floor( z1_down ), floor( z2_down ) );
! 					zmax = QMAX( ceil( z1_up ), ceil( z2_up ) );
  				}
  
--- 1116,1126 ----
  				if ( z2_up == -300 )
  				{
! 					zmin = ( signed char ) floor( z1_down );
! 					zmax = ( signed char ) ceil( z1_up );
  				}
  				else
  				{
! 					zmin = ( signed char ) QMIN( floor( z1_down ), floor( z2_down ) );
! 					zmax = ( signed char ) QMAX( ceil( z1_up ), ceil( z2_up ) );
  				}
  

Index: gumps.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/gumps.cpp,v
retrieving revision 1.169
retrieving revision 1.170
diff -C2 -d -r1.169 -r1.170
*** gumps.cpp	10 Aug 2004 03:15:57 -0000	1.169
--- gumps.cpp	13 Aug 2004 08:55:25 -0000	1.170
***************
*** 192,440 ****
  }
  
- cWhoMenuGump::cWhoMenuGump( UINT32 page )
- {
- 	if ( page == 0 )
- 		return;
- 
- 	page_ = page;
- 	QStringList charNames;
- 	QStringList accNames;
- 	QStringList IPs;
- 	std::vector<UINT32> offsets;
- 	UINT32 offset = 0;
- 
- 	sockets_.clear();
- 
- 	for ( cUOSocket*mSock = Network::instance()->first(); mSock; mSock = Network::instance()->next() )
- 	{
- 		P_PLAYER pChar = mSock->player();
- 		if ( pChar )
- 		{
- 			charNames.push_back( pChar->name() );
- 			accNames.push_back( pChar->account()->login() );
- 			IPs.push_back( mSock->ip() );
- 			sockets_.push_back( mSock );
- 			offsets.push_back( offset );
- 		}
- 		offset++;
- 	}
- 
- 	UINT32 numsocks = charNames.size();
- 	UINT32 pages = ( ( UINT32 ) ceil( ( double ) numsocks / 10.0f ) );
- 
- 	startPage();
- 	addBackground( 0xE10, 380, 360 ); //Background
- 	addCheckertrans( 15, 15, 350, 330 );
- 	addGump( 130, 18, 0xFA8 );
- 	addText( 165, 20, tr( "Who Menu" ), 0x530 );
- 
- 	// X button
- 	addText( 70, 320, "Close", 0x834 );
- 	addButton( 30, 320, 0xFB1, 0xFB3, 0 );
- 
- 	startPage( 1 );
- 
- 	INT32 i;
- 	INT32 right = page_ * 10 - 1;
- 	INT32 left = page_ * 10 - 10;
- 	if ( numsocks <= right )
- 		right = numsocks - 1;
- 
- 	for ( i = left; i <= right; i++ )
- 	{
- 		addButton( 20, 60 + ( i - left ) * 22, 0xFA5, 0xFA7, offsets[i] + 3 );
- 		addText( 50, 60 + ( i - left ) * 22, QString( "%1(%2)" ).arg( charNames[i] ).arg( accNames[i] ), 0x834 );
- 		addText( 240, 60 + ( i - left ) * 22, QString( "%1" ).arg( IPs[i] ), 0x834 );
- 	}
- 
- 	addText( 280, 320, tr( "Page %1 of %2" ).arg( page_ ).arg( pages ), 0x834 );
- 	if ( page_ > 1 ) // previous page
- 		addButton( 240, 320, 0x0FC, 0x0FC, 1 );
- 
- 	if ( page_ < pages ) // next page
- 		addButton( 260, 320, 0x0FA, 0x0FA, 2 );
- }
- 
- void cWhoMenuGump::handleResponse( cUOSocket* socket, const gumpChoice_st& choice )
- {
- 	if ( choice.button == 0 )
- 		return;
- 	else
- 	{
- 		switch ( choice.button )
- 		{
- 		case 1:
- 			{
- 				cWhoMenuGump* pGump = new cWhoMenuGump( page_ - 1 );
- 				socket->send( pGump );
- 			}
- 			break;
- 		case 2:
- 			{
- 				cWhoMenuGump* pGump = new cWhoMenuGump( page_ + 1 );
- 				socket->send( pGump );
- 			}
- 			break;
- 		default:
- 			{
- 				cSocketInfoGump* pGump = new cSocketInfoGump( sockets_[choice.button - 3] );
- 				socket->send( pGump );
- 			}
- 			break;
- 		}
- 	}
- }
- 
- cSocketInfoGump::cSocketInfoGump( cUOSocket* socket )
- {
- 	if ( !socket )
- 		return;
- 
- 	socket_ = socket;
- 	P_PLAYER pChar = socket->player();
- 
- 	bool contains = false;
- 	for ( cUOSocket*mSock = Network::instance()->first(); mSock; mSock = Network::instance()->next() )
- 	{
- 		if ( mSock == socket )
- 			contains = true;
- 	}
- 
- 	if ( contains && pChar )
- 	{
- 		startPage();
- 
- 		addBackground( 0xE10, 440, 340 ); //Background
- 		addResizeGump( 195, 260, 0xBB8, 205, 20 );
- 		addCheckertrans( 15, 15, 410, 310 );
- 		addGump( 160, 18, 0xFA2 );
- 		addText( 195, 20, tr( "Socket Menu" ), 0x530 );
- 
- 		// X button
- 		addText( 70, 300, "Close", 0x834 );
- 		addButton( 30, 300, 0xFB1, 0xFB3, 0 );
- 
- 		startPage( 1 );
- 
- 		addText( 50, 60, tr( "Char name:" ), 0x834 );
- 		addText( 250, 60, QString( "%1" ).arg( pChar->name() ), 0x834 );
- 		addText( 50, 80, tr( "IP:" ), 0x834 );
- 		addText( 250, 80, QString( "%1" ).arg( socket->ip() ), 0x834 );
- 		addText( 50, 100, tr( "Position:" ), 0x834 );
- 		addText( 250, 100, QString( "%1,%2,%3 map %4" ).arg( pChar->pos().x ).arg( pChar->pos().y ).arg( pChar->pos().z ).arg( pChar->pos().map ), 0x834 );
- 		addText( 50, 120, tr( "Region:" ), 0x834 );
- 		addText( 250, 120, QString( "%1" ).arg( pChar->region() ? pChar->region()->name() : QString( "" ) ), 0x834 );
- 		addText( 50, 140, tr( "Account / ACL:" ), 0x834 );
- 		addText( 250, 140, QString( "%1 / %2" ).arg( pChar->account()->login() ).arg( pChar->account()->acl() ), 0x834 );
- 
- 		addButton( 20, 180, 0xFA5, 0xFA7, 1 );
- 		addText( 50, 180, tr( "Go to position" ), 0x834 );
- 		addButton( 20, 200, 0xFA5, 0xFA7, 2 );
- 		addText( 50, 200, tr( "Bring char" ), 0x834 );
- 		addButton( 20, 220, 0xFA5, 0xFA7, 3 );
- 		addText( 50, 220, tr( "Jail char" ), 0x834 );
- 		addButton( 20, 260, 0xFBD, 0xFBF, 6 );
- 		addText( 50, 260, tr( "Send message:" ), 0x834 );
- 		addInputField( 200, 260, 190, 16, 1, tr( "<msg>" ), 0x834 );
- 
- 		addButton( 220, 180, 0xFAB, 0xFAD, 5 );
- 		addText( 250, 180, tr( "Show char info gump" ), 0x834 );
- 		addButton( 220, 200, 0xFA5, 0xFA7, 7 );
- 		addText( 250, 200, tr( "Disconnect" ), 0x834 );
- 		addButton( 220, 220, 0xFA5, 0xFA7, 4 );
- 		addText( 250, 220, tr( "Forgive char" ), 0x834 );
- 	}
- }
- 
- void cSocketInfoGump::handleResponse( cUOSocket* socket, const gumpChoice_st& choice )
- {
- 	if ( !socket_ )
- 		return;
- 
- 	bool contains = false;
- 	for ( cUOSocket*mSock = Network::instance()->first(); mSock && !contains; mSock = Network::instance()->next() )
- 	{
- 		if ( mSock == socket_ )
- 			contains = true;
- 	}
- 
- 	if ( choice.button == 0 )
- 		return;
- 	else if ( contains && socket_->player() )
- 	{
- 		P_PLAYER pChar = socket_->player();
- 		P_PLAYER mChar = socket->player();
- 		switch ( choice.button )
- 		{
- 		case 1:
- 			// Check if the privileges are ok
- 			if ( mChar && !mChar->account()->authorized( "command", "go" ) )
- 			{
- 				socket->sysMessage( tr( "Access to command 'go' was denied" ) );
- 			}
- 			else if ( mChar )
- 			{
- 				mChar->removeFromView( false );
- 				mChar->moveTo( pChar->pos() );
- 				mChar->resend( false );
- 			}
- 			break;
- 		case 2:
- 			// Check if the privileges are ok
- 			if ( mChar && !mChar->account()->authorized( "command", "move" ) || pChar->account()->rank() >= mChar->account()->rank() )
- 			{
- 				socket->sysMessage( tr( "Access to command 'move' was denied" ) );
- 			}
- 			else if ( mChar )
- 			{
- 				pChar->removeFromView( false );
- 				pChar->moveTo( mChar->pos() );
- 				pChar->resend( false );
- 			}
- 			break;
- 		case 3:
- 			// TODO jail command
- 			break;
- 		case 4:
- 			// TODO forgive command
- 			break;
- 		case 5:
- 			// Check if the privileges are ok
- 			if ( mChar && !mChar->account()->authorized( "command", "info" ) )
- 			{
- 				socket->sysMessage( tr( "Access to command 'info' was denied" ) );
- 			}
- 			else
- 			{
- 				//				cCharInfoGump* pGump = new cCharInfoGump( pChar );
- 				//				socket->send( pGump );
- 			}
- 			break;
- 		case 6:
- 			{
- 				std::map<UINT16, QString>::const_iterator it = choice.textentries.find( 1 );
- 				if ( it != choice.textentries.end() )
- 					socket_->sysMessage( it->second );
- 
- 				socket->sysMessage( tr( "Message sent." ) );
- 			}
- 			break;
- 		case 7:
- 			if ( pChar->account()->rank() >= mChar->account()->rank() )
- 			{
- 				socket->sysMessage( tr( "You're getting megalomaniac!" ) );
- 			}
- 			else
- 			{
- 				socket_->disconnect();
- 				socket->sysMessage( tr( "Socket disconnected." ) );
- 			}
- 			break;
- 		}
- 	}
- 	else
- 		socket->sysMessage( tr( "ERROR: Socket has disconnected or changed character in the meantime!" ) );
- }
- 
  cPagesGump::cPagesGump( UINT32 page, WPPAGE_TYPE ptype )
  {
--- 192,195 ----
***************
*** 489,493 ****
  	INT32 right = page_ * 10 - 1;
  	INT32 left = page_ * 10 - 10;
! 	if ( numsocks <= right )
  		right = numsocks - 1;
  
--- 244,248 ----
  	INT32 right = page_ * 10 - 1;
  	INT32 left = page_ * 10 - 10;
! 	if ( ( signed int ) numsocks <= ( signed int ) right )
  		right = numsocks - 1;
  
***************
*** 685,700 ****
  			}
  			break;
- 		case 5:
- 			// Check if the privileges are ok
- 			if ( mChar && !mChar->account()->authorized( "command", "info" ) || pChar->account()->rank() >= mChar->account()->rank() )
- 			{
- 				socket->sysMessage( tr( "Access to command 'info' was denied" ) );
- 			}
- 			else
- 			{
- 				cSocketInfoGump* pGump = new cSocketInfoGump( pChar->socket() );
- 				socket->send( pGump );
- 			}
- 			break;
  		case 6:
  			cPagesManager::getInstance()->moveOnTop( page_ );
--- 440,443 ----

Index: timing.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/timing.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** timing.cpp	10 Aug 2004 03:15:57 -0000	1.11
--- timing.cpp	13 Aug 2004 08:55:26 -0000	1.12
***************
*** 62,67 ****
  	lastWorldsave_ = 0;
  	nextSpawnRegionCheck = time + Config::instance()->spawnRegionCheckTime() * MY_CLOCKS_PER_SEC;
! 	nextTamedCheck = time + Config::instance()->checkTamedTime() * MY_CLOCKS_PER_SEC;
! 	nextNpcCheck = time + Config::instance()->checkNPCTime() * MY_CLOCKS_PER_SEC;
  	nextItemCheck = time + 10000; // Every 10 seconds
  	nextShopRestock = time + 20 * 60 * MY_CLOCKS_PER_SEC; // Every 20 minutes
--- 62,67 ----
  	lastWorldsave_ = 0;
  	nextSpawnRegionCheck = time + Config::instance()->spawnRegionCheckTime() * MY_CLOCKS_PER_SEC;
! 	nextTamedCheck = ( uint )( time + Config::instance()->checkTamedTime() * MY_CLOCKS_PER_SEC );
! 	nextNpcCheck = ( uint )( time + Config::instance()->checkNPCTime() * MY_CLOCKS_PER_SEC );
  	nextItemCheck = time + 10000; // Every 10 seconds
  	nextShopRestock = time + 20 * 60 * MY_CLOCKS_PER_SEC; // Every 20 minutes
***************
*** 73,77 ****
  inline int froundf( double f )
  {
! 	int i = floor( f );
  	if ( f - i >= 0.50 )
  	{
--- 73,77 ----
  inline int froundf( double f )
  {
! 	int i = ( int )floor( f );
  	if ( f - i >= 0.50 )
  	{
***************
*** 276,283 ****
  
  		if ( nextTamedCheck <= time )
! 			nextTamedCheck = time + Config::instance()->checkTamedTime() * MY_CLOCKS_PER_SEC;
  
  		if ( nextNpcCheck <= time )
! 			nextNpcCheck = time + Config::instance()->checkNPCTime() * MY_CLOCKS_PER_SEC;
  	}
  
--- 276,283 ----
  
  		if ( nextTamedCheck <= time )
! 			nextTamedCheck = ( uint )( time + Config::instance()->checkTamedTime() * MY_CLOCKS_PER_SEC );
  
  		if ( nextNpcCheck <= time )
! 			nextNpcCheck = ( uint )( time + Config::instance()->checkNPCTime() * MY_CLOCKS_PER_SEC );
  	}
  
***************
*** 306,310 ****
  				character->setHitpoints( character->hitpoints() + 1 );
  				character->updateHealth();
! 				character->setRegenHitpointsTime( Server::instance()->time() + floor( character->getHitpointRate() * 1000 ) );
  			}
  		}
--- 306,310 ----
  				character->setHitpoints( character->hitpoints() + 1 );
  				character->updateHealth();
! 				character->setRegenHitpointsTime( ( uint )( Server::instance()->time() + floor( character->getHitpointRate() * 1000 ) ) );
  			}
  		}
***************
*** 316,320 ****
  		{
  			character->setStamina( character->stamina() + 1 );
! 			character->setRegenStaminaTime( Server::instance()->time() + floor( character->getStaminaRate() * 1000 ) );
  
  			P_PLAYER player = dynamic_cast<P_PLAYER>( character );
--- 316,320 ----
  		{
  			character->setStamina( character->stamina() + 1 );
! 			character->setRegenStaminaTime( ( uint )( Server::instance()->time() + floor( character->getStaminaRate() * 1000 ) ) );
  
  			P_PLAYER player = dynamic_cast<P_PLAYER>( character );
***************
*** 331,335 ****
  		{
  			character->setMana( character->mana() + 1 );
! 			character->setRegenManaTime( Server::instance()->time() + floor( character->getManaRate() * 1000 ) );
  
  			P_PLAYER player = dynamic_cast<P_PLAYER>( character );
--- 331,335 ----
  		{
  			character->setMana( character->mana() + 1 );
! 			character->setRegenManaTime( ( uint )( Server::instance()->time() + floor( character->getManaRate() * 1000 ) ) );
  
  			P_PLAYER player = dynamic_cast<P_PLAYER>( character );
***************
*** 418,422 ****
  	if ( npc->ai() && npc->aiCheckTime() <= time )
  	{
! 		npc->setAICheckTime( time + Config::instance()->checkAITime() * MY_CLOCKS_PER_SEC );
  		npc->ai()->check();
  	}
--- 418,422 ----
  	if ( npc->ai() && npc->aiCheckTime() <= time )
  	{
! 		npc->setAICheckTime( ( uint )( time + Config::instance()->checkAITime() * MY_CLOCKS_PER_SEC ) );
  		npc->ai()->check();
  	}

Index: coord.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/coord.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** coord.h	2 Jun 2004 15:04:04 -0000	1.20
--- coord.h	13 Aug 2004 08:55:25 -0000	1.21
***************
*** 54,58 ****
  	Coord_cl operator-( const Coord_cl& src ) const;
  	unsigned int distance( const Coord_cl& src ) const;
! 	unsigned char direction( const Coord_cl& dest ) const;
  	bool lineOfSight( const Coord_cl& target, bool touch = false );
  	bool lineOfSight( const Coord_cl& target, UI16 targethight, bool touch = false );
--- 54,58 ----
  	Coord_cl operator-( const Coord_cl& src ) const;
  	unsigned int distance( const Coord_cl& src ) const;
! 	unsigned int direction( const Coord_cl& dest ) const;
  	bool lineOfSight( const Coord_cl& target, bool touch = false );
  	bool lineOfSight( const Coord_cl& target, UI16 targethight, bool touch = false );

Index: basechar.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/basechar.h,v
retrieving revision 1.78
retrieving revision 1.79
diff -C2 -d -r1.78 -r1.79
*** basechar.h	12 Aug 2004 03:02:50 -0000	1.78
--- basechar.h	13 Aug 2004 08:55:24 -0000	1.79
***************
*** 241,245 ****
  	virtual void soundEffect( UI16 soundId, bool hearAll = true ) = 0;
  	virtual void giveGold( Q_UINT32 amount, bool inBank = false ) = 0;
! 	virtual uint takeGold( uint amount, bool useBank = false ) = 0;
  	virtual void log( eLogLevel, const QString& string ) = 0;
  	virtual void log( const QString& string ) = 0;
--- 241,245 ----
  	virtual void soundEffect( UI16 soundId, bool hearAll = true ) = 0;
  	virtual void giveGold( Q_UINT32 amount, bool inBank = false ) = 0;
! 	virtual uint takeGold( uint amount, bool inBank = false ) = 0;
  	virtual void log( eLogLevel, const QString& string ) = 0;
  	virtual void log( const QString& string ) = 0;

Index: dragdrop.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/dragdrop.cpp,v
retrieving revision 1.240
retrieving revision 1.241
diff -C2 -d -r1.240 -r1.241
*** dragdrop.cpp	12 Aug 2004 03:02:50 -0000	1.240
--- dragdrop.cpp	13 Aug 2004 08:55:25 -0000	1.241
***************
*** 445,449 ****
  
  	// Get the data
! 	SERIAL contId = packet->cont();
  
  	Coord_cl dropPos = pChar->pos(); // plane
--- 445,449 ----
  
  	// Get the data
! 	//SERIAL contId = packet->cont();
  
  	Coord_cl dropPos = pChar->pos(); // plane

Index: commands.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/commands.cpp,v
retrieving revision 1.253
retrieving revision 1.254
diff -C2 -d -r1.253 -r1.254
*** commands.cpp	10 Aug 2004 03:15:56 -0000	1.253
--- commands.cpp	13 Aug 2004 08:55:24 -0000	1.254
***************
*** 790,794 ****
  			if ( x == 1383 && y >= 1642 && y <= 1643 )
  				return 0;
! 			if ( !Maps::instance()->canFit( x, y, z, map, 16 ) )
  				return 0;
  			cItem* door = cItem::createFromScript( QString::number( 0x6A5 + 2 * int( facing ), 16 ) );
--- 790,794 ----
  			if ( x == 1383 && y >= 1642 && y <= 1643 )
  				return 0;
! 			if ( !Maps::instance()->canFit( x, y, z, map ) )
  				return 0;
  			cItem* door = cItem::createFromScript( QString::number( 0x6A5 + 2 * int( facing ), 16 ) );
***************
*** 887,890 ****
--- 887,891 ----
  	{  250,  750,  775, 1330 }, {  525, 2095,  925, 2430 }, { 1025, 2155, 1265, 2310 }, { 1635, 2430, 1705, 2508 }, { 1775, 2605, 2165, 2975 }, { 1055, 3520, 1570, 4075 }, { 2860, 3310, 3120, 3630 }, { 2470, 1855, 3950, 3045 }, { 3425,  990, 3900, 1455 }, { 4175,  735, 4840, 1600 }, { 2375,  330, 3100, 1045 }, { 2100, 1090, 2310, 1450 }, { 1495, 1400, 1550, 1475 }, { 1085, 1520, 1415, 1910 }, { 1410, 1500, 1745, 1795 }, { 5120, 2300, 6143, 4095 }
  	};
+ 	/*
  	int IlshRegions[][4] =
  	{
***************
*** 895,898 ****
--- 896,900 ----
  	{ 0, 0, 320 * 8, 256 * 8 }
  	};
+ 	*/
  
  	socket->sysMessage( "Generating doors, please wait ( Slow )" );

Index: walking.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/walking.cpp,v
retrieving revision 1.132
retrieving revision 1.133
diff -C2 -d -r1.132 -r1.133
*** walking.cpp	10 Aug 2004 03:15:57 -0000	1.132
--- walking.cpp	13 Aug 2004 08:55:26 -0000	1.133
***************
*** 616,620 ****
  {
  	// Don't regenerate stamina while running
! 	pChar->setRegenStaminaTime( Server::instance()->time() + floor( pChar->getStaminaRate() * 1000 ) );
  	pChar->setRunningSteps( pChar->runningSteps() + 1 );
  
--- 616,620 ----
  {
  	// Don't regenerate stamina while running
! 	pChar->setRegenStaminaTime( ( uint )( Server::instance()->time() + floor( pChar->getStaminaRate() * 1000 ) ) );
  	pChar->setRunningSteps( pChar->runningSteps() + 1 );
  

Index: skills.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/skills.cpp,v
retrieving revision 1.229
retrieving revision 1.230
diff -C2 -d -r1.229 -r1.230
*** skills.cpp	5 Aug 2004 01:48:38 -0000	1.229
--- skills.cpp	13 Aug 2004 08:55:25 -0000	1.230
***************
*** 184,188 ****
  
  			// We have the chance of 1/chance that we reached our desired item
! 			if ( RandomNum( 1, chance ) == chance )
  			{
  				pToSteal = pItem;
--- 184,188 ----
  
  			// We have the chance of 1/chance that we reached our desired item
! 			if ( RandomNum( 1, ( int )chance ) == ( int )chance )
  			{
  				pToSteal = pItem;
***************
*** 197,201 ****
  
  	// The success of our Theft depends on the weight of the stolen item
! 	bool success = pChar->checkSkill( STEALING, 0, pToSteal->weight() );
  	bool caught = false;
  
--- 197,201 ----
  
  	// The success of our Theft depends on the weight of the stolen item
! 	bool success = pChar->checkSkill( STEALING, 0, ( long int )pToSteal->weight() );
  	bool caught = false;
  
***************
*** 228,232 ****
  		{
  			P_NPC pn = dynamic_cast<P_NPC>( pVictim );
! 			pVictim->talk( tr( "Guards! A thief is amoung us!" ), -1, 0x09 );
  			if ( pVictim->region() && pVictim->region()->isGuarded() )
  				pn->callGuards();
--- 228,232 ----
  		{
  			P_NPC pn = dynamic_cast<P_NPC>( pVictim );
! 			pVictim->talk( tr( "Guards! A thief is amoung us!" ), 0xFFFF, 0x09 );
  			if ( pVictim->region() && pVictim->region()->isGuarded() )
  				pn->callGuards();

Index: console.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/console.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** console.h	2 Jun 2004 15:04:04 -0000	1.16
--- console.h	13 Aug 2004 08:55:25 -0000	1.17
***************
*** 81,85 ****
  		\params silent Should the command fail silently.
  	*/
! 	bool handleCommand( const QString& command, bool silent = false );
  
  public:
--- 81,85 ----
  		\params silent Should the command fail silently.
  	*/
! 	bool handleCommand( const QString& command );
  
  public:

Index: customtags.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/customtags.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** customtags.cpp	10 Aug 2004 03:15:56 -0000	1.52
--- customtags.cpp	13 Aug 2004 08:55:25 -0000	1.53
***************
*** 390,394 ****
  
  	if ( typ == Long )
! 		return value.d;
  
  	if ( typ == Double )
--- 390,394 ----
  
  	if ( typ == Long )
! 		return ( int ) value.d;
  
  	if ( typ == Double )
***************
*** 469,476 ****
  
  	if ( typ == Long )
! 		return FindCharBySerial( value.d );
  
  	if ( typ == Double )
! 		return FindCharBySerial( floor( value.d ) );
  
  	return 0;
--- 469,476 ----
  
  	if ( typ == Long )
! 		return FindCharBySerial( ( unsigned int ) value.d );
  
  	if ( typ == Double )
! 		return FindCharBySerial( ( unsigned int ) floor( value.d ) );
  
  	return 0;
***************
*** 493,500 ****
  
  	if ( typ == Long )
! 		return FindItemBySerial( value.d );
  
  	if ( typ == Double )
! 		return FindItemBySerial( floor( value.d ) );
  
  	return 0;
--- 493,500 ----
  
  	if ( typ == Long )
! 		return FindItemBySerial( ( unsigned int ) value.d );
  
  	if ( typ == Double )
! 		return FindItemBySerial( ( unsigned int ) floor( value.d ) );
  
  	return 0;
***************
*** 752,756 ****
  		( ( Coord_cl * ) ( value.ptr ) )->y = reader.readShort();
  		( ( Coord_cl * ) ( value.ptr ) )->z = reader.readByte();
! 		( ( Coord_cl * ) ( value.ptr ) )->map = reader.readByte();			
  		reader.readShort();
  		break;
--- 752,756 ----
  		( ( Coord_cl * ) ( value.ptr ) )->y = reader.readShort();
  		( ( Coord_cl * ) ( value.ptr ) )->z = reader.readByte();
! 		( ( Coord_cl * ) ( value.ptr ) )->map = reader.readByte();
  		reader.readShort();
  		break;

Index: npc.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/npc.h,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** npc.h	10 Aug 2004 03:15:57 -0000	1.54
--- npc.h	13 Aug 2004 08:55:25 -0000	1.55
***************
*** 106,110 ****
  	virtual bool inWorld();
  	virtual void giveGold( Q_UINT32 amount, bool inBank = false );
! 	virtual UINT32 takeGold( UINT32 amount, bool useBank = false );
  	virtual void applyDefinition( const cElement* );
  	virtual void flagUnchanged()
--- 106,110 ----
  	virtual bool inWorld();
  	virtual void giveGold( Q_UINT32 amount, bool inBank = false );
! 	virtual UINT32 takeGold( UINT32 amount, bool inBank = false );
  	virtual void applyDefinition( const cElement* );
  	virtual void flagUnchanged()

Index: dbdriver.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/dbdriver.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** dbdriver.cpp	10 Aug 2004 03:15:56 -0000	1.39
--- dbdriver.cpp	13 Aug 2004 08:55:25 -0000	1.40
***************
*** 190,199 ****
  {
  PyObject_HEAD_INIT( NULL )
! 0, 
! "dbresult", 
! sizeof( wpDbResultType ), 
! 0, 
! wpDeallocDbResult, 
! 0, 
  ( getattrfunc ) wpDbResult_getAttr,
  0,
--- 190,199 ----
  {
  PyObject_HEAD_INIT( NULL )
! 0,
! "dbresult",
! sizeof( wpDbResultType ),
! 0,
! wpDeallocDbResult,
! 0,
  ( getattrfunc ) wpDbResult_getAttr,
  0,

Index: npc.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/npc.cpp,v
retrieving revision 1.104
retrieving revision 1.105
diff -C2 -d -r1.104 -r1.105
*** npc.cpp	12 Aug 2004 03:02:50 -0000	1.104
--- npc.cpp	13 Aug 2004 08:55:25 -0000	1.105
***************
*** 267,275 ****
  	if ( isTamed() )
  	{
! 		interval = Config::instance()->tamedNpcMoveTime() * MY_CLOCKS_PER_SEC;
  	}
  	else
  	{
! 		interval = Config::instance()->npcMoveTime() * MY_CLOCKS_PER_SEC;
  	}
  
--- 267,275 ----
  	if ( isTamed() )
  	{
! 		interval = ( unsigned int ) Config::instance()->tamedNpcMoveTime() * MY_CLOCKS_PER_SEC;
  	}
  	else
  	{
! 		interval = ( unsigned int ) Config::instance()->npcMoveTime() * MY_CLOCKS_PER_SEC;
  	}
  
***************
*** 611,616 ****
  }
  
! UINT32 cNPC::takeGold( UINT32 amount, bool useBank )
  {
  	P_ITEM pPack = getBackpack();
  
--- 611,617 ----
  }
  
! UINT32 cNPC::takeGold( UINT32 amount, bool inBank )
  {
+ 	Q_UNUSED( inBank );
  	P_ITEM pPack = getBackpack();
  
***************
*** 1431,1435 ****
  			P_ITEM mount = player->atLayer( cBaseChar::Mount );
  
! 			if ( mount && mount->getTag( "pet" ).toInt() == serial_ )
  			{
  				mount->remove();
--- 1432,1436 ----
  			P_ITEM mount = player->atLayer( cBaseChar::Mount );
  
! 			if ( mount && ( unsigned int ) mount->getTag( "pet" ).toInt() == serial_ )
  			{
  				mount->remove();

[wpdev-commits] wolfpack/muls maps.cpp,1.6,1.7 maps.h,1.2,1.3

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

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

Modified Files:
	maps.cpp maps.h 
Log Message:
I actually fixed most of the conversion warnings, and Wolfpack didn't break for me... so I'll commit. This removes quite a bit of warning garbage. :)


Index: maps.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/muls/maps.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** maps.cpp	10 Aug 2004 03:20:29 -0000	1.6
--- maps.cpp	13 Aug 2004 08:55:27 -0000	1.7
***************
*** 460,466 ****
  }
  
! bool cMaps::canFit( int x, int y, int z, int map, int height ) const
  {
! 	if ( x < 0 || y < 0 || x >= mapTileWidth( map ) * 8 || y >= mapTileHeight( map ) * 8 )
  		return false;
  
--- 460,466 ----
  }
  
! bool cMaps::canFit( int x, int y, int z, uint map ) const
  {
! 	if ( x < 0 || y < 0 || x >= ( int ) mapTileWidth( map ) * 8 || y >= ( int ) mapTileHeight( map ) * 8 )
  		return false;
  

Index: maps.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/muls/maps.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** maps.h	2 Jun 2004 15:04:09 -0000	1.2
--- maps.h	13 Aug 2004 08:55:27 -0000	1.3
***************
*** 130,134 ****
  	uint mapTileHeight( uint ) const;
  	signed char staticTop( const Coord_cl& pos ) const;
! 	bool canFit( int x, int y, int z, int map, int height ) const;
  	StaticsIterator staticsIterator( uint id, ushort x, ushort y, bool exact = true ) const throw( wpException );
  	StaticsIterator staticsIterator( const Coord_cl&, bool exact = true ) const throw( wpException );
--- 130,134 ----
  	uint mapTileHeight( uint ) const;
  	signed char staticTop( const Coord_cl& pos ) const;
! 	bool canFit( int x, int y, int z, uint map ) const;
  	StaticsIterator staticsIterator( uint id, ushort x, ushort y, bool exact = true ) const throw( wpException );
  	StaticsIterator staticsIterator( const Coord_cl&, bool exact = true ) const throw( wpException );

[wpdev-commits] wolfpack/ai ai.cpp,1.22,1.23 ai_humans.cpp,1.16,1.17

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

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

Modified Files:
	ai.cpp ai_humans.cpp 
Log Message:
I actually fixed most of the conversion warnings, and Wolfpack didn't break for me... so I'll commit. This removes quite a bit of warning garbage. :)


Index: ai_humans.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/ai/ai_humans.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** ai_humans.cpp	12 Aug 2004 03:17:05 -0000	1.16
--- ai_humans.cpp	13 Aug 2004 08:55:27 -0000	1.17
***************
*** 120,124 ****
  						continue;
  
! 					if ( ( *it ) && ( *it )->getTag( "player" ).toInt() == pTalker->serial() )
  						stableitems.push_back( ( *it ) );
  					++it;
--- 120,124 ----
  						continue;
  
! 					if ( ( *it ) && ( uint )( *it )->getTag( "player" ).toInt() == pTalker->serial() )
  						stableitems.push_back( ( *it ) );
  					++it;
***************
*** 231,237 ****
  	{
  	case 0:
! 		m_npc->talk( tr( "Thou shalt regret thine actions, swine!" ), -1, 0, true );	break;
  	case 1:
! 		m_npc->talk( tr( "Death to all Evil!" ), -1, 0, true );						break;
  	}
  
--- 231,237 ----
  	{
  	case 0:
! 		m_npc->talk( tr( "Thou shalt regret thine actions, swine!" ), 0xFFFF, 0, true );	break;
  	case 1:
! 		m_npc->talk( tr( "Death to all Evil!" ), 0xFFFF, 0, true );						break;
  	}
  
***************
*** 381,387 ****
  	{
  	case 0:
! 		m_npc->talk( tr( "Thou shalt regret thine actions, swine!" ), -1, 0, true );	break;
  	case 1:
! 		m_npc->talk( tr( "Death to all Evil!" ), -1, 0, true );						break;
  	}
  }
--- 381,387 ----
  	{
  	case 0:
! 		m_npc->talk( tr( "Thou shalt regret thine actions, swine!" ), 0xFFFF, 0, true );	break;
  	case 1:
! 		m_npc->talk( tr( "Death to all Evil!" ), 0xFFFF, 0, true );						break;
  	}
  }

Index: ai.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/ai/ai.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** ai.cpp	10 Aug 2004 03:19:27 -0000	1.22
--- ai.cpp	13 Aug 2004 08:55:26 -0000	1.23
***************
*** 589,593 ****
  				}
  				if ( pTarget->dist( m_npc ) > 3 )
! 					m_npc->setAICheckTime( Server::instance()->time() + ( float ) m_npc->aiCheckInterval() * 0.0005f * MY_CLOCKS_PER_SEC );
  			}
  			else
--- 589,593 ----
  				}
  				if ( pTarget->dist( m_npc ) > 3 )
! 					m_npc->setAICheckTime( ( uint )( Server::instance()->time() + ( float ) m_npc->aiCheckInterval() * 0.0005f * MY_CLOCKS_PER_SEC ) );
  			}
  			else

[wpdev-commits] wolfpack/python pyspawnregion.h,1.1,1.2

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

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

Modified Files:
	pyspawnregion.h 
Log Message:
I actually fixed most of the conversion warnings, and Wolfpack didn't break for me... so I'll commit. This removes quite a bit of warning garbage. :)


Index: pyspawnregion.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/pyspawnregion.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** pyspawnregion.h	27 Jul 2004 04:15:20 -0000	1.1
--- pyspawnregion.h	13 Aug 2004 08:55:27 -0000	1.2
***************
*** 32,34 ****
  PyObject* PyGetSpawnRegionObject( cSpawnRegion* pRegion );
  
! #endif // __PYSPAWNREGION_H__
\ No newline at end of file
--- 32,34 ----
  PyObject* PyGetSpawnRegionObject( cSpawnRegion* pRegion );
  
! #endif // __PYSPAWNREGION_H__

[wpdev-commits] wolfpack/twofish aes.h,1.6,1.7

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

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

Modified Files:
	aes.h 
Log Message:
I actually fixed most of the conversion warnings, and Wolfpack didn't break for me... so I'll commit. This removes quite a bit of warning garbage. :)


Index: aes.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/twofish/aes.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** aes.h	12 Aug 2004 12:13:33 -0000	1.6
--- aes.h	13 Aug 2004 08:55:42 -0000	1.7
***************
*** 11,15 ****
  Cryptographic API Profile for AES Candidate Algorithm Submissions.
  Please consult this document as a cross-reference.
! 	
  	ANY CHANGES, WHERE APPROPRIATE, TO INFORMATION PROVIDED IN THIS FILE
  MUST BE DOCUMENTED. CHANGES ARE ONLY APPROPRIATE WHERE SPECIFIED WITH
--- 11,15 ----
  Cryptographic API Profile for AES Candidate Algorithm Submissions.
  Please consult this document as a cross-reference.
! 
  	ANY CHANGES, WHERE APPROPRIATE, TO INFORMATION PROVIDED IN THIS FILE
  MUST BE DOCUMENTED. CHANGES ARE ONLY APPROPRIATE WHERE SPECIFIED WITH
***************
*** 171,175 ****
  keyMaterial parameter to NULL.  Then use reKey() for all key changes.
  Similarly, cipherInit takes an IV string in ASCII hex, so a dummy setup
! call with a null IV string will skip the ASCII parse.  
  
  Note that CFB mode is not well tested nor defined by AES, so using the
--- 171,175 ----
  keyMaterial parameter to NULL.  Then use reKey() for all key changes.
  Similarly, cipherInit takes an IV string in ASCII hex, so a dummy setup
! call with a null IV string will skip the ASCII parse.
  
  Note that CFB mode is not well tested nor defined by AES, so using the
***************
*** 241,249 ****
  
  	if ( blockDecrypt( &ci, &ki, cipherText, byteCnt * 8, decryptOut ) != byteCnt * 8 )
! 		return 1;				
  
  	/* make sure the decrypt output matches original plaintext */
  	if ( memcmp( plainText, decryptOut, byteCnt ) )
! 		return 1;		
  
  	return 0;					/* tests passed! */
--- 241,249 ----
  
  	if ( blockDecrypt( &ci, &ki, cipherText, byteCnt * 8, decryptOut ) != byteCnt * 8 )
! 		return 1;
  
  	/* make sure the decrypt output matches original plaintext */
  	if ( memcmp( plainText, decryptOut, byteCnt ) )
! 		return 1;
  
  	return 0;					/* tests passed! */
***************
*** 270,272 ****
  	printf( "Tests passed" );
  }
! #endif /* TEST_2FISH */
\ No newline at end of file
--- 270,272 ----
  	printf( "Tests passed" );
  }
! #endif /* TEST_2FISH */

[wpdev-commits] wolfpack/unix getopts_unix.cpp,1.3,1.4

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

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

Modified Files:
	getopts_unix.cpp 
Log Message:
I actually fixed most of the conversion warnings, and Wolfpack didn't break for me... so I'll commit. This removes quite a bit of warning garbage. :)


Index: getopts_unix.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/unix/getopts_unix.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** getopts_unix.cpp	2 Jun 2004 15:04:11 -0000	1.3
--- getopts_unix.cpp	13 Aug 2004 08:55:42 -0000	1.4
***************
*** 41,45 ****
  void daemonize()
  {
! 	int pid, fd, status;
  
  	pid = fork();
--- 41,45 ----
  void daemonize()
  {
! 	int pid, fd;
  
  	pid = fork();
***************
*** 107,111 ****
  	unsigned int i;
  
! 	for ( i = 1; i < argc; i++ )
  	{
  		if ( argv[i][0] == '-' )
--- 107,111 ----
  	unsigned int i;
  
! 	for ( i = 1; i < ( uint ) argc; i++ )
  	{
  		if ( argv[i][0] == '-' )

[wpdev-commits] xmlscripts/scripts/system players.py,1.3,1.4

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

Update of /cvsroot/wpdev/xmlscripts/scripts/system
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14199/system

Modified Files:
	players.py 
Log Message:
There, fixed one last small issue.


Index: players.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/players.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** players.py	13 Aug 2004 08:49:41 -0000	1.3
--- players.py	13 Aug 2004 08:53:19 -0000	1.4
***************
*** 4,11 ****
  def onLogin( player ):
  	socket = player.socket
! 	socket.sysmessage( "Welcome to Wolfpack %s" % ( wolfpack.serverversion() )  )
! 	socket.sysmessage( "Please refer to http://www.wpdev.org for bug reporting." )
  	player.hidden = 0
  	player.update()
  	return True
  
--- 4,12 ----
  def onLogin( player ):
  	socket = player.socket
! 	socket.sysmessage( "Welcome to %s" % ( wolfpack.serverversion() )  )
! 	socket.sysmessage( "Report Bugs: http://bugs.wpdev.org/" )
  	player.hidden = 0
  	player.update()
+ 	socket.resendplayer()
  	return True
  

[wpdev-commits] xmlscripts/scripts/system players.py,1.2,1.3

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

Update of /cvsroot/wpdev/xmlscripts/scripts/system
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13412/system

Modified Files:
	players.py 
Log Message:
This is what is known as very tired eyes...


Index: players.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/players.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** players.py	13 Aug 2004 08:47:33 -0000	1.2
--- players.py	13 Aug 2004 08:49:41 -0000	1.3
***************
*** 4,8 ****
  def onLogin( player ):
  	socket = player.socket
! 	socket.sysmessage( "Welcome to Wolfpack %s" % ( wolfpack.serverversion )  )
  	socket.sysmessage( "Please refer to http://www.wpdev.org for bug reporting." )
  	player.hidden = 0
--- 4,8 ----
  def onLogin( player ):
  	socket = player.socket
! 	socket.sysmessage( "Welcome to Wolfpack %s" % ( wolfpack.serverversion() )  )
  	socket.sysmessage( "Please refer to http://www.wpdev.org for bug reporting." )
  	player.hidden = 0
***************
*** 12,16 ****
  def onLogout( player ):
  	socket = player.socket
! 	char.hidden = 1
  	player.removefromview()
  	player.update()
--- 12,16 ----
  def onLogout( player ):
  	socket = player.socket
! 	player.hidden = 1
  	player.removefromview()
  	player.update()

[wpdev-commits] xmlscripts/scripts/system players.py,1.1,1.2

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

Update of /cvsroot/wpdev/xmlscripts/scripts/system
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12989/system

Modified Files:
	players.py 
Log Message:
oopsie


Index: players.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/players.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** players.py	13 Aug 2004 04:48:00 -0000	1.1
--- players.py	13 Aug 2004 08:47:33 -0000	1.2
***************
*** 6,10 ****
  	socket.sysmessage( "Welcome to Wolfpack %s" % ( wolfpack.serverversion )  )
  	socket.sysmessage( "Please refer to http://www.wpdev.org for bug reporting." )
! 	char.hidden = 0
  	player.update()
  	return True
--- 6,10 ----
  	socket.sysmessage( "Welcome to Wolfpack %s" % ( wolfpack.serverversion )  )
  	socket.sysmessage( "Please refer to http://www.wpdev.org for bug reporting." )
! 	player.hidden = 0
  	player.update()
  	return True

[wpdev-commits] xmlscripts/documentation/webroot ChangeLog.wolfpack,1.38,1.39

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

Update of /cvsroot/wpdev/xmlscripts/documentation/webroot
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15786/documentation/webroot

Modified Files:
	ChangeLog.wolfpack 
Log Message:
Updated the list, word wrapped at col 80


Index: ChangeLog.wolfpack
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** ChangeLog.wolfpack	10 Aug 2004 01:59:45 -0000	1.38
--- ChangeLog.wolfpack	13 Aug 2004 05:05:14 -0000	1.39
***************
*** 10,13 ****
--- 10,14 ----
  Wolfpack 12.9.8 Beta (4. August, 2004)
  	* Core Changes:
+ 		- Cleanups and general fixes.
  		- Gump Responses are now passed on as Unicode rather than in the
  			local codepage.
***************
*** 26,34 ****
  		- Added status on MySQL/SQLite modules.
  		- New Python getProperty method.
! 		- Fixed a possible bug with the Python interface ( possibly source of crashing bugs )
  		- Property item.magic is now item.movable
! 		- (Configurable) Speedhack Countermeasure (See Anti Speed Hack settings in the General group)
  		- Added some additional checking to wolfpack.pro
! 		- Began binary save feature (Incomplete)
  	* Definition Changes:
  		- Fixed Sheep definitions
--- 27,39 ----
  		- Added status on MySQL/SQLite modules.
  		- New Python getProperty method.
! 		- Fixed a possible bug with the Python interface 
! 			( Possibly source of crashing bugs )
  		- Property item.magic is now item.movable
! 		- (Configurable) Speedhack Countermeasure 
! 			(See Anti Speed Hack settings in the General group)
  		- Added some additional checking to wolfpack.pro
! 		- Began binary save feature. (Incomplete)
! 		- Fixes for mul and diff files.
! 			Haven should now work.
  	* Definition Changes:
  		- Fixed Sheep definitions
***************
*** 43,46 ****
--- 48,52 ----
  		- Inscription Added
  		- Controlslot values added to many NPCs related to taming.
+ 		- More NPCs were added and updated.
  	* Python Script Changes:
  		- New Function: wolfpack.findobject(serial)
***************
*** 51,55 ****
  		- New function: wolfpack.utilities.booleantoggle( boolean )
  		- New property: socket.address
! 		- Changed property: item.magic -> item.movable
  		- Moved wolfpack.servertime() / wolfpack.currenttime() to
  			wolfpack.time.servertime() / wolfpack.currenttime()
--- 57,61 ----
  		- New function: wolfpack.utilities.booleantoggle( boolean )
  		- New property: socket.address
! 		- Moved property: item.magic -> item.movable
  		- Moved wolfpack.servertime() / wolfpack.currenttime() to
  			wolfpack.time.servertime() / wolfpack.currenttime()
***************
*** 57,95 ****
  			resurrect, password, tele, invis, kill, fix, resend,
  			allskills, remove, move, who
- 		- Cleanups to help reduce memory consumption.
- 		- Fixed carving
- 		- Fixed sheering of sheeps and wool regrowing
- 		- Rudimentarily Implemented Map Plotting
  		- New script: trashcan
  		- New script: system.regionchange
  			This overrides the core region change messages.
  		- New script: system.hunger
  			This allows players to suffer from hunger once again.
! 		- Updates to the food script.
  		- Export command updates.
  			Checks for doors and corpses.
  			Does not save spawnregion items.
! 		- Potion Kegs now work.
! 		- Door improvements.
! 			Speed in which blocks are checked improved.
! 			Manual closing block checks.
! 		- Timer fixes for database scripts.
  		- Fixed recalling to areas outside of a region.
  		- Fixed renaming runes
  		- Made runebooks function again.
  			Gate/Recall still not functional, charges work however.
! 		- Fixed a bug with melting ore.
  		- Skill Fixes:
  			Provocation - Thanks to Kid_Sk8
  			Inscription - Thanks to khpae
  		- Decoration Saving
! 		- Magic fixes: Fire, Poison, Energy and Paralyze fields should work better.
  			Mass dispell can now wipe out these fields.
  		- Scrolls are now usable and actually cast the spell.
  			For scrolls the following rules are in effect:
  			50% decreased mana usage.
! 			The effective circle for measuring the skill requirement is lowered by two
  			when casting from a scroll.
! 		- Fixes for controlslots with summon spells.
  	* Misc. Changes:
  		- New Features:
--- 63,110 ----
  			resurrect, password, tele, invis, kill, fix, resend,
  			allskills, remove, move, who
  		- New script: trashcan
+ 			This is a trashcan script, the item must be a container to work.
  		- New script: system.regionchange
  			This overrides the core region change messages.
  		- New script: system.hunger
  			This allows players to suffer from hunger once again.
! 		- New Script: system.players
! 			This has basic onLogin() onLogout() hooks for players.
! 		- New script: wolfpack.locales
! 			This will be an index with messages in many languages for easy
! 			configuration for the server's non-cliloc messages.
! 		- Script Fixes:
! 			Eating food no longer animates a character if on a mount.
! 			Carving was fixed.
! 			Potion Kegs now work.
! 			Door fixes for blocking check speed.
! 		- Cleanups to help reduce memory consumption.
! 		- NPC Related: Fixed sheering of sheeps and wool regrowing,
! 			Healers will now resurrect through the context menu.
! 		- Rudimentarily Implemented Map Plotting
  		- Export command updates.
  			Checks for doors and corpses.
  			Does not save spawnregion items.
! 		- Timer fixes for database scripts. (Still Buggy)
  		- Fixed recalling to areas outside of a region.
  		- Fixed renaming runes
  		- Made runebooks function again.
  			Gate/Recall still not functional, charges work however.
! 		- Fixed a bug with smelting ore.
  		- Skill Fixes:
  			Provocation - Thanks to Kid_Sk8
  			Inscription - Thanks to khpae
  		- Decoration Saving
! 		- Magic fixes: 
! 			Fire, Poison, Energy and Paralyze fields should work better.
  			Mass dispell can now wipe out these fields.
+ 			Fixes for controlslots with summon spells.
  		- Scrolls are now usable and actually cast the spell.
  			For scrolls the following rules are in effect:
  			50% decreased mana usage.
! 			The effective circle for measuring the skill requirement 
! 				is lowered by two.
  			when casting from a scroll.
! 		- Fixed a timing issue with onCreate() and items.
  	* Misc. Changes:
  		- New Features:
***************
*** 108,117 ****
  		- Teleport Scripts are incomplete.
  			We welcome donated OSI-like teleport scripts!
! 		- Possible that a few monsters are missing.
  		- Reloading Python too many times can crash the server.
  		- There are still some memory leaks.
- 		- Healers do not resurrect.
  		- Large gumps can potentially crash remote clients.
! 		- Multis are not currently supported.
  
  Wolfpack 12.9.7 Beta (4. July 2004)
--- 123,131 ----
  		- Teleport Scripts are incomplete.
  			We welcome donated OSI-like teleport scripts!
! 		- Possible that a few monsters are missing and/or incomplete.
  		- Reloading Python too many times can crash the server.
  		- There are still some memory leaks.
  		- Large gumps can potentially crash remote clients.
! 		- Multis (Houses) are not currently supported.
  
  Wolfpack 12.9.7 Beta (4. July 2004)
***************
*** 124,129 ****
  			- Spawnregions save spawned NPCs.
  			- Multi tables removed, being redone.
! 			- Item.type and other properties are no longer saved, uses base definitions.
! 			- Removed the `spawnregion` field from the `items`,`npcs` database tables.
  		* Code Changes:
  			- Major cleanups and structure changes, much cleaner and more sane.
--- 138,145 ----
  			- Spawnregions save spawned NPCs.
  			- Multi tables removed, being redone.
! 			- Item.type and other properties are no longer saved, 
! 				uses base definitions.
! 			- Removed the `spawnregion` field from the `items`,`npcs` 
! 				database tables.
  		* Code Changes:
  			- Major cleanups and structure changes, much cleaner and more sane.
***************
*** 134,146 ****
  	* Definition Changes:
  		* Item Updates:
! 			- Colored platemail baseid mapping. This was overlooked and should fix armor bugs.
  			- Added the new artwork/items from client 4.0.3a.
  		* NPC Updates:
  			- Several AoS NPCs added. Most NPCs should be added now.
! 			- Some NPCs such as orcs and lizardmen can now pull their id and skin from a list.
  			- Lootlist improvements.
  			- Stat adjustments. ( UO Stratics Data )
  			- Fame/Karma adjustments. ( UO Stratics Data )
! 			- Basic loot list implimentation, most monsters should drop some gold/gems.
  		* Region/Spawn Region Updates:
  			- Template structure added for regions.
--- 150,165 ----
  	* Definition Changes:
  		* Item Updates:
! 			- Colored platemail baseid mapping. This was overlooked and 
! 				should fix armor bugs.
  			- Added the new artwork/items from client 4.0.3a.
  		* NPC Updates:
  			- Several AoS NPCs added. Most NPCs should be added now.
! 			- Some NPCs such as orcs and lizardmen can now pull their id 
! 				and skin from a list.
  			- Lootlist improvements.
  			- Stat adjustments. ( UO Stratics Data )
  			- Fame/Karma adjustments. ( UO Stratics Data )
! 			- Basic loot list implimentation, most monsters should drop 
! 				some gold/gems.
  		* Region/Spawn Region Updates:
  			- Template structure added for regions.
***************
*** 148,158 ****
  			- Updated town spawns for felucca and trammel towns.
  		* Misc. Updates:
! 			- Organized scripts.xml to be easier to read/check for missing scripts.
  	* Python Script Changes:
  		* Commands:
! 			- import/export now saves/imports the baseid and map values with WSC and TXT.
  			- info updated, supports NPC properties a bit better.
  			- freeze command added, toggles the frozen value.
! 			- dye updated to modify character skins. 'dye 0x0 will replace the skin with char.orgskin.
  		* Loot System:
  			- Index for loot lists in system.loot and system.lootlists.
--- 167,180 ----
  			- Updated town spawns for felucca and trammel towns.
  		* Misc. Updates:
! 			- Organized scripts.xml to be easier to read/check 
! 				for missing scripts.
  	* Python Script Changes:
  		* Commands:
! 			- import/export now saves/imports the baseid and map 
! 				values with WSC and TXT.
  			- info updated, supports NPC properties a bit better.
  			- freeze command added, toggles the frozen value.
! 			- dye updated to modify character skins. 'dye 0x0 will replace 
! 				the skin with char.orgskin.
  		* Loot System:
  			- Index for loot lists in system.loot and system.lootlists.
***************
*** 164,168 ****
  		* System:
  			- SQLite database optimization added.
! 			- Script system.debugging created to set different debugging options.
  			- Support for the Open Door Macro
  	* Misc. Changes:
--- 186,191 ----
  		* System:
  			- SQLite database optimization added.
! 			- Script system.debugging created to set different 
! 				debugging options.
  			- Support for the Open Door Macro
  	* Misc. Changes:
***************
*** 197,201 ****
  		- Add fixes.
  	* Definitions cleanup
! 		- Reorganized the definitions to be cleaner and easier to manage with updates.
  		- Note: ./definitions.xml moved to ./definitions/index.xml
  	* Item Improvements and Fixes
--- 220,225 ----
  		- Add fixes.
  	* Definitions cleanup
! 		- Reorganized the definitions to be cleaner and easier to 
! 			manage with updates.
  		- Note: ./definitions.xml moved to ./definitions/index.xml
  	* Item Improvements and Fixes
***************
*** 225,230 ****
  	* Known bugs:
  		- Necromancy/Paladin spells do not function, still in the works.
! 		- Non-functioning skills: Snooping, Inscription, Cartography, Animal Lore,
! 			Arms Lore, Enticement.
  		- Reload (python) memory leak.
  		- Line of Sight blocks even if it shouldn't.
--- 249,255 ----
  	* Known bugs:
  		- Necromancy/Paladin spells do not function, still in the works.
! 		- Non-functioning skills: 
! 			Snooping, Inscription, Cartography, 
! 			Animal Lore, Arms Lore, Enticement.
  		- Reload (python) memory leak.
  		- Line of Sight blocks even if it shouldn't.

[wpdev-commits] xmlscripts/definitions scripts.xml,1.152,1.153

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

Update of /cvsroot/wpdev/xmlscripts/definitions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14367

Modified Files:
	scripts.xml 
Log Message:
Added system.players


Index: scripts.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/scripts.xml,v
retrieving revision 1.152
retrieving revision 1.153
diff -C2 -d -r1.152 -r1.153
*** scripts.xml	12 Aug 2004 00:57:12 -0000	1.152
--- scripts.xml	13 Aug 2004 04:50:35 -0000	1.153
***************
*** 177,180 ****
--- 177,181 ----
  	<script>system.mysql_optimize_db</script>
  	-->
+ 	<script>system.players</script>
  	<script>system.poison</script>
  	<script>system.regionchange</script>

[wpdev-commits] xmlscripts/definitions/system players.xml,1.5,1.6

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

Update of /cvsroot/wpdev/xmlscripts/definitions/system
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14254/definitions/system

Modified Files:
	players.xml 
Log Message:
Updated for system.players


Index: players.xml
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/definitions/system/players.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** players.xml	3 Aug 2004 14:18:04 -0000	1.5
--- players.xml	13 Aug 2004 04:50:07 -0000	1.6
***************
*** 6,10 ****
  
  	<npc id="players_base">
! 		<events>system.regionchange,system.hunger</events>
  	</npc>
  
--- 6,10 ----
  
  	<npc id="players_base">
! 		<events>system.players,system.regionchange,system.hunger</events>
  	</npc>
  

[wpdev-commits] xmlscripts/scripts/system players.py,NONE,1.1

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

Update of /cvsroot/wpdev/xmlscripts/scripts/system
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14040/system

Added Files:
	players.py 
Log Message:
Fixed http://zs.drw.ru/m/bug_view_page.php?bug_id=0000221


--- NEW FILE: players.py ---

import wolfpack

def onLogin( player ):
	socket = player.socket
	socket.sysmessage( "Welcome to Wolfpack %s" % ( wolfpack.serverversion )  )
	socket.sysmessage( "Please refer to http://www.wpdev.org for bug reporting." )
	char.hidden = 0
	player.update()
	return True

def onLogout( player ):
	socket = player.socket
	char.hidden = 1
	player.removefromview()
	player.update()
	return True

[wpdev-commits] xmlscripts/scripts/commands invis.py,1.1,1.2

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

Update of /cvsroot/wpdev/xmlscripts/scripts/commands
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12095/commands

Modified Files:
	invis.py 
Log Message:
added removefromview


Index: invis.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/invis.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** invis.py	9 Jul 2004 10:30:58 -0000	1.1
--- invis.py	13 Aug 2004 04:31:27 -0000	1.2
***************
*** 20,23 ****
--- 20,24 ----
  	char = socket.player
  	char.invisible = booleantoggle( char.invisible )
+ 	char.removefromview()
  	char.update()
  	socket.sysmessage( "Invisible is now '%i'." % char.invisible )

[wpdev-commits] wolfpack/network uosocket.cpp,1.390,1.391 uotxpackets.h,1.112,1.113

[Correa <thi...@us...>]

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

Modified Files:
	uosocket.cpp uotxpackets.h 
Log Message:
Haven enabled.

Index: uosocket.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v
retrieving revision 1.390
retrieving revision 1.391
diff -C2 -d -r1.390 -r1.391
*** uosocket.cpp	12 Aug 2004 03:16:20 -0000	1.390
--- uosocket.cpp	13 Aug 2004 02:53:53 -0000	1.391
***************
*** 551,559 ****
  	// Send the server/account features here as well
  	// AoS needs it most likely for account creation
  	cUOTxClientFeatures clientFeatures;
  	clientFeatures.setLbr( true );
  	clientFeatures.setT2a( true );
  	//clientFeatures.setShort( 1, 0xFFFF ); // AoS TEST
! 	clientFeatures.setShort(1, 0x1F);
  	send( &clientFeatures );
  
--- 551,564 ----
  	// Send the server/account features here as well
  	// AoS needs it most likely for account creation
+ 	const uint maxChars = QMIN( 6, Config::instance()->maxCharsPerAccount() );
  	cUOTxClientFeatures clientFeatures;
  	clientFeatures.setLbr( true );
  	clientFeatures.setT2a( true );
+ 	clientFeatures.setAos( true );
+ 	clientFeatures.setAllowPaladinNecromancer( true );
+ 	if ( maxChars == 6 )
+ 		clientFeatures.setSixthCharacterSlot( true );
  	//clientFeatures.setShort( 1, 0xFFFF ); // AoS TEST
! 	clientFeatures.setShort(1, 0x801F);
  	send( &clientFeatures );
  
***************
*** 571,575 ****
  		charList.addTown( i, startLocations[i].name, startLocations[i].name );
  
! 	charList.setAgeOfShadows( true );
  
  	charList.compile();
--- 576,585 ----
  		charList.addTown( i, startLocations[i].name, startLocations[i].name );
  
! 	charList.setAgeOfShadows( true ); // Activates Heaven city
! 	charList.setContextMenus( true );
! 	if ( maxChars == 1 )
! 		charList.setOneCharacter( true );
! 	else if ( maxChars == 6 )
! 		charList.setEnableSixthSlot( true );
  
  	charList.compile();

Index: uotxpackets.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uotxpackets.h,v
retrieving revision 1.112
retrieving revision 1.113
diff -C2 -d -r1.112 -r1.113
*** uotxpackets.h	10 Aug 2004 03:24:29 -0000	1.112
--- uotxpackets.h	13 Aug 2004 02:53:53 -0000	1.113
***************
*** 129,143 ****
  	}
  
! 	virtual void addCharacter( const QString& name );
! 	virtual void addTown( unsigned char index, const QString& name, const QString& area );
! 	virtual void setCharLimit( short limit = -1 )
  	{
  		charLimit = limit;
  	}
  	virtual void compile();
! 	virtual void setAgeOfShadows( bool data )
  	{
! 		data ? flags |= 0x20 : flags &= 0xFFFFFFDF;
  	}
  };
  
--- 129,165 ----
  	}
  
! 	void addCharacter( const QString& name );
! 	void addTown( unsigned char index, const QString& name, const QString& area );
! 	void setCharLimit( short limit = -1 )
  	{
  		charLimit = limit;
  	}
  	virtual void compile();
! 	
! 	void setAgeOfShadows( bool data )
  	{
! 		data ? flags |= 0x20 : flags &= ~0x20;
  	}
+ 	
+ 	void setLimitCharacters( bool data )
+ 	{
+ 		data ? flags |= 0x4 : flags &= ~0x4;
+ 	}
+ 	
+ 	void setContextMenus( bool data )
+ 	{
+ 		data ? flags |= 0x8 : flags &= ~0x8;
+ 	}
+ 
+ 	void setOneCharacter( bool data )
+ 	{
+ 		data ? flags |= 0x10 : flags &= ~0x10;
+ 	}
+ 
+ 	void setEnableSixthSlot( bool data )
+ 	{
+ 		data ? flags |= 0x40 : flags &= ~0x40;
+ 	}
+ 
  };
  
***************
*** 384,405 ****
  };
  
! // 0xB9 ClientFeatures
  class cUOTxClientFeatures : public cUOPacket
  {
  public:
  	cUOTxClientFeatures() : cUOPacket( 0xB9, 3 )
  	{
  	}
  	cUOTxClientFeatures( const QByteArray& d ) : cUOPacket( d )
  	{
  	}
  
  	void setLbr( bool enable )
  	{
! 		enable ? ( *this )[2] |= 0x02 : ( *this )[2] &= 0xFD;
  	}
! 	void setT2a( bool enable )
  	{
! 		enable ? ( *this )[2] |= 0x01 : ( *this )[2] &= 0xFE;
  	}
  };
--- 406,457 ----
  };
  
! /*!
! 	0xB9 ClientFeatures, server side packet.
! 	This packet enables various client-side features, and should be sent 
! 	before the Character List packet.
! 
! 	Note that in order to create a Paladin or Necromancer or use the sixth 
! 	character slot, the corresponding flags in the Character List packet 
! 	must be set.
! */
  class cUOTxClientFeatures : public cUOPacket
  {
  public:
+ 
  	cUOTxClientFeatures() : cUOPacket( 0xB9, 3 )
  	{
  	}
+ 
  	cUOTxClientFeatures( const QByteArray& d ) : cUOPacket( d )
  	{
  	}
  
+ 	void setT2a( bool enable )
+ 	{
+ 		enable ? ( *this )[2] |= 0x01 : ( *this )[2] &= ~0x01;
+ 	}
+ 
  	void setLbr( bool enable )
  	{
! 		enable ? ( *this )[2] |= 0x02 : ( *this )[2] &= ~0x02;
  	}
! 
! 	void setSixthCharacterSlot( bool enable )
  	{
! 		enable ? ( *this )[2] |= 0x20 : ( *this )[2] &= ~0x20;
! 	}
! 	
! 	void setAllowPaladinNecromancer( bool enable )
! 	{
! 		enable ? ( *this )[2] |= 0x10 : ( *this )[2] &= ~0x10;
! 	}
! 
! 	/*!
! 		This flag must be present to enable Age of Shadows 
! 		features or the Sixth Character Slot
! 	*/
! 	void setAos( bool enable )
! 	{
! 		enable ? (*this)[1] |= 0x80 : (*this)[1] &= ~0x80;
  	}
  };

[wpdev-commits] xmlscripts/scripts/system hunger.py,1.2,1.3

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

Update of /cvsroot/wpdev/xmlscripts/scripts/system
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26030/system

Modified Files:
	hunger.py 
Log Message:
adjusted hunger damage.


Index: hunger.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/hunger.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** hunger.py	12 Jul 2004 16:06:27 -0000	1.2
--- hunger.py	12 Aug 2004 20:03:29 -0000	1.3
***************
*** 1,4 ****
--- 1,5 ----
  
  import wolfpack
+ import random
  import wolfpack.time
  
***************
*** 9,15 ****
  			player.socket.sysmessage( "Your stomach growls..." )
  		elif player.hunger == 0:
! 			player.hitpoints -= 1
! 			player.update()
  			player.socket.sysmessage( "Your stomach hurts from the lack of food..." )
- 	
  	return False
--- 10,14 ----
  			player.socket.sysmessage( "Your stomach growls..." )
  		elif player.hunger == 0:
! 			player.damage( 3, random.randint( 0, 3 ) )
  			player.socket.sysmessage( "Your stomach hurts from the lack of food..." )
  	return False

[wpdev-commits] xmlscripts/scripts/magic spell.py,1.13,1.14

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

Update of /cvsroot/wpdev/xmlscripts/scripts/magic
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15775/magic

Modified Files:
	spell.py 
Log Message:
spaces != tabs


Index: spell.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/spell.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** spell.py	7 Aug 2004 04:02:53 -0000	1.13
--- spell.py	12 Aug 2004 19:13:49 -0000	1.14
***************
*** 156,160 ****
  			source = 'wand (0x%x)' % item
  		elif mode == MODE_CMD:
!                         source = 'command'
  
  		char.log(LOG_MESSAGE, "Casting spell %u (%s) from %s.\n" % (self.spellid, self.__class__.__name__, source))
--- 156,160 ----
  			source = 'wand (0x%x)' % item
  		elif mode == MODE_CMD:
! 			source = 'command'
  
  		char.log(LOG_MESSAGE, "Casting spell %u (%s) from %s.\n" % (self.spellid, self.__class__.__name__, source))

[wpdev-commits] wolfpack basechar.cpp,1.127,1.128

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

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

Modified Files:
	basechar.cpp 
Log Message:
Fixed the fame warning.


Index: basechar.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/basechar.cpp,v
retrieving revision 1.127
retrieving revision 1.128
diff -C2 -d -r1.127 -r1.128
*** basechar.cpp	12 Aug 2004 18:39:56 -0000	1.127
--- basechar.cpp	12 Aug 2004 19:01:14 -0000	1.128
***************
*** 2798,2802 ****
  
  	// Fame is reduced by 10% upon death
! 	fame_ *= 0.90;
  
  	// Create the corpse
--- 2798,2802 ----
  
  	// Fame is reduced by 10% upon death
! 	fame_ = (int)( (float)fame_ * 0.90 );
  
  	// Create the corpse

[wpdev-commits] wolfpack COPYRIGHT,1.2,1.3 basechar.cpp,1.126,1.127

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

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

Modified Files:
	COPYRIGHT basechar.cpp 
Log Message:
Typo on the copyright name
Hopefully Fixed http://zs.drw.ru/m/bug_view_page.php?bug_id=0000220


Index: COPYRIGHT
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/COPYRIGHT,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** COPYRIGHT	5 Aug 2004 20:26:28 -0000	1.2
--- COPYRIGHT	12 Aug 2004 18:39:56 -0000	1.3
***************
*** 36,38 ****
  
  Unknown (Kid_Sk8)
! Unknown (Incarnus)
--- 36,38 ----
  
  Unknown (Kid_Sk8)
! Unknown (Incanus)

Index: basechar.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/basechar.cpp,v
retrieving revision 1.126
retrieving revision 1.127
diff -C2 -d -r1.126 -r1.127
*** basechar.cpp	12 Aug 2004 03:02:50 -0000	1.126
--- basechar.cpp	12 Aug 2004 18:39:56 -0000	1.127
***************
*** 1110,1117 ****
  	bool success = false;
  
! 	// Maximum Value of 120 for checks
! 	// I disabled this so you can make skillchecks for grandmasters that are still tough
! 	//if( max > 1200 )
! 	//    max = 1200;
  
  	// How far is the players skill above the required minimum.
--- 1110,1116 ----
  	bool success = false;
  
! 	/* Returns false if you don't have the skill required. */
! 	if ( skillValue( skill ) < min )
! 		return false;
  
  	// How far is the players skill above the required minimum.