X-Git-Url: https://git.cameronkatri.com/bsdgames-darwin.git/blobdiff_plain/634cb6ceab3191623a3daed5e953821e3f37a4cb..6ee975e21fcf991ef591682630e1259efc1e2d46:/trek/schedule.c

diff --git a/trek/schedule.c b/trek/schedule.c
index 70a9cf38..89576f06 100644
--- a/trek/schedule.c
+++ b/trek/schedule.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: schedule.c,v 1.4 1997/10/12 21:25:11 christos Exp $	*/
+/*	$NetBSD: schedule.c,v 1.11 2009/05/24 22:55:03 dholland Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -38,13 +34,14 @@
 #if 0
 static char sccsid[] = "@(#)schedule.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: schedule.c,v 1.4 1997/10/12 21:25:11 christos Exp $");
+__RCSID("$NetBSD: schedule.c,v 1.11 2009/05/24 22:55:03 dholland Exp $");
 #endif
 #endif /* not lint */
 
 #include <stdio.h>
 #include <math.h>
 #include <err.h>
+#include <limits.h>
 #include "trek.h"
 
 /*
@@ -57,34 +54,31 @@ __RCSID("$NetBSD: schedule.c,v 1.4 1997/10/12 21:25:11 christos Exp $");
 **	The address of the slot is returned.
 */
 
-struct event *schedule(type, offset, x, y, z)
-int	type;
-double	offset;
-char	x, y;
-char	z;
+struct event *
+schedule(int type, double offset, int x, int y, int z)
 {
 	struct event	*e;
 	int		i;
 	double			date;
 
 	date = Now.date + offset;
-	for (i = 0; i < MAXEVENTS; i++)
-	{
+	for (i = 0; i < MAXEVENTS; i++) {
 		e = &Event[i];
 		if (e->evcode)
 			continue;
 		/* got a slot */
-#		ifdef xTRACE
+#ifdef xTRACE
 		if (Trace)
-			printf("schedule: type %d @ %.2f slot %d parm %d %d %d\n",
+			printf("schedule: type %d @ %.2f "
+			       "slot %d parm %d %d %d\n",
 				type, date, i, x, y, z);
-#		endif
+#endif
 		e->evcode = type;
 		e->date = date;
 		e->x = x;
 		e->y = y;
 		e->systemname = z;
-		Now.eventptr[type] = e;
+		Now.eventptr[type & ~E_GHOST] = e;
 		return (e);
 	}
 	errx(1, "Cannot schedule event %d parm %d %d %d", type, x, y, z);
@@ -99,9 +93,7 @@ char	z;
 */
 
 void
-reschedule(e1, offset)
-struct event	*e1;
-double		offset;
+reschedule(struct event *e1, double offset)
 {
 	double			date;
 	struct event	*e;
@@ -110,11 +102,11 @@ double		offset;
 
 	date = Now.date + offset;
 	e->date = date;
-#	ifdef xTRACE
+#ifdef xTRACE
 	if (Trace)
 		printf("reschedule: type %d parm %d %d %d @ %.2f\n",
 			e->evcode, e->x, e->y, e->systemname, date);
-#	endif
+#endif
 	return;
 }
 
@@ -126,20 +118,19 @@ double		offset;
 */
 
 void
-unschedule(e1)
-struct event	*e1;
+unschedule(struct event *e1)
 {
 	struct event	*e;
 
 	e = e1;
 
-#	ifdef xTRACE
+#ifdef xTRACE
 	if (Trace)
 		printf("unschedule: type %d @ %.2f parm %d %d %d\n",
 			e->evcode, e->date, e->x, e->y, e->systemname);
-#	endif
+#endif
 	Now.eventptr[e->evcode & E_EVENT] = 0;
-	e->date = 1e50;
+	e->date = TOOLARGE;
 	e->evcode = 0;
 	return;
 }
@@ -152,15 +143,15 @@ struct event	*e1;
 **	figure.
 */
 
-struct event *xsched(ev1, factor, x, y, z)
-int	ev1;
-int	factor;
-int	x, y, z;
+struct event *
+xsched(int ev1, int factor, int x, int y, int z)
 {
 	int	ev;
+	double when;
 
 	ev = ev1;
-	return (schedule(ev, -Param.eventdly[ev] * Param.time * log(franf()) / factor, x, y, z));
+	when = -Param.eventdly[ev] * Param.time * log(franf()) / factor;
+	return (schedule(ev, when, x, y, z));
 }
 
 
@@ -172,15 +163,14 @@ int	x, y, z;
 */
 
 void
-xresched(e1, ev1, factor)
-struct event	*e1;
-int		ev1;
-int		factor;
+xresched(struct event *e1, int ev1, int factor)
 {
 	int		ev;
 	struct event	*e;
+	double when;
 
 	ev = ev1;
 	e = e1;
-	reschedule(e, -Param.eventdly[ev] * Param.time * log(franf()) / factor);
+	when = -Param.eventdly[ev] * Param.time * log(franf()) / factor;
+	reschedule(e, when);
 }