diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-05-01 12:14:06 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-05-01 12:14:06 +0000 |
| commit | 5524938f8650e659b3c838df44212de56bf72584 (patch) | |
| tree | 9696c2ef858b4ebd81eda804389f8ece788a994b /src/map/pet.c | |
| parent | 3bba210cc5151bfc2971be296ab5c4391ea28639 (diff) | |
| download | hercules-5524938f8650e659b3c838df44212de56bf72584.tar.gz hercules-5524938f8650e659b3c838df44212de56bf72584.tar.bz2 hercules-5524938f8650e659b3c838df44212de56bf72584.tar.xz hercules-5524938f8650e659b3c838df44212de56bf72584.zip | |
Implemented get_percentage() for compact and safe calculation of percentual values.
Fixed integer arithmetic overflows that were occuring in several supernovice checks (bugreport:1135).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12679 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/pet.c')
| -rw-r--r-- | src/map/pet.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/map/pet.c b/src/map/pet.c index 879edef41..d06155b54 100644 --- a/src/map/pet.c +++ b/src/map/pet.c @@ -554,7 +554,7 @@ int pet_catch_process2(struct map_session_data* sd, int target_id) return 1; } - pet_catch_rate = (pet_db[i].capture + (sd->status.base_level - md->level)*30 + sd->battle_status.luk*20)*(200 - status_calc_life(md->status.hp, md->status.max_hp))/100; + pet_catch_rate = (pet_db[i].capture + (sd->status.base_level - md->level)*30 + sd->battle_status.luk*20)*(200 - percent(md->status.hp, md->status.max_hp))/100; if(pet_catch_rate < 1) pet_catch_rate = 1; if(battle_config.pet_catch_rate != 100) @@ -1147,7 +1147,7 @@ int pet_heal_timer(int tid, unsigned int tick, int id, intptr data) struct map_session_data *sd=map_id2sd(id); struct status_data *status; struct pet_data *pd; - short rate = 100; + unsigned int rate = 100; if(sd==NULL || sd->pd == NULL || sd->pd->s_skill == NULL) return 1; @@ -1162,8 +1162,8 @@ int pet_heal_timer(int tid, unsigned int tick, int id, intptr data) status = status_get_status_data(&sd->bl); if(pc_isdead(sd) || - (rate = status_calc_life(status->sp, status->max_sp)) > pd->s_skill->sp || - (rate = status_calc_life(status->hp, status->max_hp)) > pd->s_skill->hp || + (rate = percent(status->sp, status->max_sp)) > pd->s_skill->sp || + (rate = percent(status->hp, status->max_hp)) > pd->s_skill->hp || (rate = (pd->ud.skilltimer != -1)) //Another skill is in effect ) { //Wait (how long? 1 sec for every 10% of remaining) pd->s_skill->timer=add_timer(gettick()+(rate>10?rate:10)*100,pet_heal_timer,sd->bl.id,0); @@ -1205,8 +1205,8 @@ int pet_skill_support_timer(int tid, unsigned int tick, int id, intptr data) } if(pc_isdead(sd) || - (rate = status_calc_life(status->sp, status->max_sp)) > pd->s_skill->sp || - (rate = status_calc_life(status->hp, status->max_hp)) > pd->s_skill->hp || + (rate = percent(status->sp, status->max_sp)) > pd->s_skill->sp || + (rate = percent(status->hp, status->max_hp)) > pd->s_skill->hp || (rate = (pd->ud.skilltimer != -1)) //Another skill is in effect ) { //Wait (how long? 1 sec for every 10% of remaining) pd->s_skill->timer=add_timer(tick+(rate>10?rate:10)*100,pet_skill_support_timer,sd->bl.id,0); |