[Scummvm-cvs-logs] scummvm master -> 8466c0f08da9b00408e6829ee948a62ec411de9d

wjp wjp at usecode.org
Thu May 14 16:47:52 CEST 2015


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:
8466c0f08d SCI: Restore xs after calling run_vm from debugger


Commit: 8466c0f08da9b00408e6829ee948a62ec411de9d
    https://github.com/scummvm/scummvm/commit/8466c0f08da9b00408e6829ee948a62ec411de9d
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2015-05-14T16:45:53+02:00

Commit Message:
SCI: Restore xs after calling run_vm from debugger

This fixes possible gamestate corruption when using 'send' in the
debugger to call methods.

Changed paths:
    engines/sci/console.cpp



diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp
index bc9ad36..dc017a7 100644
--- a/engines/sci/console.cpp
+++ b/engines/sci/console.cpp
@@ -3374,6 +3374,7 @@ bool Console::cmdSend(int argc, const char **argv) {
 		// We call run_engine explictly so we can restore the value of r_acc
 		// after execution.
 		run_vm(_engine->_gamestate);
+		_engine->_gamestate->xs = old_xstack;
 
 	}
 






More information about the Scummvm-git-logs mailing list