From 39723d1a947c6700e2ac41b240a70a0e7510e015 Mon Sep 17 00:00:00 2001 From: Celtic Minstrel Date: Fri, 16 Jan 2015 03:40:20 -0500 Subject: [PATCH] Fix character editor build (Was broken with the party splitting changes) --- src/pcedit/pc.main.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/pcedit/pc.main.cpp b/src/pcedit/pc.main.cpp index eabc83d0..5f1140eb 100644 --- a/src/pcedit/pc.main.cpp +++ b/src/pcedit/pc.main.cpp @@ -208,8 +208,13 @@ void handle_menu_choice(eMenu item_hit) { cChoiceDlog("not-split").show(); 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(); - univ.town.p_loc = univ.party.left_at(); + univ.town.p_loc = univ.party.left_at; for(i = 0; i < 6; i++) if(univ.party[i].main_status >= eMainStatus::SPLIT) univ.party[i].main_status -= eMainStatus::SPLIT;