@@ -22,6 +22,7 @@ #include "World.h" #include "MetaRoom.h" #include "caosVM.h" // for setupCommandPointers() +#include "caosScript.h" // for executeNetwork() #include "PointerAgent.h" #include "dialect.h" // registerDelegates #include "NullBackend.h" Engine.cpp @@ -1122,6 +1122,8 @@ void SFCScenery::copyToWorld() { #include <boost/format.hpp> #include <sstream> +#include "caosScript.h" + void SFCScript::install() { std::string scriptinfo = boost::str(boost::format("<SFC script %d, %d, %d: %d>") % (int)family % (int)genus % species % eventno); caosScript script(world.gametype, scriptinfo); SFCFile.cpp @@ -21,10 +21,13 @@ #ifndef _SCRIPTORIUM_H #define _SCRIPTORIUM_H -#include "caosScript.h" #include "openc2e.h" +#include <boost/shared_ptr.hpp> +using boost::shared_ptr; #include <map> +class script; + class Scriptorium { protected: FRIEND_SERIALIZE(Scriptorium); Scriptorium.h @@ -20,6 +20,7 @@ #include "World.h" #include "Engine.h" #include "caosVM.h" // for setupCommandPointers() +#include "caosScript.h" #include "PointerAgent.h" #include "CompoundAgent.h" // for setFocus #include <limits.h> // for MAXINT World.cpp @@ -20,6 +20,7 @@ #include "bytecode.h" #include "cmddata.h" #include "exceptions.h" +#include "caosScript.h" #include "caosVM.h" #include "openc2e.h" #include "Engine.h" caosScript.cpp @@ -21,6 +21,7 @@ #include "openc2e.h" #include "World.h" #include "bytecode.h" +#include "caosScript.h" #include <iostream> #include <boost/format.hpp> caosVM.cpp @@ -21,15 +21,18 @@ #define _CAOSVM_H #include "openc2e.h" -#include "caosScript.h" #include <map> #include <istream> #include <ostream> #include "AgentRef.h" +#include "caosVar.h" +#include <boost/variant.hpp> #include <boost/weak_ptr.hpp> using boost::weak_ptr; +class script; + //#define CAOSDEBUG //#define CAOSDEBUGDETAIL @@ -1040,7 +1043,7 @@ public: void safeJMP(int nip); void invoke_cmd(script *s, bool is_saver, int opidx); - void runOpCore(script *s, caosOp op); + void runOpCore(script *s, struct caosOp op); void runOp(); void runEntirely(shared_ptr<script> s); caosVM.h @@ -26,6 +26,7 @@ #include <cctype> #include "dialect.h" #include <algorithm> +#include "caosScript.h" // #include "malloc.h" <- unportable horror! #include <sstream> caosVM_debug.cpp @@ -25,6 +25,7 @@ #include <sstream> #include "AgentHelpers.h" #include "Vehicle.h" // EPAS +#include "caosScript.h" // CAOS /** DOIF (command) condition (condition) caosVM_flow.cpp @@ -18,6 +18,7 @@ */ #include "caosVM.h" +#include "caosScript.h" // PRAY INJT #include "World.h" #include "Catalogue.h" #include <boost/format.hpp> caosVM_resources.cpp @@ -18,6 +18,7 @@ */ #include "caosVM.h" +#include "caosScript.h" #include "World.h" #include "Engine.h" #include <iostream> caosVM_scripts.cpp @@ -20,12 +20,11 @@ #ifndef CAOSVAR_H #define CAOSVAR_H 1 -#include "boost/variant.hpp" +#include <boost/variant.hpp> #include "openc2e.h" #include <string> #include <cassert> #include "AgentRef.h" -//#include "slaballoc.h" #include <typeinfo> #include "physics.h" caosVar.h @@ -47,6 +47,7 @@ print qq{#include <cstdio>\n}; print qq{#include <climits>\n}; print qq{#include "cmddata.h"\n}; print qq{#include "caosVM.h"\n}; +print qq{#include "dialect.h"\n}; print qq{#include "openc2e.h"\n}; print qq{\n\n}; writecmds.pl 649ea4189a16dfe733814873ab2e2ddf3cd44289 Alyssa Milburn fuzzie@fuzzie.org http://github.com/ccdevnet/openc2e/commit/094af549b754a3933af5c99cc3231cab633715a0 094af549b754a3933af5c99cc3231cab633715a0 2008-02-03T16:18:43-08:00 2008-02-03T16:18:43-08:00 remove caosScript.h include from caosVM.h 5a94d51eb475e658d64d1bda5b44905b0241e9fc Alyssa Milburn fuzzie@fuzzie.org