diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2013-06-18 20:03:57 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2013-06-18 20:11:16 -0700 |
| commit | 83db3bbee4e19e7426a32ee89ad6c2d8e48260f2 (patch) | |
| tree | a6fb6f6b6acaa09d5a43cd669f87c2f7f519a521 /src/map/battle.cpp | |
| parent | 8b5370313dcc00a45ea5c3e8b4c497bc00fd8e13 (diff) | |
| download | tmwa-83db3bbee4e19e7426a32ee89ad6c2d8e48260f2.tar.gz tmwa-83db3bbee4e19e7426a32ee89ad6c2d8e48260f2.tar.bz2 tmwa-83db3bbee4e19e7426a32ee89ad6c2d8e48260f2.tar.xz tmwa-83db3bbee4e19e7426a32ee89ad6c2d8e48260f2.zip | |
Also poison memcpy, memmove, and memset
Diffstat (limited to 'src/map/battle.cpp')
| -rw-r--r-- | src/map/battle.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/map/battle.cpp b/src/map/battle.cpp index 81e606f..93ccef8 100644 --- a/src/map/battle.cpp +++ b/src/map/battle.cpp @@ -1926,8 +1926,7 @@ struct Damage battle_calc_attack(BF attack_type, dumb_ptr<block_list> target, SkillID skill_num, int skill_lv, int flag) { - struct Damage d; - memset(&d, 0, sizeof(d)); + struct Damage d {}; switch (attack_type) { @@ -2041,7 +2040,7 @@ ATK battle_weapon_attack(dumb_ptr<block_list> src, dumb_ptr<block_list> target, weapon = sd->inventory_data[weapon_index]->nameid; MAP_LOG("PC%d %s:%d,%d WPNDMG %s%d %d FOR %d WPN %d", - sd->status.char_id, src->bl_m->name, src->bl_x, src->bl_y, + sd->status.char_id, src->bl_m->name_, src->bl_x, src->bl_y, (target->bl_type == BL::PC) ? "PC" : "MOB", (target->bl_type == BL::PC) ? target->as_player()-> status.char_id @@ -2054,7 +2053,7 @@ ATK battle_weapon_attack(dumb_ptr<block_list> src, dumb_ptr<block_list> target, { dumb_ptr<map_session_data> sd2 = target->as_player(); MAP_LOG("PC%d %s:%d,%d WPNINJURY %s%d %d FOR %d", - sd2->status.char_id, target->bl_m->name, target->bl_x, target->bl_y, + sd2->status.char_id, target->bl_m->name_, target->bl_x, target->bl_y, (src->bl_type == BL::PC) ? "PC" : "MOB", (src->bl_type == BL::PC) ? src->as_player()->status.char_id @@ -2323,7 +2322,6 @@ int battle_config_read(const char *cfgName) battle_config.base_exp_rate = 100; battle_config.job_exp_rate = 100; - battle_config.pvp_exp = 1; battle_config.gtb_pvp_only = 0; battle_config.death_penalty_type = 0; battle_config.death_penalty_base = 0; @@ -2503,7 +2501,6 @@ int battle_config_read(const char *cfgName) {"item_third_get_time", &battle_config.item_third_get_time}, {"base_exp_rate", &battle_config.base_exp_rate}, {"job_exp_rate", &battle_config.job_exp_rate}, - {"pvp_exp", &battle_config.pvp_exp}, {"gtb_pvp_only", &battle_config.gtb_pvp_only}, {"death_penalty_type", &battle_config.death_penalty_type}, {"death_penalty_base", &battle_config.death_penalty_base}, |