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

Exclude more invalid indices from damage_target

Browse Source
This commit is contained in:
Nat Quayle Nelson
2025-02-23 18:00:59 -06:00
committed by Celtic Minstrel
parent b505dc5852
commit 756324ad05
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4022,10 +4022,14 @@ bool monst_cast_priest(cCreature *caster,short targ) {
}
short damage_target(short target,short dam,eDamageType type,short sound_type, bool do_print, short who_hit, eRace race) {
if(target == 6) return 0;
if(target < 6)
return damage_pc(univ.party[target],dam,type,race,sound_type, do_print);
else return damage_monst(univ.town.monst[target - 100], who_hit, dam, type,sound_type, do_print);
if(target >= 6 && target < 100) return 0;
if(target < 6){
return damage_pc(univ.party[target], dam, type, race, sound_type, do_print);
}else{
int monst_idx = target - 100;
if(monst_idx >= univ.town.monst.size()) return 0;
return damage_monst(univ.town.monst[monst_idx], who_hit, dam, type, sound_type, do_print);
}
}
short damage_target(iLiving& target,short dam,eDamageType type,short sound_type, bool do_print, short who_hit, eRace race) {