diff options
| author | panikon <panikon@zoho.com> | 2014-03-13 15:49:56 -0300 |
|---|---|---|
| committer | panikon <panikon@zoho.com> | 2014-03-13 15:49:56 -0300 |
| commit | 1849d357210bc3d01be99e1a7cd5e8c19e5d53f4 (patch) | |
| tree | e06931b65b3c63dc3ddf2a635cf6c638bda31bc7 /src/map/pc.c | |
| parent | cc0127618746e7b290fa03a68640cda4d5d1d7e3 (diff) | |
| download | hercules-1849d357210bc3d01be99e1a7cd5e8c19e5d53f4.tar.gz hercules-1849d357210bc3d01be99e1a7cd5e8c19e5d53f4.tar.bz2 hercules-1849d357210bc3d01be99e1a7cd5e8c19e5d53f4.tar.xz hercules-1849d357210bc3d01be99e1a7cd5e8c19e5d53f4.zip | |
Corrected itemheal documentation, it was fairly wrong.
Added simple overflow check in pc_heal to fix issue: 8082
http://hercules.ws/board/tracker/issue-8082-itemheal-kills-with-high-rand-value/
Diffstat (limited to 'src/map/pc.c')
| -rw-r--r-- | src/map/pc.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/map/pc.c b/src/map/pc.c index 5eb682415..41a722dfb 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -7521,7 +7521,7 @@ void pc_heal(struct map_session_data *sd,unsigned int hp,unsigned int sp, int ty *------------------------------------------*/ int pc_itemheal(struct map_session_data *sd,int itemid, int hp,int sp) { - int bonus; + int bonus, tmp; if(hp) { int i; @@ -7541,8 +7541,10 @@ int pc_itemheal(struct map_session_data *sd,int itemid, int hp,int sp) break; } } - if(bonus!=100) - hp = hp * bonus / 100; + + tmp = hp*bonus/100; + if(bonus != 100 && tmp > hp) + hp = tmp; // Recovery Potion if( sd->sc.data[SC_HEALPLUS] ) @@ -7554,8 +7556,10 @@ int pc_itemheal(struct map_session_data *sd,int itemid, int hp,int sp) + pc->checkskill(sd,AM_LEARNINGPOTION)*5; if (script->potion_flag > 1) bonus += bonus*(script->potion_flag-1)*50/100; - if(bonus != 100) - sp = sp * bonus / 100; + + tmp = sp*bonus/100; + if(bonus != 100 && tmp > sp) + sp = tmp; } if( sd->sc.count ) { if ( sd->sc.data[SC_CRITICALWOUND] ) { |