[Scummvm-git-logs] scummvm master -> 5dbffb3402156cec8fbe1cc9a5f4642af1f5d24f

sluicebox noreply at scummvm.org
Fri Nov 17 23:59:27 UTC 2023


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

Summary:
5dbffb3402 SCI: Remove redundant test from run_vm


Commit: 5dbffb3402156cec8fbe1cc9a5f4642af1f5d24f
    https://github.com/scummvm/scummvm/commit/5dbffb3402156cec8fbe1cc9a5f4642af1f5d24f
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2023-11-17T15:59:08-08:00

Commit Message:
SCI: Remove redundant test from run_vm

The same code occurs a few lines earlier

Changed paths:
    engines/sci/engine/vm.cpp


diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp
index a5bc6efc81e..d9e0c9189fb 100644
--- a/engines/sci/engine/vm.cpp
+++ b/engines/sci/engine/vm.cpp
@@ -601,9 +601,6 @@ void run_vm(EngineState *s) {
 			s->variables[VAR_PARAM] = s->xs->variables_argp;
 		}
 
-		if (s->abortScriptProcessing != kAbortNone)
-			return; // Stop processing
-
 		g_sci->checkAddressBreakpoint(s->xs->addr.pc);
 
 		// Debug if this has been requested:




More information about the Scummvm-git-logs mailing list