From 48b0ecb47ab3a8a59f881fba26ee3a4ee10095e8 Mon Sep 17 00:00:00 2001 From: skotlex Date: Tue, 30 May 2006 23:10:27 +0000 Subject: - Fixed status_damage not setting your HP to 0 when you died T.T - Fixed the pcbonus2 warnings using the wrong value before printing the invalid Element error. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6864 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/pc.c | 16 ++++++++-------- src/map/status.c | 1 + 2 files changed, 9 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/map/pc.c b/src/map/pc.c index c7cc1edec..1e032a125 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -1660,9 +1660,9 @@ int pc_bonus2(struct map_session_data *sd,int type,int type2,int val) switch(type){ case SP_ADDELE: - if(val >= ELE_MAX) { + if(type2 >= ELE_MAX) { if(battle_config.error_log) - ShowError("pc_bonus2: SP_ADDELE: Invalid element %d\n", val); + ShowError("pc_bonus2: SP_ADDELE: Invalid element %d\n", type2); break; } if(!sd->state.lr_flag) @@ -1689,9 +1689,9 @@ int pc_bonus2(struct map_session_data *sd,int type,int type2,int val) sd->arrow_addsize[type2]+=val; break; case SP_SUBELE: - if(val >= ELE_MAX) { + if(type2 >= ELE_MAX) { if(battle_config.error_log) - ShowError("pc_bonus2: SP_SUBELE: Invalid element %d\n", val); + ShowError("pc_bonus2: SP_SUBELE: Invalid element %d\n", type2); break; } if(sd->state.lr_flag != 2) @@ -1730,9 +1730,9 @@ int pc_bonus2(struct map_session_data *sd,int type,int type2,int val) sd->reseff[type2-SC_COMMON_MIN]+=val; break; case SP_MAGIC_ADDELE: - if(val >= ELE_MAX) { + if(type2 >= ELE_MAX) { if(battle_config.error_log) - ShowError("pc_bonus2: SP_MAGIC_ADDELE: Invalid element %d\n", val); + ShowError("pc_bonus2: SP_MAGIC_ADDELE: Invalid element %d\n", type2); break; } if(sd->state.lr_flag != 2) @@ -1896,9 +1896,9 @@ int pc_bonus2(struct map_session_data *sd,int type,int type2,int val) } break; case SP_WEAPON_COMA_ELE: - if(val >= ELE_MAX) { + if(type2 >= ELE_MAX) { if(battle_config.error_log) - ShowError("pc_bonus2: SP_WEAPON_COMA_ELE: Invalid element %d\n", val); + ShowError("pc_bonus2: SP_WEAPON_COMA_ELE: Invalid element %d\n", type2); break; } if(sd->state.lr_flag != 2) diff --git a/src/map/status.c b/src/map/status.c index 068e7a733..9b1e43268 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -625,6 +625,7 @@ int status_damage(struct block_list *src,struct block_list *target,int hp, int s return hp+sp; //Normal death + status->hp = 0; if (battle_config.clear_unit_ondeath && battle_config.clear_unit_ondeath&target->type) skill_clear_unitgroup(target); -- cgit v1.2.3-70-g09d2