[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

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

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 )