TWP: Fix regression in dialog due to #15070

This commit is contained in:
scemino 2024-04-22 20:53:37 +02:00
parent f37efdddfd
commit 256e01dbaa

View File

@ -206,8 +206,8 @@ void Dialog::choose(DialogSlot *slot) {
YChoice *choice = getChoice(slot);
if (slot->_dlg->_context.parrot) {
slot->_dlg->_state = DialogState::Active;
slot->_dlg->_tgt->say(slot->_dlg->_context.actor, choice->_text);
slot->_dlg->_action = Common::SharedPtr<SelectLabelMotor>(new SelectLabelMotor(slot->_dlg, choice->_goto->_line, choice->_goto->_name));
slot->_dlg->clearSlots();
} else {
slot->_dlg->selectLabel(choice->_goto->_line, choice->_goto->_name);
}
@ -416,7 +416,7 @@ void Dialog::running(float dt) {
IsShutup isShutup;
statmt->_exp->accept(isShutup);
if (g_twp->isSomeoneTalking() && !isShutup._isShutup) {
break;
return;
}
run(statmt);
if (_lbl && (_currentStatement == _lbl->_stmts.size()))