diff options
| author | Haru <haru@dotalux.com> | 2016-06-30 01:42:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-30 01:42:28 +0200 |
| commit | be91934950494423961c7f9ca6dbfb42844359c2 (patch) | |
| tree | 396829d37d642103dbd98e39b00bed7b8e875461 /src/map/skill.c | |
| parent | 48064104f599a2dfa57440a1fda861c27bd55401 (diff) | |
| parent | 7c21376f8dea2b438cb9470f74acc157a1929f06 (diff) | |
| download | hercules-be91934950494423961c7f9ca6dbfb42844359c2.tar.gz hercules-be91934950494423961c7f9ca6dbfb42844359c2.tar.bz2 hercules-be91934950494423961c7f9ca6dbfb42844359c2.tar.xz hercules-be91934950494423961c7f9ca6dbfb42844359c2.zip | |
Merge pull request #1329 from 4144/attribute
Use item attribute as flags varible. Now only ATTR_BROKEN flag exists.
Diffstat (limited to 'src/map/skill.c')
| -rw-r--r-- | src/map/skill.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 51d0792e3..af82cdbb4 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -2005,7 +2005,7 @@ int skill_break_equip (struct block_list *bl, unsigned short where, int rate, in if (sd) { for (i = 0; i < EQI_MAX; i++) { int j = sd->equip_index[i]; - if (j < 0 || sd->status.inventory[j].attribute == 1 || !sd->inventory_data[j]) + if (j < 0 || (sd->status.inventory[j].attribute & ATTR_BROKEN) != 0 || !sd->inventory_data[j]) continue; switch(i) { @@ -2031,7 +2031,7 @@ int skill_break_equip (struct block_list *bl, unsigned short where, int rate, in continue; } if (flag) { - sd->status.inventory[j].attribute = 1; + sd->status.inventory[j].attribute |= ATTR_BROKEN; pc->unequipitem(sd, j, PCUNEQUIPITEM_RECALC|PCUNEQUIPITEM_FORCE); } } @@ -15222,7 +15222,7 @@ void skill_repairweapon (struct map_session_data *sd, int idx) { return; //Invalid index?? item = &target_sd->status.inventory[idx]; - if( item->nameid <= 0 || item->attribute == 0 ) + if( item->nameid <= 0 || (item->attribute & ATTR_BROKEN) == 0 ) return; //Again invalid item.... if( sd != target_sd && !battle->check_range(&sd->bl,&target_sd->bl, skill->get_range2(&sd->bl, sd->menuskill_id,sd->menuskill_val2) ) ){ @@ -15241,7 +15241,8 @@ void skill_repairweapon (struct map_session_data *sd, int idx) { clif->skill_nodamage(&sd->bl,&target_sd->bl,sd->menuskill_id,1,1); - item->attribute = 0;/* clear broken state */ + item->attribute |= ATTR_BROKEN; + item->attribute ^= ATTR_BROKEN; /* clear broken state */ clif->equiplist(target_sd); |