[Scummvm-git-logs] scummvm master -> 7741a6d50b16664539728575d9617c8e93d041fd

[scemino]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
256e01dbaa TWP: Fix regression in dialog due to #15070
7741a6d50b TWP: Fix regression in cutscene override due to #15069


Commit: 256e01dbaad6771287d105ec19d6b5d131373713
    https://github.com/scummvm/scummvm/commit/256e01dbaad6771287d105ec19d6b5d131373713
Author: scemino (scemino74 at gmail.com)
Date: 2024-04-22T21:09:16+02:00

Commit Message:
TWP: Fix regression in dialog due to #15070

Changed paths:
    engines/twp/dialog.cpp


diff --git a/engines/twp/dialog.cpp b/engines/twp/dialog.cpp
index f4de2989aa1..6c8f96a8ccc 100644
--- a/engines/twp/dialog.cpp
+++ b/engines/twp/dialog.cpp
@@ -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()))


Commit: 7741a6d50b16664539728575d9617c8e93d041fd
    https://github.com/scummvm/scummvm/commit/7741a6d50b16664539728575d9617c8e93d041fd
Author: scemino (scemino74 at gmail.com)
Date: 2024-04-22T21:09:16+02:00

Commit Message:
TWP: Fix regression in cutscene override due to #15069

Changed paths:
    engines/twp/syslib.cpp


diff --git a/engines/twp/syslib.cpp b/engines/twp/syslib.cpp
index 0a7ccad26ca..817bda06e2d 100644
--- a/engines/twp/syslib.cpp
+++ b/engines/twp/syslib.cpp
@@ -444,9 +444,6 @@ static SQInteger cutscene(HSQUIRRELVM v) {
 	HSQUIRRELVM vm = g_twp->getVm();
 	SQInteger nArgs = sq_gettop(v);
 
-	if (g_twp->_cutscene.id && !g_twp->_cutscene.inOverride && sqthread(g_twp->_cutscene.id))
-		return sq_throwerror(v, "cutscene called while another cutscene is running");
-
 	HSQOBJECT envObj;
 	sq_resetobject(&envObj);
 	if (SQ_FAILED(sq_getstackobj(v, 1, &envObj)))