wpdev-commits Mailing List for Wolfpack Emu (Page 65)

Brought to you by: rip, thiagocorrea

wpdev-commits — Wolfpack CVS commit info

You can subscribe to this list here.

2003	_Jan	_Feb	_Mar	_Apr	_May	_Jun	_Jul (14)	_Aug (121)	_Sep (256)	_Oct (59)	_Nov (73)	_Dec (120)
2004	_Jan (259)	_Feb (381)	_Mar (501)	_Apr (355)	_May (427)	_Jun (270)	_Jul (394)	_Aug (412)	_Sep (724)	_Oct (578)	_Nov (65)	_Dec

Flat | Threaded

<< < 1 .. 63 64 65 66 67 .. 201 > >> (Page 65 of 201)

[wpdev-commits] wolfpack/network uosocket.cpp,1.395,1.396

From: Correa <thi...@us...> - 2004-08-19 01:59:25

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

Modified Files:
	uosocket.cpp 
Log Message:
QT_CLEAN_NAMESPACE

Index: uosocket.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v
retrieving revision 1.395
retrieving revision 1.396
diff -C2 -d -r1.395 -r1.396
*** uosocket.cpp	19 Aug 2004 01:55:56 -0000	1.395
--- uosocket.cpp	19 Aug 2004 01:59:16 -0000	1.396
***************
*** 1980,1984 ****
  	// Add all items to the container
  	cUOTxItemContent itemContent;
! 	INT32 count = 0;
  
  	cItem::ContainerContent container = pCont->content();
--- 1980,1984 ----
  	// Add all items to the container
  	cUOTxItemContent itemContent;
! 	Q_INT32 count = 0;
  
  	cItem::ContainerContent container = pCont->content();

[wpdev-commits] wolfpack/ai ai.cpp,1.25,1.26

From: Correa <thi...@us...> - 2004-08-19 01:59:25

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

Modified Files:
	ai.cpp 
Log Message:
QT_CLEAN_NAMESPACE

Index: ai.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/ai/ai.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** ai.cpp	19 Aug 2004 01:55:56 -0000	1.25
--- ai.cpp	19 Aug 2004 01:59:15 -0000	1.26
***************
*** 237,241 ****
  		{
  			// Find the last dot
! 			INT32 position = onspeech.findRev( "." );
  			QString sModule = onspeech.left( position );
  			QString sFunction = onspeech.right( onspeech.length() - ( position + 1 ) );
--- 237,241 ----
  		{
  			// Find the last dot
! 			Q_INT32 position = onspeech.findRev( "." );
  			QString sModule = onspeech.left( position );
  			QString sFunction = onspeech.right( onspeech.length() - ( position + 1 ) );
***************
*** 277,281 ****
  		{
  			// Find the last dot
! 			INT32 position = precond.findRev( "." );
  			QString sModule = precond.left( position );
  			QString sFunction = precond.right( precond.length() - ( position + 1 ) );
--- 277,281 ----
  		{
  			// Find the last dot
! 			Q_INT32 position = precond.findRev( "." );
  			QString sModule = precond.left( position );
  			QString sFunction = precond.right( precond.length() - ( position + 1 ) );
***************
*** 330,334 ****
  		{
  			// Find the last dot
! 			INT32 position = postcond.findRev( "." );
  			QString sModule = postcond.left( position );
  			QString sFunction = postcond.right( postcond.length() - ( position + 1 ) );
--- 330,334 ----
  		{
  			// Find the last dot
! 			Q_INT32 position = postcond.findRev( "." );
  			QString sModule = postcond.left( position );
  			QString sFunction = postcond.right( postcond.length() - ( position + 1 ) );
***************
*** 383,387 ****
  		{
  			// Find the last dot
! 			INT32 position = exec.findRev( "." );
  			QString sModule = exec.left( position );
  			QString sFunction = exec.right( exec.length() - ( position + 1 ) );
--- 383,387 ----
  		{
  			// Find the last dot
! 			Q_INT32 position = exec.findRev( "." );
  			QString sModule = exec.left( position );
  			QString sFunction = exec.right( exec.length() - ( position + 1 ) );

[wpdev-commits] wolfpack basechar.cpp,1.131,1.132 basics.cpp,1.37,1.38 coord.cpp,1.52,1.53 corpse.cpp,1.64,1.65 corpse.h,1.29,1.30 guilds.cpp,1.20,1.21 items.cpp,1.436,1.437 items.h,1.213,1.214 npc.cpp,1.107,1.108 npc.h,1.57,1.58 player.cpp,1.120,1.121 player.h,1.56,1.57 skills.cpp,1.231,1.232 skills.h,1.32,1.33 targetrequests.h,1.73,1.74 tracking.cpp,1.28,1.29 trade.cpp,1.9,1.10 uobject.cpp,1.175,1.176 uobject.h,1.104,1.105 walking.cpp,1.134,1.135

From: Correa <thi...@us...> - 2004-08-19 01:56:08

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

Modified Files:
	basechar.cpp basics.cpp coord.cpp corpse.cpp corpse.h 
	guilds.cpp items.cpp items.h npc.cpp npc.h player.cpp player.h 
	skills.cpp skills.h targetrequests.h tracking.cpp trade.cpp 
	uobject.cpp uobject.h walking.cpp 
Log Message:
QT_CLEAN_NAMESPACE

Index: player.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/player.h,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** player.h	19 Aug 2004 01:22:52 -0000	1.56
--- player.h	19 Aug 2004 01:55:56 -0000	1.57
***************
*** 82,87 ****
  	virtual void update( bool excludeself = false );
  	virtual void resend( bool clean = true );
! 	virtual void talk( const QString& message, UI16 color = 0xFFFF, UINT8 type = 0, bool autospam = false, cUOSocket* socket = NULL );
! 	virtual UINT8 notoriety( P_CHAR pChar );
  	virtual void showName( cUOSocket* socket );
  	virtual void soundEffect( ushort soundId, bool hearAll = true );
--- 82,87 ----
  	virtual void update( bool excludeself = false );
  	virtual void resend( bool clean = true );
! 	virtual void talk( const QString& message, UI16 color = 0xFFFF, Q_UINT8 type = 0, bool autospam = false, cUOSocket* socket = NULL );
! 	virtual Q_UINT8 notoriety( P_CHAR pChar );
  	virtual void showName( cUOSocket* socket );
  	virtual void soundEffect( ushort soundId, bool hearAll = true );
***************
*** 140,146 ****
  	}
  	SERIAL inputItem() const;
! 	UINT8 visualRange() const;
  	QString profile() const;
! 	UINT8 fixedLightLevel() const;
  
  	// bit flag getters
--- 140,146 ----
  	}
  	SERIAL inputItem() const;
! 	Q_UINT8 visualRange() const;
  	QString profile() const;
! 	Q_UINT8 fixedLightLevel() const;
  
  	// bit flag getters
***************
*** 166,172 ****
  	}
  	void setInputItem( SERIAL data );
! 	void setVisualRange( UINT8 data );
  	void setProfile( const QString& data );
! 	void setFixedLightLevel( UINT8 data );
  	// bit flag setters
  	void setMaySnoop( bool data );
--- 166,172 ----
  	}
  	void setInputItem( SERIAL data );
! 	void setVisualRange( Q_UINT8 data );
  	void setProfile( const QString& data );
! 	void setFixedLightLevel( Q_UINT8 data );
  	// bit flag setters
  	void setMaySnoop( bool data );
***************
*** 184,188 ****
  	void setIntelligenceLock( unsigned char data );
  
! 	virtual void setStamina( INT16 data, bool notify = true );
  
  	void remove();
--- 184,188 ----
  	void setIntelligenceLock( unsigned char data );
  
! 	virtual void setStamina( Q_INT16 data, bool notify = true );
  
  	void remove();
***************
*** 268,272 ****
  
  	// Visual range of the player
! 	UINT8 visualRange_;
  
  	// Paperdoll profile of the char
--- 268,272 ----
  
  	// Visual range of the player
! 	Q_UINT8 visualRange_;
  
  	// Paperdoll profile of the char
***************
*** 275,279 ****
  	// Fixed light level. is used in dungeons or for nightsight spell.
  	// cOldChar:fixedlight_
! 	UINT8 fixedLightLevel_;
  };
  
--- 275,279 ----
  	// Fixed light level. is used in dungeons or for nightsight spell.
  	// cOldChar:fixedlight_
! 	Q_UINT8 fixedLightLevel_;
  };
  
***************
*** 365,374 ****
  }
  
! inline UINT8 cPlayer::visualRange() const
  {
  	return visualRange_;
  }
  
! inline void cPlayer::setVisualRange( UINT8 data )
  {
  	visualRange_ = data;
--- 365,374 ----
  }
  
! inline Q_UINT8 cPlayer::visualRange() const
  {
  	return visualRange_;
  }
  
! inline void cPlayer::setVisualRange( Q_UINT8 data )
  {
  	visualRange_ = data;
***************
*** 387,396 ****
  }
  
! inline UINT8 cPlayer::fixedLightLevel() const
  {
  	return fixedLightLevel_;
  }
  
! inline void cPlayer::setFixedLightLevel( UINT8 data )
  {
  	fixedLightLevel_ = data;
--- 387,396 ----
  }
  
! inline Q_UINT8 cPlayer::fixedLightLevel() const
  {
  	return fixedLightLevel_;
  }
  
! inline void cPlayer::setFixedLightLevel( Q_UINT8 data )
  {
  	fixedLightLevel_ = data;

Index: trade.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/trade.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** trade.cpp	19 Aug 2004 01:22:53 -0000	1.9
--- trade.cpp	19 Aug 2004 01:55:56 -0000	1.10
***************
*** 122,126 ****
  
  		Q_UINT16 amount = packet->iAmount( i );
! 		UINT8 layer = packet->iLayer( i );
  
  		// First check: is the item on the vendor in the specified layer
--- 122,126 ----
  
  		Q_UINT16 amount = packet->iAmount( i );
! 		Q_UINT8 layer = packet->iLayer( i );
  
  		// First check: is the item on the vendor in the specified layer

Index: targetrequests.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/targetrequests.h,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** targetrequests.h	19 Aug 2004 01:46:13 -0000	1.73
--- targetrequests.h	19 Aug 2004 01:55:56 -0000	1.74
***************
*** 131,139 ****
  {
  private:
! 	UINT8 type_;
  	QString key_;
  	QString value_;
  public:
! 	cSetTagTarget( QString key, QString value, UINT8 type )
  	{
  		type_ = type;
--- 131,139 ----
  {
  private:
! 	Q_UINT8 type_;
  	QString key_;
  	QString value_;
  public:
! 	cSetTagTarget( QString key, QString value, Q_UINT8 type )
  	{
  		type_ = type;
***************
*** 299,303 ****
  	Q_INT16 x, y, z;
  public:
! 	cMoveTarget( Q_INT16 _x, Q_INT16 _y, INT8 _z ) : x( _x ), y( _y ), z( _z )
  	{
  	}
--- 299,303 ----
  	Q_INT16 x, y, z;
  public:
! 	cMoveTarget( Q_INT16 _x, Q_INT16 _y, Q_INT8 _z ) : x( _x ), y( _y ), z( _z )
  	{
  	}

Index: basechar.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/basechar.cpp,v
retrieving revision 1.131
retrieving revision 1.132
diff -C2 -d -r1.131 -r1.132
*** basechar.cpp	19 Aug 2004 01:22:51 -0000	1.131
--- basechar.cpp	19 Aug 2004 01:55:55 -0000	1.132
***************
*** 363,367 ****
  		Q_UINT16 skill = res.getInt( 0 );
  		Q_UINT16 value = res.getInt( 1 );
! 		UINT8 lockType = res.getInt( 2 );
  		Q_UINT16 cap = res.getInt( 3 );
  
--- 363,367 ----
  		Q_UINT16 skill = res.getInt( 0 );
  		Q_UINT16 value = res.getInt( 1 );
! 		Q_UINT8 lockType = res.getInt( 2 );
  		Q_UINT16 cap = res.getInt( 3 );
  
***************
*** 895,901 ****
  void cBaseChar::turnTo( const Coord_cl& pos )
  {
! 	INT16 xdif = ( INT16 ) ( pos.x - this->pos().x );
! 	INT16 ydif = ( INT16 ) ( pos.y - this->pos().y );
! 	UINT8 nDir;
  
  	if ( xdif == 0 && ydif < 0 )
--- 895,901 ----
  void cBaseChar::turnTo( const Coord_cl& pos )
  {
! 	Q_INT16 xdif = ( Q_INT16 ) ( pos.x - this->pos().x );
! 	Q_INT16 ydif = ( Q_INT16 ) ( pos.y - this->pos().y );
! 	Q_UINT8 nDir;
  
  	if ( xdif == 0 && ydif < 0 )
***************
*** 935,939 ****
  void cBaseChar::wear( P_ITEM pi )
  {
! 	UINT8 layer = pi->layer();
  
  	if ( !pi->container() )
--- 935,939 ----
  void cBaseChar::wear( P_ITEM pi )
  {
! 	Q_UINT8 layer = pi->layer();
  
  	if ( !pi->container() )
***************
*** 1319,1323 ****
  		else
  		{
! 			INT16 skillId = Skills::instance()->findSkillByDef( Tag->getAttribute( "type", "" ) );
  			setSkillValue( skillId, Value.toInt() );
  		}
--- 1319,1323 ----
  		else
  		{
! 			Q_INT16 skillId = Skills::instance()->findSkillByDef( Tag->getAttribute( "type", "" ) );
  			setSkillValue( skillId, Value.toInt() );
  		}
***************
*** 1403,1407 ****
  	else
  	{
! 		INT16 skillId = Skills::instance()->findSkillByDef( TagName );
  
  		if ( skillId == -1 )
--- 1403,1407 ----
  	else
  	{
! 		Q_INT16 skillId = Skills::instance()->findSkillByDef( TagName );
  
  		if ( skillId == -1 )
***************
*** 2137,2141 ****
  	{
  		QString skill = name.right( name.length() - 6 );
! 		INT16 skillId = Skills::instance()->findSkillByDef( skill );
  
  		if ( skillId != -1 )
--- 2137,2141 ----
  	{
  		QString skill = name.right( name.length() - 6 );
! 		Q_INT16 skillId = Skills::instance()->findSkillByDef( skill );
  
  		if ( skillId != -1 )
***************
*** 2148,2152 ****
  	{
  		QString skill = name.right( name.length() - 9 );
! 		INT16 skillId = Skills::instance()->findSkillByDef( skill );
  
  		if ( skillId != -1 )
--- 2148,2152 ----
  	{
  		QString skill = name.right( name.length() - 9 );
! 		Q_INT16 skillId = Skills::instance()->findSkillByDef( skill );
  
  		if ( skillId != -1 )
***************
*** 2158,2162 ****
  	{
  		// See if there's a skill by that name
! 		INT16 skillId = Skills::instance()->findSkillByDef( name );
  
  		if ( skillId != -1 )
--- 2158,2162 ----
  	{
  		// See if there's a skill by that name
! 		Q_INT16 skillId = Skills::instance()->findSkillByDef( name );
  
  		if ( skillId != -1 )
***************
*** 2180,2184 ****
  }
  
! void cBaseChar::setSkillLock( Q_UINT16 skill, UINT8 lock )
  {
  	if ( lock > 2 )
--- 2180,2184 ----
  }
  
! void cBaseChar::setSkillLock( Q_UINT16 skill, Q_UINT8 lock )
  {
  	if ( lock > 2 )
***************
*** 2199,2208 ****
  }
  
! UINT8 cBaseChar::skillLock( Q_UINT16 skill ) const
  {
  	return skills_[skill].lock;
  }
  
! void cBaseChar::setStamina( INT16 data, bool notify )
  {
  	stamina_ = data;
--- 2199,2208 ----
  }
  
! Q_UINT8 cBaseChar::skillLock( Q_UINT16 skill ) const
  {
  	return skills_[skill].lock;
  }
  
! void cBaseChar::setStamina( Q_INT16 data, bool notify )
  {
  	stamina_ = data;

Index: uobject.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/uobject.cpp,v
retrieving revision 1.175
retrieving revision 1.176
diff -C2 -d -r1.175 -r1.176
*** uobject.cpp	19 Aug 2004 01:22:53 -0000	1.175
--- uobject.cpp	19 Aug 2004 01:55:56 -0000	1.176
***************
*** 605,609 ****
  	Displays an effect emitting from this object toward another item or character
  */
! void cUObject::effect( Q_UINT16 id, cUObject* target, bool fixedDirection, bool explodes, UINT8 speed, Q_UINT16 hue, Q_UINT16 renderMode )
  {
  	if ( !target )
--- 605,609 ----
  	Displays an effect emitting from this object toward another item or character
  */
! void cUObject::effect( Q_UINT16 id, cUObject* target, bool fixedDirection, bool explodes, Q_UINT8 speed, Q_UINT16 hue, Q_UINT16 renderMode )
  {
  	if ( !target )
***************
*** 639,643 ****
  	Displays an effect emitting from this object and moving towards a specific location.
  */
! void cUObject::effect( Q_UINT16 id, const Coord_cl& target, bool fixedDirection, bool explodes, UINT8 speed, Q_UINT16 hue, Q_UINT16 renderMode )
  {
  	cUOTxEffect effect;
--- 639,643 ----
  	Displays an effect emitting from this object and moving towards a specific location.
  */
! void cUObject::effect( Q_UINT16 id, const Coord_cl& target, bool fixedDirection, bool explodes, Q_UINT8 speed, Q_UINT16 hue, Q_UINT16 renderMode )
  {
  	cUOTxEffect effect;
***************
*** 669,673 ****
  	Displays an effect moving with this object.
  */
! void cUObject::effect( Q_UINT16 id, UINT8 speed, UINT8 duration, Q_UINT16 hue, Q_UINT16 renderMode )
  {
  	cUOTxEffect effect;
--- 669,673 ----
  	Displays an effect moving with this object.
  */
! void cUObject::effect( Q_UINT16 id, Q_UINT8 speed, Q_UINT8 duration, Q_UINT16 hue, Q_UINT16 renderMode )
  {
  	cUOTxEffect effect;

Index: uobject.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/uobject.h,v
retrieving revision 1.104
retrieving revision 1.105
diff -C2 -d -r1.104 -r1.105
*** uobject.h	19 Aug 2004 01:22:53 -0000	1.104
--- uobject.h	19 Aug 2004 01:55:56 -0000	1.105
***************
*** 137,143 ****
  
  	// Utility Methods
! 	void effect( Q_UINT16 id, UINT8 speed = 10, UINT8 duration = 5, Q_UINT16 hue = 0, Q_UINT16 renderMode = 0 ); // Moving with this character
! 	void effect( Q_UINT16 id, cUObject* target, bool fixedDirection = true, bool explodes = false, UINT8 speed = 10, Q_UINT16 hue = 0, Q_UINT16 renderMode = 0 );
! 	void effect( Q_UINT16 id, const Coord_cl& target, bool fixedDirection = true, bool explodes = false, UINT8 speed = 10, Q_UINT16 hue = 0, Q_UINT16 renderMode = 0 );
  	void lightning( unsigned short hue = 0 );
  	bool inRange( cUObject* object, Q_UINT32 range ) const;
--- 137,143 ----
  
  	// Utility Methods
! 	void effect( Q_UINT16 id, Q_UINT8 speed = 10, Q_UINT8 duration = 5, Q_UINT16 hue = 0, Q_UINT16 renderMode = 0 ); // Moving with this character
! 	void effect( Q_UINT16 id, cUObject* target, bool fixedDirection = true, bool explodes = false, Q_UINT8 speed = 10, Q_UINT16 hue = 0, Q_UINT16 renderMode = 0 );
! 	void effect( Q_UINT16 id, const Coord_cl& target, bool fixedDirection = true, bool explodes = false, Q_UINT8 speed = 10, Q_UINT16 hue = 0, Q_UINT16 renderMode = 0 );
  	void lightning( unsigned short hue = 0 );
  	bool inRange( cUObject* object, Q_UINT32 range ) const;
***************
*** 152,156 ****
  		return isCharSerial( serial_ );
  	}
! 	virtual void talk( const QString& message, UI16 color = 0xFFFF, UINT8 type = 0, bool autospam = false, cUOSocket* socket = NULL ) = 0;
  	virtual void flagUnchanged()
  	{
--- 152,156 ----
  		return isCharSerial( serial_ );
  	}
! 	virtual void talk( const QString& message, UI16 color = 0xFFFF, Q_UINT8 type = 0, bool autospam = false, cUOSocket* socket = NULL ) = 0;
  	virtual void flagUnchanged()
  	{

Index: items.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/items.cpp,v
retrieving revision 1.436
retrieving revision 1.437
diff -C2 -d -r1.436 -r1.437
*** items.cpp	19 Aug 2004 01:22:52 -0000	1.436
--- items.cpp	19 Aug 2004 01:55:55 -0000	1.437
***************
*** 1273,1277 ****
  }
  
! void cItem::talk( const QString& message, UI16 color, UINT8 type, bool autospam, cUOSocket* socket )
  {
  	Q_UNUSED( autospam );
--- 1273,1277 ----
  }
  
! void cItem::talk( const QString& message, UI16 color, Q_UINT8 type, bool autospam, cUOSocket* socket )
  {
  	Q_UNUSED( autospam );

Index: basics.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/basics.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** basics.cpp	19 Aug 2004 01:22:51 -0000	1.37
--- basics.cpp	19 Aug 2004 01:55:55 -0000	1.38
***************
*** 115,123 ****
  		return false;
  
! 	INT8 z = coords[2].toShort( &ok );
  	if ( !ok )
  		return false;
  
! 	UINT8 map = coord.map; // Current by default
  	if ( coords.size() > 3 )
  	{
--- 115,123 ----
  		return false;
  
! 	Q_INT8 z = coords[2].toShort( &ok );
  	if ( !ok )
  		return false;
  
! 	Q_UINT8 map = coord.map; // Current by default
  	if ( coords.size() > 3 )
  	{

Index: walking.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/walking.cpp,v
retrieving revision 1.134
retrieving revision 1.135
diff -C2 -d -r1.134 -r1.135
*** walking.cpp	19 Aug 2004 01:22:53 -0000	1.134
--- walking.cpp	19 Aug 2004 01:55:56 -0000	1.135
***************
*** 108,113 ****
  struct stBlockItem
  {
! 	INT8 z;
! 	UINT8 height;
  	bool walkable;
  
--- 108,113 ----
  struct stBlockItem
  {
! 	Q_INT8 z;
! 	Q_UINT8 height;
  	bool walkable;
  
***************
*** 187,191 ****
  		// If we are a stair only the half height counts (round up)
  		if ( tTile.flag2 & 0x04 )
! 			staticBlock.height = ( UINT8 ) ( tTile.height + 1 / 2 );
  		else
  			staticBlock.height = tTile.height;
--- 187,191 ----
  		// If we are a stair only the half height counts (round up)
  		if ( tTile.flag2 & 0x04 )
! 			staticBlock.height = ( Q_UINT8 ) ( tTile.height + 1 / 2 );
  		else
  			staticBlock.height = tTile.height;
***************
*** 291,295 ****
  	{
  		stBlockItem item = blockList[i];
! 		INT8 itemTop = ( item.z + item.height );
  
  		// If we encounter any object with itemTop <= pos.z which is NOT walkable
--- 291,295 ----
  	{
  		stBlockItem item = blockList[i];
! 		Q_INT8 itemTop = ( item.z + item.height );
  
  		// If we encounter any object with itemTop <= pos.z which is NOT walkable
***************
*** 329,333 ****
  		// If there is ANY impassable object between pos.z and pos.z + 15 we can't walk here
  		stBlockItem item = blockList[i];
! 		INT8 itemTop = ( item.z + item.height );
  
  		// Does the top of the item looms into our space
--- 329,333 ----
  		// If there is ANY impassable object between pos.z and pos.z + 15 we can't walk here
  		stBlockItem item = blockList[i];
! 		Q_INT8 itemTop = ( item.z + item.height );
  
  		// Does the top of the item looms into our space
***************
*** 805,809 ****
  
  	// if there is a dynamic tile at this spot, check to see if its a blocker
! 	// if it does block, might as well INT16-circuit and return right away
  	if ( dt >= 0 )
  	{
--- 805,809 ----
  
  	// if there is a dynamic tile at this spot, check to see if its a blocker
! 	// if it does block, might as well Q_INT16-circuit and return right away
  	if ( dt >= 0 )
  	{

Index: skills.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/skills.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** skills.h	19 Aug 2004 01:22:52 -0000	1.32
--- skills.h	19 Aug 2004 01:55:56 -0000	1.33
***************
*** 63,67 ****
  	const QString& getSkillName( Q_UINT16 skill ) const;
  	const QString& getSkillDef( Q_UINT16 skill ) const;
! 	INT16 findSkillByDef( const QString& defname ) const; // -1 = Not Found
  
  	// Skill Usage methods
--- 63,67 ----
  	const QString& getSkillName( Q_UINT16 skill ) const;
  	const QString& getSkillDef( Q_UINT16 skill ) const;
! 	Q_INT16 findSkillByDef( const QString& defname ) const; // -1 = Not Found
  
  	// Skill Usage methods

Index: skills.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/skills.cpp,v
retrieving revision 1.231
retrieving revision 1.232
diff -C2 -d -r1.231 -r1.232
*** skills.cpp	19 Aug 2004 01:22:52 -0000	1.231
--- skills.cpp	19 Aug 2004 01:55:56 -0000	1.232
***************
*** 416,420 ****
  }
  
! INT16 cSkills::findSkillByDef( const QString& defname ) const
  {
  	QString defName = defname.upper();
--- 416,420 ----
  }
  
! Q_INT16 cSkills::findSkillByDef( const QString& defname ) const
  {
  	QString defName = defname.upper();

Index: corpse.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/corpse.cpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -d -r1.64 -r1.65
*** corpse.cpp	19 Aug 2004 01:22:51 -0000	1.64
--- corpse.cpp	19 Aug 2004 01:55:55 -0000	1.65
***************
*** 162,166 ****
  	}
  
! 	for ( QMap<UINT8, SERIAL>::iterator it = equipment_.begin(); it != equipment_.end(); ++it )
  		PersistentBroker::instance()->executeQuery( QString( "REPLACE INTO corpses_equipment VALUES(%1,%2,%3)" ).arg( serial() ).arg( it.key() ).arg( it.data() ) );
  
--- 162,166 ----
  	}
  
! 	for ( QMap<Q_UINT8, SERIAL>::iterator it = equipment_.begin(); it != equipment_.end(); ++it )
  		PersistentBroker::instance()->executeQuery( QString( "REPLACE INTO corpses_equipment VALUES(%1,%2,%3)" ).arg( serial() ).arg( it.key() ).arg( it.data() ) );
  
***************
*** 203,207 ****
  	corpseEquip.setSerial( serial() );
  
! 	for ( QMap<UINT8, SERIAL>::iterator it = equipment_.begin(); it != equipment_.end(); ++it )
  	{
  		P_ITEM pItem = World::instance()->findItem( it.data() );
--- 203,207 ----
  	corpseEquip.setSerial( serial() );
  
! 	for ( QMap<Q_UINT8, SERIAL>::iterator it = equipment_.begin(); it != equipment_.end(); ++it )
  	{
  		P_ITEM pItem = World::instance()->findItem( it.data() );
***************
*** 265,269 ****
  }
  
! SERIAL cCorpse::getEquipment( UINT8 layer )
  {
  	if ( equipment_.find( layer ) == equipment_.end() )
--- 265,269 ----
  }
  
! SERIAL cCorpse::getEquipment( Q_UINT8 layer )
  {
  	if ( equipment_.find( layer ) == equipment_.end() )
***************
*** 277,281 ****
  }
  
! void cCorpse::addEquipment( UINT8 layer, SERIAL serial )
  {
  	if ( equipment_.find( layer ) != equipment_.end() )
--- 277,281 ----
  }
  
! void cCorpse::addEquipment( Q_UINT8 layer, SERIAL serial )
  {
  	if ( equipment_.find( layer ) != equipment_.end() )

Index: items.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/items.h,v
retrieving revision 1.213
retrieving revision 1.214
diff -C2 -d -r1.213 -r1.214
*** items.h	19 Aug 2004 01:22:52 -0000	1.213
--- items.h	19 Aug 2004 01:55:56 -0000	1.214
***************
*** 200,204 ****
  
  	bool isInLockedItem();
! 	virtual void talk( const QString& message, UI16 color = 0xFFFF, UINT8 type = 0, bool autospam = false, cUOSocket* socket = NULL );
  	virtual void talk( const Q_UINT32 MsgID, const QString& params = 0, const QString& affix = 0, bool prepend = false, UI16 color = 0xFFFF, cUOSocket* socket = 0 );
  	void load( char**, Q_UINT16& );
--- 200,204 ----
  
  	bool isInLockedItem();
! 	virtual void talk( const QString& message, UI16 color = 0xFFFF, Q_UINT8 type = 0, bool autospam = false, cUOSocket* socket = NULL );
  	virtual void talk( const Q_UINT32 MsgID, const QString& params = 0, const QString& affix = 0, bool prepend = false, UI16 color = 0xFFFF, cUOSocket* socket = 0 );
  	void load( char**, Q_UINT16& );

Index: tracking.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/tracking.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** tracking.cpp	19 Aug 2004 01:22:53 -0000	1.28
--- tracking.cpp	19 Aug 2004 01:55:56 -0000	1.29
***************
*** 98,102 ****
  	}
  
! 	cTrackingList( P_CHAR player, UINT8 type )
  	{
  		setType( 0xFE12ACDE );
--- 98,102 ----
  	}
  
! 	cTrackingList( P_CHAR player, Q_UINT8 type )
  	{
  		setType( 0xFE12ACDE );

Index: guilds.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/guilds.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** guilds.cpp	15 Aug 2004 20:54:16 -0000	1.20
--- guilds.cpp	19 Aug 2004 01:55:55 -0000	1.21
***************
*** 899,903 ****
  
  	// Save Members/Canidates
- 	P_PLAYER player;
  
  	int count, i;
--- 899,902 ----

Index: npc.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/npc.h,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** npc.h	19 Aug 2004 01:22:52 -0000	1.57
--- npc.h	19 Aug 2004 01:55:56 -0000	1.58
***************
*** 98,104 ****
  	virtual void update( bool excludeself = false );
  	virtual void resend( bool clean = true );
! 	virtual void talk( const QString& message, UI16 color = 0xFFFF, UINT8 type = 0, bool autospam = false, cUOSocket* socket = NULL );
  	void talk( const Q_UINT32 MsgID, const QString& params = 0, const QString& affix = 0, bool prepend = false, UI16 color = 0xFFFF, cUOSocket* socket = 0 );
! 	virtual UINT8 notoriety( P_CHAR pChar = 0 );
  	virtual void showName( cUOSocket* socket );
  	virtual void soundEffect( UI16 soundId, bool hearAll = true );
--- 98,104 ----
  	virtual void update( bool excludeself = false );
  	virtual void resend( bool clean = true );
! 	virtual void talk( const QString& message, UI16 color = 0xFFFF, Q_UINT8 type = 0, bool autospam = false, cUOSocket* socket = NULL );
  	void talk( const Q_UINT32 MsgID, const QString& params = 0, const QString& affix = 0, bool prepend = false, UI16 color = 0xFFFF, cUOSocket* socket = 0 );
! 	virtual Q_UINT8 notoriety( P_CHAR pChar = 0 );
  	virtual void showName( cUOSocket* socket );
  	virtual void soundEffect( UI16 soundId, bool hearAll = true );

Index: coord.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/coord.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** coord.cpp	19 Aug 2004 01:22:51 -0000	1.52
--- coord.cpp	19 Aug 2004 01:55:55 -0000	1.53
***************
*** 121,125 ****
  }
  
! void Coord_cl::effect( Q_UINT16 id, UINT8 speed, UINT8 duration, Q_UINT16 hue, Q_UINT16 renderMode )
  {
  	cUOTxEffect effect;
--- 121,125 ----
  }
  
! void Coord_cl::effect( Q_UINT16 id, Q_UINT8 speed, Q_UINT8 duration, Q_UINT16 hue, Q_UINT16 renderMode )
  {
  	cUOTxEffect effect;

Index: player.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/player.cpp,v
retrieving revision 1.120
retrieving revision 1.121
diff -C2 -d -r1.120 -r1.121
*** player.cpp	19 Aug 2004 01:22:52 -0000	1.120
--- player.cpp	19 Aug 2004 01:55:56 -0000	1.121
***************
*** 280,284 ****
  }
  
! void cPlayer::talk( const QString& message, UI16 color, UINT8 type, bool autospam, cUOSocket* socket )
  {
  	Q_UNUSED( autospam );
--- 280,284 ----
  }
  
! void cPlayer::talk( const QString& message, UI16 color, Q_UINT8 type, bool autospam, cUOSocket* socket )
  {
  	Q_UNUSED( autospam );
***************
*** 367,371 ****
  }
  
! UINT8 cPlayer::notoriety( P_CHAR pChar ) // Gets the notoriety toward another char
  {
  	// Player is incognito
--- 367,371 ----
  }
  
! Q_UINT8 cPlayer::notoriety( P_CHAR pChar ) // Gets the notoriety toward another char
  {
  	// Player is incognito
***************
*** 376,380 ****
  
  	// 0x01 Blue, 0x02 Green, 0x03 Grey, 0x05 Orange, 0x06 Red, 0x07 Yellow
! 	UINT8 result;
  
  	if ( isInvulnerable() )
--- 376,380 ----
  
  	// 0x01 Blue, 0x02 Green, 0x03 Grey, 0x05 Orange, 0x06 Red, 0x07 Yellow
! 	Q_UINT8 result;
  
  	if ( isInvulnerable() )
***************
*** 1111,1115 ****
  }
  
! void cPlayer::setStamina( INT16 data, bool notify /* = true */ )
  {
  	bool update = false;
--- 1111,1115 ----
  }
  
! void cPlayer::setStamina( Q_INT16 data, bool notify /* = true */ )
  {
  	bool update = false;
***************
*** 1201,1205 ****
  	{
  		QString skill = name.right( name.length() - 6 );
! 		INT16 skillId = Skills::instance()->findSkillByDef( skill );
  
  		if ( skillId != -1 )
--- 1201,1205 ----
  	{
  		QString skill = name.right( name.length() - 6 );
! 		Q_INT16 skillId = Skills::instance()->findSkillByDef( skill );
  
  		if ( skillId != -1 )
***************
*** 1216,1220 ****
  	{
  		QString skill = name.right( name.length() - 9 );
! 		INT16 skillId = Skills::instance()->findSkillByDef( skill );
  
  		if ( skillId != -1 )
--- 1216,1220 ----
  	{
  		QString skill = name.right( name.length() - 9 );
! 		Q_INT16 skillId = Skills::instance()->findSkillByDef( skill );
  
  		if ( skillId != -1 )
***************
*** 1228,1232 ****
  	else
  	{
! 		INT16 skillId = Skills::instance()->findSkillByDef( name );
  		if ( skillId != -1 )
  		{
--- 1228,1232 ----
  	else
  	{
! 		Q_INT16 skillId = Skills::instance()->findSkillByDef( name );
  		if ( skillId != -1 )
  		{

Index: corpse.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/corpse.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** corpse.h	19 Aug 2004 01:22:51 -0000	1.29
--- corpse.h	19 Aug 2004 01:55:55 -0000	1.30
***************
*** 57,61 ****
  	QCString charbaseid_;
  
! 	QMap<UINT8, SERIAL> equipment_; // Serials of the old equipment
  	// The meaning of this is that even if the items are inside of the corpse
  	// they're displayed as equipment
--- 57,61 ----
  	QCString charbaseid_;
  
! 	QMap<Q_UINT8, SERIAL> equipment_; // Serials of the old equipment
  	// The meaning of this is that even if the items are inside of the corpse
  	// they're displayed as equipment
***************
*** 100,105 ****
  	unsigned int murderTime() const;
  
! 	void addEquipment( UINT8 layer, SERIAL serial );
! 	SERIAL getEquipment( UINT8 layer );
  
  	const char* objectID() const
--- 100,105 ----
  	unsigned int murderTime() const;
  
! 	void addEquipment( Q_UINT8 layer, SERIAL serial );
! 	SERIAL getEquipment( Q_UINT8 layer );
  
  	const char* objectID() const

Index: npc.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/npc.cpp,v
retrieving revision 1.107
retrieving revision 1.108
diff -C2 -d -r1.107 -r1.108
*** npc.cpp	19 Aug 2004 01:22:52 -0000	1.107
--- npc.cpp	19 Aug 2004 01:55:56 -0000	1.108
***************
*** 195,199 ****
  		addField( "stablemaster", stablemasterSerial_ );
  		addStrField( "ai", aiid_ );
! 		addField( "wandertype", ( UINT8 ) wanderType() );
  		addField( "wanderx1", wanderX1() );
  		addField( "wanderx2", wanderX2() );
--- 195,199 ----
  		addField( "stablemaster", stablemasterSerial_ );
  		addStrField( "ai", aiid_ );
! 		addField( "wandertype", ( Q_UINT8 ) wanderType() );
  		addField( "wanderx1", wanderX1() );
  		addField( "wanderx2", wanderX2() );
***************
*** 320,324 ****
  }
  
! void cNPC::talk( const QString& message, UI16 color, UINT8 type, bool autospam, cUOSocket* socket )
  {
  	if ( autospam )
--- 320,324 ----
  }
  
! void cNPC::talk( const QString& message, UI16 color, Q_UINT8 type, bool autospam, cUOSocket* socket )
  {
  	if ( autospam )
***************
*** 409,413 ****
  }
  
! UINT8 cNPC::notoriety( P_CHAR pChar ) // Gets the notoriety toward another char
  {
  	if ( isIncognito() )
--- 409,413 ----
  }
  
! Q_UINT8 cNPC::notoriety( P_CHAR pChar ) // Gets the notoriety toward another char
  {
  	if ( isIncognito() )
***************
*** 428,432 ****
  		//7 = unknown use (translucent (like 0x4000 hue))
  	*/
! 	UINT8 result;
  
  	if ( isInvulnerable() )
--- 428,432 ----
  		//7 = unknown use (translucent (like 0x4000 hue))
  	*/
! 	Q_UINT8 result;
  
  	if ( isInvulnerable() )
***************
*** 436,440 ****
  
  	// Check for Guild status + Highlight
! 	//	UINT8 guildStatus = GuildCompare( this, pChar );
  
  	//	if( npcaitype() == 0x02 )
--- 436,440 ----
  
  	// Check for Guild status + Highlight
! 	//	Q_UINT8 guildStatus = GuildCompare( this, pChar );
  
  	//	if( npcaitype() == 0x02 )
***************
*** 825,829 ****
  	{
  		QString skill = name.right( name.length() - 6 );
! 		INT16 skillId = Skills::instance()->findSkillByDef( skill );
  
  		if ( skillId != -1 )
--- 825,829 ----
  	{
  		QString skill = name.right( name.length() - 6 );
! 		Q_INT16 skillId = Skills::instance()->findSkillByDef( skill );
  
  		if ( skillId != -1 )
***************
*** 846,850 ****
  	{
  		QString skill = name.right( name.length() - 9 );
! 		INT16 skillId = Skills::instance()->findSkillByDef( skill );
  
  		if ( skillId != -1 )
--- 846,850 ----
  	{
  		QString skill = name.right( name.length() - 9 );
! 		Q_INT16 skillId = Skills::instance()->findSkillByDef( skill );
  
  		if ( skillId != -1 )
***************
*** 856,860 ****
  	else
  	{
! 		INT16 skillId = Skills::instance()->findSkillByDef( name );
  
  		if ( skillId != -1 )
--- 856,860 ----
  	else
  	{
! 		Q_INT16 skillId = Skills::instance()->findSkillByDef( name );
  
  		if ( skillId != -1 )

[wpdev-commits] wolfpack/python char.cpp,1.179,1.180 item.cpp,1.121,1.122 skills.h,1.22,1.23 target.h,1.18,1.19

From: Correa <thi...@us...> - 2004-08-19 01:56:07

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

Modified Files:
	char.cpp item.cpp skills.h target.h 
Log Message:
QT_CLEAN_NAMESPACE

Index: item.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/item.cpp,v
retrieving revision 1.121
retrieving revision 1.122
diff -C2 -d -r1.121 -r1.122
*** item.cpp	19 Aug 2004 01:22:57 -0000	1.121
--- item.cpp	19 Aug 2004 01:55:58 -0000	1.122
***************
*** 340,344 ****
  
  	Q_UINT16 id = PyInt_AsLong( PyTuple_GetItem( args, 0 ) );
! 	INT16 color = -1;
  
  	if ( PyTuple_Size( args ) > 1 && PyInt_Check( PyTuple_GetItem( args, 1 ) ) )
--- 340,344 ----
  
  	Q_UINT16 id = PyInt_AsLong( PyTuple_GetItem( args, 0 ) );
! 	Q_INT16 color = -1;
  
  	if ( PyTuple_Size( args ) > 1 && PyInt_Check( PyTuple_GetItem( args, 1 ) ) )
***************
*** 532,536 ****
  	bool fixedDirection = true;
  	bool explodes = false;
! 	UINT8 speed = 10;
  	Q_UINT16 hue = 0;
  	Q_UINT16 renderMode = 0;
--- 532,536 ----
  	bool fixedDirection = true;
  	bool explodes = false;
! 	Q_UINT8 speed = 10;
  	Q_UINT16 hue = 0;
  	Q_UINT16 renderMode = 0;
***************
*** 1050,1055 ****
  	Q_UINT16 id;
  	// Optional Arguments
! 	UINT8 speed = 5;
! 	UINT8 duration = 10;
  	Q_UINT16 hue = 0;
  	Q_UINT16 renderMode = 0;
--- 1050,1055 ----
  	Q_UINT16 id;
  	// Optional Arguments
! 	Q_UINT8 speed = 5;
! 	Q_UINT8 duration = 10;
  	Q_UINT16 hue = 0;
  	Q_UINT16 renderMode = 0;

Index: skills.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/skills.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** skills.h	19 Aug 2004 01:22:57 -0000	1.22
--- skills.h	19 Aug 2004 01:55:58 -0000	1.23
***************
*** 41,45 ****
  	PyObject_HEAD;
  	P_CHAR pChar;
! 	UINT8 type; // 0: Value; 1: Cap; 2: Lock
  } wpSkills;
  
--- 41,45 ----
  	PyObject_HEAD;
  	P_CHAR pChar;
! 	Q_UINT8 type; // 0: Value; 1: Cap; 2: Lock
  } wpSkills;
  

Index: target.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/target.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** target.h	19 Aug 2004 01:22:57 -0000	1.18
--- target.h	19 Aug 2004 01:55:58 -0000	1.19
***************
*** 95,99 ****
  };
  
! static PyObject* PyGetTarget( cUORxTarget* target, UINT8 map )
  {
  	if ( !target )
--- 95,99 ----
  };
  
! static PyObject* PyGetTarget( cUORxTarget* target, Q_UINT8 map )
  {
  	if ( !target )

Index: char.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/char.cpp,v
retrieving revision 1.179
retrieving revision 1.180
diff -C2 -d -r1.179 -r1.180
*** char.cpp	19 Aug 2004 01:22:57 -0000	1.179
--- char.cpp	19 Aug 2004 01:55:57 -0000	1.180
***************
*** 735,739 ****
  
  	Q_UINT16 id = getArgInt( 0 );
! 	INT16 color = -1;
  
  	if ( PyTuple_Size( args ) > 1 && checkArgInt( 1 ) )
--- 735,739 ----
  
  	Q_UINT16 id = getArgInt( 0 );
! 	Q_INT16 color = -1;
  
  	if ( PyTuple_Size( args ) > 1 && checkArgInt( 1 ) )
***************
*** 1328,1333 ****
  
  	// Optional Arguments
! 	UINT8 speed = 5;
! 	UINT8 duration = 10;
  	Q_UINT16 hue = 0;
  	Q_UINT16 renderMode = 0;
--- 1328,1333 ----
  
  	// Optional Arguments
! 	Q_UINT8 speed = 5;
! 	Q_UINT8 duration = 10;
  	Q_UINT16 hue = 0;
  	Q_UINT16 renderMode = 0;

[wpdev-commits] wolfpack/network encryption.cpp,1.4,1.5 uosocket.cpp,1.394,1.395 uosocket.h,1.124,1.125

From: Correa <thi...@us...> - 2004-08-19 01:56:06

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

Modified Files:
	encryption.cpp uosocket.cpp uosocket.h 
Log Message:
QT_CLEAN_NAMESPACE

Index: encryption.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/encryption.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** encryption.cpp	19 Aug 2004 01:22:56 -0000	1.4
--- encryption.cpp	19 Aug 2004 01:55:56 -0000	1.5
***************
*** 109,113 ****
  	for ( Q_UINT32 i = 0; i < length; ++i )
  	{
! 		buffer[i] = buffer[i] ^ ( UINT8 ) ( table1 & 0xFF );
  		edx = table2;
  		esi = table1 << 31;
--- 109,113 ----
  	for ( Q_UINT32 i = 0; i < length; ++i )
  	{
! 		buffer[i] = buffer[i] ^ ( Q_UINT8 ) ( table1 & 0xFF );
  		edx = table2;
  		esi = table1 << 31;
***************
*** 179,183 ****
  void cGameEncryption::serverEncrypt( char* buffer, unsigned int length )
  {
! 	static const UINT8 xorData[0x10] =
  	{
  	// Seed: 7F000001
--- 179,183 ----
  void cGameEncryption::serverEncrypt( char* buffer, unsigned int length )
  {
! 	static const Q_UINT8 xorData[0x10] =
  	{
  	// Seed: 7F000001

Index: uosocket.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v
retrieving revision 1.394
retrieving revision 1.395
diff -C2 -d -r1.394 -r1.395
*** uosocket.cpp	19 Aug 2004 01:22:56 -0000	1.394
--- uosocket.cpp	19 Aug 2004 01:55:56 -0000	1.395
***************
*** 1451,1455 ****
    \sa cUObject, cUOTxUnicodeSpeech, cUOTxUnicodeSpeech::eSpeechType
  */
! void cUOSocket::showSpeech( const cUObject* object, const QString& message, Q_UINT16 color, Q_UINT16 font, UINT8 speechType ) const
  {
  	cUOTxUnicodeSpeech speech;
--- 1451,1455 ----
    \sa cUObject, cUOTxUnicodeSpeech, cUOTxUnicodeSpeech::eSpeechType
  */
! void cUOSocket::showSpeech( const cUObject* object, const QString& message, Q_UINT16 color, Q_UINT16 font, Q_UINT8 speechType ) const
  {
  	cUOTxUnicodeSpeech speech;
***************
*** 2071,2075 ****
  }
  
! void cUOSocket::attachTarget( cTargetRequest* request, std::vector<stTargetItem>& items, INT16 xOffset, INT16 yOffset, INT16 zOffset )
  {
  	// Let the old one time out
--- 2071,2075 ----
  }
  
! void cUOSocket::attachTarget( cTargetRequest* request, std::vector<stTargetItem>& items, Q_INT16 xOffset, Q_INT16 yOffset, Q_INT16 zOffset )
  {
  	// Let the old one time out
***************
*** 2146,2150 ****
  
  	// Check if there really was a response or if it just was canceled
! 	if ( !packet->serial() && ( ( packet->x() == 0xFFFF ) || ( packet->y() == 0xFFFF ) || ( ( UINT8 ) packet->z() == 0xFF ) ) )
  		targetRequest->canceled( this );
  	else
--- 2146,2150 ----
  
  	// Check if there really was a response or if it just was canceled
! 	if ( !packet->serial() && ( ( packet->x() == 0xFFFF ) || ( packet->y() == 0xFFFF ) || ( ( Q_UINT8 ) packet->z() == 0xFF ) ) )
  		targetRequest->canceled( this );
  	else
***************
*** 2240,2244 ****
  }
  
! void cUOSocket::bounceItem( P_ITEM pItem, UINT8 reason )
  {
  	cUOTxBounceItem bounce;
--- 2240,2244 ----
  }
  
! void cUOSocket::bounceItem( P_ITEM pItem, Q_UINT8 reason )
  {
  	cUOTxBounceItem bounce;
***************
*** 2466,2470 ****
  	pUpdate.setRealValue( _player->skillValue( skill ) );
  
! 	UINT8 lock = _player->skillLock( skill );
  
  	if ( lock == 0 )
--- 2466,2470 ----
  	pUpdate.setRealValue( _player->skillValue( skill ) );
  
! 	Q_UINT8 lock = _player->skillLock( skill );
  
  	if ( lock == 0 )
***************
*** 2778,2782 ****
  	msg.setFont( font );
  
! 	UINT8 flags = 0;
  	if ( prepend )
  		flags |= cUOTxClilocMsgAffix::Prepend;
--- 2778,2782 ----
  	msg.setFont( font );
  
! 	Q_UINT8 flags = 0;
  	if ( prepend )
  		flags |= cUOTxClilocMsgAffix::Prepend;

Index: uosocket.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.h,v
retrieving revision 1.124
retrieving revision 1.125
diff -C2 -d -r1.124 -r1.125
*** uosocket.h	19 Aug 2004 01:46:13 -0000	1.124
--- uosocket.h	19 Aug 2004 01:55:56 -0000	1.125
***************
*** 82,86 ****
  	P_PLAYER _player;
  	eSocketState _state;
! 	UINT8 lastPacket, _viewRange, _walkSequence;
  	cTargetRequest* targetRequest;
  	QString _lang, _version;
--- 82,86 ----
  	P_PLAYER _player;
  	eSocketState _state;
! 	Q_UINT8 lastPacket, _viewRange, _walkSequence;
  	cTargetRequest* targetRequest;
  	QString _lang, _version;
***************
*** 248,252 ****
  	void updateChar( P_CHAR pChar );
  	void sendChar( P_CHAR pChar );
! 	void showSpeech( const cUObject* object, const QString& message, Q_UINT16 color = 0x3B2, Q_UINT16 font = 3, UINT8 speechType = 0x00 ) const;
  	void sysMessage( const QString& message, Q_UINT16 color = 0x3b2, Q_UINT16 font = 3 ) const;
  	void sendCharList();
--- 248,252 ----
  	void updateChar( P_CHAR pChar );
  	void sendChar( P_CHAR pChar );
! 	void showSpeech( const cUObject* object, const QString& message, Q_UINT16 color = 0x3B2, Q_UINT16 font = 3, Q_UINT8 speechType = 0x00 ) const;
  	void sysMessage( const QString& message, Q_UINT16 color = 0x3b2, Q_UINT16 font = 3 ) const;
  	void sendCharList();
***************
*** 261,265 ****
  	void playMusic( void );
  	void sendContainer( P_ITEM pCont );
! 	void bounceItem( P_ITEM pItem, UINT8 reason );
  	void updatePlayer();
  	void resendPlayer( bool quick = true );
--- 261,265 ----
  	void playMusic( void );
  	void sendContainer( P_ITEM pCont );
! 	void bounceItem( P_ITEM pItem, Q_UINT8 reason );
  	void updatePlayer();
  	void resendPlayer( bool quick = true );

[wpdev-commits] wolfpack/ai ai.cpp,1.24,1.25 ai_monsters.cpp,1.16,1.17

From: Correa <thi...@us...> - 2004-08-19 01:56:06

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

Modified Files:
	ai.cpp ai_monsters.cpp 
Log Message:
QT_CLEAN_NAMESPACE

Index: ai.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/ai/ai.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** ai.cpp	19 Aug 2004 01:22:54 -0000	1.24
--- ai.cpp	19 Aug 2004 01:55:56 -0000	1.25
***************
*** 541,545 ****
  	case enFreely:
  		{
! 			UINT8 dir = m_npc->direction();
  			if ( RandomNum( 0, 100 ) < 20 )
  				dir = RandomNum( 0, 7 );
--- 541,545 ----
  	case enFreely:
  		{
! 			Q_UINT8 dir = m_npc->direction();
  			if ( RandomNum( 0, 100 ) < 20 )
  				dir = RandomNum( 0, 7 );
***************
*** 556,560 ****
  			Q_UINT16 rndy = RandomNum( m_npc->wanderY1(), m_npc->wanderY2() );
  
! 			UINT8 dir = m_npc->pos().direction( Coord_cl( rndx, rndy ) );
  			m_npc->setDirection( dir );
  			Movement::instance()->Walking( m_npc, dir, 0xFF );
--- 556,560 ----
  			Q_UINT16 rndy = RandomNum( m_npc->wanderY1(), m_npc->wanderY2() );
  
! 			Q_UINT8 dir = m_npc->pos().direction( Coord_cl( rndx, rndy ) );
  			m_npc->setDirection( dir );
  			Movement::instance()->Walking( m_npc, dir, 0xFF );
***************
*** 571,578 ****
  			// now get a point on this circle around the m_npc
  			float rndphi = ( float ) RandomNum( 0, 100 ) / 100.0f * 2.0f * 3.14159265358979323846f;
! 			pos.x = pos.x + ( INT16 ) floor( cos( rndphi ) * rnddist );
! 			pos.y = pos.y + ( INT16 ) floor( sin( rndphi ) * rnddist );
  
! 			UINT8 dir = m_npc->pos().direction( pos );
  			m_npc->setDirection( dir );
  			Movement::instance()->Walking( m_npc, dir, 0xFF );
--- 571,578 ----
  			// now get a point on this circle around the m_npc
  			float rndphi = ( float ) RandomNum( 0, 100 ) / 100.0f * 2.0f * 3.14159265358979323846f;
! 			pos.x = pos.x + ( Q_INT16 ) floor( cos( rndphi ) * rnddist );
! 			pos.y = pos.y + ( Q_INT16 ) floor( sin( rndphi ) * rnddist );
  
! 			Q_UINT8 dir = m_npc->pos().direction( pos );
  			m_npc->setDirection( dir );
  			Movement::instance()->Walking( m_npc, dir, 0xFF );
***************
*** 612,616 ****
  {
  	// simply move towards the target
! 	UINT8 dir = m_npc->pos().direction( pos );
  	Coord_cl newPos = Movement::instance()->calcCoordFromDir( dir, m_npc->pos() );
  	if ( !mayWalk( m_npc, newPos ) )
--- 612,616 ----
  {
  	// simply move towards the target
! 	Q_UINT8 dir = m_npc->pos().direction( pos );
  	Coord_cl newPos = Movement::instance()->calcCoordFromDir( dir, m_npc->pos() );
  	if ( !mayWalk( m_npc, newPos ) )
***************
*** 647,651 ****
  	if ( ( waitForPathCalculation <= 0 && !m_npc->hasPath() ) || pos != m_npc->pathDestination() )
  	{
! 		UINT8 range = 1;
  		if ( m_npc->rightHandItem() )
  		{
--- 647,651 ----
  	if ( ( waitForPathCalculation <= 0 && !m_npc->hasPath() ) || pos != m_npc->pathDestination() )
  	{
! 		Q_UINT8 range = 1;
  		if ( m_npc->rightHandItem() )
  		{
***************
*** 672,676 ****
  		waitForPathCalculation = 0;
  		Coord_cl nextmove = m_npc->nextMove();
! 		UINT8 dir = m_npc->pos().direction( nextmove );
  		m_npc->setDirection( dir );
  		Movement::instance()->Walking( m_npc, dir, 0xFF );
--- 672,676 ----
  		waitForPathCalculation = 0;
  		Coord_cl nextmove = m_npc->nextMove();
! 		Q_UINT8 dir = m_npc->pos().direction( nextmove );
  		m_npc->setDirection( dir );
  		Movement::instance()->Walking( m_npc, dir, 0xFF );
***************
*** 700,711 ****
  			int v2 = newPos.y - fleePos.y;
  			float v_norm = sqrt( ( double ) ( v1* v1 + v2* v2 ) );
! 			newPos.x = newPos.x + ( INT16 ) floor( rnddist * v1 / v_norm );
! 			newPos.y = newPos.y + ( INT16 ) floor( rnddist * v2 / v_norm );
  		}
  		else
  		{
  			float rndphi = ( float ) RandomNum( 0, 100 ) / 100.0f * 2 * 3.14;
! 			newPos.x = newPos.x + ( INT16 ) floor( sin( rndphi ) * rnddist );
! 			newPos.y = newPos.y + ( INT16 ) floor( cos( rndphi ) * rnddist );
  		}
  
--- 700,711 ----
  			int v2 = newPos.y - fleePos.y;
  			float v_norm = sqrt( ( double ) ( v1* v1 + v2* v2 ) );
! 			newPos.x = newPos.x + ( Q_INT16 ) floor( rnddist * v1 / v_norm );
! 			newPos.y = newPos.y + ( Q_INT16 ) floor( rnddist * v2 / v_norm );
  		}
  		else
  		{
  			float rndphi = ( float ) RandomNum( 0, 100 ) / 100.0f * 2 * 3.14;
! 			newPos.x = newPos.x + ( Q_INT16 ) floor( sin( rndphi ) * rnddist );
! 			newPos.y = newPos.y + ( Q_INT16 ) floor( cos( rndphi ) * rnddist );
  		}
  
***************
*** 798,802 ****
  		return 0.0f;
  
! 	UINT8 range = 1;
  	if ( m_npc->rightHandItem() )
  	{
--- 798,802 ----
  		return 0.0f;
  
! 	Q_UINT8 range = 1;
  	if ( m_npc->rightHandItem() )
  	{
***************
*** 840,844 ****
  		return 1.0f;
  
! 	UINT8 range = 1;
  	if ( m_npc->rightHandItem() )
  	{
--- 840,844 ----
  		return 1.0f;
  
! 	Q_UINT8 range = 1;
  	if ( m_npc->rightHandItem() )
  	{

Index: ai_monsters.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/ai/ai_monsters.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** ai_monsters.cpp	4 Aug 2004 23:17:38 -0000	1.16
--- ai_monsters.cpp	19 Aug 2004 01:55:56 -0000	1.17
***************
*** 270,274 ****
  		return 0.0f;
  
! 	UINT8 range = 1;
  	P_ITEM weapon = m_npc->getWeapon();
  
--- 270,274 ----
  		return 0.0f;
  
! 	Q_UINT8 range = 1;
  	P_ITEM weapon = m_npc->getWeapon();
  
***************
*** 305,309 ****
  		return 1.0f;
  
! 	UINT8 range = 1;
  	P_ITEM weapon = m_npc->getWeapon();
  	if ( weapon && weapon->hasTag( "range" ) )
--- 305,309 ----
  		return 1.0f;
  
! 	Q_UINT8 range = 1;
  	P_ITEM weapon = m_npc->getWeapon();
  	if ( weapon && weapon->hasTag( "range" ) )
***************
*** 362,366 ****
  		return 0.0f;
  
! 	UINT8 range = 1;
  	P_ITEM weapon = m_npc->getWeapon();
  	if ( weapon && weapon->hasTag( "range" ) )
--- 362,366 ----
  		return 0.0f;
  
! 	Q_UINT8 range = 1;
  	P_ITEM weapon = m_npc->getWeapon();
  	if ( weapon && weapon->hasTag( "range" ) )
***************
*** 397,401 ****
  		return 1.0f;
  
! 	UINT8 range = 1;
  	P_ITEM weapon = m_npc->getWeapon();
  	if ( weapon && weapon->hasTag( "range" ) )
--- 397,401 ----
  		return 1.0f;
  
! 	Q_UINT8 range = 1;
  	P_ITEM weapon = m_npc->getWeapon();
  	if ( weapon && weapon->hasTag( "range" ) )

[wpdev-commits] wolfpack/muls maps.cpp,1.8,1.9

From: Correa <thi...@us...> - 2004-08-19 01:56:05

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

Modified Files:
	maps.cpp 
Log Message:
QT_CLEAN_NAMESPACE

Index: maps.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/muls/maps.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** maps.cpp	19 Aug 2004 01:22:55 -0000	1.8
--- maps.cpp	19 Aug 2004 01:55:56 -0000	1.9
***************
*** 416,424 ****
  	{
  		// get three other nearby titles to decide on an average z?
! 		INT8 map2z = mapElevation( p + Coord_cl( 1, 0, 0 ) );
! 		INT8 map3z = mapElevation( p + Coord_cl( 0, 1, 0 ) );
! 		INT8 map4z = mapElevation( p + Coord_cl( 1, 1, 0 ) );
  
! 		INT8 testz = 0;
  		if ( abs( map1.z - map4z ) <= abs( map2z - map3z ) )
  		{
--- 416,424 ----
  	{
  		// get three other nearby titles to decide on an average z?
! 		Q_INT8 map2z = mapElevation( p + Coord_cl( 1, 0, 0 ) );
! 		Q_INT8 map3z = mapElevation( p + Coord_cl( 0, 1, 0 ) );
! 		Q_INT8 map4z = mapElevation( p + Coord_cl( 1, 1, 0 ) );
  
! 		Q_INT8 testz = 0;
  		if ( abs( map1.z - map4z ) <= abs( map2z - map3z ) )
  		{
***************
*** 521,525 ****
  			if ( ( mapitem->pos().x == pos.x ) && ( mapitem->pos().y == pos.y ) && ( !mapitem->isMulti() ) )
  			{
! 				const INT8 ztemp = mapitem->pos().z + TileCache::instance()->tileHeight( mapitem->id() );
  				if ( ( ztemp <= pos.z + MaxZstep ) && ( ztemp > z ) )
  				{
--- 521,525 ----
  			if ( ( mapitem->pos().x == pos.x ) && ( mapitem->pos().y == pos.y ) && ( !mapitem->isMulti() ) )
  			{
! 				const Q_INT8 ztemp = mapitem->pos().z + TileCache::instance()->tileHeight( mapitem->id() );
  				if ( ( ztemp <= pos.z + MaxZstep ) && ( ztemp > z ) )
  				{

[wpdev-commits] wolfpack/network uosocket.h,1.123,1.124

From: Correa <thi...@us...> - 2004-08-19 01:46:22

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

Modified Files:
	uosocket.h 
Log Message:
QT_CLEAN_NAMESPACE

Index: uosocket.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.h,v
retrieving revision 1.123
retrieving revision 1.124
diff -C2 -d -r1.123 -r1.124
*** uosocket.h	19 Aug 2004 01:22:56 -0000	1.123
--- uosocket.h	19 Aug 2004 01:46:13 -0000	1.124
***************
*** 57,63 ****
  {
  	Q_UINT16 id;
! 	INT16 xOffset;
! 	INT16 yOffset;
! 	INT16 zOffset;
  	Q_UINT16 hue;
  };
--- 57,63 ----
  {
  	Q_UINT16 id;
! 	Q_INT16 xOffset;
! 	Q_INT16 yOffset;
! 	Q_INT16 zOffset;
  	Q_UINT16 hue;
  };
***************
*** 268,272 ****
  	void attachTarget( cTargetRequest* request );
  	void attachTarget( cTargetRequest* request, Q_UINT16 multiid );
! 	void attachTarget( cTargetRequest* request, std::vector<stTargetItem>& items, INT16 xOffset = 0, INT16 yOffset = 0, INT16 zOffset = 0 );
  	void cancelTarget();
  	void resendWorld( bool clean = true );
--- 268,272 ----
  	void attachTarget( cTargetRequest* request );
  	void attachTarget( cTargetRequest* request, Q_UINT16 multiid );
! 	void attachTarget( cTargetRequest* request, std::vector<stTargetItem>& items, Q_INT16 xOffset = 0, Q_INT16 yOffset = 0, Q_INT16 zOffset = 0 );
  	void cancelTarget();
  	void resendWorld( bool clean = true );

[wpdev-commits] wolfpack targetrequests.h,1.72,1.73

From: Correa <thi...@us...> - 2004-08-19 01:46:22

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

Modified Files:
	targetrequests.h 
Log Message:
QT_CLEAN_NAMESPACE

Index: targetrequests.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/targetrequests.h,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -d -r1.72 -r1.73
*** targetrequests.h	5 Aug 2004 01:48:38 -0000	1.72
--- targetrequests.h	19 Aug 2004 01:46:13 -0000	1.73
***************
*** 297,303 ****
  {
  private:
! 	INT16 x, y, z;
  public:
! 	cMoveTarget( INT16 _x, INT16 _y, INT8 _z ) : x( _x ), y( _y ), z( _z )
  	{
  	}
--- 297,303 ----
  {
  private:
! 	Q_INT16 x, y, z;
  public:
! 	cMoveTarget( Q_INT16 _x, Q_INT16 _y, INT8 _z ) : x( _x ), y( _y ), z( _z )
  	{
  	}

[wpdev-commits] wolfpack accounts.h,1.42,1.43 basechar.cpp,1.130,1.131 basics.cpp,1.36,1.37 console.cpp,1.23,1.24 console.h,1.17,1.18 coord.cpp,1.51,1.52 corpse.cpp,1.63,1.64 corpse.h,1.28,1.29 dbdriver.cpp,1.41,1.42 dbdriver.h,1.19,1.20 gumps.cpp,1.170,1.171 gumps.h,1.42,1.43 items.cpp,1.435,1.436 items.h,1.212,1.213 multi.h,1.9,1.10 npc.cpp,1.106,1.107 npc.h,1.56,1.57 pagesystem.h,1.20,1.21 persistentobject.cpp,1.10,1.11 persistentobject.h,1.14,1.15 player.cpp,1.119,1.120 player.h,1.55,1.56 skills.cpp,1.230,1.231 skills.h,1.31,1.32 speech.cpp,1.183,1.184 speech.h,1.25,1.26 territories.h,1.29,1.30 tracking.cpp,1.27,1.28 trade.cpp,1.8,1.9 uobject.cpp,1.174,1.175 uobject.h,1.103,1.104 walking.cpp,1.133,1.134 world.cpp,1.116,1.117

From: Correa <thi...@us...> - 2004-08-19 01:23:41

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

Modified Files:
	accounts.h basechar.cpp basics.cpp console.cpp console.h 
	coord.cpp corpse.cpp corpse.h dbdriver.cpp dbdriver.h 
	gumps.cpp gumps.h items.cpp items.h multi.h npc.cpp npc.h 
	pagesystem.h persistentobject.cpp persistentobject.h 
	player.cpp player.h skills.cpp skills.h speech.cpp speech.h 
	territories.h tracking.cpp trade.cpp uobject.cpp uobject.h 
	walking.cpp world.cpp 
Log Message:
QT_CLEAN_NAMESPACE

Index: skills.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/skills.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** skills.h	2 Jun 2004 15:04:07 -0000	1.31
--- skills.h	19 Aug 2004 01:22:52 -0000	1.32
***************
*** 61,66 ****
  	}
  	QString getSkillTitle( P_CHAR pChar ) const;
! 	const QString& getSkillName( UINT16 skill ) const;
! 	const QString& getSkillDef( UINT16 skill ) const;
  	INT16 findSkillByDef( const QString& defname ) const; // -1 = Not Found
  
--- 61,66 ----
  	}
  	QString getSkillTitle( P_CHAR pChar ) const;
! 	const QString& getSkillName( Q_UINT16 skill ) const;
! 	const QString& getSkillDef( Q_UINT16 skill ) const;
  	INT16 findSkillByDef( const QString& defname ) const; // -1 = Not Found
  
***************
*** 70,74 ****
  	static void RandomSteal( cUOSocket*, SERIAL );
  	void Track( P_CHAR pc_i );
! 	void SkillUse( cUOSocket*, UINT16 );
  	void Snooping( P_PLAYER, P_ITEM );
  };
--- 70,74 ----
  	static void RandomSteal( cUOSocket*, SERIAL );
  	void Track( P_CHAR pc_i );
! 	void SkillUse( cUOSocket*, Q_UINT16 );
  	void Snooping( P_PLAYER, P_ITEM );
  };

Index: trade.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/trade.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** trade.cpp	13 Aug 2004 08:55:26 -0000	1.8
--- trade.cpp	19 Aug 2004 01:22:53 -0000	1.9
***************
*** 86,90 ****
  	}
  
! 	UINT32 itemCount = packet->itemCount();
  
  	if ( itemCount >= 256 )
--- 86,90 ----
  	}
  
! 	Q_UINT32 itemCount = packet->itemCount();
  
  	if ( itemCount >= 256 )
***************
*** 106,112 ****
  		bContent = pBought->content();
  
! 	UINT32 totalValue = 0;
! 	UINT32 i;
! 	map<SERIAL, UINT16> items;
  
  	for ( i = 0; i < itemCount; ++i )
--- 106,112 ----
  		bContent = pBought->content();
  
! 	Q_UINT32 totalValue = 0;
! 	Q_UINT32 i;
! 	map<SERIAL, Q_UINT16> items;
  
  	for ( i = 0; i < itemCount; ++i )
***************
*** 121,125 ****
  		}
  
! 		UINT16 amount = packet->iAmount( i );
  		UINT8 layer = packet->iLayer( i );
  
--- 121,125 ----
  		}
  
! 		Q_UINT16 amount = packet->iAmount( i );
  		UINT8 layer = packet->iLayer( i );
  
***************
*** 172,177 ****
  
  	// Get our total gold at once
! 	UINT32 bankGold = pChar->countBankGold();
! 	UINT32 packGold = pChar->countGold();
  	bool fromBank;
  
--- 172,177 ----
  
  	// Get our total gold at once
! 	Q_UINT32 bankGold = pChar->countBankGold();
! 	Q_UINT32 packGold = pChar->countGold();
  	bool fromBank;
  
***************
*** 198,205 ****
  
  	// Sanity checks all passed here
! 	for ( map<SERIAL, UINT16>::iterator iter = items.begin(); iter != items.end(); ++iter )
  	{
  		P_ITEM pItem = FindItemBySerial( iter->first );
! 		UINT16 amount = QMIN( iter->second, pItem->restock() );
  
  		pItem->setRestock( pItem->restock() - amount ); // Reduce the items in stock
--- 198,205 ----
  
  	// Sanity checks all passed here
! 	for ( map<SERIAL, Q_UINT16>::iterator iter = items.begin(); iter != items.end(); ++iter )
  	{
  		P_ITEM pItem = FindItemBySerial( iter->first );
! 		Q_UINT16 amount = QMIN( iter->second, pItem->restock() );
  
  		pItem->setRestock( pItem->restock() - amount ); // Reduce the items in stock
***************
*** 217,221 ****
  		else
  		{
! 			for ( UINT16 j = 0; j < amount; ++j )
  			{
  				pSold = pItem->dupe();
--- 217,221 ----
  		else
  		{
! 			for ( Q_UINT16 j = 0; j < amount; ++j )
  			{
  				pSold = pItem->dupe();
***************
*** 271,275 ****
  	}
  
! 	UINT32 itemCount = packet->itemCount();
  
  	if ( itemCount >= 256 )
--- 271,275 ----
  	}
  
! 	Q_UINT32 itemCount = packet->itemCount();
  
  	if ( itemCount >= 256 )
***************
*** 289,295 ****
  	cItem::ContainerContent::const_iterator it;
  
! 	UINT32 totalValue = 0;
! 	UINT32 i;
! 	map<SERIAL, UINT16> items;
  
  	for ( i = 0; i < itemCount; ++i )
--- 289,295 ----
  	cItem::ContainerContent::const_iterator it;
  
! 	Q_UINT32 totalValue = 0;
! 	Q_UINT32 i;
! 	map<SERIAL, Q_UINT16> items;
  
  	for ( i = 0; i < itemCount; ++i )
***************
*** 304,308 ****
  		}
  
! 		UINT16 amount = packet->iAmount( i );
  
  		// First an equal item with higher amount must be in the vendors sell container!
--- 304,308 ----
  		}
  
! 		Q_UINT16 amount = packet->iAmount( i );
  
  		// First an equal item with higher amount must be in the vendors sell container!
***************
*** 349,356 ****
  	if ( pBought )
  	{
! 		for ( map<SERIAL, UINT16>::iterator iter = items.begin(); iter != items.end(); ++iter )
  		{
  			P_ITEM pItem = FindItemBySerial( iter->first );
! 			UINT16 amount = iter->second;
  
  			if ( pItem->isPileable() )
--- 349,356 ----
  	if ( pBought )
  	{
! 		for ( map<SERIAL, Q_UINT16>::iterator iter = items.begin(); iter != items.end(); ++iter )
  		{
  			P_ITEM pItem = FindItemBySerial( iter->first );
! 			Q_UINT16 amount = iter->second;
  
  			if ( pItem->isPileable() )

Index: gumps.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/gumps.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** gumps.h	13 Aug 2004 08:55:25 -0000	1.42
--- gumps.h	19 Aug 2004 01:22:52 -0000	1.43
***************
*** 149,158 ****
  
  	// HTML Stuff
! 	void addHtmlGump( INT32 x, INT32 y, INT32 width, INT32 height, const QString& html, bool hasBack = false, bool canScroll = false );
! 	void addXmfHtmlGump( INT32 x, INT32 y, INT32 width, INT32 height, UINT32 clilocid, bool hasBack = false, bool canScroll = false );
  	// void addXmfHtmlColorGump( );
  
  	// CheckerTrans
! 	void addCheckertrans( INT32 x, INT32 y, INT32 width, INT32 height );
  };
  
--- 149,158 ----
  
  	// HTML Stuff
! 	void addHtmlGump( Q_INT32 x, Q_INT32 y, Q_INT32 width, Q_INT32 height, const QString& html, bool hasBack = false, bool canScroll = false );
! 	void addXmfHtmlGump( Q_INT32 x, Q_INT32 y, Q_INT32 width, Q_INT32 height, Q_UINT32 clilocid, bool hasBack = false, bool canScroll = false );
  	// void addXmfHtmlColorGump( );
  
  	// CheckerTrans
! 	void addCheckertrans( Q_INT32 x, Q_INT32 y, Q_INT32 width, Q_INT32 height );
  };
  
***************
*** 255,259 ****
  {
  private:
! 	UINT32 page_;
  	WPPAGE_TYPE ptype_;
  
--- 255,259 ----
  {
  private:
! 	uint page_;
  	WPPAGE_TYPE ptype_;
  
***************
*** 261,265 ****
  
  public:
! 	cPagesGump( UINT32 page, WPPAGE_TYPE ptype );
  
  	virtual void handleResponse( cUOSocket* socket, const gumpChoice_st& choice );
--- 261,265 ----
  
  public:
! 	cPagesGump( uint page, WPPAGE_TYPE ptype );
  
  	virtual void handleResponse( cUOSocket* socket, const gumpChoice_st& choice );

Index: accounts.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/accounts.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** accounts.h	2 Jun 2004 15:04:02 -0000	1.42
--- accounts.h	19 Aug 2004 01:22:51 -0000	1.43
***************
*** 66,70 ****
  	// 0x00000020 staff - gm mode on/off
  	// 0x00000040 multigems on/off
! 	UINT32 flags_;
  	int attempts_;
  	bool inUse_;
--- 66,70 ----
  	// 0x00000020 staff - gm mode on/off
  	// 0x00000040 multigems on/off
! 	Q_UINT32 flags_;
  	int attempts_;
  	bool inUse_;
***************
*** 103,109 ****
  	void refreshAcl();
  	void setInUse( bool data );
! 	void setFlags( UINT32 data );
  	void setPassword( const QString& );
! 	UINT32 flags() const;
  	QDateTime blockedUntil() const
  	{
--- 103,109 ----
  	void refreshAcl();
  	void setInUse( bool data );
! 	void setFlags( Q_UINT32 data );
  	void setPassword( const QString& );
! 	Q_UINT32 flags() const;
  	QDateTime blockedUntil() const
  	{
***************
*** 208,212 ****
  }
  
! inline UINT32 cAccount::flags() const
  {
  	return flags_;
--- 208,212 ----
  }
  
! inline Q_UINT32 cAccount::flags() const
  {
  	return flags_;
***************
*** 233,237 ****
  }
  
! inline void cAccount::setFlags( UINT32 data )
  {
  	flags_ = data;
--- 233,237 ----
  }
  
! inline void cAccount::setFlags( Q_UINT32 data )
  {
  	flags_ = data;

Index: npc.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/npc.h,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** npc.h	15 Aug 2004 02:17:39 -0000	1.56
--- npc.h	19 Aug 2004 01:22:52 -0000	1.57
***************
*** 66,73 ****
  		{
  		}
! 		stWanderType( UINT16 x1_, UINT16 x2_, UINT16 y1_, UINT16 y2_ ) : type( enRectangle ), x1( x1_ ), x2( x2_ ), y1( y1_ ), y2( y2_ )
  		{
  		}
! 		stWanderType( UINT16 x_, UINT16 y_, UINT16 radius_ ) : type( enCircle ), x1( x_ ), y1( y_ ), radius( radius_ )
  		{
  		}
--- 66,73 ----
  		{
  		}
! 		stWanderType( Q_UINT16 x1_, Q_UINT16 x2_, Q_UINT16 y1_, Q_UINT16 y2_ ) : type( enRectangle ), x1( x1_ ), x2( x2_ ), y1( y1_ ), y2( y2_ )
  		{
  		}
! 		stWanderType( Q_UINT16 x_, Q_UINT16 y_, Q_UINT16 radius_ ) : type( enCircle ), x1( x_ ), y1( y_ ), radius( radius_ )
  		{
  		}
***************
*** 76,84 ****
  		enWanderTypes type;
  		// rectangles and circles
! 		UINT16 x1;
! 		UINT16 x2;
! 		UINT16 y1;
! 		UINT16 y2;
! 		UINT16 radius;
  
  		P_CHAR followTarget;
--- 76,84 ----
  		enWanderTypes type;
  		// rectangles and circles
! 		Q_UINT16 x1;
! 		Q_UINT16 x2;
! 		Q_UINT16 y1;
! 		Q_UINT16 y2;
! 		Q_UINT16 radius;
  
  		P_CHAR followTarget;
***************
*** 87,91 ****
  
  	// implementation of interfaces
! 	void load( char**, UINT16& );
  	void save();
  	bool del();
--- 87,91 ----
  
  	// implementation of interfaces
! 	void load( char**, Q_UINT16& );
  	void save();
  	bool del();
***************
*** 99,103 ****
  	virtual void resend( bool clean = true );
  	virtual void talk( const QString& message, UI16 color = 0xFFFF, UINT8 type = 0, bool autospam = false, cUOSocket* socket = NULL );
! 	void talk( const UINT32 MsgID, const QString& params = 0, const QString& affix = 0, bool prepend = false, UI16 color = 0xFFFF, cUOSocket* socket = 0 );
  	virtual UINT8 notoriety( P_CHAR pChar = 0 );
  	virtual void showName( cUOSocket* socket );
--- 99,103 ----
  	virtual void resend( bool clean = true );
  	virtual void talk( const QString& message, UI16 color = 0xFFFF, UINT8 type = 0, bool autospam = false, cUOSocket* socket = NULL );
! 	void talk( const Q_UINT32 MsgID, const QString& params = 0, const QString& affix = 0, bool prepend = false, UI16 color = 0xFFFF, cUOSocket* socket = 0 );
  	virtual UINT8 notoriety( P_CHAR pChar = 0 );
  	virtual void showName( cUOSocket* socket );
***************
*** 105,109 ****
  	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()
--- 105,109 ----
  	virtual bool inWorld();
  	virtual void giveGold( Q_UINT32 amount, bool inBank = false );
! 	virtual Q_UINT32 takeGold( Q_UINT32 amount, bool inBank = false );
  	virtual void applyDefinition( const cElement* );
  	virtual void flagUnchanged()
***************
*** 130,144 ****
  
  	// getters
! 	UINT32 additionalFlags() const;
! 	UINT32 nextBeggingTime() const;
! 	UINT32 nextGuardCallTime() const;
! 	UINT32 nextMoveTime() const;
! 	UINT32 nextMsgTime() const;
! 	UINT32 summonTime() const;
  	P_PLAYER owner() const;
  	SERIAL stablemasterSerial() const;
  	AbstractAI* ai() const;
! 	UINT32 aiCheckTime() const;
! 	UINT16 aiCheckInterval() const;
  	bool summoned() const;
  	// advanced getters for data structures
--- 130,144 ----
  
  	// getters
! 	Q_UINT32 additionalFlags() const;
! 	Q_UINT32 nextBeggingTime() const;
! 	Q_UINT32 nextGuardCallTime() const;
! 	Q_UINT32 nextMoveTime() const;
! 	Q_UINT32 nextMsgTime() const;
! 	Q_UINT32 summonTime() const;
  	P_PLAYER owner() const;
  	SERIAL stablemasterSerial() const;
  	AbstractAI* ai() const;
! 	Q_UINT32 aiCheckTime() const;
! 	Q_UINT16 aiCheckInterval() const;
  	bool summoned() const;
  	// advanced getters for data structures
***************
*** 150,168 ****
  	// wander type
  	enWanderTypes wanderType() const;
! 	UINT16 wanderX1() const;
! 	UINT16 wanderX2() const;
! 	UINT16 wanderY1() const;
! 	UINT16 wanderY2() const;
! 	UINT16 wanderRadius() const;
  	P_CHAR wanderFollowTarget() const;
  	Coord_cl wanderDestination() const;
  
  	// setters
! 	void setAdditionalFlags( UINT32 data );
! 	void setNextBeggingTime( UINT32 data );
! 	void setNextGuardCallTime( UINT32 data );
! 	void setNextMoveTime( UINT32 data );
! 	void setNextMsgTime( UINT32 data );
! 	void setSummonTime( UINT32 data );
  	void setOwner( P_PLAYER data, bool nochecks = false );
  	void setSummoned( bool data );
--- 150,168 ----
  	// wander type
  	enWanderTypes wanderType() const;
! 	Q_UINT16 wanderX1() const;
! 	Q_UINT16 wanderX2() const;
! 	Q_UINT16 wanderY1() const;
! 	Q_UINT16 wanderY2() const;
! 	Q_UINT16 wanderRadius() const;
  	P_CHAR wanderFollowTarget() const;
  	Coord_cl wanderDestination() const;
  
  	// setters
! 	void setAdditionalFlags( Q_UINT32 data );
! 	void setNextBeggingTime( Q_UINT32 data );
! 	void setNextGuardCallTime( Q_UINT32 data );
! 	void setNextMoveTime( Q_UINT32 data );
! 	void setNextMsgTime( Q_UINT32 data );
! 	void setSummonTime( Q_UINT32 data );
  	void setOwner( P_PLAYER data, bool nochecks = false );
  	void setSummoned( bool data );
***************
*** 170,175 ****
  	void setGuarding( P_PLAYER data );
  	void setAI( AbstractAI* ai );
! 	void setAICheckTime( UINT32 data );
! 	void setAICheckInterval( UINT16 data );
  
  	// advanced setters for data structures
--- 170,175 ----
  	void setGuarding( P_PLAYER data );
  	void setAI( AbstractAI* ai );
! 	void setAICheckTime( Q_UINT32 data );
! 	void setAICheckInterval( Q_UINT16 data );
  
  	// advanced setters for data structures
***************
*** 184,192 ****
  	// wander type
  	void setWanderType( enWanderTypes data );
! 	void setWanderX1( UINT16 data );
! 	void setWanderX2( UINT16 data );
! 	void setWanderY1( UINT16 data );
! 	void setWanderY2( UINT16 data );
! 	void setWanderRadius( UINT16 data );
  	void setWanderFollowTarget( P_CHAR data );
  	void setWanderDestination( const Coord_cl& data );
--- 184,192 ----
  	// wander type
  	void setWanderType( enWanderTypes data );
! 	void setWanderX1( Q_UINT16 data );
! 	void setWanderX2( Q_UINT16 data );
! 	void setWanderY1( Q_UINT16 data );
! 	void setWanderY2( Q_UINT16 data );
! 	void setWanderRadius( Q_UINT16 data );
  	void setWanderFollowTarget( P_CHAR data );
  	void setWanderDestination( const Coord_cl& data );
***************
*** 217,233 ****
  	// Time till NPC talks again.
  	// cOldChar::antispamtimer_
! 	UINT32 nextMsgTime_;
  
  	// Time till the NPC calls another guard.
  	// cOldChar::antiguardstimer_
! 	UINT32 nextGuardCallTime_;
  
  	// Time till the NPC handles another begging attempt.
  	// cOldChar::begging_timer_
! 	UINT32 nextBeggingTime_;
  
  	// Time till npc moves next.
  	// cOldChar::npcmovetime_
! 	UINT32 nextMoveTime_;
  
  	// Stores information about how the npc wanders. uses the struct
--- 217,233 ----
  	// Time till NPC talks again.
  	// cOldChar::antispamtimer_
! 	Q_UINT32 nextMsgTime_;
  
  	// Time till the NPC calls another guard.
  	// cOldChar::antiguardstimer_
! 	Q_UINT32 nextGuardCallTime_;
  
  	// Time till the NPC handles another begging attempt.
  	// cOldChar::begging_timer_
! 	Q_UINT32 nextBeggingTime_;
  
  	// Time till npc moves next.
  	// cOldChar::npcmovetime_
! 	Q_UINT32 nextMoveTime_;
  
  	// Stores information about how the npc wanders. uses the struct
***************
*** 240,244 ****
  	// Time till summoned creature disappears.
  	// cOldChar::summontimer_
! 	UINT32 summonTime_;
  
  	// Additional property flags
--- 240,244 ----
  	// Time till summoned creature disappears.
  	// cOldChar::summontimer_
! 	Q_UINT32 summonTime_;
  
  	// Additional property flags
***************
*** 246,250 ****
  	// Bits:
  	// 0x00000001 Creature is summoned
! 	UINT32 additionalFlags_;
  
  	// Owner of this NPC.
--- 246,250 ----
  	// Bits:
  	// 0x00000001 Creature is summoned
! 	Q_UINT32 additionalFlags_;
  
  	// Owner of this NPC.
***************
*** 264,279 ****
  
  	// NPC AI check timer
! 	UINT32 aiCheckTime_;
  
  	// NPC AI check time intervall in msec
! 	UINT16 aiCheckInterval_;
  };
  
! inline UINT32 cNPC::additionalFlags() const
  {
  	return additionalFlags_;
  }
  
! inline void cNPC::setAdditionalFlags( UINT32 data )
  {
  	additionalFlags_ = data;
--- 264,279 ----
  
  	// NPC AI check timer
! 	Q_UINT32 aiCheckTime_;
  
  	// NPC AI check time intervall in msec
! 	Q_UINT16 aiCheckInterval_;
  };
  
! inline Q_UINT32 cNPC::additionalFlags() const
  {
  	return additionalFlags_;
  }
  
! inline void cNPC::setAdditionalFlags( Q_UINT32 data )
  {
  	additionalFlags_ = data;
***************
*** 281,290 ****
  }
  
! inline UINT32 cNPC::nextBeggingTime() const
  {
  	return nextBeggingTime_;
  }
  
! inline void cNPC::setNextBeggingTime( UINT32 data )
  {
  	nextBeggingTime_ = data;
--- 281,290 ----
  }
  
! inline Q_UINT32 cNPC::nextBeggingTime() const
  {
  	return nextBeggingTime_;
  }
  
! inline void cNPC::setNextBeggingTime( Q_UINT32 data )
  {
  	nextBeggingTime_ = data;
***************
*** 292,301 ****
  }
  
! inline UINT32 cNPC::nextGuardCallTime() const
  {
  	return nextGuardCallTime_;
  }
  
! inline void cNPC::setNextGuardCallTime( UINT32 data )
  {
  	nextGuardCallTime_ = data;
--- 292,301 ----
  }
  
! inline Q_UINT32 cNPC::nextGuardCallTime() const
  {
  	return nextGuardCallTime_;
  }
  
! inline void cNPC::setNextGuardCallTime( Q_UINT32 data )
  {
  	nextGuardCallTime_ = data;
***************
*** 303,332 ****
  }
  
! inline UINT32 cNPC::nextMoveTime() const
  {
  	return nextMoveTime_;
  }
  
! inline void cNPC::setNextMoveTime( UINT32 data )
  {
  	nextMoveTime_ = data;
  }
  
! inline UINT32 cNPC::nextMsgTime() const
  {
  	return nextMsgTime_;
  }
  
! inline void cNPC::setNextMsgTime( UINT32 data )
  {
  	nextMsgTime_ = data;
  }
  
! inline UINT32 cNPC::summonTime() const
  {
  	return summonTime_;
  }
  
! inline void cNPC::setSummonTime( UINT32 data )
  {
  	summonTime_ = data;
--- 303,332 ----
  }
  
! inline Q_UINT32 cNPC::nextMoveTime() const
  {
  	return nextMoveTime_;
  }
  
! inline void cNPC::setNextMoveTime( Q_UINT32 data )
  {
  	nextMoveTime_ = data;
  }
  
! inline Q_UINT32 cNPC::nextMsgTime() const
  {
  	return nextMsgTime_;
  }
  
! inline void cNPC::setNextMsgTime( Q_UINT32 data )
  {
  	nextMsgTime_ = data;
  }
  
! inline Q_UINT32 cNPC::summonTime() const
  {
  	return summonTime_;
  }
  
! inline void cNPC::setSummonTime( Q_UINT32 data )
  {
  	summonTime_ = data;
***************
*** 355,374 ****
  }
  
! inline UINT32 cNPC::aiCheckTime() const
  {
  	return aiCheckTime_;
  }
  
! inline void cNPC::setAICheckTime( UINT32 data )
  {
  	aiCheckTime_ = data;
  }
  
! inline UINT16 cNPC::aiCheckInterval() const
  {
  	return aiCheckInterval_;
  }
  
! inline void cNPC::setAICheckInterval( UINT16 data )
  {
  	aiCheckInterval_ = data;
--- 355,374 ----
  }
  
! inline Q_UINT32 cNPC::aiCheckTime() const
  {
  	return aiCheckTime_;
  }
  
! inline void cNPC::setAICheckTime( Q_UINT32 data )
  {
  	aiCheckTime_ = data;
  }
  
! inline Q_UINT16 cNPC::aiCheckInterval() const
  {
  	return aiCheckInterval_;
  }
  
! inline void cNPC::setAICheckInterval( Q_UINT16 data )
  {
  	aiCheckInterval_ = data;
***************
*** 386,410 ****
  }
  
! inline UINT16 cNPC::wanderX1() const
  {
  	return wanderType_.x1;
  }
  
! inline UINT16 cNPC::wanderX2() const
  {
  	return wanderType_.x2;
  }
  
! inline UINT16 cNPC::wanderY1() const
  {
  	return wanderType_.y1;
  }
  
! inline UINT16 cNPC::wanderY2() const
  {
  	return wanderType_.y2;
  }
  
! inline UINT16 cNPC::wanderRadius() const
  {
  	return wanderType_.radius;
--- 386,410 ----
  }
  
! inline Q_UINT16 cNPC::wanderX1() const
  {
  	return wanderType_.x1;
  }
  
! inline Q_UINT16 cNPC::wanderX2() const
  {
  	return wanderType_.x2;
  }
  
! inline Q_UINT16 cNPC::wanderY1() const
  {
  	return wanderType_.y1;
  }
  
! inline Q_UINT16 cNPC::wanderY2() const
  {
  	return wanderType_.y2;
  }
  
! inline Q_UINT16 cNPC::wanderRadius() const
  {
  	return wanderType_.radius;
***************
*** 426,450 ****
  }
  
! inline void cNPC::setWanderX1( UINT16 data )
  {
  	wanderType_.x1 = data;
  }
  
! inline void cNPC::setWanderX2( UINT16 data )
  {
  	wanderType_.x2 = data;
  }
  
! inline void cNPC::setWanderY1( UINT16 data )
  {
  	wanderType_.y1 = data;
  }
  
! inline void cNPC::setWanderY2( UINT16 data )
  {
  	wanderType_.y2 = data;
  }
  
! inline void cNPC::setWanderRadius( UINT16 data )
  {
  	wanderType_.radius = data;
--- 426,450 ----
  }
  
! inline void cNPC::setWanderX1( Q_UINT16 data )
  {
  	wanderType_.x1 = data;
  }
  
! inline void cNPC::setWanderX2( Q_UINT16 data )
  {
  	wanderType_.x2 = data;
  }
  
! inline void cNPC::setWanderY1( Q_UINT16 data )
  {
  	wanderType_.y1 = data;
  }
  
! inline void cNPC::setWanderY2( Q_UINT16 data )
  {
  	wanderType_.y2 = data;
  }
  
! inline void cNPC::setWanderRadius( Q_UINT16 data )
  {
  	wanderType_.radius = data;

Index: uobject.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/uobject.cpp,v
retrieving revision 1.174
retrieving revision 1.175
diff -C2 -d -r1.174 -r1.175
*** uobject.cpp	18 Aug 2004 18:33:18 -0000	1.174
--- uobject.cpp	19 Aug 2004 01:22:53 -0000	1.175
***************
*** 147,151 ****
  	Performs persistency layer loads.
  */
! void cUObject::load( char** result, UINT16& offset )
  {
  	name_ = ( result[offset] == 0 ) ? QString::null : QString::fromUtf8( result[offset] );
--- 147,151 ----
  	Performs persistency layer loads.
  */
! void cUObject::load( char** result, Q_UINT16& offset )
  {
  	name_ = ( result[offset] == 0 ) ? QString::null : QString::fromUtf8( result[offset] );
***************
*** 555,559 ****
  	Checks if the specified object is in given range
  */
! bool cUObject::inRange( cUObject* object, UINT32 range ) const
  {
  	if ( !object )
--- 555,559 ----
  	Checks if the specified object is in given range
  */
! bool cUObject::inRange( cUObject* object, Q_UINT32 range ) const
  {
  	if ( !object )
***************
*** 605,609 ****
  	Displays an effect emitting from this object toward another item or character
  */
! void cUObject::effect( UINT16 id, cUObject* target, bool fixedDirection, bool explodes, UINT8 speed, UINT16 hue, UINT16 renderMode )
  {
  	if ( !target )
--- 605,609 ----
  	Displays an effect emitting from this object toward another item or character
  */
! void cUObject::effect( Q_UINT16 id, cUObject* target, bool fixedDirection, bool explodes, UINT8 speed, Q_UINT16 hue, Q_UINT16 renderMode )
  {
  	if ( !target )
***************
*** 639,643 ****
  	Displays an effect emitting from this object and moving towards a specific location.
  */
! void cUObject::effect( UINT16 id, const Coord_cl& target, bool fixedDirection, bool explodes, UINT8 speed, UINT16 hue, UINT16 renderMode )
  {
  	cUOTxEffect effect;
--- 639,643 ----
  	Displays an effect emitting from this object and moving towards a specific location.
  */
! void cUObject::effect( Q_UINT16 id, const Coord_cl& target, bool fixedDirection, bool explodes, UINT8 speed, Q_UINT16 hue, Q_UINT16 renderMode )
  {
  	cUOTxEffect effect;
***************
*** 669,673 ****
  	Displays an effect moving with this object.
  */
! void cUObject::effect( UINT16 id, UINT8 speed, UINT8 duration, UINT16 hue, UINT16 renderMode )
  {
  	cUOTxEffect effect;
--- 669,673 ----
  	Displays an effect moving with this object.
  */
! void cUObject::effect( Q_UINT16 id, UINT8 speed, UINT8 duration, Q_UINT16 hue, Q_UINT16 renderMode )
  {
  	cUOTxEffect effect;

Index: uobject.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/uobject.h,v
retrieving revision 1.103
retrieving revision 1.104
diff -C2 -d -r1.103 -r1.104
*** uobject.h	15 Aug 2004 02:17:39 -0000	1.103
--- uobject.h	19 Aug 2004 01:22:53 -0000	1.104
***************
*** 123,127 ****
  
  	// Serialization Methods
! 	void load( char**, UINT16& );
  	void save();
  	bool del();
--- 123,127 ----
  
  	// Serialization Methods
! 	void load( char**, Q_UINT16& );
  	void save();
  	bool del();
***************
*** 137,145 ****
  
  	// Utility Methods
! 	void effect( UINT16 id, UINT8 speed = 10, UINT8 duration = 5, UINT16 hue = 0, UINT16 renderMode = 0 ); // Moving with this character
! 	void effect( UINT16 id, cUObject* target, bool fixedDirection = true, bool explodes = false, UINT8 speed = 10, UINT16 hue = 0, UINT16 renderMode = 0 );
! 	void effect( UINT16 id, const Coord_cl& target, bool fixedDirection = true, bool explodes = false, UINT8 speed = 10, UINT16 hue = 0, UINT16 renderMode = 0 );
  	void lightning( unsigned short hue = 0 );
! 	bool inRange( cUObject* object, UINT32 range ) const;
  	void removeFromView( bool clean = true );
  	virtual void sendTooltip( cUOSocket* mSock );
--- 137,145 ----
  
  	// Utility Methods
! 	void effect( Q_UINT16 id, UINT8 speed = 10, UINT8 duration = 5, Q_UINT16 hue = 0, Q_UINT16 renderMode = 0 ); // Moving with this character
! 	void effect( Q_UINT16 id, cUObject* target, bool fixedDirection = true, bool explodes = false, UINT8 speed = 10, Q_UINT16 hue = 0, Q_UINT16 renderMode = 0 );
! 	void effect( Q_UINT16 id, const Coord_cl& target, bool fixedDirection = true, bool explodes = false, UINT8 speed = 10, Q_UINT16 hue = 0, Q_UINT16 renderMode = 0 );
  	void lightning( unsigned short hue = 0 );
! 	bool inRange( cUObject* object, Q_UINT32 range ) const;
  	void removeFromView( bool clean = true );
  	virtual void sendTooltip( cUOSocket* mSock );
***************
*** 189,193 ****
  		return serial_;
  	}
! 	UINT32 getTooltip() const
  	{
  		return tooltip_;
--- 189,193 ----
  		return serial_;
  	}
! 	Q_UINT32 getTooltip() const
  	{
  		return tooltip_;
***************
*** 219,223 ****
  	}
  
! 	void setTooltip( const UINT32 d )
  	{
  		tooltip_ = d;
--- 219,223 ----
  	}
  
! 	void setTooltip( const Q_UINT32 d )
  	{
  		tooltip_ = d;

Index: speech.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/speech.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** speech.h	2 Jun 2004 15:04:07 -0000	1.25
--- speech.h	19 Aug 2004 01:22:53 -0000	1.26
***************
*** 47,52 ****
  namespace Speech
  {
! bool response( cUOSocket* socket, P_PLAYER pPlayer, const QString& comm, QValueVector<UINT16>& keywords );
! void talking( P_PLAYER pChar, const QString& lang, const QString& speech, QValueVector<UINT16>& keywords, UINT16 color, UINT16 font, UINT8 type );
  };
  
--- 47,52 ----
  namespace Speech
  {
! bool response( cUOSocket* socket, P_PLAYER pPlayer, const QString& comm, QValueVector<Q_UINT16>& keywords );
! void talking( P_PLAYER pChar, const QString& lang, const QString& speech, QValueVector<Q_UINT16>& keywords, Q_UINT16 color, Q_UINT16 font, Q_UINT8 type );
  };
  

Index: speech.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/speech.cpp,v
retrieving revision 1.183
retrieving revision 1.184
diff -C2 -d -r1.183 -r1.184
*** speech.cpp	10 Aug 2004 03:15:57 -0000	1.183
--- speech.cpp	19 Aug 2004 01:22:52 -0000	1.184
***************
*** 237,241 ****
  //			that they might be interested in.
  //			This is especially usefull in crowded places.
! bool Speech::response( cUOSocket* socket, P_PLAYER pPlayer, const QString& comm, QValueVector<UINT16>& keywords )
  {
  	if ( !pPlayer->socket() || pPlayer->isDead() )
--- 237,241 ----
  //			that they might be interested in.
  //			This is especially usefull in crowded places.
! bool Speech::response( cUOSocket* socket, P_PLAYER pPlayer, const QString& comm, QValueVector<Q_UINT16>& keywords )
  {
  	if ( !pPlayer->socket() || pPlayer->isDead() )
***************
*** 295,299 ****
  }
  
! void Speech::talking( P_PLAYER pChar, const QString& lang, const QString& speech, QValueVector<UINT16>& keywords, UINT16 color, UINT16 font, UINT8 type ) // PC speech
  {
  	// handle things like renaming or describing an item
--- 295,299 ----
  }
  
! void Speech::talking( P_PLAYER pChar, const QString& lang, const QString& speech, QValueVector<Q_UINT16>& keywords, Q_UINT16 color, Q_UINT16 font, Q_UINT8 type ) // PC speech
  {
  	// handle things like renaming or describing an item
***************
*** 335,341 ****
  
  	// 0x0007 -> Speech-id for "Guards"
! 	for ( QValueVector<UINT16>::const_iterator iter = keywords.begin(); iter != keywords.end(); ++iter )
  	{
! 		UINT16 keyword = *iter;
  
  		if ( keyword == 0x07 )
--- 335,341 ----
  
  	// 0x0007 -> Speech-id for "Guards"
! 	for ( QValueVector<Q_UINT16>::const_iterator iter = keywords.begin(); iter != keywords.end(); ++iter )
  	{
! 		Q_UINT16 keyword = *iter;
  
  		if ( keyword == 0x07 )

Index: basics.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/basics.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** basics.cpp	18 Aug 2004 17:05:46 -0000	1.36
--- basics.cpp	19 Aug 2004 01:22:51 -0000	1.37
***************
*** 107,115 ****
  	bool ok = false;
  
! 	UINT16 x = coords[0].toULong( &ok );
  	if ( !ok )
  		return false;
  
! 	UINT16 y = coords[1].toULong( &ok );
  	if ( !ok )
  		return false;
--- 107,115 ----
  	bool ok = false;
  
! 	Q_UINT16 x = coords[0].toULong( &ok );
  	if ( !ok )
  		return false;
  
! 	Q_UINT16 y = coords[1].toULong( &ok );
  	if ( !ok )
  		return false;

Index: items.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/items.cpp,v
retrieving revision 1.435
retrieving revision 1.436
diff -C2 -d -r1.435 -r1.436
*** items.cpp	18 Aug 2004 18:33:17 -0000	1.435
--- items.cpp	19 Aug 2004 01:22:52 -0000	1.436
***************
*** 264,268 ****
  long cItem::reduceAmount( const short amt )
  {
! 	UINT16 rest = 0;
  	if ( amount_ > amt )
  	{
--- 264,268 ----
  long cItem::reduceAmount( const short amt )
  {
! 	Q_UINT16 rest = 0;
  	if ( amount_ > amt )
  	{
***************
*** 1236,1240 ****
  }
  
! void cItem::soundEffect( UINT16 sound )
  {
  	for ( cUOSocket*mSock = Network::instance()->first(); mSock; mSock = Network::instance()->next() )
--- 1236,1240 ----
  }
  
! void cItem::soundEffect( Q_UINT16 sound )
  {
  	for ( cUOSocket*mSock = Network::instance()->first(); mSock; mSock = Network::instance()->next() )
***************
*** 1329,1333 ****
  }
  
! void cItem::talk( const UINT32 MsgID, const QString& params, const QString& affix, bool prepend, UI16 color, cUOSocket* socket )
  {
  	if ( color == 0xFFFF )
--- 1329,1333 ----
  }
  
! void cItem::talk( const Q_UINT32 MsgID, const QString& params, const QString& affix, bool prepend, UI16 color, cUOSocket* socket )
  {
  	if ( color == 0xFFFF )
***************
*** 1437,1441 ****
  static FactoryRegistration<cItem> registration("cItem");
  
! void cItem::load( char** result, UINT16& offset )
  {
  	cUObject::load( result, offset ); // Load the items we inherit from first
--- 1437,1441 ----
  static FactoryRegistration<cItem> registration("cItem");
  
! void cItem::load( char** result, Q_UINT16& offset )
  {
  	cUObject::load( result, offset ); // Load the items we inherit from first
***************
*** 1672,1676 ****
  }
  
! UINT16 cItem::getWeaponSkill()
  {
  	switch ( type() )
--- 1672,1676 ----
  }
  
! Q_UINT16 cItem::getWeaponSkill()
  {
  	switch ( type() )

Index: console.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/console.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** console.cpp	13 Aug 2004 08:55:25 -0000	1.23
--- console.cpp	19 Aug 2004 01:22:51 -0000	1.24
***************
*** 58,62 ****
  }
  
! void cConsole::log( UINT8 logLevel, const QString& message, bool timestamp )
  {
  	// Legacy Code
--- 58,62 ----
  }
  
! void cConsole::log( uchar logLevel, const QString& message, bool timestamp )
  {
  	// Legacy Code

Index: corpse.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/corpse.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** corpse.cpp	15 Aug 2004 02:17:39 -0000	1.63
--- corpse.cpp	19 Aug 2004 01:22:51 -0000	1.64
***************
*** 109,113 ****
  }
  
! void cCorpse::load( char** result, UINT16& offset )
  {
  	cItem::load( result, offset );
--- 109,113 ----
  }
  
! void cCorpse::load( char** result, Q_UINT16& offset )
  {
  	cItem::load( result, offset );

Index: items.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/items.h,v
retrieving revision 1.212
retrieving revision 1.213
diff -C2 -d -r1.212 -r1.213
*** items.h	15 Aug 2004 02:17:39 -0000	1.212
--- items.h	19 Aug 2004 01:22:52 -0000	1.213
***************
*** 201,206 ****
  	bool isInLockedItem();
  	virtual void talk( const QString& message, UI16 color = 0xFFFF, UINT8 type = 0, bool autospam = false, cUOSocket* socket = NULL );
! 	virtual void talk( const UINT32 MsgID, const QString& params = 0, const QString& affix = 0, bool prepend = false, UI16 color = 0xFFFF, cUOSocket* socket = 0 );
! 	void load( char**, UINT16& );
  	void save();
  	bool del();
--- 201,206 ----
  	bool isInLockedItem();
  	virtual void talk( const QString& message, UI16 color = 0xFFFF, UINT8 type = 0, bool autospam = false, cUOSocket* socket = NULL );
! 	virtual void talk( const Q_UINT32 MsgID, const QString& params = 0, const QString& affix = 0, bool prepend = false, UI16 color = 0xFFFF, cUOSocket* socket = 0 );
! 	void load( char**, Q_UINT16& );
  	void save();
  	bool del();
***************
*** 213,217 ****
  	virtual void update( cUOSocket* mSock = NULL );
  	P_ITEM dupe();
! 	void soundEffect( UINT16 sound );
  
  	// Returns Zero if the item shouldn't decay
--- 213,217 ----
  	virtual void update( cUOSocket* mSock = NULL );
  	P_ITEM dupe();
! 	void soundEffect( Q_UINT16 sound );
  
  	// Returns Zero if the item shouldn't decay
***************
*** 461,465 ****
  		return type() == 1008;
  	}
! 	UINT16 getWeaponSkill();
  
  	void moveTo( const Coord_cl& pos, bool noremove = false );
--- 461,465 ----
  		return type() == 1008;
  	}
! 	Q_UINT16 getWeaponSkill();
  
  	void moveTo( const Coord_cl& pos, bool noremove = false );

Index: tracking.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/tracking.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** tracking.cpp	2 Jun 2004 15:04:07 -0000	1.27
--- tracking.cpp	19 Aug 2004 01:22:53 -0000	1.28
***************
*** 107,112 ****
  		addResizeGump( 10, 85, 0xBB8, 420, 50 );
  
! 		UINT32 pCount = 0;
! 		UINT32 pAmount = 0;
  
  		// 1: Animals
--- 107,112 ----
  		addResizeGump( 10, 85, 0xBB8, 420, 50 );
  
! 		Q_UINT32 pCount = 0;
! 		Q_UINT32 pAmount = 0;
  
  		// 1: Animals

Index: coord.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/coord.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** coord.cpp	13 Aug 2004 08:55:25 -0000	1.51
--- coord.cpp	19 Aug 2004 01:22:51 -0000	1.52
***************
*** 121,125 ****
  }
  
! void Coord_cl::effect( UINT16 id, UINT8 speed, UINT8 duration, UINT16 hue, UINT16 renderMode )
  {
  	cUOTxEffect effect;
--- 121,125 ----
  }
  
! void Coord_cl::effect( Q_UINT16 id, UINT8 speed, UINT8 duration, Q_UINT16 hue, Q_UINT16 renderMode )
  {
  	cUOTxEffect effect;

Index: dbdriver.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/dbdriver.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** dbdriver.cpp	16 Aug 2004 14:58:59 -0000	1.41
--- dbdriver.cpp	19 Aug 2004 01:22:51 -0000	1.42
***************
*** 151,155 ****
  
  // Get an integer with a specific offset
! INT32 cDBResult::getInt( UINT32 offset ) const
  {
  	if ( !_row )
--- 151,155 ----
  
  // Get an integer with a specific offset
! INT32 cDBResult::getInt( Q_UINT32 offset ) const
  {
  	if ( !_row )
***************
*** 160,164 ****
  
  // Get a string with a specific offset
! QString cDBResult::getString( UINT32 offset ) const
  {
  	if ( !_row )
--- 160,164 ----
  
  // Get a string with a specific offset
! QString cDBResult::getString( Q_UINT32 offset ) const
  {
  	if ( !_row )

Index: gumps.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/gumps.cpp,v
retrieving revision 1.170
retrieving revision 1.171
diff -C2 -d -r1.170 -r1.171
*** gumps.cpp	13 Aug 2004 08:55:25 -0000	1.170
--- gumps.cpp	19 Aug 2004 01:22:51 -0000	1.171
***************
*** 81,85 ****
  }
  
! void cGump::addHtmlGump( INT32 x, INT32 y, INT32 width, INT32 height, const QString& html, bool hasBack, bool canScroll )
  {
  	QString layout( "{htmlgump %1 %2 %3 %4 %5 %6 %7}" );
--- 81,85 ----
  }
  
! void cGump::addHtmlGump( Q_INT32 x, Q_INT32 y, Q_INT32 width, Q_INT32 height, const QString& html, bool hasBack, bool canScroll )
  {
  	QString layout( "{htmlgump %1 %2 %3 %4 %5 %6 %7}" );
***************
*** 89,93 ****
  }
  
! void cGump::addXmfHtmlGump( INT32 x, INT32 y, INT32 width, INT32 height, UINT32 clilocid, bool hasBack, bool canScroll )
  {
  	QString layout( "{xmfhtmlgump %1 %2 %3 %4 %5 %6 %7}" );
--- 89,93 ----
  }
  
! void cGump::addXmfHtmlGump( Q_INT32 x, Q_INT32 y, Q_INT32 width, Q_INT32 height, Q_UINT32 clilocid, bool hasBack, bool canScroll )
  {
  	QString layout( "{xmfhtmlgump %1 %2 %3 %4 %5 %6 %7}" );
***************
*** 97,101 ****
  }
  
! void cGump::addCheckertrans( INT32 x, INT32 y, INT32 width, INT32 height )
  {
  	QString layout( "{checkertrans %1 %2 %3 %4}" );
--- 97,101 ----
  }
  
! void cGump::addCheckertrans( Q_INT32 x, Q_INT32 y, Q_INT32 width, Q_INT32 height )
  {
  	QString layout( "{checkertrans %1 %2 %3 %4}" );
***************
*** 126,132 ****
  		QStringList allrectangles = region->rectangles();
  
! 		UINT32 page_ = 0;
! 		UINT32 numrects = allrectangles.size();
! 		UINT32 pages = ( ( UINT32 ) ceil( ( double ) numrects / 10.0f ) );
  
  		startPage();
--- 126,132 ----
  		QStringList allrectangles = region->rectangles();
  
! 		uint page_ = 0;
! 		uint numrects = allrectangles.size();
! 		uint pages = ( ( uint ) ceil( ( double ) numrects / 10.0f ) );
  
  		startPage();
***************
*** 150,156 ****
  			startPage( page_ );
  
! 			UINT32 i;
! 			UINT32 right = page_ * 10 - 1;
! 			UINT32 left = page_ * 10 - 10;
  			if ( numrects <= right )
  				right = numrects - 1;
--- 150,156 ----
  			startPage( page_ );
  
! 			uint i;
! 			uint right = page_ * 10 - 1;
! 			uint left = page_ * 10 - 10;
  			if ( numrects <= right )
  				right = numrects - 1;
***************
*** 163,167 ****
  				it++;
  			}
! 			UINT32 thisrects = rectangles.size();
  
  			for ( i = 0; i < thisrects; i++ )
--- 163,167 ----
  				it++;
  			}
! 			uint thisrects = rectangles.size();
  
  			for ( i = 0; i < thisrects; i++ )
***************
*** 192,196 ****
  }
  
! cPagesGump::cPagesGump( UINT32 page, WPPAGE_TYPE ptype )
  {
  	if ( page == 0 )
--- 192,196 ----
  }
  
! cPagesGump::cPagesGump( uint page, WPPAGE_TYPE ptype )
  {
  	if ( page == 0 )
***************
*** 203,208 ****
  	QStringList pageCategories;
  	std::vector<WPPAGE_TYPE> pageTypes;
! 	std::vector<UINT32> offsets;
! 	UINT32 offset = 0;
  
  	QStringList categories = cPagesManager::getInstance()->categories();
--- 203,208 ----
  	QStringList pageCategories;
  	std::vector<WPPAGE_TYPE> pageTypes;
! 	std::vector<uint> offsets;
! 	uint offset = 0;
  
  	QStringList categories = cPagesManager::getInstance()->categories();
***************
*** 227,232 ****
  	}
  
! 	UINT32 numsocks = charNames.size();
! 	UINT32 pages = ( ( UINT32 ) ceil( ( double ) numsocks / 10.0f ) );
  
  	startPage();
--- 227,232 ----
  	}
  
! 	uint numsocks = charNames.size();
! 	uint pages = ( ( uint ) ceil( ( double ) numsocks / 10.0f ) );
  
  	startPage();
***************
*** 242,251 ****
  	startPage( 1 );
  
! 	INT32 right = page_ * 10 - 1;
! 	INT32 left = page_ * 10 - 10;
  	if ( ( signed int ) numsocks <= ( signed int ) right )
  		right = numsocks - 1;
  
! 	INT32 i = left;
  	while ( i <= right )
  	{
--- 242,251 ----
  	startPage( 1 );
  
! 	int right = page_ * 10 - 1;
! 	int left = page_ * 10 - 10;
  	if ( ( signed int ) numsocks <= ( signed int ) right )
  		right = numsocks - 1;
  
! 	int i = left;
  	while ( i <= right )
  	{
***************
*** 330,334 ****
  		startPage( 1 );
  
! 		UINT16 hue = 0x834;
  
  		addText( 50, 60, tr( "Char name:" ), hue );
--- 330,334 ----
  		startPage( 1 );
  
! 		Q_UINT16 hue = 0x834;
  
  		addText( 50, 60, tr( "Char name:" ), hue );
***************
*** 433,437 ****
  		case 4:
  			{
! 				std::map<UINT16, QString>::const_iterator it = choice.textentries.find( 1 );
  				if ( it != choice.textentries.end() )
  					socket_->sysMessage( it->second );
--- 433,437 ----
  		case 4:
  			{
! 				std::map<Q_UINT16, QString>::const_iterator it = choice.textentries.find( 1 );
  				if ( it != choice.textentries.end() )
  					socket_->sysMessage( it->second );
***************
*** 464,468 ****
  	cPage* pPage = cPagesManager::getInstance()->find( pChar->serial() );
  
! 	UINT32 category = 0;
  	QStringList lines;
  	if ( pPage )
--- 464,468 ----
  	cPage* pPage = cPagesManager::getInstance()->find( pChar->serial() );
  
! 	uint category = 0;
  	QStringList lines;
  	if ( pPage )
***************
*** 482,486 ****
  		category = 0;
  
! 	UINT32 heightmod = ( ( UINT32 ) ( categories.count() / 2 ) + ( ( pPage ) ? 2 : 0 ) );
  
  	startPage();
--- 482,486 ----
  		category = 0;
  
! 	uint heightmod = ( ( uint ) ( categories.count() / 2 ) + ( ( pPage ) ? 2 : 0 ) );
  
  	startPage();
***************
*** 507,512 ****
  	addText( 280, 230, tr( "Counselor Page" ), 0x849 );
  
! 	UINT32 i = 0; // categories[0] == none.. should not be option!
! 	UINT32 offset = 0;
  	startGroup( 2 );
  	addText( 50, 270, tr( "Categories:" ), 0x834 );
--- 507,512 ----
  	addText( 280, 230, tr( "Counselor Page" ), 0x849 );
  
! 	uint i = 0; // categories[0] == none.. should not be option!
! 	uint offset = 0;
  	startGroup( 2 );
  	addText( 50, 270, tr( "Categories:" ), 0x834 );
***************
*** 565,569 ****
  
  		QStringList lines;
! 		std::map<UINT16, QString>::const_iterator it = choice.textentries.begin();
  		while ( it != choice.textentries.end() )
  		{
--- 565,569 ----
  
  		QStringList lines;
! 		std::map<Q_UINT16, QString>::const_iterator it = choice.textentries.begin();
  		while ( it != choice.textentries.end() )
  		{

Index: corpse.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/corpse.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** corpse.h	15 Aug 2004 02:17:39 -0000	1.28
--- corpse.h	19 Aug 2004 01:22:51 -0000	1.29
***************
*** 47,55 ****
  
  protected:
! 	UINT16 bodyId_; // Body id of the corpse
! 	UINT16 hairStyle_; // Style of the hair
! 	UINT16 hairColor_; // Color of the hair
! 	UINT16 beardStyle_; // Beardstyle
! 	UINT16 beardColor_; // Color of the beard
  	unsigned char direction_; // Direction the corpse is facing.
  	uint murdertime_; // When the people has been killed
--- 47,55 ----
  
  protected:
! 	Q_UINT16 bodyId_; // Body id of the corpse
! 	Q_UINT16 hairStyle_; // Style of the hair
! 	Q_UINT16 hairColor_; // Color of the hair
! 	Q_UINT16 beardStyle_; // Beardstyle
! 	Q_UINT16 beardColor_; // Color of the beard
  	unsigned char direction_; // Direction the corpse is facing.
  	uint murdertime_; // When the people has been killed
***************
*** 73,81 ****
  
  	cCorpse( bool init = false );
! 	void setBodyId( UINT16 data );
! 	void setHairStyle( UINT16 data );
! 	void setHairColor( UINT16 data );
! 	void setBeardStyle( UINT16 data );
! 	void setBeardColor( UINT16 data );
  	void setMurderer( SERIAL data );
  	void setMurderTime( uint data );
--- 73,81 ----
  
  	cCorpse( bool init = false );
! 	void setBodyId( Q_UINT16 data );
! 	void setHairStyle( Q_UINT16 data );
! 	void setHairColor( Q_UINT16 data );
! 	void setBeardStyle( Q_UINT16 data );
! 	void setBeardColor( Q_UINT16 data );
  	void setMurderer( SERIAL data );
  	void setMurderTime( uint data );
***************
*** 90,98 ****
  	unsigned int decayDelay();
  
! 	UINT16 bodyId() const;
! 	UINT16 hairStyle() const;
! 	UINT16 hairColor() const;
! 	UINT16 beardStyle() const;
! 	UINT16 beardColor() const;
  	unsigned char direction() const;
  	const QCString& charBaseid() const;
--- 90,98 ----
  	unsigned int decayDelay();
  
! 	Q_UINT16 bodyId() const;
! 	Q_UINT16 hairStyle() const;
! 	Q_UINT16 hairColor() const;
! 	Q_UINT16 beardStyle() const;
! 	Q_UINT16 beardColor() const;
  	unsigned char direction() const;
  	const QCString& charBaseid() const;
***************
*** 114,118 ****
  
  	// DB Serialization
! 	void load( char**, UINT16& );
  	void save();
  	bool del();
--- 114,118 ----
  
  	// DB Serialization
! 	void load( char**, Q_UINT16& );
  	void save();
  	bool del();
***************
*** 132,156 ****
  
  // Inline members
! inline void cCorpse::setBodyId( UINT16 data )
  {
  	bodyId_ = data; changed_ = true;
  }
  
! inline void cCorpse::setHairStyle( UINT16 data )
  {
  	hairStyle_ = data; changed_ = true;
  }
  
! inline void cCorpse::setHairColor( UINT16 data )
  {
  	hairColor_ = data; changed_ = true;
  }
  
! inline void cCorpse::setBeardStyle( UINT16 data )
  {
  	beardStyle_ = data; changed_ = true;
  }
  
! inline void cCorpse::setBeardColor( UINT16 data )
  {
  	beardColor_ = data; changed_ = true;
--- 132,156 ----
  
  // Inline members
! inline void cCorpse::setBodyId( Q_UINT16 data )
  {
  	bodyId_ = data; changed_ = true;
  }
  
! inline void cCorpse::setHairStyle( Q_UINT16 data )
  {
  	hairStyle_ = data; changed_ = true;
  }
  
! inline void cCorpse::setHairColor( Q_UINT16 data )
  {
  	hairColor_ = data; changed_ = true;
  }
  
! inline void cCorpse::setBeardStyle( Q_UINT16 data )
  {
  	beardStyle_ = data; changed_ = true;
  }
  
! inline void cCorpse::setBeardColor( Q_UINT16 data )
  {
  	beardColor_ = data; changed_ = true;
***************
*** 177,201 ****
  }
  
! inline UINT16 cCorpse::bodyId() const
  {
  	return bodyId_;
  }
  
! inline UINT16 cCorpse::hairStyle() const
  {
  	return hairStyle_;
  }
  
! inline UINT16 cCorpse::hairColor() const
  {
  	return hairColor_;
  }
  
! inline UINT16 cCorpse::beardStyle() const
  {
  	return beardStyle_;
  }
  
! inline UINT16 cCorpse::beardColor() const
  {
  	return beardColor_;
--- 177,201 ----
  }
  
! inline Q_UINT16 cCorpse::bodyId() const
  {
  	return bodyId_;
  }
  
! inline Q_UINT16 cCorpse::hairStyle() const
  {
  	return hairStyle_;
  }
  
! inline Q_UINT16 cCorpse::hairColor() const
  {
  	return hairColor_;
  }
  
! inline Q_UINT16 cCorpse::beardStyle() const
  {
  	return beardStyle_;
  }
  
! inline Q_UINT16 cCorpse::beardColor() const
  {
  	return beardColor_;

Index: player.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/player.h,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** player.h	15 Aug 2004 02:17:39 -0000	1.55
--- player.h	19 Aug 2004 01:22:52 -0000	1.56
***************
*** 71,75 ****
  
  	// implementation of interfaces
! 	void load( char**, UINT16& );
  	void save();
  	bool del();
--- 71,75 ----
  
  	// implementation of interfaces
! 	void load( char**, Q_UINT16& );
  	void save();
  	bool del();
***************
*** 85,91 ****
  	virtual UINT8 notoriety( P_CHAR pChar );
  	virtual void showName( cUOSocket* socket );
! 	virtual void soundEffect( UI16 soundId, bool hearAll = true );
! 	virtual void giveGold( Q_UINT32 amount, bool inBank = false );
! 	virtual UINT32 takeGold( UINT32 amount, bool useBank = false );
  	virtual void flagUnchanged();
  	virtual bool message( const QString& message, unsigned short color = 0x3b2, cUObject* source = 0, unsigned short font = 0x03, unsigned char mode = 0x00 );
--- 85,91 ----
  	virtual UINT8 notoriety( P_CHAR pChar );
  	virtual void showName( cUOSocket* socket );
! 	virtual void soundEffect( ushort soundId, bool hearAll = true );
! 	virtual void giveGold( uint amount, bool inBank = false );
! 	virtual uint takeGold( uint amount, bool useBank = false );
  	virtual void flagUnchanged();
  	virtual bool message( const QString& message, unsigned short color = 0x3b2, cUObject* source = 0, unsigned short font = 0x03, unsigned char mode = 0x00 );
***************
*** 130,137 ****
  	// getters
  	cAccount* account() const;
! 	UINT32 additionalFlags() const;
! 	UINT32 logoutTime() const;
! 	UINT32 objectDelay() const;
! 	UINT32 trackingTime() const;
  	cUOSocket* socket() const;
  	enInputMode inputMode() const
--- 130,137 ----
  	// getters
  	cAccount* account() const;
! 	Q_UINT32 additionalFlags() const;
! 	Q_UINT32 logoutTime() const;
! 	Q_UINT32 objectDelay() const;
! 	Q_UINT32 trackingTime() const;
  	cUOSocket* socket() const;
  	enInputMode inputMode() const
***************
*** 156,163 ****
  	// setters
  	void setAccount( cAccount* data, bool moveFromAccToAcc = true );
! 	void setAdditionalFlags( UINT32 data );
! 	void setLogoutTime( UINT32 data );
! 	void setObjectDelay( UINT32 data );
! 	void setTrackingTime( UINT32 data );
  	void setSocket( cUOSocket* data );
  	void setInputMode( enInputMode data )
--- 156,163 ----
  	// setters
  	void setAccount( cAccount* data, bool moveFromAccToAcc = true );
! 	void setAdditionalFlags( Q_UINT32 data );
! 	void setLogoutTime( Q_UINT32 data );
! 	void setObjectDelay( Q_UINT32 data );
! 	void setTrackingTime( Q_UINT32 data );
  	void setSocket( cUOSocket* data );
  	void setInputMode( enInputMode data )
***************
*** 233,240 ****
  	// time till char will be logged out
  	// cOldChar::logout_
! 	UINT32 logoutTime_;
  
  	// Time till the player can use another object.
! 	UINT32 objectDelay_;
  
  	// Additional property flags.
--- 233,240 ----
  	// time till char will be logged out
  	// cOldChar::logout_
! 	Q_UINT32 logoutTime_;
  
  	// Time till the player can use another object.
! 	Q_UINT32 objectDelay_;
  
  	// Additional property flags.
***************
*** 244,248 ****
  	// 03 - may broadcast, cOldChar::priv Bit 2
  	// 04 - show serials, cOldChar::priv Bit 4
! 	UINT32 additionalFlags_;
  
  	// The pets that follow the char.
--- 244,248 ----
  	// 03 - may broadcast, cOldChar::priv Bit 2
  	// 04 - show serials, cOldChar::priv Bit 4
! 	Q_UINT32 additionalFlags_;
  
  	// The pets that follow the char.
***************
*** 254,258 ****
  
  	// Time till the quest arrow for tracking disappears.
! 	UINT32 trackingTime_;
  
  	// Network socket of the player.
--- 254,258 ----
  
  	// Time till the quest arrow for tracking disappears.
! 	Q_UINT32 trackingTime_;
  
  	// Network socket of the player.
***************
*** 302,311 ****
  }
  
! inline UINT32 cPlayer::additionalFlags() const
  {
  	return additionalFlags_;
  }
  
! inline void cPlayer::setAdditionalFlags( UINT32 data )
  {
  	additionalFlags_ = data;
--- 302,311 ----
  }
  
! inline uint cPlayer::additionalFlags() const
  {
  	return additionalFlags_;
  }
  
! inline void cPlayer::setAdditionalFlags( uint data )
  {
  	additionalFlags_ = data;
***************
*** 313,322 ****
  }
  
! inline UINT32 cPlayer::logoutTime() const
  {
  	return logoutTime_;
  }
  
! inline void cPlayer::setLogoutTime( UINT32 data )
  {
  	logoutTime_ = data;
--- 313,322 ----
  }
  
! inline Q_UINT32 cPlayer::logoutTime() const
  {
  	return logoutTime_;
  }
  
! inline void cPlayer::setLogoutTime( Q_UINT32 data )
  {
  	logoutTime_ = data;
***************
*** 324,343 ****
  }
  
! inline UINT32 cPlayer::objectDelay() const
  {
  	return objectDelay_;
  }
  
! inline void cPlayer::setObjectDelay( UINT32 data )
  {
  	objectDelay_ = data;
  }
  
! inline UINT32 cPlayer::trackingTime() const
  {
  	return trackingTime_;
  }
  
! inline void cPlayer::setTrackingTime( UINT32 data )
  {
  	trackingTime_ = data;
--- 324,343 ----
  }
  
! inline Q_UINT32 cPlayer::objectDelay() const
  {
  	return objectDelay_;
  }
  
! inline void cPlayer::setObjectDelay( Q_UINT32 data )
  {
  	objectDelay_ = data;
  }
  
! inline Q_UINT32 cPlayer::trackingTime() const
  {
  	return trackingTime_;
  }
  
! inline void cPlayer::setTrackingTime( Q_UINT32 data )
  {
  	trackingTime_ = data;

Index: persistentobject.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/persistentobject.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** persistentobject.cpp	15 Aug 2004 02:17:39 -0000	1.10
--- persistentobject.cpp	19 Aug 2004 01:22:52 -0000	1.11
***************
*** 39,43 ****
  }
  
! void PersistentObject::load( char** result, UINT16& offset )
  {
  	Q_UNUSED( result );
--- 39,43 ----
  }
  
! void PersistentObject::load( char** result, ushort& offset )
  {
  	Q_UNUSED( result );

Index: territories.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/territories.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** territories.h	10 Jul 2004 23:03:29 -0000	1.29
--- territories.h	19 Aug 2004 01:22:53 -0000	1.30
***************
*** 230,234 ****
  	QString midilist_; // midilist to play
  
! 	UINT16 flags_; // flags like guarded, mark allowed, etc. (see getters)
  
  	QString guardowner_;
--- 230,234 ----
  	QString midilist_; // midilist to play
  
! 	Q_UINT16 flags_; // flags like guarded, mark allowed, etc. (see getters)
  
  	QString guardowner_;

Index: basechar.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/basechar.cpp,v
retrieving revision 1.130
retrieving revision 1.131
diff -C2 -d -r1.130 -r1.131
*** basechar.cpp	15 Aug 2004 02:17:38 -0000	1.130
--- basechar.cpp	19 Aug 2004 01:22:51 -0000	1.131
***************
*** 293,297 ****
  }
  
! void cBaseChar::load( char** result, UINT16& offset )
  {
  	cUObject::load( result, offset );
--- 293,297 ----
  }
  
! void cBaseChar::load( char** result, Q_UINT16& offset )
  {
  	cUObject::load( result, offset );
***************
*** 361,368 ****
  		// row[2] = locktype
  		// row[3] = cap (unused!)
! 		UINT16 skill = res.getInt( 0 );
! 		UINT16 value = res.getInt( 1 );
  		UINT8 lockType = res.getInt( 2 );
! 		UINT16 cap = res.getInt( 3 );
  
  		if ( lockType > 2 )
--- 361,368 ----
  		// row[2] = locktype
  		// row[3] = cap (unused!)
! 		Q_UINT16 skill = res.getInt( 0 );
! 		Q_UINT16 value = res.getInt( 1 );
  		UINT8 lockType = res.getInt( 2 );
! 		Q_UINT16 cap = res.getInt( 3 );
  
  		if ( lockType > 2 )
***************
*** 676,680 ****
  }
  
! void cBaseChar::setHairColor( UINT16 d )
  {
  	changed_ = true;
--- 676,680 ----
  }
  
! void cBaseChar::setHairColor( Q_UINT16 d )
  {
  	changed_ = true;
***************
*** 685,689 ****
  }
  
! void cBaseChar::setHairStyle( UINT16 d )
  {
  	if ( !isHair( d ) )
--- 685,689 ----
  }
  
! void cBaseChar::setHairStyle( Q_UINT16 d )
  {
  	if ( !isHair( d ) )
***************
*** 708,712 ****
  }
  
! void cBaseChar::setBeardColor( UINT16 d )
  {
  	changed_ = true;
--- 708,712 ----
  }
  
! void cBaseChar::setBeardColor( Q_UINT16 d )
  {
  	changed_ = true;
***************
*** 717,721 ****
  }
  
! void cBaseChar::setBeardStyle( UINT16 d )
  {
  	if ( !isBeard( d ) )
--- 717,721 ----
  }
  
! void cBaseChar::setBeardStyle( Q_UINT16 d )
  {
  	if ( !isBeard( d ) )
***************
*** 814,820 ****
  	setSkin( orgSkin_ );
  	setDead( false );
! 	hitpoints_ = QMAX( 1, ( UINT16 ) ( 0.1 * maxHitpoints_ ) );
! 	stamina_ = ( UINT16 ) ( 0.1 * maxStamina_ );
! 	mana_ = ( UINT16 ) ( 0.1 * maxMana_ );
  	fight( 0 );
  	P_ITEM backpack = getBackpack(); // Make sure he has a backpack
--- 814,820 ----
  	setSkin( orgSkin_ );
  	setDead( false );
! 	hitpoints_ = QMAX( 1, ( Q_UINT16 ) ( 0.1 * maxHitpoints_ ) );
! 	stamina_ = ( Q_UINT16 ) ( 0.1 * maxStamina_ );
! 	mana_ = ( Q_UINT16 ) ( 0.1 * maxMana_ );
  	fight( 0 );
  	P_ITEM backpack = getBackpack(); // Make sure he has a backpack
***************
*** 976,980 ****
  {
  	// Dont you think it's better to search the char's equipment as well?
! 	UINT32 number = 0;
  	ItemContainer::const_iterator it(content_.begin());
  	ItemContainer::const_iterator end(content_.end());
--- 976,980 ----
  {
  	// Dont you think it's better to search the char's equipment as well?
! 	Q_UINT32 number = 0;
  	ItemContainer::const_iterator it(content_.begin());
  	ItemContainer::const_iterator end(content_.end());
***************
*** 2168,2172 ****
  }
  
! void cBaseChar::setSkillValue( UINT16 skill, UINT16 value )
  {
  	skills_[skill].value = value;
--- 2168,2172 ----
  }
  
! void cBaseChar::setSkillValue( Q_UINT16 skill, Q_UINT16 value )
  {
  	skills_[skill].value = value;
***************
*** 2174,2178 ****
  }
  
! void cBaseChar::setSkillCap( UINT16 skill, UINT16 cap )
  {
  	skills_[skill].cap = cap;
--- 2174,2178 ----
  }
  
! void cBaseChar::setSkillCap( Q_UINT16 skill, Q_UINT16 cap )
  {
  	skills_[skill].cap = cap;
***************
*** 2180,2184 ****
  }
  
! void cBaseChar::setSkillLock( UINT16 skill, UINT8 lock )
  {
  	if ( lock > 2 )
--- 2180,2184 ----
  }
  
! void cBaseChar::setSkillLock( Q_UINT16 skill, UINT8 lock )
  {
  	if ( lock > 2 )
***************
*** 2189,2203 ****
  }
  
! UINT16 cBaseChar::skillValue( UINT16 skill ) const
  {
  	return skills_[skill].value;
  }
  
! UINT16 cBaseChar::skillCap( UINT16 skill ) const
  {
  	return skills_[skill].cap;
  }
  
! UINT8 cBaseChar::skillLock( UINT16 skill ) const
  {
  	return skills_[skill].lock;
--- 2189,2203 ----
  }
  
! Q_UINT16 cBaseChar::skillValue( Q_UINT16 skill ) const
  {
  	return skills_[skill].value;
  }
  
! Q_UINT16 cBaseChar::skillCap( Q_UINT16 skill ) const
  {
  	return skills_[skill].cap;
  }
  
! UINT8 cBaseChar::skillLock( Q_UINT16 skill ) const
  {
  	return skills_[skill].lock;

Index: walking.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/walking.cpp,v
retrieving revision 1.133
retrieving revision 1.134
diff -C2 -d -r1.133 -r1.134
*** walking.cpp	13 Aug 2004 08:55:26 -0000	1.133
--- walking.cpp	19 Aug 2004 01:22:53 -0000	1.134
***************
*** 119,123 ****
  // Keep in mind that this only get's called when
  // the tile we're walking on is impassable
! bool checkWalkable( P_CHAR pChar, UINT16 tileId )
  {
  	Q_UNUSED( pChar );
--- 119,123 ----
  // Keep in mind that this only get's called when
  // the tile we're walking on is impassable
! bool checkWalkable( P_CHAR pChar, Q_UINT16 tileId )
  {
  	Q_UNUSED( pChar );
***************
*** 281,285 ****
  	vector<stBlockItem> blockList = getBlockingItems( pChar, pos );
  	bool found = false;
! 	UINT32 i;
  	bool priviledged = false;
  
--- 281,285 ----
  	vector<stBlockItem> blockList = getBlockingItems( pChar, pos );
  	bool found = false;
! 	Q_UINT32 i;
  	bool priviledged = false;
  
***************
*** 759,763 ****
  }
  
! UINT16 DynTile( const Coord_cl& pos )
  {
  	RegionIterator4Items ri( pos );
--- 759,763 ----
  }
  
! Q_UINT16 DynTile( const Coord_cl& pos )
  {
  	RegionIterator4Items ri( pos );
***************
*** 773,777 ****
  					return 0;
  				QValueVector<multiItem_st> multi = def->getEntries();
! 				for ( UINT32 j = 0; j < multi.size(); ++j )
  				{
  					if ( ( multi[j].visible && ( mapitem->pos().x + multi[j].x == pos.x ) && ( mapitem->pos().y + multi[j].y == pos.y ) && ( abs( mapitem->pos().z + multi[j].z - pos.z ) <= 1 ) ) )
--- 773,777 ----
  					return 0;
  				QValueVector<multiItem_st> multi = def->getEntries();
! 				for ( Q_...
 
[truncated message content]

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

From: Correa <thi...@us...> - 2004-08-19 01:23:35

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

Modified Files:
	maps.cpp tilecache.cpp tilecache.h 
Log Message:
QT_CLEAN_NAMESPACE

Index: maps.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/muls/maps.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** maps.cpp	13 Aug 2004 08:55:27 -0000	1.7
--- maps.cpp	19 Aug 2004 01:22:55 -0000	1.8
***************
*** 621,625 ****
  	assert( indexPos < 0x8000000 ); // dam, breaks our assumption
  
! 	UINT32 cachePos;
  	if ( exact )
  		cachePos = ( x * y ) | 0x80000000;
--- 621,625 ----
  	assert( indexPos < 0x8000000 ); // dam, breaks our assumption
  
! 	Q_UINT32 cachePos;
  	if ( exact )
  		cachePos = ( x * y ) | 0x80000000;

Index: tilecache.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/muls/tilecache.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tilecache.h	2 Jun 2004 15:04:09 -0000	1.2
--- tilecache.h	19 Aug 2004 01:22:55 -0000	1.3
***************
*** 155,167 ****
  private:
  	QString path;
! 	std::map<UINT16, tile_st> staticTiles;
  	tile_st emptyStaticTile;
  
! 	std::map<UINT16, land_st> landTiles;
  	land_st emptyLandTile;
  public:
  
! 	land_st getLand( UINT16 tileId );
! 	tile_st getTile( UINT16 tileId );
  	signed char tileHeight( ushort tileId );
  	static signed char tileHeight( const tile_st& );
--- 155,167 ----
  private:
  	QString path;
! 	std::map<Q_UINT16, tile_st> staticTiles;
  	tile_st emptyStaticTile;
  
! 	std::map<Q_UINT16, land_st> landTiles;
  	land_st emptyLandTile;
  public:
  
! 	land_st getLand( Q_UINT16 tileId );
! 	tile_st getTile( Q_UINT16 tileId );
  	signed char tileHeight( ushort tileId );
  	static signed char tileHeight( const tile_st& );

Index: tilecache.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/muls/tilecache.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tilecache.cpp	4 Aug 2004 23:17:38 -0000	1.3
--- tilecache.cpp	19 Aug 2004 01:22:55 -0000	1.4
***************
*** 89,93 ****
  
  	// Begin reading in the Land-Tiles
! 	UINT32 i, j;
  
  	for ( i = 0; i < 512; ++i )
--- 89,93 ----
  
  	// Begin reading in the Land-Tiles
! 	Q_UINT32 i, j;
  
  	for ( i = 0; i < 512; ++i )
***************
*** 99,103 ****
  		for ( j = 0; j < 32; ++j )
  		{
! 			UINT16 tileId = ( i * 32 ) + j;
  			land_st landTile;
  			input.readBlock( ( char * ) &landTile, 26 );
--- 99,103 ----
  		for ( j = 0; j < 32; ++j )
  		{
! 			Q_UINT16 tileId = ( i * 32 ) + j;
  			land_st landTile;
  			input.readBlock( ( char * ) &landTile, 26 );
***************
*** 114,118 ****
  	// NOTE: We are only interested in the REAL static tiles, nothing of
  	// that ALHPA crap above it
! 	UINT32 skipLand = 512 * ( 4 + ( 32 * 26 ) );
  
  	for ( i = 0; i < 512; ++i )
--- 114,118 ----
  	// NOTE: We are only interested in the REAL static tiles, nothing of
  	// that ALHPA crap above it
! 	Q_UINT32 skipLand = 512 * ( 4 + ( 32 * 26 ) );
  
  	for ( i = 0; i < 512; ++i )
***************
*** 124,128 ****
  		for ( j = 0; j < 32; ++j )
  		{
! 			UINT16 tileId = ( i * 32 ) + j;
  			tile_st staticTile;
  			input.readBlock( ( char * ) &staticTile, 37 ); // Length of one record: 37
--- 124,128 ----
  		for ( j = 0; j < 32; ++j )
  		{
! 			Q_UINT16 tileId = ( i * 32 ) + j;
  			tile_st staticTile;
  			input.readBlock( ( char * ) &staticTile, 37 ); // Length of one record: 37
***************
*** 141,145 ****
  	if ( input.open( IO_ReadOnly ) )
  	{
! 		UINT32 patches;
  		QDataStream verdata( &input );
  		verdata.setByteOrder( QDataStream::LittleEndian );
--- 141,145 ----
  	if ( input.open( IO_ReadOnly ) )
  	{
! 		Q_UINT32 patches;
  		QDataStream verdata( &input );
  		verdata.setByteOrder( QDataStream::LittleEndian );
***************
*** 148,157 ****
  
  		// Seek trough all patches
! 		for ( UINT32 patchId = 0; patchId < patches; ++patchId )
  		{
  			verdata.device()->at( 4 + ( patchId * 21 ) );
  
  			// Read the patch
! 			UINT32 fileId, blockId, offset, length, extra;
  			verdata >> fileId >> blockId >> offset >> length >> extra;
  
--- 148,157 ----
  
  		// Seek trough all patches
! 		for ( Q_UINT32 patchId = 0; patchId < patches; ++patchId )
  		{
  			verdata.device()->at( 4 + ( patchId * 21 ) );
  
  			// Read the patch
! 			Q_UINT32 fileId, blockId, offset, length, extra;
  			verdata >> fileId >> blockId >> offset >> length >> extra;
  
***************
*** 166,170 ****
  				for ( i = 0; i < 32; ++i )
  				{
! 					UINT16 tileId = ( blockId * 32 ) + i;
  					tile_st tile;
  					verdata.device()->readBlock( ( char * ) &tile, sizeof( tile_st ) );
--- 166,170 ----
  				for ( i = 0; i < 32; ++i )
  				{
! 					Q_UINT16 tileId = ( blockId * 32 ) + i;
  					tile_st tile;
  					verdata.device()->readBlock( ( char * ) &tile, sizeof( tile_st ) );
***************
*** 180,184 ****
  				for ( i = 0; i < 32; ++i )
  				{
! 					UINT16 tileId = ( blockId * 32 ) + i;
  					land_st tile;
  					verdata.device()->readBlock( ( char * ) &tile, sizeof( land_st ) );
--- 180,184 ----
  				for ( i = 0; i < 32; ++i )
  				{
! 					Q_UINT16 tileId = ( blockId * 32 ) + i;
  					land_st tile;
  					verdata.device()->readBlock( ( char * ) &tile, sizeof( land_st ) );
***************
*** 198,202 ****
  
  // Get's a land-tile out of the cache
! land_st cTileCache::getLand( UINT16 tileId )
  {
  	if ( landTiles.find( tileId ) == landTiles.end() )
--- 198,202 ----
  
  // Get's a land-tile out of the cache
! land_st cTileCache::getLand( Q_UINT16 tileId )
  {
  	if ( landTiles.find( tileId ) == landTiles.end() )
***************
*** 207,211 ****
  
  // The same for static-tiles
! tile_st cTileCache::getTile( UINT16 tileId )
  {
  	if ( staticTiles.find( tileId ) == staticTiles.end() )
--- 207,211 ----
  
  // The same for static-tiles
! tile_st cTileCache::getTile( Q_UINT16 tileId )
  {
  	if ( staticTiles.find( tileId ) == staticTiles.end() )

[wpdev-commits] wolfpack/ai ai.cpp,1.23,1.24

From: Correa <thi...@us...> - 2004-08-19 01:23:33

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

Modified Files:
	ai.cpp 
Log Message:
QT_CLEAN_NAMESPACE

Index: ai.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/ai/ai.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** ai.cpp	13 Aug 2004 08:55:26 -0000	1.23
--- ai.cpp	19 Aug 2004 01:22:54 -0000	1.24
***************
*** 553,558 ****
  		{
  			// get any point out of the rectangle and calculate the direction to it
! 			UINT16 rndx = RandomNum( m_npc->wanderX1(), m_npc->wanderX2() );
! 			UINT16 rndy = RandomNum( m_npc->wanderY1(), m_npc->wanderY2() );
  
  			UINT8 dir = m_npc->pos().direction( Coord_cl( rndx, rndy ) );
--- 553,558 ----
  		{
  			// get any point out of the rectangle and calculate the direction to it
! 			Q_UINT16 rndx = RandomNum( m_npc->wanderX1(), m_npc->wanderX2() );
! 			Q_UINT16 rndy = RandomNum( m_npc->wanderY1(), m_npc->wanderY2() );
  
  			UINT8 dir = m_npc->pos().direction( Coord_cl( rndx, rndy ) );

[wpdev-commits] wolfpack/network asyncnetio.cpp,1.49,1.50 encryption.cpp,1.3,1.4 network.cpp,1.3,1.4 network.h,1.2,1.3 uorxpackets.cpp,1.64,1.65 uorxpackets.h,1.65,1.66 uosocket.cpp,1.393,1.394 uosocket.h,1.122,1.123

From: Correa <thi...@us...> - 2004-08-19 01:23:24

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

Modified Files:
	asyncnetio.cpp encryption.cpp network.cpp network.h 
	uorxpackets.cpp uorxpackets.h uosocket.cpp uosocket.h 
Log Message:
QT_CLEAN_NAMESPACE

Index: encryption.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/encryption.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** encryption.cpp	10 Aug 2004 03:24:29 -0000	1.3
--- encryption.cpp	19 Aug 2004 01:22:56 -0000	1.4
***************
*** 106,111 ****
  void cLoginEncryption::clientDecrypt( char* buffer, unsigned int length )
  {
! 	register UINT32 eax, ecx, edx, esi;
! 	for ( UINT32 i = 0; i < length; ++i )
  	{
  		buffer[i] = buffer[i] ^ ( UINT8 ) ( table1 & 0xFF );
--- 106,111 ----
  void cLoginEncryption::clientDecrypt( char* buffer, unsigned int length )
  {
! 	register Q_UINT32 eax, ecx, edx, esi;
! 	for ( Q_UINT32 i = 0; i < length; ++i )
  	{
  		buffer[i] = buffer[i] ^ ( UINT8 ) ( table1 & 0xFF );

Index: uorxpackets.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uorxpackets.h,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** uorxpackets.h	10 Aug 2004 03:24:29 -0000	1.65
--- uorxpackets.h	19 Aug 2004 01:22:56 -0000	1.66
***************
*** 396,400 ****
  		return getShort( 0x87 );
  	}
! 	INT32 timezoneBias( void ) const
  	{
  		return getInt( 0x8C );
--- 396,400 ----
  		return getShort( 0x87 );
  	}
! 	int timezoneBias( void ) const
  	{
  		return getInt( 0x8C );
***************
*** 876,880 ****
  		return ( *this )[15];
  	}
! 	INT8 z() const
  	{
  		return ( *this )[16];
--- 876,880 ----
  		return ( *this )[15];
  	}
! 	signed char z() const
  	{
  		return ( *this )[16];
***************
*** 956,960 ****
  		return getShort( 7 );
  	}
! 	INT8 z() const
  	{
  		return ( *this )[9];
--- 956,960 ----
  		return getShort( 7 );
  	}
! 	signed char z() const
  	{
  		return ( *this )[9];

Index: asyncnetio.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/asyncnetio.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** asyncnetio.cpp	10 Aug 2004 03:24:29 -0000	1.49
--- asyncnetio.cpp	19 Aug 2004 01:22:55 -0000	1.50
***************
*** 131,135 ****
  
  	bool login; // false = GameServer Protocol, true = LoginServer Protocol
! 	UINT32 seed;
  	cClientEncryption* encryption;
  };
--- 131,135 ----
  
  	bool login; // false = GameServer Protocol, true = LoginServer Protocol
! 	Q_UINT32 seed;
  	cClientEncryption* encryption;
  };

Index: uosocket.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.h,v
retrieving revision 1.122
retrieving revision 1.123
diff -C2 -d -r1.122 -r1.123
*** uosocket.h	10 Aug 2004 03:24:29 -0000	1.122
--- uosocket.h	19 Aug 2004 01:22:56 -0000	1.123
***************
*** 56,64 ****
  struct stTargetItem
  {
! 	UINT16 id;
  	INT16 xOffset;
  	INT16 yOffset;
  	INT16 zOffset;
! 	UINT16 hue;
  };
  
--- 56,64 ----
  struct stTargetItem
  {
! 	Q_UINT16 id;
  	INT16 xOffset;
  	INT16 yOffset;
  	INT16 zOffset;
! 	Q_UINT16 hue;
  };
  
***************
*** 142,154 ****
  		return tooltipscache_;
  	}
! 	bool haveTooltip( UINT32 data ) const
  	{
  		return tooltipscache_->testBit( data );
  	}
! 	void delTooltip( UINT32 data )
  	{
  		tooltipscache_->setBit( data, false );
  	}
! 	void addTooltip( UINT32 );
  
  	cUOSocket( QSocketDevice* sDevice );
--- 142,154 ----
  		return tooltipscache_;
  	}
! 	bool haveTooltip( Q_UINT32 data ) const
  	{
  		return tooltipscache_->testBit( data );
  	}
! 	void delTooltip( Q_UINT32 data )
  	{
  		tooltipscache_->setBit( data, false );
  	}
! 	void addTooltip( Q_UINT32 );
  
  	cUOSocket( QSocketDevice* sDevice );
***************
*** 249,253 ****
  	void sendChar( P_CHAR pChar );
  	void showSpeech( const cUObject* object, const QString& message, Q_UINT16 color = 0x3B2, Q_UINT16 font = 3, UINT8 speechType = 0x00 ) const;
! 	void sysMessage( const QString& message, Q_UINT16 color = 0x3b2, UINT16 font = 3 ) const;
  	void sendCharList();
  	void removeObject( cUObject* object );
--- 249,253 ----
  	void sendChar( P_CHAR pChar );
  	void showSpeech( const cUObject* object, const QString& message, Q_UINT16 color = 0x3B2, Q_UINT16 font = 3, UINT8 speechType = 0x00 ) const;
! 	void sysMessage( const QString& message, Q_UINT16 color = 0x3b2, Q_UINT16 font = 3 ) const;
  	void sendCharList();
  	void removeObject( cUObject* object );
***************
*** 265,271 ****
  	void resendPlayer( bool quick = true );
  	void poll();
! 	void soundEffect( UINT16 soundId, cUObject* source = NULL );
  	void attachTarget( cTargetRequest* request );
! 	void attachTarget( cTargetRequest* request, UINT16 multiid );
  	void attachTarget( cTargetRequest* request, std::vector<stTargetItem>& items, INT16 xOffset = 0, INT16 yOffset = 0, INT16 zOffset = 0 );
  	void cancelTarget();
--- 265,271 ----
  	void resendPlayer( bool quick = true );
  	void poll();
! 	void soundEffect( Q_UINT16 soundId, cUObject* source = NULL );
  	void attachTarget( cTargetRequest* request );
! 	void attachTarget( cTargetRequest* request, Q_UINT16 multiid );
  	void attachTarget( cTargetRequest* request, std::vector<stTargetItem>& items, INT16 xOffset = 0, INT16 yOffset = 0, INT16 zOffset = 0 );
  	void cancelTarget();
***************
*** 277,289 ****
  	void sendStatWindow( P_CHAR pChar = NULL );
  	bool inRange( cUOSocket* ) const;
! 	void sendSkill( UINT16 skill );
  	void sendBuyWindow( P_NPC pVendor );
  	void sendSellWindow( P_NPC pVendor, P_CHAR pSeller );
  	void sendVendorCont( P_ITEM pItem );
! 	void clilocMessage( const UINT32 MsgID, const QString& params = 0, const Q_UINT16 color = 0x3b2, const Q_UINT16 font = 3, cUObject* object = 0, bool system = false );
! 	void clilocMessageAffix( const UINT32 MsgID, const QString& params = 0, const QString& affix = 0, const Q_UINT16 color = 0x3b2, const Q_UINT16 font = 3, cUObject* object = 0, bool dontMove = false, bool prepend = false, bool system = false );
  	void updateLightLevel();
! 	void sendQuestArrow( bool show, UINT16 x, UINT16 y );
! 	void closeGump( UINT32 type, UINT32 returnCode );
  	void log( eLogLevel loglevel, const QString& message );
  	void log( const QString& message );
--- 277,289 ----
  	void sendStatWindow( P_CHAR pChar = NULL );
  	bool inRange( cUOSocket* ) const;
! 	void sendSkill( Q_UINT16 skill );
  	void sendBuyWindow( P_NPC pVendor );
  	void sendSellWindow( P_NPC pVendor, P_CHAR pSeller );
  	void sendVendorCont( P_ITEM pItem );
! 	void clilocMessage( const Q_UINT32 MsgID, const QString& params = 0, const Q_UINT16 color = 0x3b2, const Q_UINT16 font = 3, cUObject* object = 0, bool system = false );
! 	void clilocMessageAffix( const Q_UINT32 MsgID, const QString& params = 0, const QString& affix = 0, const Q_UINT16 color = 0x3b2, const Q_UINT16 font = 3, cUObject* object = 0, bool dontMove = false, bool prepend = false, bool system = false );
  	void updateLightLevel();
! 	void sendQuestArrow( bool show, Q_UINT16 x, Q_UINT16 y );
! 	void closeGump( Q_UINT32 type, Q_UINT32 returnCode );
  	void log( eLogLevel loglevel, const QString& message );
  	void log( const QString& message );

Index: network.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/network.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** network.cpp	4 Aug 2004 23:17:38 -0000	1.3
--- network.cpp	19 Aug 2004 01:22:56 -0000	1.4
***************
*** 215,219 ****
  }
  
! void cNetwork::broadcast( const QString& message, UINT16 color, UINT16 font )
  {
  	for ( cUOSocket*socket = uoSockets.first(); socket; socket = uoSockets.next() )
--- 215,219 ----
  }
  
! void cNetwork::broadcast( const QString& message, Q_UINT16 color, Q_UINT16 font )
  {
  	for ( cUOSocket*socket = uoSockets.first(); socket; socket = uoSockets.next() )

Index: network.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/network.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** network.h	2 Jun 2004 15:04:09 -0000	1.2
--- network.h	19 Aug 2004 01:22:56 -0000	1.3
***************
*** 89,93 ****
  		return uoSockets.next();
  	}
! 	UINT32 count()
  	{
  		return uoSockets.count();
--- 89,93 ----
  		return uoSockets.next();
  	}
! 	Q_UINT32 count()
  	{
  		return uoSockets.count();
***************
*** 98,102 ****
  	}
  
! 	void broadcast( const QString& message, UINT16 color = 0x84d, UINT16 font = 0 );
  };
  
--- 98,102 ----
  	}
  
! 	void broadcast( const QString& message, Q_UINT16 color = 0x84d, Q_UINT16 font = 0 );
  };
  

Index: uosocket.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v
retrieving revision 1.393
retrieving revision 1.394
diff -C2 -d -r1.393 -r1.394
*** uosocket.cpp	15 Aug 2004 02:17:40 -0000	1.393
--- uosocket.cpp	19 Aug 2004 01:22:56 -0000	1.394
***************
*** 1051,1055 ****
    \sa cUOTxUnicodeSpeech
  */
! void cUOSocket::sysMessage( const QString& message, Q_UINT16 color, UINT16 font ) const
  {
  	if ( message.isEmpty() )
--- 1051,1055 ----
    \sa cUOTxUnicodeSpeech
  */
! void cUOSocket::sysMessage( const QString& message, Q_UINT16 color, Q_UINT16 font ) const
  {
  	if ( message.isEmpty() )
***************
*** 1664,1673 ****
  	// if it's normal speech send it to the normal speech dispatcher
  	QString speech = packet->message();
! 	QValueVector<UINT16> keywords;
  	if ( packet->type() & 0xc0 )
  		keywords = packet->keywords();
! 	UINT16 color = packet->color();
! 	UINT16 font = packet->font();
! 	UINT16 type = packet->type() & 0x3f; // Pad out the Tokenized speech flag
  
  	// There is one special case. if the user has the body 0x3db and the first char
--- 1664,1673 ----
  	// if it's normal speech send it to the normal speech dispatcher
  	QString speech = packet->message();
! 	QValueVector<Q_UINT16> keywords;
  	if ( packet->type() & 0xc0 )
  		keywords = packet->keywords();
! 	Q_UINT16 color = packet->color();
! 	Q_UINT16 font = packet->font();
! 	Q_UINT16 type = packet->type() & 0x3f; // Pad out the Tokenized speech flag
  
  	// There is one special case. if the user has the body 0x3db and the first char
***************
*** 1782,1786 ****
  
  	cTerritory* Region = _player->region();
! 	UINT32 midi = 0;
  
  	if ( _player->isAtWar() )
--- 1782,1786 ----
  
  	cTerritory* Region = _player->region();
! 	Q_UINT32 midi = 0;
  
  	if ( _player->isAtWar() )
***************
*** 1803,1807 ****
  
  	// Get the container gump
! 	UINT16 gump = 0x3D;
  
  	switch ( pCont->id() )
--- 1803,1807 ----
  
  	// Get the container gump
! 	Q_UINT16 gump = 0x3D;
  
  	switch ( pCont->id() )
***************
*** 2114,2118 ****
  }
  
! void cUOSocket::attachTarget( cTargetRequest* request, UINT16 multiid )
  {
  	if ( multiid < 0x4000 )
--- 2114,2118 ----
  }
  
! void cUOSocket::attachTarget( cTargetRequest* request, Q_UINT16 multiid )
  {
  	if ( multiid < 0x4000 )
***************
*** 2172,2176 ****
  }
  
! void cUOSocket::soundEffect( UINT16 soundId, cUObject* source )
  {
  	if ( !_player )
--- 2172,2176 ----
  }
  
! void cUOSocket::soundEffect( Q_UINT16 soundId, cUObject* source )
  {
  	if ( !_player )
***************
*** 2283,2287 ****
  	{
  		update.setMaximum( 100 );
! 		update.setCurrent( ( UINT16 ) ( ( pChar->stamina() / pChar->dexterity() ) * 100 ) );
  	}
  
--- 2283,2287 ----
  	{
  		update.setMaximum( 100 );
! 		update.setCurrent( ( Q_UINT16 ) ( ( pChar->stamina() / pChar->dexterity() ) * 100 ) );
  	}
  
***************
*** 2314,2318 ****
  	{
  		update.setMaximum( 100 );
! 		update.setCurrent( ( UINT16 ) ( ( pChar->mana() / pChar->intelligence() ) * 100 ) );
  	}
  
--- 2314,2318 ----
  	{
  		update.setMaximum( 100 );
! 		update.setCurrent( ( Q_UINT16 ) ( ( pChar->mana() / pChar->intelligence() ) * 100 ) );
  	}
  
***************
*** 2456,2460 ****
  }
  
! void cUOSocket::sendSkill( UINT16 skill )
  {
  	if ( !_player )
--- 2456,2460 ----
  }
  
! void cUOSocket::sendSkill( Q_UINT16 skill )
  {
  	if ( !_player )
***************
*** 2709,2713 ****
  thanks to codex
  */
! void cUOSocket::clilocMessage( const UINT32 MsgID, const QString& params, const Q_UINT16 color, const Q_UINT16 font, cUObject* object, bool system )
  {
  	cUOTxClilocMsg msg;
--- 2709,2713 ----
  thanks to codex
  */
! void cUOSocket::clilocMessage( const Q_UINT32 MsgID, const QString& params, const Q_UINT16 color, const Q_UINT16 font, cUObject* object, bool system )
  {
  	cUOTxClilocMsg msg;
***************
*** 2755,2759 ****
  }
  
! void cUOSocket::clilocMessageAffix( const UINT32 MsgID, const QString& params, const QString& affix, const Q_UINT16 color, const Q_UINT16 font, cUObject* object, bool dontMove, bool prepend, bool system )
  {
  	cUOTxClilocMsgAffix msg;
--- 2755,2759 ----
  }
  
! void cUOSocket::clilocMessageAffix( const Q_UINT32 MsgID, const QString& params, const QString& affix, const Q_UINT16 color, const Q_UINT16 font, cUObject* object, bool dontMove, bool prepend, bool system )
  {
  	cUOTxClilocMsgAffix msg;
***************
*** 2887,2891 ****
  }
  
! void cUOSocket::sendQuestArrow( bool show, UINT16 x, UINT16 y )
  {
  	cUOTxQuestArrow qArrow;
--- 2887,2891 ----
  }
  
! void cUOSocket::sendQuestArrow( bool show, Q_UINT16 x, Q_UINT16 y )
  {
  	cUOTxQuestArrow qArrow;
***************
*** 2895,2899 ****
  }
  
! void cUOSocket::closeGump( UINT32 type, UINT32 returnCode )
  {
  	cUOTxCloseGump closegump;
--- 2895,2899 ----
  }
  
! void cUOSocket::closeGump( Q_UINT32 type, Q_UINT32 returnCode )
  {
  	cUOTxCloseGump closegump;
***************
*** 2903,2907 ****
  }
  
! void cUOSocket::addTooltip( UINT32 data )
  {
  	if ( data >= tooltipscache_->size() )
--- 2903,2907 ----
  }
  
! void cUOSocket::addTooltip( Q_UINT32 data )
  {
  	if ( data >= tooltipscache_->size() )

Index: uorxpackets.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uorxpackets.cpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -d -r1.64 -r1.65
*** uorxpackets.cpp	1 Jul 2004 20:07:07 -0000	1.64
--- uorxpackets.cpp	19 Aug 2004 01:22:56 -0000	1.65
***************
*** 174,179 ****
  	{
  		// Skip the keywords
! 		UINT16 skipCount = ( keywordCount() + 1 ) * 12; // We have 12 Bits for the count as well
! 		UINT16 skipBytes = static_cast<UINT16>( skipCount / 8 );
  		if ( skipCount % 8 > 0 ) // Round up
  			skipBytes++;
--- 174,179 ----
  	{
  		// Skip the keywords
! 		Q_UINT16 skipCount = ( keywordCount() + 1 ) * 12; // We have 12 Bits for the count as well
! 		Q_UINT16 skipBytes = static_cast<Q_UINT16>( skipCount / 8 );
  		if ( skipCount % 8 > 0 ) // Round up
  			skipBytes++;
***************
*** 194,209 ****
  	gumpChoice_st choice;
  	choice.button = getInt( 11 );
! 	UINT32 numSwitches = getInt( 15 );
! 	UINT32 i;
  	for ( i = 0; i < numSwitches; i++ )
  	{
  		choice.switches.push_back( getInt( 19 + 4 * i ) );
  	}
! 	UINT32 numTextEntries = getInt( 19 + 4 * numSwitches );
! 	UINT32 offset = 0;
  	for ( i = 0; i < numTextEntries; i++ )
  	{
! 		UINT16 textLength = getShort( 25 + 4 * numSwitches + offset );
! 		choice.textentries.insert( make_pair<UINT16, QString>( getShort( 23 + 4 * numSwitches + offset ), getUnicodeString( 27 + 4 * numSwitches + offset, textLength * 2 ) ) );
  
  		offset += 4 + textLength * 2;
--- 194,209 ----
  	gumpChoice_st choice;
  	choice.button = getInt( 11 );
! 	Q_UINT32 numSwitches = getInt( 15 );
! 	Q_UINT32 i;
  	for ( i = 0; i < numSwitches; i++ )
  	{
  		choice.switches.push_back( getInt( 19 + 4 * i ) );
  	}
! 	Q_UINT32 numTextEntries = getInt( 19 + 4 * numSwitches );
! 	Q_UINT32 offset = 0;
  	for ( i = 0; i < numTextEntries; i++ )
  	{
! 		Q_UINT16 textLength = getShort( 25 + 4 * numSwitches + offset );
! 		choice.textentries.insert( make_pair<Q_UINT16, QString>( getShort( 23 + 4 * numSwitches + offset ), getUnicodeString( 27 + 4 * numSwitches + offset, textLength * 2 ) ) );
  
  		offset += 4 + textLength * 2;
***************
*** 213,224 ****
  }
  
! QValueVector< UINT16 > cUORxSpeechRequest::keywords()
  {
! 	QValueVector<UINT16> keywords;
  
! 	UINT16 count = keywordCount();
! 	UINT16 offset = 13; // Skip the count
  
! 	for ( UINT16 i = 0; i < count; ++i )
  	{
  		// Invalid Packet size
--- 213,224 ----
  }
  
! QValueVector< Q_UINT16 > cUORxSpeechRequest::keywords()
  {
! 	QValueVector<Q_UINT16> keywords;
  
! 	ushort count = keywordCount();
! 	ushort offset = 13; // Skip the count
  
! 	for ( ushort i = 0; i < count; ++i )
  	{
  		// Invalid Packet size
***************
*** 226,230 ****
  			return keywords;
  
! 		UINT16 value;
  
  		// The second, fourth, etc. keyword always
--- 226,230 ----
  			return keywords;
  
! 		ushort value;
  
  		// The second, fourth, etc. keyword always

[wpdev-commits] wolfpack/python char.cpp,1.178,1.179 global.cpp,1.145,1.146 item.cpp,1.120,1.121 skills.h,1.21,1.22 target.h,1.17,1.18

From: Correa <thi...@us...> - 2004-08-19 01:23:22

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

Modified Files:
	char.cpp global.cpp item.cpp skills.h target.h 
Log Message:
QT_CLEAN_NAMESPACE

Index: item.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/item.cpp,v
retrieving revision 1.120
retrieving revision 1.121
diff -C2 -d -r1.120 -r1.121
*** item.cpp	12 Aug 2004 03:18:24 -0000	1.120
--- item.cpp	19 Aug 2004 01:22:57 -0000	1.121
***************
*** 307,318 ****
  	}
  
! 	UINT16 amount = PyInt_AsLong( PyTuple_GetItem( args, 0 ) );
! 	UINT16 id = PyInt_AsLong( PyTuple_GetItem( args, 1 ) );
! 	UINT16 color = 0;
  
  	if ( PyTuple_Size( args ) > 2 && PyInt_Check( PyTuple_GetItem( args, 2 ) ) )
  		color = PyInt_AsLong( PyTuple_GetItem( args, 2 ) );
  
! 	UINT16 deleted = 0;
  	deleted = self->pItem->deleteAmount( amount, id, color );
  
--- 307,318 ----
  	}
  
! 	Q_UINT16 amount = PyInt_AsLong( PyTuple_GetItem( args, 0 ) );
! 	Q_UINT16 id = PyInt_AsLong( PyTuple_GetItem( args, 1 ) );
! 	Q_UINT16 color = 0;
  
  	if ( PyTuple_Size( args ) > 2 && PyInt_Check( PyTuple_GetItem( args, 2 ) ) )
  		color = PyInt_AsLong( PyTuple_GetItem( args, 2 ) );
  
! 	Q_UINT16 deleted = 0;
  	deleted = self->pItem->deleteAmount( amount, id, color );
  
***************
*** 339,343 ****
  	}
  
! 	UINT16 id = PyInt_AsLong( PyTuple_GetItem( args, 0 ) );
  	INT16 color = -1;
  
--- 339,343 ----
  	}
  
! 	Q_UINT16 id = PyInt_AsLong( PyTuple_GetItem( args, 0 ) );
  	INT16 color = -1;
  
***************
*** 518,522 ****
  	}
  
! 	UINT16 id = getArgInt( 0 );
  
  	cUObject* object = getArgChar( 1 );
--- 518,522 ----
  	}
  
! 	Q_UINT16 id = getArgInt( 0 );
  
  	cUObject* object = getArgChar( 1 );
***************
*** 533,538 ****
  	bool explodes = false;
  	UINT8 speed = 10;
! 	UINT16 hue = 0;
! 	UINT16 renderMode = 0;
  
  	if ( checkArgInt( 2 ) )
--- 533,538 ----
  	bool explodes = false;
  	UINT8 speed = 10;
! 	Q_UINT16 hue = 0;
! 	Q_UINT16 renderMode = 0;
  
  	if ( checkArgInt( 2 ) )
***************
*** 579,583 ****
  	}
  
! 	UINT32 expiretime = getArgInt( 0 );
  	QString function = getArgStr( 1 );
  	PyObject* py_args = PyList_AsTuple( PyTuple_GetItem( args, 2 ) );
--- 579,583 ----
  	}
  
! 	Q_UINT32 expiretime = getArgInt( 0 );
  	QString function = getArgStr( 1 );
  	PyObject* py_args = PyList_AsTuple( PyTuple_GetItem( args, 2 ) );
***************
*** 1048,1057 ****
  static PyObject* wpItem_effect( wpItem* self, PyObject* args )
  {
! 	UINT16 id;
  	// Optional Arguments
  	UINT8 speed = 5;
  	UINT8 duration = 10;
! 	UINT16 hue = 0;
! 	UINT16 renderMode = 0;
  
  	if ( !PyArg_ParseTuple( args, "H|BBHH:char.effect(id, [speed], [duration], [hue], [rendermode])", &id, &speed, &duration, &hue, &renderMode ) )
--- 1048,1057 ----
  static PyObject* wpItem_effect( wpItem* self, PyObject* args )
  {
! 	Q_UINT16 id;
  	// Optional Arguments
  	UINT8 speed = 5;
  	UINT8 duration = 10;
! 	Q_UINT16 hue = 0;
! 	Q_UINT16 renderMode = 0;
  
  	if ( !PyArg_ParseTuple( args, "H|BBHH:char.effect(id, [speed], [duration], [hue], [rendermode])", &id, &speed, &duration, &hue, &renderMode ) )

Index: global.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/global.cpp,v
retrieving revision 1.145
retrieving revision 1.146
diff -C2 -d -r1.145 -r1.146
*** global.cpp	10 Aug 2004 03:27:52 -0000	1.145
--- global.cpp	19 Aug 2004 01:22:57 -0000	1.146
***************
*** 532,536 ****
  	}
  
! 	UINT32 expiretime = getArgInt( 0 );
  	QString function = getArgStr( 1 );
  	PyObject* py_args = PyList_AsTuple( PyTuple_GetItem( args, 2 ) );
--- 532,536 ----
  	}
  
! 	Q_UINT32 expiretime = getArgInt( 0 );
  	QString function = getArgStr( 1 );
  	PyObject* py_args = PyList_AsTuple( PyTuple_GetItem( args, 2 ) );
***************
*** 620,625 ****
  
  	PyObject* list = PyList_New( 0 );
! 	UINT32 xBlock = x / 8;
! 	UINT32 yBlock = y / 8;
  
  	for ( ; !iter.atEnd(); ++iter )
--- 620,625 ----
  
  	PyObject* list = PyList_New( 0 );
! 	Q_UINT32 xBlock = x / 8;
! 	Q_UINT32 yBlock = y / 8;
  
  	for ( ; !iter.atEnd(); ++iter )

Index: skills.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/skills.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** skills.h	10 Aug 2004 03:27:54 -0000	1.21
--- skills.h	19 Aug 2004 01:22:57 -0000	1.22
***************
*** 71,75 ****
  	}
  
! 	UINT16 value = PyInt_AsLong( pValue );
  
  	if ( self->type == 0 )
--- 71,75 ----
  	}
  
! 	Q_UINT16 value = PyInt_AsLong( pValue );
  
  	if ( self->type == 0 )

Index: target.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/target.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** target.h	10 Aug 2004 03:27:54 -0000	1.17
--- target.h	19 Aug 2004 01:22:57 -0000	1.18
***************
*** 41,45 ****
  	PyObject_HEAD;
  	Coord_cl pos;
! 	UINT16 model;
  	SERIAL object;
  } wpTarget;
--- 41,45 ----
  	PyObject_HEAD;
  	Coord_cl pos;
! 	Q_UINT16 model;
  	SERIAL object;
  } wpTarget;

Index: char.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/char.cpp,v
retrieving revision 1.178
retrieving revision 1.179
diff -C2 -d -r1.178 -r1.179
*** char.cpp	12 Aug 2004 03:18:24 -0000	1.178
--- char.cpp	19 Aug 2004 01:22:57 -0000	1.179
***************
*** 538,544 ****
  	}
  
! 	UINT16 amount = PyInt_AsLong( PyTuple_GetItem( args, 0 ) );
! 	UINT16 id = PyInt_AsLong( PyTuple_GetItem( args, 1 ) );
! 	UINT16 color = 0;
  
  	if ( PyTuple_Size( args ) > 2 && PyInt_Check( PyTuple_GetItem( args, 2 ) ) )
--- 538,544 ----
  	}
  
! 	Q_UINT16 amount = PyInt_AsLong( PyTuple_GetItem( args, 0 ) );
! 	Q_UINT16 id = PyInt_AsLong( PyTuple_GetItem( args, 1 ) );
! 	Q_UINT16 color = 0;
  
  	if ( PyTuple_Size( args ) > 2 && PyInt_Check( PyTuple_GetItem( args, 2 ) ) )
***************
*** 546,550 ****
  
  	P_ITEM pPack = self->pChar->getBackpack();
! 	UINT16 deleted = 0;
  
  	if ( pPack )
--- 546,550 ----
  
  	P_ITEM pPack = self->pChar->getBackpack();
! 	Q_UINT16 deleted = 0;
  
  	if ( pPack )
***************
*** 734,738 ****
  	}
  
! 	UINT16 id = getArgInt( 0 );
  	INT16 color = -1;
  
--- 734,738 ----
  	}
  
! 	Q_UINT16 id = getArgInt( 0 );
  	INT16 color = -1;
  
***************
*** 1325,1335 ****
  	}
  
! 	UINT16 id = getArgInt( 0 );
  
  	// Optional Arguments
  	UINT8 speed = 5;
  	UINT8 duration = 10;
! 	UINT16 hue = 0;
! 	UINT16 renderMode = 0;
  
  	if ( !PyArg_ParseTuple( args, "H|BBHH:char.effect(id, [speed], [duration], [hue], [rendermode])", &id, &speed, &duration, &hue, &renderMode ) )
--- 1325,1335 ----
  	}
  
! 	Q_UINT16 id = getArgInt( 0 );
  
  	// Optional Arguments
  	UINT8 speed = 5;
  	UINT8 duration = 10;
! 	Q_UINT16 hue = 0;
! 	Q_UINT16 renderMode = 0;
  
  	if ( !PyArg_ParseTuple( args, "H|BBHH:char.effect(id, [speed], [duration], [hue], [rendermode])", &id, &speed, &duration, &hue, &renderMode ) )
***************
*** 1499,1503 ****
  	}
  
! 	UINT32 expiretime = getArgInt( 0 );
  	QString function = getArgStr( 1 );
  	PyObject* py_args = PyList_AsTuple( PyTuple_GetItem( args, 2 ) );
--- 1499,1503 ----
  	}
  
! 	Q_UINT32 expiretime = getArgInt( 0 );
  	QString function = getArgStr( 1 );
  	PyObject* py_args = PyList_AsTuple( PyTuple_GetItem( args, 2 ) );
***************
*** 1861,1865 ****
  	}
  
! 	UINT32 range = getArgInt( 1 );
  
  	if ( self->pChar->pos().map != pos.map )
--- 1861,1865 ----
  	}
  
! 	Q_UINT32 range = getArgInt( 1 );
  
  	if ( self->pChar->pos().map != pos.map )

[wpdev-commits] wolfpack/sqlite os.c,1.4,1.5

From: Correa <thi...@us...> - 2004-08-19 01:23:21

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

Modified Files:
	os.c 
Log Message:
QT_CLEAN_NAMESPACE

Index: os.c
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/sqlite/os.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** os.c	19 Mar 2004 16:36:19 -0000	1.4
--- os.c	19 Aug 2004 01:22:58 -0000	1.5
***************
*** 1374,1378 ****
      params.ioParam.ioReqCount = 1;
      while( cnt-->0 && (res = PBLockRangeSync(&params))!=noErr ){
!       UInt32 finalTicks;
        Delay(1, &finalTicks); /* 1/60 sec */
      }
--- 1374,1378 ----
      params.ioParam.ioReqCount = 1;
      while( cnt-->0 && (res = PBLockRangeSync(&params))!=noErr ){
!       Q_UINT32 finalTicks;
        Delay(1, &finalTicks); /* 1/60 sec */
      }
***************
*** 1480,1484 ****
      params.ioParam.ioReqCount = 1;
      while( cnt-->0 && (res = PBLockRangeSync(&params))!=noErr ){
!       UInt32 finalTicks;
        Delay(1, &finalTicks); /* 1/60 sec */
      }
--- 1480,1484 ----
      params.ioParam.ioReqCount = 1;
      while( cnt-->0 && (res = PBLockRangeSync(&params))!=noErr ){
!       Q_UINT32 finalTicks;
        Delay(1, &finalTicks); /* 1/60 sec */
      }
***************
*** 1659,1664 ****
  #endif
  #if OS_MAC
!   UInt32 finalTicks;
!   UInt32 ticks = (((UInt32)ms+16)*3)/50;  /* 1/60 sec per tick */
    Delay(ticks, &finalTicks);
    return (int)((ticks*50)/3);
--- 1659,1664 ----
  #endif
  #if OS_MAC
!   Q_UINT32 finalTicks;
!   Q_UINT32 ticks = (((Q_UINT32)ms+16)*3)/50;  /* 1/60 sec per tick */
    Delay(ticks, &finalTicks);
    return (int)((ticks*50)/3);

[wpdev-commits] wolfpack commands.cpp,1.254,1.255

From: Sebastian H. <dar...@us...> - 2004-08-19 00:03:34

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

Modified Files:
	commands.cpp 
Log Message:
Export definitions using .exportdefinitions.

Use: WPGM

Index: commands.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/commands.cpp,v
retrieving revision 1.254
retrieving revision 1.255
diff -C2 -d -r1.254 -r1.255
*** commands.cpp	13 Aug 2004 08:55:24 -0000	1.254
--- commands.cpp	19 Aug 2004 00:03:19 -0000	1.255
***************
*** 46,49 ****
--- 46,50 ----
  #include "pythonscript.h"
  #include "network/network.h"
+ #include "dbdriver.h"
  
  // System Includes
***************
*** 675,678 ****
--- 676,880 ----
  
  /*
+ 	Recursive processing function to get neccesary information about items.
+ */
+ static void processItem(QMap<QCString, QString> &item, const cElement *node) {
+ 	// If there is an inherit tag, inherit a parent item definition.
+ 	QString inherit = node->getAttribute("inherit");
+ 	if (inherit != QString::null) {
+ 		const cElement *parent = Definitions::instance()->getDefinition(WPDT_ITEM, inherit);
+ 		if (parent) {
+ 			processItem(item, parent);
+ 		}
+ 	}
+ 
+ 	int count = node->childCount();
+ 	int i;
+ 	for (i = 0; i < count; ++i) {
+ 		const cElement *child = node->getChild(i);
+ 		
+ 		// Inherit properties from another item definition
+ 		if (child->name() == "inherit") {
+ 			const cElement *parent = 0;
+ 
+ 			if (child->hasAttribute("id")) {
+ 				parent = Definitions::instance()->getDefinition(WPDT_ITEM, child->getAttribute("id"));
+ 			} else {
+ 				parent = Definitions::instance()->getDefinition(WPDT_ITEM, child->text());
+ 			}
+ 			 
+ 			if (parent) {
+ 				processItem(item, parent);
+ 			}
+ 		} else if (child->name() == "id") {
+             item["dispid"] = child->value();
+ 		} else if (child->name() == "name") {
+ 			item["name"] = child->text();
+ 		} else if (child->name() == "color") {
+ 			item["color"] = child->value();
+ 		} else if (child->name() == "category") {
+ 			item["categoryname"] = child->text();
+ 		}
+ 	}
+ }
+ 
+ static void ensureCategory(QMap<QString, unsigned int> &categories, unsigned int &lastcategory, QString category) {
+ 	int pos = category.findRev('\\');
+ 	if (pos != -1) {
+ 		QString parentCategory = category.left(pos);
+ 		ensureCategory(categories, lastcategory, parentCategory);
+ 	}
+ 
+ 	if (!categories.contains(category)) {
+ 		categories.insert(category, ++lastcategory);
+ 	}
+ }
+ 
+ /*
+ 	\command exportdefinitions
+ 	\description Export the definitions used by the WPGM utility.
+ 	\notes This command will export the definitions used by the WPGM utility to 
+ 	a file called categories.db in your wolfpack directory.
+ */
+ void commandExportDefinitions( cUOSocket *socket, const QString &command, const QStringList &args) throw() {
+ 	if (QFile::exists("categories.db") && !QFile::remove("categories.db")) {
+ 		socket->sysMessage("Unable to remove existing categories.db.");
+ 		return;
+ 	}
+ 
+ 	cSQLiteDriver driver;
+ 	driver.setDatabaseName("categories.db");
+ 	
+ 	if (!driver.open()) {
+ 		socket->sysMessage("Unable to open categories.db in your wolfpack directory.");
+ 		return;
+ 	}
+ 
+ 	try {
+ 		// Create Tables
+ 		driver.exec("CREATE TABLE items (\
+ 			id INTEGER PRIMARY KEY,\
+ 			name varchar(255) NULL,\
+ 			parent int NOT NULL,\
+ 			artid int,\
+ 			color int,\
+ 			addid varchar(255)\
+ 		);");
+ 
+ 		driver.exec("CREATE TABLE categories (\
+ 			id INTEGER PRIMARY KEY,\
+ 			name varchar(255) NULL,\
+ 			parent int NOT NULL,\
+ 			type int\
+ 		);");
+ 
+ 		driver.exec("CREATE TABLE locationcategories (\
+ 			id INTEGER PRIMARY KEY,\
+ 			name varchar(255) NULL,\
+ 			parent int NOT NULL,\
+ 			type int\
+ 		);");
+ 
+ 		driver.exec("CREATE TABLE locations (\
+ 			id INTEGER PRIMARY KEY,\
+ 			name varchar(255) NULL,\
+ 			parent INT NOT NULL,\
+ 			posx INT NOT NULL,\
+ 			posy INT NOT NULL,\
+ 			posz INT NOT NULL,\
+ 			posmap INT NOT NULL,\
+ 			location varchar(255)\
+ 		);");
+ 
+ 		unsigned int lastcategory = 0;
+ 		QMap<QString, unsigned int> categories;
+ 		QMap<QString, unsigned int>::iterator categoriesIt;
+ 
+ 		QStringList sections = Definitions::instance()->getSections(WPDT_ITEM);
+ 		QStringList::const_iterator sectionIt;
+ 		QMap<QCString, QString> item;
+ 
+ 		for (sectionIt = sections.begin(); sectionIt != sections.end(); ++sectionIt) {
+ 			const cElement *element = Definitions::instance()->getDefinition(WPDT_ITEM, *sectionIt);
+ 
+ 			item.clear();
+ 			item.insert("name", QString::null);
+ 			item.insert("color", "0");
+ 			item.insert("dispid", "0");
+ 			item.insert("category", "0");
+ 			item.insert("categoryname", QString::null);
+ 
+ 			processItem(item, element);
+ 
+ 			QString category = item["categoryname"];
+ 
+ 			if (category.isNull()) {
+ 				continue;
+ 			}
+ 
+ 			// Strip out the portion after the last \ 
+ 			int pos = category.findRev('\\');
+ 			if (pos != -1) {
+ 				category = category.left(pos);
+ 			}
+ 
+ 			// Create an id for the category
+ 			if (!categories.contains(category)) {
+ 				ensureCategory(categories, lastcategory, category);
+ 				item["category"] = QString::number(lastcategory);
+ 			} else {
+ 				item["category"] = QString::number(categories[category]);
+ 			}
+ 
+ 			// See if there has been a custom name definition
+ 			if (item["name"].isNull()) {
+ 				QString categoryname = item["categoryname"];
+ 				if (pos != -1) {
+ 					item["name"] = categoryname.right(categoryname.length() - (pos + 1));
+ 				} else {
+ 					item["name"] = categoryname;
+ 				}
+ 			}
+ 
+ 			// Insert the item into the table.
+ 			QString section = *sectionIt;
+ 			QString sql = QString("INSERT INTO items VALUES(NULL,'%1',%2,%3,%4,'%5');")
+ 				.arg(item["name"].replace("'", "''"))
+ 				.arg(item["category"])
+ 				.arg(item["dispid"])
+ 				.arg(item["color"])
+ 				.arg(section.replace("'", "''"));
+ 			driver.exec(sql);
+ 		}
+ 
+ 		// Ensure that all categories are in the list
+ 		for (categoriesIt = categories.begin(); categoriesIt != categories.end(); ++categoriesIt) {
+ 			unsigned int parent = 0;
+ 			int pos = categoriesIt.key().findRev('\\');
+ 			if (pos != -1) {
+ 				QString parentName = categoriesIt.key().left(pos);
+ 				if (categories.contains(parentName)) {
+ 					parent = categories[parentName];
+ 				}
+ 			}
+ 
+ 			QString name = categoriesIt.key();
+ 			name = name.right(name.length() - (pos + 1));
+ 
+ 			QString sql = QString("INSERT INTO categories VALUES(%1,'%2',%3,0);")
+ 				.arg(categoriesIt.data())
+ 				.arg(name.replace("'", "''"))
+ 				.arg(parent);
+ 			driver.exec(sql);
+ 		}
+ 	} catch(const QString &e) {
+ 		socket->sysMessage(e);
+ 	} catch(const wpException &e) {
+ 		socket->sysMessage(e.error());
+ 	}
+ 
+ 	driver.close();
+ }
+ 
+ /*
  	\command doorgen
  	\description Generate doors in passage ways.
***************
*** 915,918 ****
--- 1117,1121 ----
  {
  { "ALLMOVE", commandAllMove },
+ { "EXPORTDEFINITIONS", commandExportDefinitions },
  { "ALLSHOW", commandAllShow },
  { "BROADCAST", commandBroadcast },

[wpdev-commits] wolfpack items.cpp,1.434,1.435 uobject.cpp,1.173,1.174 world.cpp,1.115,1.116

From: Sebastian H. <dar...@us...> - 2004-08-18 18:33:27

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

Modified Files:
	items.cpp uobject.cpp world.cpp 
Log Message:
More binary save features.

Index: items.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/items.cpp,v
retrieving revision 1.434
retrieving revision 1.435
diff -C2 -d -r1.434 -r1.435
*** items.cpp	15 Aug 2004 02:17:39 -0000	1.434
--- items.cpp	18 Aug 2004 18:33:17 -0000	1.435
***************
*** 2358,2368 ****
  void cItem::save( cBufferedWriter& writer )
  {
! 	cUObject::save( writer );
  
  	// Save container content
  	ContainerContent::iterator it = content_.begin();
! 	for ( ; it != content_.end(); ++it )
! 	{
! 		( *it )->save( writer );
  	}
  }
--- 2358,2367 ----
  void cItem::save( cBufferedWriter& writer )
  {
! 	cUObject::save(writer);
  
  	// Save container content
  	ContainerContent::iterator it = content_.begin();
! 	for (; it != content_.end(); ++it) {
! 		(*it)->save(writer);
  	}
  }

Index: world.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/world.cpp,v
retrieving revision 1.115
retrieving revision 1.116
diff -C2 -d -r1.115 -r1.116
*** world.cpp	17 Aug 2004 00:13:50 -0000	1.115
--- world.cpp	18 Aug 2004 18:33:18 -0000	1.116
***************
*** 466,469 ****
--- 466,482 ----
  					// Special Type for Tags
  				}
+ 				else if ( type == 0xFA )
+ 				{
+ 					QString spawnregion = reader.readUtf8();
+ 					SERIAL serial = reader.readInt();
+ 
+ 					cSpawnRegion *region = SpawnRegions::instance()->region( spawnregion );
+ 					cUObject *object = findObject( serial );
+ 					if (object && region) {
+ 						object->setSpawnregion(region);
+ 					} else if (object) {
+ 						object->remove();
+ 					}
+ 				}
  				else if ( type == 0xFB )
  				{
***************
*** 752,758 ****
  			cSpawnRegion *region = SpawnRegions::instance()->region( spawnregion );
  			cUObject *object = findObject( serial );
! 			if (object && region)
! 			{
  				object->setSpawnregion(region);
  			}
  		}
--- 765,772 ----
  			cSpawnRegion *region = SpawnRegions::instance()->region( spawnregion );
  			cUObject *object = findObject( serial );
! 			if (object && region) {
  				object->setSpawnregion(region);
+ 			} else if (object) {
+ 				object->remove();
  			}
  		}

Index: uobject.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/uobject.cpp,v
retrieving revision 1.173
retrieving revision 1.174
diff -C2 -d -r1.173 -r1.174
*** uobject.cpp	15 Aug 2004 02:17:39 -0000	1.173
--- uobject.cpp	18 Aug 2004 18:33:18 -0000	1.174
***************
*** 1070,1073 ****
--- 1070,1080 ----
  	writer.setSkipSize( getClassid(), length );
  
+ 	// Save the spawnregion association
+ 	if (spawnregion_) {
+ 		writer.writeByte(0xFA);
+ 		writer.writeUtf8(spawnregion_->name());
+ 		writer.writeInt(serial_);
+ 	}
+ 
  	// Save tags for this object
  	tags_.save( serial_, writer );

[wpdev-commits] wolfpack basics.cpp,1.35,1.36 basics.h,1.28,1.29 wolfpack.vcproj,1.43,1.44

From: Sebastian H. <dar...@us...> - 2004-08-18 17:05:57

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

Modified Files:
	basics.cpp basics.h wolfpack.vcproj 
Log Message:
Sped up binary save speed.

Index: wolfpack.vcproj
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/wolfpack.vcproj,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** wolfpack.vcproj	17 Aug 2004 00:13:50 -0000	1.43
--- wolfpack.vcproj	18 Aug 2004 17:05:46 -0000	1.44
***************
*** 75,79 ****
  			ConfigurationType="1"
  			CharacterSet="2"
! 			WholeProgramOptimization="TRUE">
  			<Tool
  				Name="VCCLCompilerTool"
--- 75,79 ----
  			ConfigurationType="1"
  			CharacterSet="2"
! 			WholeProgramOptimization="FALSE">
  			<Tool
  				Name="VCCLCompilerTool"

Index: basics.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/basics.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** basics.cpp	17 Aug 2004 00:22:25 -0000	1.35
--- basics.cpp	18 Aug 2004 17:05:46 -0000	1.36
***************
*** 191,195 ****
  	d->version = version;
  	d->magic = magic;
! 	d->buffer.resize( buffersize );
  	d->bufferpos = 0;
  	d->lastStringId = 0;
--- 191,195 ----
  	d->version = version;
  	d->magic = magic;
! 	d->buffer = new char[buffersize];
  	d->bufferpos = 0;
  	d->lastStringId = 0;
***************
*** 205,208 ****
--- 205,209 ----
  {
  	close();
+ 	delete d->buffer;
  	delete d;
  }
***************
*** 308,315 ****
  }
  
! void cBufferedWriter::flush()
! {
! 	d->file.writeBlock( d->buffer.data(), d->bufferpos );
! 	d->bufferpos = 0;
  }
  
--- 309,317 ----
  }
  
! void cBufferedWriter::flush() {
! 	if (d->bufferpos != 0) {
!         d->file.writeBlock( d->buffer, d->bufferpos );
! 		d->bufferpos = 0;
! 	}
  }
  

Index: basics.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/basics.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** basics.h	17 Aug 2004 00:22:25 -0000	1.28
--- basics.h	18 Aug 2004 17:05:46 -0000	1.29
***************
*** 131,135 ****
  	QCString magic;
  	bool needswap;
! 	QByteArray buffer;
  	unsigned int bufferpos;
  	QMap<QCString, unsigned int> dictionary;
--- 131,135 ----
  	QCString magic;
  	bool needswap;
! 	char *buffer;
  	unsigned int bufferpos;
  	QMap<QCString, unsigned int> dictionary;
***************
*** 176,180 ****
  	}
  
! 	writeRaw( &data, sizeof( data ), unbuffered );
  }
  
--- 176,192 ----
  	}
  
! 	if (unbuffered) {
! 		flush();
! 		d->file.writeBlock((char*)&data, sizeof(data));
! 	} else {
! 		if (d->bufferpos > buffersize - sizeof(data)) {
! 			flush();
! 		}
! 
! 		d->buffer[d->bufferpos++] = ((char*)&data)[0];
! 		d->buffer[d->bufferpos++] = ((char*)&data)[1];
! 		d->buffer[d->bufferpos++] = ((char*)&data)[2];
! 		d->buffer[d->bufferpos++] = ((char*)&data)[3];
! 	}
  }
  
***************
*** 187,191 ****
  	}
  
! 	writeRaw( &data, sizeof( data ), unbuffered );
  }
  
--- 199,213 ----
  	}
  
! 	if (unbuffered) {
! 		flush();
! 		d->file.writeBlock((char*)&data, sizeof(data));
! 	} else {
! 		if (d->bufferpos > buffersize - sizeof(data)) {
! 			flush();
! 		}
! 
! 		d->buffer[d->bufferpos++] = ((char*)&data)[0];
! 		d->buffer[d->bufferpos++] = ((char*)&data)[1];
! 	}
  }
  
***************
*** 203,213 ****
  	else
  	{
! 		if ( d->bufferpos + sizeof( data ) >= buffersize )
! 		{
! 			flush(); // Flush buffer to file
  		}
  
! 		*( unsigned char * ) ( d->buffer.data() + d->bufferpos ) = data;
! 		d->bufferpos += sizeof( data );
  	}
  }
--- 225,233 ----
  	else
  	{
! 		if (d->bufferpos >= 4096) {
! 			flush();
  		}
  
! 		d->buffer[d->bufferpos++] = (char)data;
  	}
  }
***************
*** 254,258 ****
  			if ( bspace != 0 )
  			{
! 				memcpy( d->buffer.data() + d->bufferpos, ( unsigned char * ) data + pos, bspace );
  				d->bufferpos = buffersize;
  				pos += bspace;
--- 274,278 ----
  			if ( bspace != 0 )
  			{
! 				memcpy( d->buffer + d->bufferpos, ( unsigned char * ) data + pos, bspace );
  				d->bufferpos = buffersize;
  				pos += bspace;
***************
*** 266,270 ****
  		if ( size != 0 )
  		{
! 			memcpy( d->buffer.data() + d->bufferpos, ( unsigned char * ) data + pos, size );
  			d->bufferpos += size;
  		}
--- 286,290 ----
  		if ( size != 0 )
  		{
! 			memcpy( d->buffer + d->bufferpos, ( unsigned char * ) data + pos, size );
  			d->bufferpos += size;
  		}

[wpdev-commits] xmlscripts/documentation/webroot ChangeLog.wolfpack,1.40,1.41

From: Richard M. <dr...@us...> - 2004-08-17 23:06:29

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

Modified Files:
	ChangeLog.wolfpack 
Log Message:
ChangeLog updates


Index: ChangeLog.wolfpack
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** ChangeLog.wolfpack	14 Aug 2004 05:44:58 -0000	1.40
--- ChangeLog.wolfpack	17 Aug 2004 19:34:26 -0000	1.41
***************
*** 10,13 ****
--- 10,14 ----
  Wolfpack 12.9.8 Beta (4. August, 2004)
  	* Core Changes:
+ 		- Save fixes
  		- Cleanups and general fixes.
  		- Gump Responses are now passed on as Unicode rather than in the
***************
*** 71,79 ****
  		- 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.
--- 72,83 ----
  		- 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.
+ 		- Removed script: commands.addtree
+ 		- New script: commands.adddecor
+ 			This replaces addtree and expands the usage.
  		- Script Fixes:
  			Eating food no longer animates a character if on a mount.

[wpdev-commits] wolfpack .cvsignore,1.3,1.4

From: Richard M. <dr...@us...> - 2004-08-17 22:56:23

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

Modified Files:
	.cvsignore 
Log Message:
Updates


Index: .cvsignore
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** .cvsignore	31 Mar 2004 21:13:46 -0000	1.3
--- .cvsignore	17 Aug 2004 19:39:41 -0000	1.4
***************
*** 10,11 ****
--- 10,16 ----
  wolfpack.ncb
  vc70.pdb
+ wolfpack.exe
+ wolfpack
+ Makefile
+ config.pri
+ obj

[wpdev-commits] xmlscripts/documentation/webroot ChangeLog.wolfpack,1.41,1.42

From: Richard M. <dr...@us...> - 2004-08-17 22:49:56

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

Modified Files:
	ChangeLog.wolfpack 
Log Message:
Well, 12.9.8 still wasn't released... so this until then :)


Index: ChangeLog.wolfpack
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** ChangeLog.wolfpack	17 Aug 2004 19:34:26 -0000	1.41
--- ChangeLog.wolfpack	17 Aug 2004 20:21:24 -0000	1.42
***************
*** 1,5 ****
  Wolfpack 13.0.0 ChangeLog
  
! Wolfpack 12.9.9 Beta (CVS)
  	* Core Changes:
  	* Definition Changes:
--- 1,5 ----
  Wolfpack 13.0.0 ChangeLog
  
! Wolfpack 12.9.9 Beta (N/A)
  	* Core Changes:
  	* Definition Changes:
***************
*** 8,12 ****
  	* Known Issues, Bugs, and Missing Features:
  
! Wolfpack 12.9.8 Beta (4. August, 2004)
  	* Core Changes:
  		- Save fixes
--- 8,12 ----
  	* Known Issues, Bugs, and Missing Features:
  
! Wolfpack 12.9.8 Beta (CVS)
  	* Core Changes:
  		- Save fixes

[wpdev-commits] wolfpack ChangeLog,1.6,1.7

From: Richard M. <dr...@us...> - 2004-08-17 21:22:04

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

Modified Files:
	ChangeLog 
Log Message:
Updates.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ChangeLog	14 Aug 2004 03:55:50 -0000	1.6
--- ChangeLog	17 Aug 2004 19:35:50 -0000	1.7
***************
*** 5,8 ****
--- 5,9 ----
  
  Wolfpack 12.9.8 Beta (4. August 2004)
+ 	- Save fixes
  	- Cleanups and general fixes.
  	- Gump Responses are now passed on as Unicode rather than in the

[wpdev-commits] xmlscripts/scripts/commands adddecor.py,1.4,1.5

From: Richard M. <dr...@us...> - 2004-08-17 19:36:22

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

Modified Files:
	adddecor.py 
Log Message:
Updates


Index: adddecor.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/adddecor.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** adddecor.py	16 Aug 2004 01:43:43 -0000	1.4
--- adddecor.py	17 Aug 2004 19:30:46 -0000	1.5
***************
*** 66,79 ****
  
  forest_decor = [
- 	'c84', # Foxglove Flowers
- 	'c85', # Orfluer Flowers
- 	'c87', # Champion Flowers
- 	'c88', # Snowdrops
- 	'c89', # Champion Flowers
- 	'c8a', # Foxglove Flowers
- 	'c8b', # White Flowers
- 	'c8c', # White Flowers
- 	'cdd', # White Poppies
- 	'c8e', # Snowdrops
  	'cac', # Grasses
  	'cad', # Grasses
--- 66,69 ----
***************
*** 87,112 ****
  	'cb5', # Grasses
  	'cb6', # Grasses
- 	'cb7', # Cattails
- 	'cb8', # Cattails
- 	'cb9', # Grasses
- 	'cba', # Grasses
- 	'cbe', # Poppies
- 	'cbf', # Poppies
- 	'cc0', # Orfluer Flowers
- 	'cc1', # Orfluer Flowers
- 	'cc3', # Muck
  	'cc5', # Grasses
  	'cc6', # Grasses
! 	'cc7', # Weed
! 	'cc8', # Juniper Bush
! 	'cc9', # Spider Tree
! 	'd3f', # Brambles
! 	'd40', # Brambles
! 	'c9e', # O'hii Tree
! 	'd29', # Flowers
! 	'd2b', # Flowers
! 	'd2d', # Flowers
! 	'd36', # Flowers
! 	'd2f' # Flowers
  ]
  plains_decor = [
--- 77,83 ----
  	'cb5', # Grasses
  	'cb6', # Grasses
  	'cc5', # Grasses
  	'cc6', # Grasses
! 	'cc7' # Weed
  ]
  plains_decor = [
***************
*** 144,153 ****
  	'cc6', # Grasses
  	'cc7', # Weed
! 	'c9e', # O'hii Tree
! 	'd29', # Flowers
! 	'd2b', # Flowers
! 	'd2d', # Flowers
! 	'd36', # Flowers
! 	'd2f' # Flowers
  ]
  desert_decor = [
--- 115,119 ----
  	'cc6', # Grasses
  	'cc7', # Weed
! 	'c9e' # O'hii Tree
  ]
  desert_decor = [
***************
*** 241,244 ****
--- 207,245 ----
  	'cc5' # Grasses
  ]
+ flowers_decor = [
+ 	'c37', 'c38', 'c45', 'c46', 'c47', 'c48', 'c49', 'c4a', 'c4b', 'c4c', 'c4d', 'c4e', # Small Flowers
+ 	'c84', # Foxglove Flowers
+ 	'c85', # Orfluer Flowers
+ 	'c87', # Champion Flowers
+ 	'c88', # Snowdrops
+ 	'c89', # Champion Flowers
+ 	'c8a', # Foxglove Flowers
+ 	'c8b', # White Flowers
+ 	'c8c', # White Flowers
+ 	'c8d', # White Popies
+ 	'c8e', # Snowdrops
+ 	'cbe', # Poppies
+ 	'cbf', # Poppies
+ 	'cc0', # Orfluer Flowers
+ 	'cc1' # Orfluer Flowers
+ ]
+ smallflowers_decor = [ 'c37', 'c38', 'c45', 'c46', 'c47', 'c48', 'c49', 'c4a', 'c4b', 'c4c', 'c4d', 'c4e' ]
+ 
+ bigflowers_decor = [
+ 	'c84', # Foxglove Flowers
+ 	'c85', # Orfluer Flowers
+ 	'c87', # Champion Flowers
+ 	'c88', # Snowdrops
+ 	'c89', # Champion Flowers
+ 	'c8a', # Foxglove Flowers
+ 	'c8b', # White Flowers
+ 	'c8c', # White Flowers
+ 	'c8d', # White Popies
+ 	'c8e', # Snowdrops
+ 	'cbe', # Poppies
+ 	'cbf', # Poppies
+ 	'cc0', # Orfluer Flowers
+ 	'cc1' # Orfluer Flowers
+ ]
  
  # Constants
***************
*** 545,548 ****
--- 546,550 ----
  				# Tree Logs log1, log2
  				elif value in [ 'log1', 'log2' ]: #added by Jim 20040814
+ 					item = value
  					socket.sysmessage( "Where do you want to place the fallen log [%s]?" % ( item ) )
  					socket.attachtarget( 'commands.adddecor.createlog', [ item ] )
***************
*** 644,647 ****
--- 646,669 ----
  					socket.attachtarget( 'commands.adddecor.createground', [ item ] )
  					return True
+ 				# Random Ground Flowers
+ 				elif value in [ "flowers", "smallflowers", "bigflowers" ]:
+ 					if value == "flowers":
+ 						flowers = flowers_decor
+ 					elif value == "smallflowers":
+ 						flowers = smallflowers_decor
+ 					elif value == "bigflowers":
+ 						flowers = bigflowers_decor
+ 					if socket.hastag( 'last_ground_flowers' ):
+ 						templist = []
+ 						for choice in flowers:
+ 							if choice != str( socket.gettag( 'last_ground_flowers' ) ):
+ 								templist += [ choice ]
+ 						item = random.choice( templist )
+ 						socket.settag( 'last_ground_flowers', str( item ) )
+ 					else:
+ 						item = random.choice( flowers )
+ 						socket.settag( 'last_ground_flowers', str( item ) )
+ 					socket.attachtarget( 'commands.adddecor.createground', [ item ] )
+ 					return True
  				# Nothing
  				else:

[wpdev-commits] wolfpack basics.cpp,1.34,1.35 basics.h,1.27,1.28

From: Sebastian H. <dar...@us...> - 2004-08-17 00:25:42

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

Modified Files:
	basics.cpp basics.h 
Log Message:
Updated binary saves.

Index: basics.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/basics.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** basics.cpp	15 Aug 2004 20:54:16 -0000	1.34
--- basics.cpp	17 Aug 2004 00:22:25 -0000	1.35
***************
*** 191,195 ****
  	d->version = version;
  	d->magic = magic;
! 	d->buffer.resize( 4096 );
  	d->bufferpos = 0;
  	d->lastStringId = 0;
--- 191,195 ----
  	d->version = version;
  	d->magic = magic;
! 	d->buffer.resize( buffersize );
  	d->bufferpos = 0;
  	d->lastStringId = 0;

Index: basics.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/basics.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** basics.h	15 Aug 2004 20:54:16 -0000	1.27
--- basics.h	17 Aug 2004 00:22:25 -0000	1.28
***************
*** 98,101 ****
--- 98,102 ----
  private:
  	class cBufferedWriterPrivate *d;
+ 	static const int buffersize = 4096;
  
  public:
***************
*** 202,206 ****
  	else
  	{
! 		if ( d->bufferpos + sizeof( data ) >= 4096 )
  		{
  			flush(); // Flush buffer to file
--- 203,207 ----
  	else
  	{
! 		if ( d->bufferpos + sizeof( data ) >= buffersize )
  		{
  			flush(); // Flush buffer to file
***************
*** 246,252 ****
  		unsigned int pos = 0;
  
! 		while ( d->bufferpos + size >= 4096 )
  		{
! 			unsigned int bspace = 4096 - d->bufferpos;
  
  			// Try putting in some bytes of the remaining data
--- 247,253 ----
  		unsigned int pos = 0;
  
! 		while ( d->bufferpos + size >= buffersize )
  		{
! 			unsigned int bspace = buffersize - d->bufferpos;
  
  			// Try putting in some bytes of the remaining data
***************
*** 254,258 ****
  			{
  				memcpy( d->buffer.data() + d->bufferpos, ( unsigned char * ) data + pos, bspace );
! 				d->bufferpos = 4096;
  				pos += bspace;
  				size -= bspace;
--- 255,259 ----
  			{
  				memcpy( d->buffer.data() + d->bufferpos, ( unsigned char * ) data + pos, bspace );
! 				d->bufferpos = buffersize;
  				pos += bspace;
  				size -= bspace;

[wpdev-commits] wolfpack/python tempeffect.h,1.25,1.26

From: Sebastian H. <dar...@us...> - 2004-08-17 00:24:57

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

Modified Files:
	tempeffect.h 
Log Message:
Updated binary saves.

Index: tempeffect.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/tempeffect.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** tempeffect.h	17 Aug 2004 00:13:51 -0000	1.25
--- tempeffect.h	17 Aug 2004 00:22:25 -0000	1.26
***************
*** 196,210 ****
  
  			if ( PyInt_Check( object ) ) {
! 				cVariant((int)PyInt_AsLong(object)).serialize(writer, version);
  			} else if ( PyString_Check( object ) || PyUnicode_Check( object ) ) {
! 				cVariant((QString)Python2QString(object)).serialize(writer, version);
  			} else if ( PyFloat_Check( object ) ) {
! 				cVariant(PyFloat_AsDouble(object)).serialize(writer, version);
  			} else if ( checkWpChar( object ) ) {
! 				cVariant(getWpChar(object)).serialize(writer, version);
  			} else if ( checkWpItem( object ) ) {
! 				cVariant(getWpItem(object)).serialize(writer, version);
  			} else if ( checkWpCoord( object ) ) {
! 				cVariant(getWpCoord(object)).serialize(writer, version);
  			}
  		}
--- 196,216 ----
  
  			if ( PyInt_Check( object ) ) {
! 				int value = PyInt_AsLong(object);
! 				cVariant(value).serialize(writer, version);
  			} else if ( PyString_Check( object ) || PyUnicode_Check( object ) ) {
! 				QString value = Python2QString(object);
! 				cVariant(value).serialize(writer, version);
  			} else if ( PyFloat_Check( object ) ) {
! 				double value = PyFloat_AsDouble(object);
! 				cVariant(value).serialize(writer, version);
  			} else if ( checkWpChar( object ) ) {
! 				P_CHAR pChar = getWpChar(object);
! 				cVariant(pChar).serialize(writer, version);
  			} else if ( checkWpItem( object ) ) {
! 				P_ITEM pItem = getWpItem(object);
! 				cVariant(pItem).serialize(writer, version);
  			} else if ( checkWpCoord( object ) ) {
! 				Coord_cl coord = getWpCoord(object);
! 				cVariant(coord).serialize(writer, version);
  			}
  		}

Flat | Threaded

<< < 1 .. 63 64 65 66 67 .. 201 > >> (Page 65 of 201)

2003	Jan	Feb	Mar	Apr	May	Jun	Jul (14)	Aug (121)	Sep (256)	Oct (59)	Nov (73)	Dec (120)
2004	Jan (259)	Feb (381)	Mar (501)	Apr (355)	May (427)	Jun (270)	Jul (394)	Aug (412)	Sep (724)	Oct (578)	Nov (65)	Dec