[Scummvm-cvs-logs] SF.net SVN: scummvm:[47834] scummvm/trunk/engines/sci/engine

[fingolfin at users.sourceforge.net]

Revision: 47834
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47834&view=rev
Author:   fingolfin
Date:     2010-02-03 01:33:23 +0000 (Wed, 03 Feb 2010)

Log Message:
-----------
SCI: restoring param of run_vm is a bool, not an int

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/selector.cpp
    scummvm/trunk/engines/sci/engine/vm.cpp
    scummvm/trunk/engines/sci/engine/vm.h

Modified: scummvm/trunk/engines/sci/engine/selector.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/selector.cpp	2010-02-03 01:32:59 UTC (rev 47833)
+++ scummvm/trunk/engines/sci/engine/selector.cpp	2010-02-03 01:33:23 UTC (rev 47834)
@@ -230,7 +230,7 @@
 	xstack->sp += argc + 2;
 	xstack->fp += argc + 2;
 
-	run_vm(s, 0); // Start a new vm
+	run_vm(s, false); // Start a new vm
 
 	return 0;
 }

Modified: scummvm/trunk/engines/sci/engine/vm.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.cpp	2010-02-03 01:32:59 UTC (rev 47833)
+++ scummvm/trunk/engines/sci/engine/vm.cpp	2010-02-03 01:33:23 UTC (rev 47834)
@@ -529,7 +529,7 @@
 
 static const byte _fake_return_buffer[2] = {op_ret << 1, op_ret << 1};
 
-void run_vm(EngineState *s, int restoring) {
+void run_vm(EngineState *s, bool restoring) {
 	assert(s);
 
 #ifndef DISABLE_VALIDATIONS
@@ -1613,7 +1613,7 @@
 
 	do {
 		s->_executionStackPosChanged = false;
-		run_vm(s, successor ? 1 : 0);
+		run_vm(s, successor ? true : false);
 		if (s->restarting_flags & SCI_GAME_IS_RESTARTING_NOW) { // Restart was requested?
 			successor = NULL;
 			s->_executionStack.clear();

Modified: scummvm/trunk/engines/sci/engine/vm.h
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.h	2010-02-03 01:32:59 UTC (rev 47833)
+++ scummvm/trunk/engines/sci/engine/vm.h	2010-02-03 01:33:23 UTC (rev 47834)
@@ -395,9 +395,9 @@
  * It executes the code on s->heap[pc] until it hits a 'ret' operation
  * while (stack_base == stack_pos). Requires s to be set up correctly.
  * @param[in] s			The state to use
- * @param[in] restoring	1 if s has just been restored, 0 otherwise
+ * @param[in] restoring	true if s has just been restored, false otherwise
  */
-void run_vm(EngineState *s, int restoring);
+void run_vm(EngineState *s, bool restoring);
 
 /**
  * Debugger functionality


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.