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

Fix character editor build

Browse Source 
(Was broken with the party splitting changes)
This commit is contained in:
Celtic Minstrel
2015-01-16 03:40:20 -05:00
parent 4ae8f7661e
commit 39723d1a94
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/pcedit/pc.main.cpp
View File

@@ -208,8 +208,13 @@ void handle_menu_choice(eMenu item_hit) {
cChoiceDlog("not-split").show(); cChoiceDlog("not-split").show();
break; break;
} }
if(univ.party.left_in != size_t(-1) && univ.party.left_in != univ.town.num) {
std::string need_town = univ.scenario.towns[univ.party.left_in]->town_name;
giveError("You can't reunite your party when you're in a different town than you split up in.", "Return to the following town in-game and then try again: " + need_town);
break;
}
cChoiceDlog("reunited").show(); cChoiceDlog("reunited").show();
univ.town.p_loc = univ.party.left_at(); univ.town.p_loc = univ.party.left_at;
for(i = 0; i < 6; i++) for(i = 0; i < 6; i++)
if(univ.party[i].main_status >= eMainStatus::SPLIT) if(univ.party[i].main_status >= eMainStatus::SPLIT)
univ.party[i].main_status -= eMainStatus::SPLIT; univ.party[i].main_status -= eMainStatus::SPLIT;