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

Fix showing the outdoors if you die in town combat

Browse Source
This commit is contained in:
Celtic Minstrel
2015-06-21 22:54:40 -04:00
parent 525371fb81
commit c5c3e0c681
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/boe.actions.cpp
View File

@@ -974,7 +974,7 @@ static void handle_party_death() {
for(int i = 0; i < 6; i++) for(int i = 0; i < 6; i++)
if(univ.party[i].main_status == eMainStatus::FLED) if(univ.party[i].main_status == eMainStatus::FLED)
univ.party[i].main_status = eMainStatus::ALIVE; univ.party[i].main_status = eMainStatus::ALIVE;
if(is_combat()) { if(is_combat() && univ.party.is_alive()) {
// TODO: Should this only happen in outdoor combat? Or should we allow fleeing town during combat? // TODO: Should this only happen in outdoor combat? Or should we allow fleeing town during combat?
end_town_mode(0,univ.town.p_loc); end_town_mode(0,univ.town.p_loc);
add_string_to_buf("End combat."); add_string_to_buf("End combat.");