diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2012-08-30 17:37:27 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2012-09-03 16:23:10 -0700 |
| commit | 31544d2b6973931be7fdec898ea3672bea831de2 (patch) | |
| tree | dcf946429b406f39297404be662b0a840094e477 /src/map/battle.cpp | |
| parent | 41974ae5265fbc23a06f276f9e008d5dad020e0b (diff) | |
| download | tmwa-31544d2b6973931be7fdec898ea3672bea831de2.tar.gz tmwa-31544d2b6973931be7fdec898ea3672bea831de2.tar.bz2 tmwa-31544d2b6973931be7fdec898ea3672bea831de2.tar.xz tmwa-31544d2b6973931be7fdec898ea3672bea831de2.zip | |
Fix compiler errors of C++ conversion
Diffstat (limited to 'src/map/battle.cpp')
| -rw-r--r-- | src/map/battle.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/map/battle.cpp b/src/map/battle.cpp index a46db13..818d77e 100644 --- a/src/map/battle.cpp +++ b/src/map/battle.cpp @@ -521,6 +521,7 @@ int battle_get_flee2 (struct block_list *bl) * 戻りは整数で1以上 *------------------------------------------ */ +static int battle_get_critical (struct block_list *bl) { int critical = 1; @@ -625,6 +626,7 @@ int battle_get_atk (struct block_list *bl) * 戻りは整数で0以上 *------------------------------------------ */ +static int battle_get_atk_ (struct block_list *bl) { nullpo_retr (0, bl); @@ -687,6 +689,7 @@ int battle_get_atk2 (struct block_list *bl) * 戻りは整数で0以上 *------------------------------------------ */ +static int battle_get_atk_2 (struct block_list *bl) { nullpo_retr (0, bl); @@ -701,6 +704,7 @@ int battle_get_atk_2 (struct block_list *bl) * 戻りは整数で0以上 *------------------------------------------ */ +static int battle_get_matk1 (struct block_list *bl) { struct status_change *sc_data; @@ -727,6 +731,7 @@ int battle_get_matk1 (struct block_list *bl) * 戻りは整数で0以上 *------------------------------------------ */ +static int battle_get_matk2 (struct block_list *bl) { struct status_change *sc_data = battle_get_sc_data (bl); @@ -1422,6 +1427,7 @@ struct battle_delay_damage_ int damage; int flag; }; +static void battle_delay_damage_sub (timer_id tid, tick_t tick, custom_id_t id, custom_data_t data) { struct battle_delay_damage_ *dat = (struct battle_delay_damage_ *) data; @@ -1853,6 +1859,7 @@ int battle_calc_damage (struct block_list *src, struct block_list *bl, * 修練ダメージ *------------------------------------------ */ +static int battle_addmastery (struct map_session_data *sd, struct block_list *target, int dmg, int type) { |