diff options
| author | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-13 13:54:56 +0000 |
|---|---|---|
| committer | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-13 13:54:56 +0000 |
| commit | 7fae29dea80ba1c6b005b195dc65e5e4df73ae21 (patch) | |
| tree | 29e1165d361f4d5b85215c741e164cdd327bd369 /src/map/clif.c | |
| parent | 469d68189f96c332eba0b90cd50f851ae751d75d (diff) | |
| download | hercules-7fae29dea80ba1c6b005b195dc65e5e4df73ae21.tar.gz hercules-7fae29dea80ba1c6b005b195dc65e5e4df73ae21.tar.bz2 hercules-7fae29dea80ba1c6b005b195dc65e5e4df73ae21.tar.xz hercules-7fae29dea80ba1c6b005b195dc65e5e4df73ae21.zip | |
* Added 'Throw Tomahawk'
* Added some new monster skills - still not complete.
* Adjusted Palm Strike, Tiger Fist and Chain Crush
* Removed redundant 'sg_count'
* Save both persons' data after trading
* Removed 'type' paramater from pc_unequipitem
* Moved unequip checking code from clif.c to pc.c
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@554 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/clif.c')
| -rw-r--r-- | src/map/clif.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 0d2370890..7e4605807 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -8306,17 +8306,18 @@ void clif_parse_UnequipItem(int fd,struct map_session_data *sd) clif_clearchar_area(&sd->bl,1); return; } + if(sd->npc_id!=0 || sd->vender_id != 0 || sd->opt1 > 0) + return; index = RFIFOW(fd,2)-2; - if(sd->status.inventory[index].attribute == 1 && sd->sc_data && sd->sc_data[SC_BROKNWEAPON].timer!=-1) + + /*if(sd->status.inventory[index].attribute == 1 && sd->sc_data && sd->sc_data[SC_BROKNWEAPON].timer!=-1) skill_status_change_end(&sd->bl,SC_BROKNWEAPON,-1); if(sd->status.inventory[index].attribute == 1 && sd->sc_data && sd->sc_data[SC_BROKNARMOR].timer!=-1) skill_status_change_end(&sd->bl,SC_BROKNARMOR,-1); - if(sd->sc_data && ( sd->sc_data[SC_BLADESTOP].timer!=-1 || sd->sc_data[SC_BERSERK].timer!=-1 )) - return; + if(sd->sc_count && ( sd->sc_data[SC_BLADESTOP].timer!=-1 || sd->sc_data[SC_BERSERK].timer!=-1 )) + return;*/ - if(sd->npc_id!=0 || sd->vender_id != 0 || sd->opt1 > 0) - return; - pc_unequipitem(sd,index,0,BF_NORMAL); + pc_unequipitem(sd,index,1); } /*========================================== |