Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1:/tmp/cvs-serv5540/src
Modified Files:
basechar.cpp basechar.h customtags.cpp dragdrop.cpp items.cpp
items.h npc.cpp player.cpp
Log Message:
moved some properties from cItem to python
Index: basechar.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/basechar.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** basechar.cpp 27 Aug 2003 20:35:09 -0000 1.37
--- basechar.cpp 27 Aug 2003 21:11:41 -0000 1.38
***************
*** 756,777 ****
}
- void cBaseChar::removeItemBonus(cItem* pi)
- {
- changed( TOOLTIP );
- changed_ = true;
- strength_ -= pi->strengthMod();
- dexterity_ -= pi->dexterityMod();
- intelligence_ -= pi->intelligenceMod();
- }
-
- void cBaseChar::giveItemBonus(cItem* pi)
- {
- changed( TOOLTIP );
- changed_ = true;
- strength_ += pi->strengthMod();
- dexterity_ += pi->dexterityMod();
- intelligence_ += pi->intelligenceMod();
- }
-
void cBaseChar::Init( bool createSerial )
{
--- 756,759 ----
***************
*** 919,924 ****
if( pHitItem->layer() != 0x0B && pHitItem->layer() != 0x10 && pHitItem->layer() != 0x15 )
{
! if( pHitItem->wearOut() )
! removeItemBonus( pHitItem ); // remove BONUS STATS given by equipped special items
}
}
--- 901,905 ----
if( pHitItem->layer() != 0x0B && pHitItem->layer() != 0x10 && pHitItem->layer() != 0x15 )
{
! pHitItem->wearOut();
}
}
Index: basechar.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/basechar.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** basechar.h 27 Aug 2003 20:35:09 -0000 1.26
--- basechar.h 27 Aug 2003 21:11:41 -0000 1.27
***************
*** 134,139 ****
bool Wears(P_ITEM pi);
unsigned int getSkillSum() const;
- void removeItemBonus(cItem* pi);
- void giveItemBonus(cItem* pi);
void Init(bool ser = true);
bool isSameAs(P_CHAR pc);
--- 134,137 ----
Index: customtags.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/customtags.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** customtags.cpp 27 Aug 2003 20:35:10 -0000 1.27
--- customtags.cpp 27 Aug 2003 21:11:41 -0000 1.28
***************
*** 658,669 ****
{
if( d.tags_ )
- tags_ = d.tags_;
- else
tags_ = new QMap< QString, cVariant >( *d.tags_ );
changed = true;
}
! cCustomTags& cCustomTags::operator=( const cCustomTags& tags)
{
changed = true;
--- 658,669 ----
{
if( d.tags_ )
tags_ = new QMap< QString, cVariant >( *d.tags_ );
+ else
+ tags_ = 0;
changed = true;
}
! cCustomTags& cCustomTags::operator=( const cCustomTags& tags )
{
changed = true;
Index: dragdrop.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/dragdrop.cpp,v
retrieving revision 1.192
retrieving revision 1.193
diff -C2 -d -r1.192 -r1.193
*** dragdrop.cpp 27 Aug 2003 20:35:10 -0000 1.192
--- dragdrop.cpp 27 Aug 2003 21:11:41 -0000 1.193
***************
*** 192,198 ****
P_CHAR wearer = dynamic_cast<P_CHAR>( pItem->container() );
- if( wearer )
- wearer->removeItemBonus( pItem );
-
// resend the stat window
if( wearer && wearer->objectType() == enPlayer )
--- 192,195 ----
***************
*** 290,302 ****
if( equip && ( equip->layer() == tile.layer ) )
equip->toBackpack( wearer );
-
- wearer->removeItemBonus( equip );
}
// *finally* equip the item
wearer->addItem( static_cast<cBaseChar::enLayer>(item->layer()), item );
-
- // Add the item bonuses
- wearer->giveItemBonus( item );
}
--- 287,294 ----
***************
*** 391,430 ****
}
- // Required Strength
- if( pItem->strengthReq() > pWearer->strength() )
- {
- if( pWearer == pChar )
- socket->sysMessage( tr( "You cannot wear that item, you seem not strong enough" ) );
- else
- socket->sysMessage( tr( "This person can't wear that item, seems not strong enough" ) );
-
- socket->bounceItem( pItem, BR_NO_REASON );
- return;
- }
-
- // Required Dexterity
- if( pItem->dexterityReq() > pWearer->dexterity() )
- {
- if( pWearer == pChar )
- socket->sysMessage( tr( "You cannot wear that item, you seem not agile enough" ) );
- else
- socket->sysMessage( tr( "This person can't wear that item, seems not agile enough" ) );
-
- socket->bounceItem( pItem, BR_NO_REASON );
- return;
- }
-
- // Required Intelligence
- if( pItem->intelligenceReq() > pWearer->intelligence() )
- {
- if( pWearer == pChar )
- socket->sysMessage( tr( "You cannot wear that item, you seem not smart enough" ) );
- else
- socket->sysMessage( tr( "This person can't wear that item, seems not smart enough" ) );
-
- socket->bounceItem( pItem, BR_NO_REASON );
- return;
- }
-
// Males can't wear female armor
if( ( pChar->bodyID() == 0x0190 ) && ( pItem->id() >= 0x1C00 ) && ( pItem->id() <= 0x1C0D ) )
--- 383,386 ----
***************
*** 471,477 ****
// At this point we're certain that we can wear the item
pWearer->addItem( static_cast<cBaseChar::enLayer>(pTile.layer), pItem );
-
- // Apply the bonuses
- pWearer->giveItemBonus( pItem );
if( pWearer->objectType() == enPlayer )
--- 427,430 ----
Index: items.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/items.cpp,v
retrieving revision 1.337
retrieving revision 1.338
diff -C2 -d -r1.337 -r1.338
*** items.cpp 27 Aug 2003 20:35:10 -0000 1.337
--- items.cpp 27 Aug 2003 21:11:41 -0000 1.338
***************
*** 74,78 ****
// constructor
cItem::cItem(): container_(0), totalweight_(0), incognito(false),
! rndvaluerate_(0), dooropen_(0),timeused_last(0), sellprice_( 0 ),
buyprice_( 0 ), restock_( 1 ), antispamtimer_( 0 )
{
--- 74,78 ----
// constructor
cItem::cItem(): container_(0), totalweight_(0), incognito(false),
! rndvaluerate_(0), timeused_last(0), sellprice_( 0 ),
buyprice_( 0 ), restock_( 1 ), antispamtimer_( 0 )
{
***************
*** 100,104 ****
this->type_ = src.type_;
this->type2_ = src.type2_;
- this->offspell_ = src.offspell_;
this->weight_ = src.weight_;
this->more1_ = src.more1_;
--- 100,103 ----
***************
*** 110,115 ****
this->morez_ = src.morez_;
this->amount_ = src.amount_;
- this->doordir_ = src.doordir_;
- this->dooropen_ = src.dooropen_;
this->dye_ = src.dye_;
this->att_ = src.att_;
--- 109,112 ----
***************
*** 119,128 ****
this->hp_ = src.hp_;
this->maxhp_ = src.maxhp_;
- this->st_ = src.st_;
- this->st2_ = src.st2_;
- this->dx_ = src.dx_;
- this->dx2_ = src.dx2_;
- this->in_ = src.in_;
- this->in2_ = src.in2_;
this->speed_=src.speed_;
this->magic_ = src.magic_;
--- 116,119 ----
***************
*** 469,473 ****
addField("type", type_);
addField("type2", type2_);
- addField("offspell", offspell_);
addField("more1", more1_);
addField("more2", more2_);
--- 460,463 ----
***************
*** 478,482 ****
addField("morez", morez_);
addField("amount", amount_);
- addField("doordir", doordir_);
addField("dye", dye_);
addField("decaytime", (decaytime_ > uiCurrentTime) ? decaytime_ - uiCurrentTime : 0 );
--- 468,471 ----
***************
*** 485,489 ****
addField("hidamage", hidamage_);
addField("lodamage", lodamage_);
- addField("st", st_);
addField("time_unused", time_unused);
addField("weight", weight_);
--- 474,477 ----
***************
*** 491,499 ****
addField("maxhp", maxhp_);
addField("rank", rank_);
- addField("st2", st2_);
- addField("dx", dx_);
- addField("dx2", dx2_);
- addField("intelligence", in_);
- addField("intelligence2", in2_);
addField("speed", speed_);
addField("poisoned", poisoned_);
--- 479,482 ----
***************
*** 618,622 ****
this->type_=0; // For things that do special things on doubleclicking
this->type2_=0;
- this->offspell_ = 0;
this->weight_ = 0;
this->more1_=0; // For various stuff
--- 601,604 ----
***************
*** 628,633 ****
this->morez_=0;
this->amount_ = 1; // Amount of items in pile
- this->doordir_=0; // Reserved for doors
- this->dooropen_=0;
this->dye_=0; // Reserved: Can item be dyed by dye kit
this->att_=0; // Item attack
--- 610,613 ----
***************
*** 637,646 ****
this->hp_=0; //Number of hit points an item has.
this->maxhp_=0; // Max number of hit points an item can have.
- this->st_=0; // The strength needed to equip the item
- this->st2_=0; // The strength the item gives
- this->dx_ = 0; // The dexterity needed to equip the item
- this->dx2_ = 0; // The dexterity the item gives
- this->in_ = 0; // The intelligence needed to equip the item
- this->in2_ = 0; // The intelligence the item gives
this->speed_=0; //The speed of the weapon
this->magic_ = 0; // 0=Default as stored in client, 1=Always movable, 2=Never movable, 3=Owner movable.
--- 617,620 ----
***************
*** 1325,1344 ****
this->setTwohanded( false );
- // <requires type="xx">2</requires>
- else if( TagName == "requires" )
- {
- if( !Tag->hasAttribute( "type" ) )
- return;
-
- QString Type = Tag->getAttribute( "type" );
-
- if( Type == "str" )
- this->st_ = Value.toULong();
- else if( Type == "dex" )
- this->dx_ = Value.toULong();
- else if( Type == "int" )
- this->in_ = Value.toULong();
- }
-
// <visible />
// <invisible />
--- 1299,1302 ----
***************
*** 1351,1370 ****
this->visible_ = 1;
- // <modifier type="xx">2</modifier>
- else if( TagName == "modifier" )
- {
- if( !Tag->hasAttribute( "type" ) )
- return;
-
- QString Type = Tag->getAttribute( "type" );
-
- if( Type == "str" )
- this->st2_ = Value.toShort();
- else if( Type == "dex" )
- this->dx2_ = Value.toShort();
- else if( Type == "int" )
- this->in2_ = Value.toShort();
- }
-
// <dye />
// <nodye />
--- 1309,1312 ----
***************
*** 1532,1597 ****
}
- // <requires type="xx">2</requires>
- else if( TagName == "requires" )
- {
- if( !Tag->hasAttribute( "type" ) )
- return;
-
- QString Type = Tag->getAttribute( "type" );
-
- if( Type == "str" )
- {
- if( Value.contains(".") || Value.contains(",") )
- st_ = (INT32)ceil((float)st_ * Value.toFloat());
- else
- this->st_ += Value.toLong();
- }
- else if( Type == "dex" )
- {
- if( Value.contains(".") || Value.contains(",") )
- dx_ = (INT32)ceil((float)dx_ * Value.toFloat());
- else
- this->dx_ += Value.toLong();
- }
- else if( Type == "int" )
- {
- if( Value.contains(".") || Value.contains(",") )
- in_ = (INT32)ceil((float)in_ * Value.toFloat());
- else
- this->in_ += Value.toLong();
- }
- }
-
- // <modifier type="xx">2</modifier>
- else if( TagName == "modifier" )
- {
- if( !Tag->hasAttribute( "type" ) )
- return;
-
- QString Type = Tag->getAttribute( "type" );
-
- if( Type == "str" )
- {
- if( Value.contains(".") || Value.contains(",") )
- st2_ = (INT32)ceil((float)st2_ * Value.toFloat());
- else
- this->st2_ += Value.toLong();
- }
- else if( Type == "dex" )
- {
- if( Value.contains(".") || Value.contains(",") )
- dx2_ = (INT32)ceil((float)dx2_ * Value.toFloat());
- else
- this->dx2_ += Value.toLong();
- }
- else if( Type == "int" )
- {
- if( Value.contains(".") || Value.contains(",") )
- in2_ = (INT32)ceil((float)in2_ * Value.toFloat());
- else
- this->in2_ += Value.toLong();
- }
- }
-
else
cUObject::processNode( Tag );
--- 1474,1477 ----
***************
*** 2065,2069 ****
}
! this->remove();
return true;
}
--- 1945,1949 ----
}
! remove();
return true;
}
***************
*** 2162,2166 ****
type_ = atoi( result[offset++] );
type2_ = atoi( result[offset++] );
- offspell_ = atoi( result[offset++] );
more1_ = atoi( result[offset++] );
more2_ = atoi( result[offset++] );
--- 2042,2045 ----
***************
*** 2171,2175 ****
morez_ = atoi( result[offset++] );
amount_ = atoi( result[offset++] );
- doordir_ = atoi( result[offset++] );
dye_ = atoi( result[offset++] );
decaytime_ = atoi( result[offset++] );
--- 2050,2053 ----
***************
*** 2180,2184 ****
hidamage_ = atoi( result[offset++] );
lodamage_ = atoi( result[offset++] );
- st_ = atoi( result[offset++] );
time_unused = atoi( result[offset++] );
weight_ = atoi( result[offset++] );
--- 2058,2061 ----
***************
*** 2186,2194 ****
maxhp_ = atoi( result[offset++] );
rank_ = atoi( result[offset++] );
- st2_ = atoi( result[offset++] );
- dx_ = atoi( result[offset++] );
- dx2_ = atoi( result[offset++] );
- in_ = atoi( result[offset++] );
- in2_ = atoi( result[offset++] );
speed_ = atoi( result[offset++] );
poisoned_ = atoi( result[offset++] );
--- 2063,2066 ----
***************
*** 2214,2218 ****
{
cUObject::buildSqlString( fields, tables, conditions );
! fields.push_back( "items.id,items.creator,items.sk_name,items.color,items.cont,items.layer,items.type,items.type2,items.offspell,items.more1,items.more2,items.more3,items.more4,items.morex,items.morey,items.morez,items.amount,items.doordir,items.dye,items.decaytime,items.att,items.def,items.hidamage,items.lodamage,items.st,items.time_unused,items.weight,items.hp,items.maxhp,items.rank,items.st2,items.dx,items.dx2,items.intelligence,items.intelligence2,items.speed,items.poisoned,items.magic,items.owner,items.visible,items.spawn,items.priv,items.sellprice,items.buyprice,items.restock,items.disabled,items.good,items.accuracy" ); // for now! later on we should specify each field
tables.push_back( "items" );
conditions.push_back( "uobjectmap.serial = items.serial" );
--- 2086,2090 ----
{
cUObject::buildSqlString( fields, tables, conditions );
! fields.push_back( "items.id,items.creator,items.sk_name,items.color,items.cont,items.layer,items.type,items.type2,items.offspell,items.more1,items.more2,items.more3,items.more4,items.morex,items.morey,items.morez,items.amount,items.dye,items.decaytime,items.att,items.def,items.hidamage,items.lodamage,items.time_unused,items.weight,items.hp,items.maxhp,items.rank,items.speed,items.poisoned,items.magic,items.owner,items.visible,items.spawn,items.priv,items.sellprice,items.buyprice,items.restock,items.disabled,items.good,items.accuracy" ); // for now! later on we should specify each field
tables.push_back( "items" );
conditions.push_back( "uobjectmap.serial = items.serial" );
***************
*** 2409,2413 ****
else SET_INT_PROPERTY( "type", type_ )
else SET_INT_PROPERTY( "type2", type2_ )
- else SET_INT_PROPERTY( "offspell", offspell_ )
else SET_INT_PROPERTY( "speed", speed_ )
else SET_INT_PROPERTY( "lodamage", lodamage_ )
--- 2281,2284 ----
***************
*** 2474,2524 ****
else SET_INT_PROPERTY( "morey", morey_ )
else SET_INT_PROPERTY( "morez", morez_ )
- else SET_INT_PROPERTY( "doordir", doordir_ )
- else SET_INT_PROPERTY( "dooropen", dooropen_ )
else SET_INT_PROPERTY( "dye", dye_ )
else SET_INT_PROPERTY( "attack", att_ )
else SET_INT_PROPERTY( "defense", def_ )
- else SET_INT_PROPERTY( "strength", st_ )
- else SET_INT_PROPERTY( "dexterity", dx_ )
- else SET_INT_PROPERTY( "intelligence", in_ )
- else if( name == "strength2" )
- {
- P_CHAR pChar = dynamic_cast< P_CHAR >( container_ );
- if( pChar )
- pChar->removeItemBonus( this );
-
- st2_ = value.toInt();
-
- if( pChar )
- pChar->giveItemBonus( this );
-
- return 0;
- }
- else if( name == "dexterity2" )
- {
- P_CHAR pChar = dynamic_cast< P_CHAR >( container_ );
- if( pChar )
- pChar->removeItemBonus( this );
-
- dx2_ = value.toInt();
-
- if( pChar )
- pChar->giveItemBonus( this );
-
- return 0;
- }
- else if( name == "intelligence2" )
- {
- P_CHAR pChar = dynamic_cast< P_CHAR >( container_ );
- if( pChar )
- pChar->removeItemBonus( this );
-
- in2_ = value.toInt();
-
- if( pChar )
- pChar->giveItemBonus( this );
-
- return 0;
- }
else SET_INT_PROPERTY( "decaytime", decaytime_ )
--- 2345,2351 ----
***************
*** 2630,2634 ****
else GET_PROPERTY( "type", type_ )
else GET_PROPERTY( "type2", type2_ )
- else GET_PROPERTY( "offspell", offspell_ )
else GET_PROPERTY( "speed", speed_ )
else GET_PROPERTY( "lodamage", lodamage_ )
--- 2457,2460 ----
***************
*** 2663,2677 ****
else GET_PROPERTY( "morey", (int)morey_ )
else GET_PROPERTY( "morez", (int)morez_ )
- else GET_PROPERTY( "doordir", doordir_ )
- else GET_PROPERTY( "dooropen", dooropen_ )
else GET_PROPERTY( "dye", dye_ )
else GET_PROPERTY( "attack", (int)att_ )
else GET_PROPERTY( "defense", (int)def_ )
- else GET_PROPERTY( "strength", st_ )
- else GET_PROPERTY( "strength2", st2_ )
- else GET_PROPERTY( "dexterity", dx_ )
- else GET_PROPERTY( "dexterity2", dx2_ )
- else GET_PROPERTY( "intelligence", in_ )
- else GET_PROPERTY( "intelligence2", in2_ )
else GET_PROPERTY( "decaytime", (int)decaytime_ )
--- 2489,2495 ----
Index: items.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/items.h,v
retrieving revision 1.173
retrieving revision 1.174
diff -C2 -d -r1.173 -r1.174
*** items.h 27 Aug 2003 20:35:10 -0000 1.173
--- items.h 27 Aug 2003 21:11:41 -0000 1.174
***************
*** 81,85 ****
UI32 type() const { return type_; } // Used for hardcoded behaviour
UI32 type2() const { return type2_; }
- uchar offspell() const { return offspell_; }
bool secured() const { return priv_&0x08; } // Is the container secured (houses)
SI16 speed() const { return speed_; } // Weapon speed
--- 81,84 ----
***************
*** 109,123 ****
uint morey() const { return morey_; }
uint morez() const { return morez_; }
- uchar doordir() const { return doordir_; }
- uchar dooropen() const { return dooropen_; }
uchar dye() const { return dye_; }
uint att() const { return att_; }
uint def() const { return def_; }
- short strengthReq() const { return st_; }
- short strengthMod() const { return st2_; }
- short dexterityReq() const { return dx_; }
- short dexterityMod() const { return dx2_; }
- short intelligenceReq() const { return in_; }
- short intelligenceMod() const { return in2_; }
uchar magic() const { return magic_; }
uint decaytime() const { return decaytime_; }
--- 108,114 ----
***************
*** 156,160 ****
void setType( UI32 nValue ) { type_ = nValue; flagChanged();};
void setType2( UI32 nValue ) { type2_ = nValue; flagChanged();};
- void setOffspell( uchar nValue ) { offspell_ = nValue; flagChanged();};
void setSecured( bool nValue ) { ( nValue ) ? priv_ &= 0x08 : priv_ |= 0xF7; flagChanged(); changed( TOOLTIP );};
void setSpeed( SI16 nValue ) { speed_ = nValue; flagChanged(); changed( TOOLTIP );};
--- 147,150 ----
***************
*** 190,204 ****
void setMoreY( uint data ) { morey_ = data; flagChanged();}
void setMoreZ( uint data ) { morez_ = data; flagChanged();}
- void setDoorDir( uchar data ) { doordir_ = data; flagChanged();}
- void setDoorOpen( uchar data ) { dooropen_ = data; flagChanged();}
void setDye( uchar data ) { dye_ = data; flagChanged();}
void setAtt( uint data ) { att_ = data; flagChanged();}
void setDef( uint data ) { def_ = data; flagChanged(); changed( TOOLTIP );}
- void setStrengthReq( short data ) { st_ = data; flagChanged(); changed( TOOLTIP );}
- void setStrengthMod( short data ) { st2_ = data; flagChanged(); changed( TOOLTIP );}
- void setDexterityReq( short data ) { dx_ = data; flagChanged(); changed( TOOLTIP );}
- void setDexterityMod( short data ) { dx2_ = data; flagChanged(); changed( TOOLTIP );}
- void setIntelligenceReq( short data ) { in_ = data; flagChanged(); changed( TOOLTIP );}
- void setIntelligenceMod( short data ) { in2_ = data; flagChanged(); changed( TOOLTIP );}
void setMagic( uchar data ) { magic_ = data; flagChanged(); changed( TOOLTIP );}
void setDecayTime( uint data ) { decaytime_ = data; }
--- 180,186 ----
***************
*** 322,326 ****
ushort type_;
ushort type2_;
- uchar offspell_; // Whats that for ?!
SI16 speed_;
SI16 weight_;
--- 304,307 ----
***************
*** 343,357 ****
uint morey_;
uint morez_;
- uchar doordir_; // Reserved for doors
- uchar dooropen_;
uchar dye_; // Reserved: Can item be dyed by dye kit
uint att_; // Item attack
uint def_; // Item defense
- short st_; // The strength needed to equip the item
- short st2_; // The strength the item gives
- short dx_; // The dexterity needed to equip the item
- short dx2_; // The dexterity the item gives
- short in_; // The intelligence needed to equip the item
- short in2_; // The intelligence the item gives
uchar magic_; // 0=Default as stored in client, 1=Always movable, 2=Never movable, 3=Owner movable, 4=Locked Down
uint decaytime_;
--- 324,330 ----
Index: npc.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/npc.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** npc.cpp 27 Aug 2003 20:35:10 -0000 1.34
--- npc.cpp 27 Aug 2003 21:11:41 -0000 1.35
***************
*** 574,581 ****
P_ITEM pi_j = *iit;
- if( !pi_j->newbie() )
- removeItemBonus( pi_j );
-
- // unequip trigger...
if( pi_j->layer() != 0x0B && pi_j->layer() != 0x10 )
{ // Let's check all items, except HAIRS and BEARD
--- 574,577 ----
Index: player.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/player.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** player.cpp 27 Aug 2003 20:35:10 -0000 1.28
--- player.cpp 27 Aug 2003 21:11:41 -0000 1.29
***************
*** 587,593 ****
P_ITEM pi_j = *iit;
- if( !pi_j->newbie() )
- removeItemBonus( pi_j );
-
// unequip trigger...
if( pi_j->layer() != 0x0B && pi_j->layer() != 0x10 )
--- 587,590 ----
***************
*** 1238,1242 ****
// Put it onto the char
this->addItem( static_cast<cBaseChar::enLayer>( mLayer ), pItem );
- giveItemBonus( pItem );
}
}
--- 1235,1238 ----
|
