Some cleanup for the script debugger code:

- Renamed struct DebugState to ScriptState and r_amp_rest to restAdjust inside EngineState. Changed restAdjust to be a uint16 (actually it is a uint16, but it was being casted back and forth from an unsigned integer, so this clears up its type and size)
- Moved the script state variables from inside the run_vm() into the ScriptState struct, so that they can be accessed by the console commands and the script debugger all the time, and removed the weird isValid code

svn-id: r42260

1 files changed, 4 insertions, 4 deletions

diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index 09c433edc2..9c94e2edde 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -240,12 +240,12 @@ Common::Error SciEngine::run() {
 GUI::Debugger *SciEngine::getDebugger() {
 	if (_gamestate) {
 		ExecStack *xs = &(_gamestate->_executionStack.back());
-		xs->addr.pc.offset = debugState.old_pc_offset;
-		xs->sp = debugState.old_sp;
+		xs->addr.pc.offset = scriptState.old_pc_offset;
+		xs->sp = scriptState.old_sp;
 	}
 
-	debugState.runningStep = 0; // Stop multiple execution
-	debugState.seeking = kDebugSeekNothing; // Stop special seeks
+	scriptState.runningStep = 0; // Stop multiple execution
+	scriptState.seeking = kDebugSeekNothing; // Stop special seeks
 
 	return _console;
 }