summaryrefslogtreecommitdiff
path: root/src/map/status.c
diff options
context:
space:
mode:
authorcelest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-03-18 07:00:31 +0000
committercelest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-03-18 07:00:31 +0000
commit712ea2e956dbaae6f23229e0c7634cd95a14fe9d (patch)
treef91b0bcbfe657ffe3eff11c793c226a7c72f0335 /src/map/status.c
parent13c7d7cbceddc381bfaeb54889364780573dd0ae (diff)
downloadhercules-712ea2e956dbaae6f23229e0c7634cd95a14fe9d.tar.gz
hercules-712ea2e956dbaae6f23229e0c7634cd95a14fe9d.tar.bz2
hercules-712ea2e956dbaae6f23229e0c7634cd95a14fe9d.tar.xz
hercules-712ea2e956dbaae6f23229e0c7634cd95a14fe9d.zip
* Fixed the bDamageWhenUnequip effect dealing damage when unequipping unrelated items
* Fixed Incantation Samurai card reducing hp too quickly git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1248 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.c')
-rw-r--r--src/map/status.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/map/status.c b/src/map/status.c
index 16b489660..c5b728b73 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -521,7 +521,7 @@ int status_calc_pc(struct map_session_data* sd,int first)
memset(sd->addrace2_,0,sizeof(sd->addrace2_));
sd->hp_gain_value = sd->sp_drain_type = 0;
memset(sd->subsize,0,sizeof(sd->subsize));
- sd->unequip_damage = 0;
+ memset(sd->unequip_damage,0,sizeof(sd->unequip_damage));
if(!sd->disguiseflag && sd->disguise) {
sd->disguise=0;
@@ -552,6 +552,7 @@ int status_calc_pc(struct map_session_data* sd,int first)
continue;
if(sd->inventory_data[index]) {
+ sd->current_item = sd->inventory_data[index];
if(sd->inventory_data[index]->type == 4) {
if(sd->status.inventory[index].card[0]!=0x00ff && sd->status.inventory[index].card[0]!=0x00fe && sd->status.inventory[index].card[0]!=(short)0xff00) {
int j;
@@ -576,6 +577,7 @@ int status_calc_pc(struct map_session_data* sd,int first)
}
}
}
+ sd->current_item = NULL;
}
}
wele = sd->atk_ele;