agd-cvs

[Peep P. <so...@us...>]

Update of /cvsroot/agd/server/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11697/src

Modified Files:
	arch.h interpret.c lpc_incl.h 
Log Message:
Updates for 0.0.2-3.

Index: interpret.c
===================================================================
RCS file: /cvsroot/agd/server/src/interpret.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- interpret.c	18 Mar 2004 20:47:08 -0000	1.12
+++ interpret.c	21 Mar 2004 08:56:52 -0000	1.13
@@ -29,6 +29,7 @@
 	int *cp;
 	array_t *code;
 	object_t *this_ob, *previous_ob;
+	player_t *this_player;
 	int num_arg;
 } control_stack_t;
 
@@ -214,8 +215,10 @@
 
 void push_control_stack(void)
 {
-	csp->previous_ob = previous_ob;
+/*	csp->previous_ob = previous_ob;*/
 	csp->this_ob = this_ob;
+	if(this_ob)
+		csp->this_player = this_ob->iaob;
 	csp->fp = fp;
 	csp->sp = sp;
 	csp->cp = cp;
@@ -237,12 +240,13 @@
 	cp = csp->cp;
 	code = csp->code;
 
-	previous_ob = csp->previous_ob;
+/*	previous_ob = csp->previous_ob;*/
 	this_ob = csp->this_ob;
 	if(this_ob && this_ob->iaob)
-		this_player = this_ob->iaob;
+		this_player = /*this_ob->iaob*/ csp->this_player;
 }
 
+/*
 void remove_lvalues(void) {
 	int i;
 	for(i=0;i<csp->num_arg;i++) {
@@ -252,6 +256,7 @@
 		}
 	}
 }
+*/
 
 /* Used by F_JMP and F_JMPF to check if they jumped too far. */
 #define CHECK_OVERRUN() if((int *) cp >= (int *) code->data + code->length) {\
@@ -564,7 +569,7 @@
 #ifdef DEBUG	
 	debug("interpret", "call_function %d on %s\n", index, ob->name);
 #endif
-	previous_ob = this_ob;
+/*	previous_ob = this_ob;*/
 	this_ob = ob;
 	if(this_ob->iaob)
 		this_player = this_ob->iaob;

Index: arch.h
===================================================================
RCS file: /cvsroot/agd/server/src/arch.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- arch.h	12 Mar 2004 08:40:10 -0000	1.5
+++ arch.h	21 Mar 2004 08:56:42 -0000	1.6
@@ -1,6 +1,6 @@
 #ifndef _ARCH_H
 #define _ARCH_H
-/* OpenBSD, QNX, OpenVMS/VAX, Cygwin? */
+/* OpenBSD, QNX, OpenVMS/VAX, Cygwin, OS/2? */
 
 /* Operating system checks */
 #ifdef __linux

Index: lpc_incl.h
===================================================================
RCS file: /cvsroot/agd/server/src/lpc_incl.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- lpc_incl.h	1 Feb 2004 13:12:30 -0000	1.4
+++ lpc_incl.h	21 Mar 2004 08:56:52 -0000	1.5
@@ -11,7 +11,7 @@
 #include "dfuns.h"
 #include "vars.h"
 
-extern object_t *master;
+/*extern object_t *master;*/
 extern list_t all_objects;
 extern player_t *this_player;
 extern object_t *this_ob, *previous_ob;