exult-cvs-logs

[<ma...@us...>]

Update of /cvsroot/exult/./exult
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv7584

Modified Files:
	actors.cc 
Log Message:
The avatar should not execute schedule actions if in usecode control.

Index: actors.cc
===================================================================
RCS file: /cvsroot/exult/./exult/actors.cc,v
retrieving revision 1.641
retrieving revision 1.642
diff -u -d -r1.641 -r1.642
--- actors.cc	23 Sep 2006 18:13:28 -0000	1.641
+++ actors.cc	23 Sep 2006 19:01:03 -0000	1.642
@@ -3851,6 +3851,10 @@
 		if (delay)		// Keep going with same action.
 			gwin->get_tqueue()->add(
 					curtime + delay, this, udata);
+		else if (in_usecode_control())
+			// Keep trying if we are in usecode control.
+			gwin->get_tqueue()->add(
+					curtime + gwin->get_std_delay(), this, udata);
 		else
 			{
 			set_action(0);
@@ -3858,6 +3862,10 @@
 				schedule->now_what();
 			}
 		}
+	else if (in_usecode_control())
+		// Keep trying if we are in usecode control.
+		gwin->get_tqueue()->add(
+				curtime + gwin->get_std_delay(), this, udata);
 	else if (schedule)
 		schedule->now_what();
 	}