From c99a901f65dbb61ad961d8c70be41fd6620ca840 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sat, 21 Feb 2015 14:41:57 -0500 Subject: XEEN: More code for dismiss dialog --- engines/xeen/dialogs_dismiss.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/engines/xeen/dialogs_dismiss.cpp b/engines/xeen/dialogs_dismiss.cpp index 1317d84447..9323b46429 100644 --- a/engines/xeen/dialogs_dismiss.cpp +++ b/engines/xeen/dialogs_dismiss.cpp @@ -45,7 +45,8 @@ void Dismiss::execute() { _iconSprites.draw(w, 0, Common::Point(225, 120)); w.update(); - while (!_vm->shouldQuit()) { + bool breakFlag = false; + while (!_vm->shouldQuit() && !breakFlag) { do { events.updateGameCounter(); intf.draw3d(false); @@ -70,17 +71,14 @@ void Dismiss::execute() { ErrorScroll::show(_vm, CANT_DISMISS_LAST_CHAR, WT_NONFREEZED_WAIT); w.open(); } else { - Character tempChar = party._activeParty[_buttonValue]; - int charIndex = party._activeParty[_buttonValue]._rosterId; - -// party.sortParty(); - - // TODO + // Remove the character from the party + party._activeParty.remove_at(_buttonValue); + breakFlag = true; } break; } } else if (_buttonValue == Common::KEYCODE_ESCAPE) { - + breakFlag = true; } } } -- cgit v1.2.3