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

[fingolfin at users.sourceforge.net]

Revision: 44172
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44172&view=rev
Author:   fingolfin
Date:     2009-09-17 16:56:36 +0000 (Thu, 17 Sep 2009)

Log Message:
-----------
SCI: Move CallsStruct into vm.cpp, the only place it is being used

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

Modified: scummvm/trunk/engines/sci/engine/segment.h
===================================================================
--- scummvm/trunk/engines/sci/engine/segment.h	2009-09-17 16:53:58 UTC (rev 44171)
+++ scummvm/trunk/engines/sci/engine/segment.h	2009-09-17 16:56:36 UTC (rev 44172)
@@ -163,21 +163,6 @@
 	virtual void saveLoadWithSerializer(Common::Serializer &ser);
 };
 
-/** This struct is used to buffer the list of send calls in send_selector() */
-struct CallsStruct {
-	reg_t addr_func;
-	reg_t varp_objp;
-	union {
-		reg_t func;
-		ObjVarRef var;
-	} address;
-	StackPtr argp;
-	int argc;
-	Selector selector;
-	StackPtr sp; /**< Stack pointer */
-	int type; /**< Same as ExecStack.type */
-};
-
 struct LocalVariables : public SegmentObj {
 	int script_id; /**< Script ID this local variable block belongs to */
 	Common::Array<reg_t> _locals;

Modified: scummvm/trunk/engines/sci/engine/vm.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.cpp	2009-09-17 16:53:58 UTC (rev 44171)
+++ scummvm/trunk/engines/sci/engine/vm.cpp	2009-09-17 16:56:36 UTC (rev 44172)
@@ -258,6 +258,21 @@
 	}
 }
 
+/** This struct is used to buffer the list of send calls in send_selector() */
+struct CallsStruct {
+	reg_t addr_func;
+	reg_t varp_objp;
+	union {
+		reg_t func;
+		ObjVarRef var;
+	} address;
+	StackPtr argp;
+	int argc;
+	Selector selector;
+	StackPtr sp; /**< Stack pointer */
+	int type; /**< Same as ExecStack.type */
+};
+
 ExecStack *send_selector(EngineState *s, reg_t send_obj, reg_t work_obj, StackPtr sp, int framesize, StackPtr argp) {
 // send_obj and work_obj are equal for anything but 'super'
 // Returns a pointer to the TOS exec_stack element


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