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

Add some braces

Browse Source
This commit is contained in:
Celtic Minstrel
2023-01-18 09:57:31 -05:00
parent 924692c1dd
commit 3c246c7df5
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/game/boe.locutils.cpp
View File

@@ -299,13 +299,15 @@ bool is_blocked(location to_check) {
// Note: The purpose of the above check is to avoid portals. // Note: The purpose of the above check is to avoid portals.
// Party there? // Party there?
if(is_town()) if(is_town() && to_check == univ.party.town_loc)
if(to_check == univ.party.town_loc) return true;
return true; if(is_combat()) {
if(is_combat()) for(short i = 0; i < 6; i++) {
for(short i = 0; i < 6; i++) if(univ.party[i].main_status == eMainStatus::ALIVE && to_check == univ.party[i].combat_pos) {
if(univ.party[i].main_status == eMainStatus::ALIVE && to_check == univ.party[i].combat_pos)
return true; return true;
}
}
}
// Monster there? // Monster there?
if(univ.target_there(to_check, TARG_MONST)) if(univ.target_there(to_check, TARG_MONST))
@@ -399,10 +401,13 @@ bool outd_is_blocked(location to_check) {
if(impassable(univ.out[to_check.x][to_check.y])) { if(impassable(univ.out[to_check.x][to_check.y])) {
return true; return true;
} }
for(short i = 0; i < 10; i++) for(short i = 0; i < 10; i++) {
if((univ.party.out_c[i].exists)) if((univ.party.out_c[i].exists)) {
if(univ.party.out_c[i].m_loc == to_check) if(univ.party.out_c[i].m_loc == to_check) {
return true; return true;
}
}
}
return false; return false;
} }
return false; return false;