diff options
| author | Haru <haru@dotalux.com> | 2013-07-17 05:29:19 +0200 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2013-07-17 05:29:19 +0200 |
| commit | 857e4fb58b26ea088c0ad92ec5b1ac9423ec1e65 (patch) | |
| tree | d71a14fd519210ac9735f804e0bb7a046ff7cbd5 /src/map/battle.c | |
| parent | f530cfe173bc5e9ac177adac0ae4aef33164838f (diff) | |
| download | hercules-857e4fb58b26ea088c0ad92ec5b1ac9423ec1e65.tar.gz hercules-857e4fb58b26ea088c0ad92ec5b1ac9423ec1e65.tar.bz2 hercules-857e4fb58b26ea088c0ad92ec5b1ac9423ec1e65.tar.xz hercules-857e4fb58b26ea088c0ad92ec5b1ac9423ec1e65.zip | |
Added missing initialization of some functions in the homunculus interface
- Fixes issue #7536 (thanks to jTynne for the report)
http://hercules.ws/board/tracker/issue-7536-map-crash-july-15th/
- Minor corrections to the other interfaces as well (reordered
initialization to follow the definitions, removed duplicate entry in
the skill interface initialization, commented out some unused entries)
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 2016efa3b..bded771e7 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -6784,18 +6784,11 @@ void battle_defaults(void) { battle->calc_damage = battle_calc_damage; battle->calc_gvg_damage = battle_calc_gvg_damage; battle->calc_bg_damage = battle_calc_bg_damage; - battle->calc_base_damage = battle_calc_base_damage; - battle->calc_misc_attack = battle_calc_misc_attack; - battle->calc_magic_attack = battle_calc_magic_attack; battle->weapon_attack = battle_weapon_attack; + battle->calc_weapon_attack = battle_calc_weapon_attack; battle->delay_damage = battle_delay_damage; battle->drain = battle_drain; battle->calc_return_damage = battle_calc_return_damage; - battle->calc_weapon_attack = battle_calc_weapon_attack; -#ifdef RENEWAL - battle->calc_weapon_damage = battle_calc_weapon_damage; -#endif - battle->calc_defense = battle_calc_defense; battle->attr_ratio = battle_attr_ratio; battle->attr_fix = battle_attr_fix; battle->calc_cardfix = battle_calc_cardfix; @@ -6803,6 +6796,10 @@ void battle_defaults(void) { battle->calc_masteryfix = battle_calc_masteryfix; battle->calc_skillratio = battle_calc_skillratio; battle->calc_sizefix = battle_calc_sizefix; +#ifdef RENEWAL + battle->calc_weapon_damage = battle_calc_weapon_damage; +#endif + battle->calc_defense = battle_calc_defense; battle->get_master = battle_get_master; battle->get_targeted = battle_gettargeted; battle->get_enemy = battle_getenemy; @@ -6818,6 +6815,9 @@ void battle_defaults(void) { battle->delay_damage_sub = battle_delay_damage_sub; battle->blewcount_bonus = battle_blewcount_bonus; battle->range_type = battle_range_type; + battle->calc_base_damage = battle_calc_base_damage; + battle->calc_misc_attack = battle_calc_misc_attack; + battle->calc_magic_attack = battle_calc_magic_attack; battle->adjust_skill_damage = battle_adjust_skill_damage; battle->add_mastery = battle_addmastery; battle->calc_drain = battle_calc_drain; |