openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Cleanup variable usage that used to be bool

Browse Source
This commit is contained in:
xq
2020-02-11 04:33:34 +02:00
parent 4711871a1c
commit 1d23a55131
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/game/boe.combat.cpp
View File

@@ -2850,14 +2850,14 @@ void monster_attack(short who_att,iLiving* target) {
store_hp = target->get_health(); store_hp = target->get_health();
sound_type = get_monst_sound(attacker,i); sound_type = get_monst_sound(attacker,i);
size_t i_monst = univ.get_target_i(*target); size_t i_monst = univ.get_target_i(*target);
short damaged = false; short damaged = 0;
if(m_target != nullptr) { if(m_target != nullptr) {
// TODO: Maybe this damage should be printed? // TODO: Maybe this damage should be printed?
damaged = damage_monst(*m_target,7,r2,dam_type,sound_type,false); damaged = damage_monst(*m_target,7,r2,dam_type,sound_type,false);
} else if(pc_target != nullptr) { } else if(pc_target != nullptr) {
damaged = damage_pc(*pc_target,r2,dam_type,attacker->m_type,sound_type); damaged = damage_pc(*pc_target,r2,dam_type,attacker->m_type,sound_type);
if(store_hp - target->get_health() <= 0) if(store_hp - target->get_health() <= 0)
damaged = false; damaged = 0;
} }
if(damaged) { if(damaged) {
damaged_message(store_hp - target->get_health(), attacker->a[i].type); damaged_message(store_hp - target->get_health(), attacker->a[i].type);