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] |
