diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-30 23:10:27 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-30 23:10:27 +0000 |
| commit | 48b0ecb47ab3a8a59f881fba26ee3a4ee10095e8 (patch) | |
| tree | 4fcd9c9605b987d1d32366d9f54fa1b0cc617b5f | |
| parent | 411161fcd972c22db5df40dce515ae1797853fe3 (diff) | |
| download | hercules-48b0ecb47ab3a8a59f881fba26ee3a4ee10095e8.tar.gz hercules-48b0ecb47ab3a8a59f881fba26ee3a4ee10095e8.tar.bz2 hercules-48b0ecb47ab3a8a59f881fba26ee3a4ee10095e8.tar.xz hercules-48b0ecb47ab3a8a59f881fba26ee3a4ee10095e8.zip | |
- 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
| -rw-r--r-- | Changelog-Trunk.txt | 3 | ||||
| -rw-r--r-- | src/map/pc.c | 16 | ||||
| -rw-r--r-- | src/map/status.c | 1 |
3 files changed, 12 insertions, 8 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index c22424f9b..b8ab706b9 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,9 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/05/30
+ * Fixed status_damage not setting your HP to 0 when you died [Skotlex]
+ * Fixed the pcbonus2 warnings using the wrong value before printing the
+ invalid Element error. [Skotlex]
* Fixed underflow issues when calculating dmotion. [Skotlex]
* Fixed Absorb Spirit Spheres [Skotlex]
* Added battle_config min_chat_delay (default 0, battle/client.conf)
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); |