diff options
| author | Max Horn | 2009-09-17 16:56:36 +0000 |
|---|---|---|
| committer | Max Horn | 2009-09-17 16:56:36 +0000 |
| commit | c2455aad870b87e9603d52b19060f77510bd74a4 (patch) | |
| tree | f221d9817fb5d697c3430ba9a31f69308c181a82 | |
| parent | f2d2276c4ac02a84dadabbdf8863d09ec946d3c7 (diff) | |
| download | scummvm-rg350-c2455aad870b87e9603d52b19060f77510bd74a4.tar.gz scummvm-rg350-c2455aad870b87e9603d52b19060f77510bd74a4.tar.bz2 scummvm-rg350-c2455aad870b87e9603d52b19060f77510bd74a4.zip | |
SCI: Move CallsStruct into vm.cpp, the only place it is being used
svn-id: r44172
| -rw-r--r-- | engines/sci/engine/segment.h | 15 | ||||
| -rw-r--r-- | engines/sci/engine/vm.cpp | 15 |
2 files changed, 15 insertions, 15 deletions
diff --git a/engines/sci/engine/segment.h b/engines/sci/engine/segment.h index 0c59ad59c5..c98c112bbc 100644 --- a/engines/sci/engine/segment.h +++ b/engines/sci/engine/segment.h @@ -163,21 +163,6 @@ public: 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; diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp index be09cd5de0..0b757eff20 100644 --- a/engines/sci/engine/vm.cpp +++ b/engines/sci/engine/vm.cpp @@ -258,6 +258,21 @@ static void _exec_varselectors(EngineState *s) { } } +/** 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 |
