* Implement CALL

* Set inst = false when blocking

Author: bdonlan

Agent.cpp

@@ -45,10 +45,20 @@ Agent::Agent(unsigned char f, unsigned char g, unsigned short s, unsigned int p)
 	zorder_iter = world.agents.insert(this);
 }
 
+void Agent::zotstack() {
+	std::list<caosVM *>::iterator i = vmstack.begin();
+	while (i != vmstack.end()) {
+		world.freeVM(*i);
+	}
+	vmstack.clear();
+}
+
+
 Agent::~Agent() {
 	world.agents.erase(zorder_iter);
 	if (vm)
 		world.freeVM(vm);
+	zotstack();
 	zotrefs();
 	if (unid != -1)
 		world.freeUNID(unid);
@@ -58,13 +68,19 @@ void Agent::moveTo(float _x, float _y) {
 	x = _x; y = _y;
 }
 
+script *Agent::findScript(unsigned short event) {
+	return world.scriptorium.getScript(family, genus, species, event);
+}
+
 void Agent::fireScript(unsigned short event) {
 	if (dying) return;
 
-	script *s = world.scriptorium.getScript(family, genus, species, event);
+	script *s = findScript(event);
 	if (!vm) vm = world.getVM(this);
-	if (vm->fireScript(s, (event == 9)))
+	if (vm->fireScript(s, (event == 9))) {
 		vm->setTarg(this);
+		zotstack();
+	}
 
 	// This slows us down too much :)
 #if 0
@@ -171,8 +187,11 @@ void Agent::tick() {
 			world.freeVM(vm);
 			vm = NULL;
 		}
+	} 
+	if (!vm && !vmstack.empty()) {
+		vm = vmstack.front();
+		vmstack.pop_front();
 	}
-		
 }
 
 void Agent::kill() {
@@ -218,4 +237,11 @@ bool agentzorder::operator ()(const Agent *s1, const Agent *s2) const {
 	return s1->zorder < s2->zorder;
 }
 
+void Agent::pushVM(caosVM *newvm) {
+	assert(newvm);
+	if (vm)
+		vmstack.push_front(vm);
+	vm = newvm;
+}
+
 /* vim: set noet: */

Agent.h

@@ -25,6 +25,7 @@
 #include "caosVar.h"
 #include "AgentRef.h"
 #include <set>
+#include <list>
 
 struct agentzorder {
 	bool operator()(const class Agent *s1, const class Agent *s2) const;
@@ -43,13 +44,16 @@ class Agent {
 	class caosVM *vm;
 
 	void zotrefs();
+	void zotstack();
 
 	bool dying;
 	int unid;
 	unsigned int zorder;
 	unsigned int tickssincelasttimer, timerrate;
 
 	std::multiset<Agent *, agentzorder>::iterator zorder_iter;
+	std::list<caosVM *> vmstack; // for CALL etc
+
 
 public:
 	int clac[3]; int clik;
@@ -72,6 +76,7 @@ class Agent {
 	void fireScript(unsigned short event);
 	void moveTo(float, float);
 	void setTimerRate(unsigned int r) { tickssincelasttimer = 0; timerrate = r; }
+	void pushVM(caosVM *newvm);
 
 	Agent(unsigned char f, unsigned char g, unsigned short s, unsigned int p);
 	virtual ~Agent();
@@ -88,6 +93,8 @@ class Agent {
 	virtual void setZOrder(unsigned int plane);
 	virtual unsigned int getZOrder() const { return zorder; }
 
+	class script *findScript(unsigned short event);
+	
 	int getUNID();
 	std::string identify() const;
 };

caosVM.cpp

@@ -56,6 +56,7 @@ inline bool caosVM::isBlocking() {
 }
 
 void caosVM::startBlocking(blockCond *whileWhat) {
+	inst = false;
 	if (blocking)
 		throw creaturesException("trying to block with a block condition in-place");
 	blocking = whileWhat;
@@ -153,7 +154,8 @@ void caosVM::tick() {
 
 void caosVM::runTimeslice(int units) {
 	timeslice = units;
-	while (currentscript && (timeslice > 0 || inst)) {
+	stop_loop = false;
+	while (currentscript && !stop_loop && (timeslice > 0 || inst)) {
 		if (isBlocking()) return;
 		runOp();
 	}

caosVM.h

@@ -98,7 +98,7 @@ class caosVM {
 	script *currentscript;
 	caosOp *nip, *cip;
 
-	bool inst, lock;
+	bool inst, lock, stop_loop;
 	int timeslice;
 
 	std::vector<vmStackItem> valueStack;
@@ -232,6 +232,7 @@ class caosVM {
 	void c_ETCH();
 	void c_EPAS();
 	void c_NEXT();
+	void c_CALL();
 
 	// debug
 	void c_TEST_PASS();

caosVM_flow.cpp

@@ -196,6 +196,7 @@ void caosVM::c_ESEE() {
  ETCH (command) family (integer) genus (integer) species (integer)
  %pragma parserclass ENUMhelper
  %pragma retc -1
+ %status stub
 
  like ENUM, but iterate through agents OWNR is touching
 */
@@ -215,6 +216,7 @@ void caosVM::c_ETCH() {
  EPAS (command) family (integer) genus (integer) species (integer)
  %pragma parserclass ENUMhelper
  %pragma retc -1
+ %status stub
 
  like ENUM, but iterate through OWNR vehicle's passengers
 */
@@ -230,4 +232,40 @@ void caosVM::c_EPAS() {
 	valueStack.push_back(nullv);
 }
 
+/**
+ CALL (command) script_no (integer) p1 (any) p2 (any)
+
+ <p>Calls script_no on OWNR, then waits for it to return. The invoked script
+ will inherit the caller's INST setting, but any changes it makes to it will
+ be reversed once it returns - so eg if you call a script when in INST mode,
+ it calls OVEr and returns, you'll still be in INST.</p>
+ 
+ <p>Script variables (VAxx) will not be preserved - you'll have to use OVxx
+ for any parameters.</p>
+ */
+void caosVM::c_CALL() {
+	VM_PARAM_VALUE(p2)
+	VM_PARAM_VALUE(p1)
+	VM_PARAM_INTEGER(script_no)
+
+	caos_assert(owner);
+	caos_assert(script_no > 0 && script_no < 65536);
+
+	script *s = owner->findScript(script_no);
+	if (!s) return;
+	caosVM *newvm = world.getVM(owner);
+	
+	if (newvm->fireScript(s, false)) {
+		newvm->setTarg(owner);
+		newvm->inst = inst;
+		newvm->_p_[0] = p1;
+		newvm->_p_[1] = p2;
+		owner->pushVM(newvm);
+	} else
+		world.freeVM(newvm);
+
+	stop_loop = true;
+}
+
+
 /* vim: set noet: */

testcall.cos

@@ -0,0 +1,25 @@
+DBG: OUTS "1..n"
+
+NEW: SIMP 3 2 1 "bluebell" 1 0 0
+TICK 1
+
+SCRP 3 2 1 9
+    SETV OV00 0
+    CALL 42 "hello, world" TARG
+    DOIF OV00 eq 0
+        DBG: OUTS "not ok 3 - CALL blocks"
+    ELSE
+        DBG: OUTS "ok 3 - CALL blocks"
+    ENDI
+    TICK 0
+ENDM
+
+SCRP 3 2 1 42
+    DBG: OUTS "ok 1 - CALL"
+    DOIF _P1_ ne "hello, world"
+        DBG: OUTS "not ok 2 - _P1_"
+    ELSE
+        DBG: OUTS "ok 2 - _P1_"
+    ENDI
+    SETV OV00 1
+ENDM