diff options
| author | Haru <haru@dotalux.com> | 2019-02-11 02:00:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-11 02:00:58 +0100 |
| commit | 2d8a44b753832610d23678629127369f5db576a3 (patch) | |
| tree | 258e78c458642cc017837f674b0d23255ac49bf4 /src/map/battle.c | |
| parent | 68126f7d762e001b1a34cfe5e0a340db9c7d9da8 (diff) | |
| parent | dbaa9ac111496fdfde9948d5cb15a0b052843b3f (diff) | |
| download | hercules-2d8a44b753832610d23678629127369f5db576a3.tar.gz hercules-2d8a44b753832610d23678629127369f5db576a3.tar.bz2 hercules-2d8a44b753832610d23678629127369f5db576a3.tar.xz hercules-2d8a44b753832610d23678629127369f5db576a3.zip | |
Merge pull request #2364 from 4144/shortfixes
Change different variables types short to int
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index f51240810..6fa46a7c7 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -1019,7 +1019,7 @@ static int64 battle_calc_cardfix(int attack_type, struct block_list *src, struct { struct map_session_data *sd, *tsd; int cardfix = 1000; - short t_class, s_class, s_race2, t_race2; + int t_class, s_class, s_race2, t_race2; struct status_data *sstatus, *tstatus; int i; @@ -5552,7 +5552,7 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src, struct bl #endif if( flag.infdef ) { //Plants receive 1 damage when hit - short class_ = status->get_class(target); + int class_ = status->get_class(target); if( flag.hit || wd.damage > 0 ) wd.damage = wd.div_; // In some cases, right hand no need to have a weapon to increase damage if( flag.lh && (flag.hit || wd.damage2 > 0) ) |