X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=src%2Fevents.c;h=7d4392109697e2fdcf6ab88b1b1ecf3be2d601ca;hp=cd921c57c914b1de8e8769e77636226decc0a91d;hb=dc45b3ccf42344c238ddb146d79dc62086624848;hpb=c8f91a7e3437017d237a3bad0166054b97206d8d

diff --git a/src/events.c b/src/events.c
index cd921c5..7d43921 100644
--- a/src/events.c
+++ b/src/events.c
@@ -1,34 +1,51 @@
 #include "sst.h"
 #include <math.h>
 
-void unschedule(int evtype)
+event *unschedule(int evtype)
 /* remove an event from the schedule */
 {
-    game.future[evtype] = FOREVER;
+    game.future[evtype].date = FOREVER;
+    return &game.future[evtype];
 }
 
 int is_scheduled(int evtype)
 /* is an event of specified type scheduled */
 {
-    return game.future[evtype] != FOREVER;
+    return game.future[evtype].date != FOREVER;
 }
 
 extern double scheduled(int evtype)
 /* when will this event happen? */
 {
-    return game.future[evtype];
+    return game.future[evtype].date;
 }
 
-void schedule(int evtype, double offset)
+event *schedule(int evtype, double offset)
 /* schedule an event of specified type */
 {
-    game.future[evtype] = game.state.date + offset;
+    game.future[evtype].date = game.state.date + offset;
+    return &game.future[evtype];
 }
 
 void postpone(int evtype, double offset)
 /* poistpone a scheduled event */
 {
-    game.future[evtype] += offset;
+    game.future[evtype].date += offset;
+}
+
+static bool cancelrest(void)
+{
+    if (game.resting) {
+	skip(1);
+	proutn(_("Mr. Spock-  \"Captain, shall we cancel the rest period?\""));
+	if (ja()) {
+	    game.resting = false;
+	    game.optime = 0.0;
+	    return true;
+	}
+    }
+
+    return false;
 }
 
 void events(void) 
@@ -36,11 +53,33 @@ void events(void)
     int ictbeam=0, ipage=0, istract=0, line, i=0, j, k, l, ixhold=0, iyhold=0;
     double fintim = game.state.date + game.optime, datemin, xtime, repair, yank=0;
     int radio_was_broken;
-    struct quadrant *pdest;
+    struct quadrant *pdest, *q;
+    coord w, hold;
+    event *ev;
 
-#ifdef DEBUG
-    if (game.idebug) prout("EVENTS");
-#endif
+    if (idebug) {
+	prout("=== EVENTS from %.2f to %.2f:", game.state.date, fintim);
+	for (i = 1; i < NEVENTS; i++) {
+	    switch (i) {
+	    case FSNOVA:  proutn("=== Supernova       "); break;
+	    case FTBEAM:  proutn("=== T Beam          "); break;
+	    case FSNAP:   proutn("=== Snapshot        "); break;
+	    case FBATTAK: proutn("=== Base Attack     "); break;
+	    case FCDBAS:  proutn("=== Base Destroy    "); break;
+	    case FSCMOVE: proutn("=== SC Move         "); break;
+	    case FSCDBAS: proutn("=== SC Base Destroy "); break;
+	    case FDSPROB: proutn("=== Probe Move      "); break;
+	    case FDISTR:  proutn("=== Distress Call   "); break;
+	    case FENSLV:  proutn("=== Enlavement      "); break;
+	    case FREPRO:  proutn("=== Klingon Build   "); break;
+	    }
+	    if (is_scheduled(i))
+		prout("%.2f", scheduled(i));
+	    else
+		prout("never");
+
+	}
+    }
 
     radio_was_broken = (game.damage[DRADIO] != 0.0);
 
@@ -50,9 +89,11 @@ void events(void)
 	if (game.alldone) return;
 	datemin = fintim;
 	for (l = 1; l < NEVENTS; l++)
-	    if (game.future[l] < datemin) {
+	    if (game.future[l].date < datemin) {
 		line = l;
-		datemin = game.future[l];
+		if (idebug)
+		    prout("== Event %d fires", line);
+		datemin = game.future[l].date;
 	    }
 	xtime = datemin-game.state.date;
 	game.state.date = datemin;
@@ -163,14 +204,10 @@ void events(void)
 		    prout(_("Galileo, left on the planet surface, is well hidden."));
 		}
 	    }
-	    if (line==0) {
-		game.quadrant.x = game.state.kscmdr.x;
-		game.quadrant.y = game.state.kscmdr.y;
-	    }
-	    else {
-		game.quadrant.x = game.state.kcmdr[i].x;
-		game.quadrant.y = game.state.kcmdr[i].y;
-	    }
+	    if (line==0)
+		game.quadrant = game.state.kscmdr;
+	    else
+		game.quadrant = game.state.kcmdr[i];
 	    iran(QUADSIZE, &game.sector.x, &game.sector.y);
 	    crmshp();
 	    proutn(_(" is pulled to "));
@@ -179,9 +216,9 @@ void events(void)
 	    prout(cramlc(sector, game.sector));
 	    if (game.resting) {
 		prout(_("(Remainder of rest/repair period cancelled.)"));
-		game.resting = 0;
+		game.resting = false;
 	    }
-	    if (game.shldup==0) {
+	    if (!game.shldup) {
 		if (game.damage[DSHIELD]==0 && game.shield > 0) {
 		    doshield(2); /* Shldsup */
 		    game.shldchg=0;
@@ -210,9 +247,9 @@ void events(void)
 	    i = 0;
 	    for_starbases(j) {
 		for_commanders(k)
-		    if (game.state.baseq[j].x==game.state.kcmdr[k].x && game.state.baseq[j].y==game.state.kcmdr[k].y &&
-			(game.state.baseq[j].x!=game.quadrant.x || game.state.baseq[j].y!=game.quadrant.y) &&
-			(game.state.baseq[j].x!=game.state.kscmdr.x || game.state.baseq[j].y!=game.state.kscmdr.y)) {
+		    if (same(game.state.baseq[j], game.state.kcmdr[k]) &&
+			!same(game.state.baseq[j], game.quadrant) &&
+			!same(game.state.baseq[j], game.state.kscmdr)) {
 			i = 1;
 			break;
 		    }
@@ -225,15 +262,14 @@ void events(void)
 		break;
 	    }
 	    /* commander + starbase combination found -- launch attack */
-	    game.battle.x = game.state.baseq[j].x;
-	    game.battle.y = game.state.baseq[j].y;
+	    game.battle = game.state.baseq[j];
 	    schedule(FCDBAS, 1.0+3.0*Rand());
 	    if (game.isatb) /* extra time if SC already attacking */
 		postpone(FCDBAS, scheduled(FSCDBAS)-game.state.date);
-	    game.future[FBATTAK] = game.future[FCDBAS] +expran(0.3*game.intime);
+	    game.future[FBATTAK].date = game.future[FCDBAS].date + expran(0.3*game.intime);
 	    game.iseenit = 0;
-	    if (game.damage[DRADIO] != 0.0 &&
-		game.condit != IHDOCKED) break; /* No warning :-( */
+	    if (game.damage[DRADIO] != 0.0 && game.condit != IHDOCKED) 
+		break; /* No warning :-( */
 	    game.iseenit = 1;
 	    if (ipage==0) pause_game(1);
 	    ipage = 1;
@@ -244,15 +280,8 @@ void events(void)
 	    proutn(_("   hold out only until stardate %d"),
 		   (int)scheduled(FCDBAS));
 	    prout(".\"");
-	    if (game.resting) {
-		skip(1);
-		proutn(_("Mr. Spock-  \"Captain, shall we cancel the rest period?\""));
-		if (ja()) {
-		    game.resting = 0;
-		    game.optime = 0.0;
-		    return;
-		}
-	    }
+	    if (cancelrest())
+		return;
 	    break;
 	case FSCDBAS: /* Supercommander destroys base */
 	    unschedule(FSCDBAS);
@@ -261,14 +290,14 @@ void events(void)
 		break; /* WAS RETURN! */
 	    ixhold = game.battle.x;
 	    iyhold = game.battle.y;
-	    game.battle.x = game.state.kscmdr.x;
-	    game.battle.y = game.state.kscmdr.y;
+	    game.battle = game.state.kscmdr;
+	    /* FALL THROUGH */
 	case FCDBAS: /* Commander succeeds in destroying base */
 	    if (line==FCDBAS) {
 		unschedule(FCDBAS);
 		/* find the lucky pair */
 		for_commanders(i)
-		    if (game.state.kcmdr[i].x==game.battle.x && game.state.kcmdr[i].y==game.battle.y) 
+		    if (same(game.state.kcmdr[i], game.battle)) 
 			break;
 		if (i > game.state.remcom || game.state.rembase == 0 ||
 		    !game.state.galaxy[game.battle.x][game.battle.y].starbase) {
@@ -280,7 +309,7 @@ void events(void)
 	    /* Code merges here for any commander destroying base */
 	    /* Not perfect, but will have to do */
 	    /* Handle case where base is in same quadrant as starship */
-	    if (game.battle.x==game.quadrant.x && game.battle.y==game.quadrant.y) {
+	    if (same(game.battle, game.quadrant)) {
 		game.state.chart[game.battle.x][game.battle.y].starbase = false;
 		game.quad[game.base.x][game.base.y] = IHDOT;
 		game.base.x=game.base.y=0;
@@ -298,17 +327,16 @@ void events(void)
 		proutn(_("   the starbase in "));
 		proutn(cramlc(quadrant, game.battle));
 		prout(_(" has been destroyed by"));
-		if (game.isatb==2) prout(_("the Klingon Super-Commander"));
+		if (game.isatb == 2) 
+		    prout(_("the Klingon Super-Commander"));
 		else prout(_("a Klingon Commander"));
 		game.state.chart[game.battle.x][game.battle.y].starbase = false;
 	    }
 	    /* Remove Starbase from galaxy */
 	    game.state.galaxy[game.battle.x][game.battle.y].starbase = false;
 	    for_starbases(i)
-		if (game.state.baseq[i].x==game.battle.x && game.state.baseq[i].y==game.battle.y) {
-		    game.state.baseq[i].x=game.state.baseq[game.state.rembase].x;
-		    game.state.baseq[i].y=game.state.baseq[game.state.rembase].y;
-		}
+		if (same(game.state.baseq[i], game.battle))
+		    game.state.baseq[i] = game.state.baseq[game.state.rembase];
 	    game.state.rembase--;
 	    if (game.isatb == 2) {
 		/* reinstate a commander's base attack */
@@ -323,8 +351,8 @@ void events(void)
 	case FSCMOVE: /* Supercommander moves */
 	    schedule(FSCMOVE, 0.2777);
 	    if (game.ientesc+istract==0 &&
-		game.isatb!=1 &&
-		(game.iscate!=1 || game.justin==1)) scom(&ipage);
+		game.isatb != 1 &&
+		(game.iscate != 1 || !game.justin)) scom(&ipage);
 	    break;
 	case FDSPROB: /* Move deep space probe */
 	    schedule(FDSPROB, 0.01);
@@ -381,122 +409,104 @@ void events(void)
 		    return;
 	    }
 	    break;
-#ifdef EXPERIMENTAL
 	case FDISTR: /* inhabited system issues distress call */
-	    /* in BSD Trek this is a straight 1 stardate ahead */ 
-	    schedule(FDISTR, 1.0 + Rand());
-	    /* if we already have too many, throw this one away */
-	    if (game.ndistr >= MAXDISTR)
-		break;
+	    schedule(FDISTR, expran(0.5*game.intime));
 	    /* try a whole bunch of times to find something suitable */
-	    for (i = 0; i < 100; i++) {
-		struct quadrant *q;
-		iran(GALSIZE, &ix, &iy);
-		q = &game.state.galaxy[game.quadrant.x][game.quadrant.y];
+	    i = 100;
+	    do {
 		/* need a quadrant which is not the current one,
 		   which has some stars which are inhabited and
 		   not already under attack, which is not
 		   supernova'ed, and which has some Klingons in it */
-		if (!((ix == game.quadrant.x && iy == game.quadrant.y) || q->stars<=0 ||
-		      (q->qsystemname & Q_DISTRESSED) ||
-		      (q->qsystemname & Q_SYSTEM) == 0 || q->klings <= 0))
-		    break;
-	    }
-	    if (i >= 100)
+		iran(GALSIZE, &w.x, &w.y);
+		q = &game.state.galaxy[w.x][w.y];
+	    } while (--i &&
+		     (same(game.quadrant, w) || q->planet == NOPLANET ||
+		      q->supernova || q->status!=secure || q->klingons<=0));
+	    if (i == 0) {
 		/* can't seem to find one; ignore this call */
+		if (idebug)
+		    prout("=== Couldn't find location for distress event.");
 		break;
+	    }
 
 	    /* got one!!  Schedule its enslavement */
-	    game.ndistr++;
-	    e = xsched(E_ENSLV, 1, ix, iy, q->qsystemname);
-	    q->qsystemname = (e - Event) | Q_DISTRESSED;
+	    ev = schedule(FENSLV, expran(game.intime));
+	    ev->quadrant = w;
+	    q->status = distressed;
+	    if (idebug)
+		prout("=== Distress call set at %d, %d.", w.x, w.y);
 
 	    /* tell the captain about it if we can */
-	    if (game.damage[DRADIO] == 0.0)
+	    if (game.damage[DRADIO] == 0.0 || game.condit == IHDOCKED)
 	    {
-		printf("\nUhura: Captain, starsystem %s in quadrant %d,%d is under attack\n",
-		       Systemname[e->systemname], ix, iy);
-		restcancel++;
+		prout("Uhura: Captain, starsystem %s in quadrant %d - %d is under attack.",
+		      systemname(q->planet), w.x, w.y);
+		if (cancelrest())
+		    return;
 	    }
-	    else
-		/* if we can't tell him, make it invisible */
-		e->evcode |= E_HIDDEN;
 	    break;
       case FENSLV:		/* starsystem is enslaved */
-	    unschedule(e);
+	    ev = unschedule(FENSLV);
 	    /* see if current distress call still active */
-	    q = &Quad[e->x][e->y];
-	    if (q->klings <= 0)
-	    {
-		/* no Klingons, clean up */
-		/* restore the system name */
-		q->qsystemname = e->systemname;
+	    q = &game.state.galaxy[ev->quadrant.x][ev->quadrant.y];
+	    if (q->klingons <= 0) {
+		q->status = secure;
 		break;
 	    }
+	    q->status = enslaved;
 
 	    /* play stork and schedule the first baby */
-	    e = schedule(E_REPRO, Param.eventdly[E_REPRO] * franf(), e->x, e->y, e->systemname);
+	    ev = schedule(FREPRO, expran(2.0 * game.intime));
 
 	    /* report the disaster if we can */
-	    if (game.damage[DRADIO] == 0.0)
+	    if (game.damage[DRADIO] == 0.0 || game.condit == IHDOCKED)
 	    {
-		printf("\nUhura:  We've lost contact with starsystem %s\n",
-		       Systemname[e->systemname]);
-		printf("  in quadrant %d,%d.\n", e->x, e->y);
+		prout("\nUhura:  We've lost contact with starsystem %s\n",
+		      systemname(q->planet));
+		prout("  in quadrant %d,%d.\n", ev->quadrant.x,ev->quadrant.y);
 	    }
-	    else
-		e->evcode |= E_HIDDEN;
 	    break;
       case FREPRO:		/* Klingon reproduces */
-	    /* see if distress call is still active */
-	    q = &Quad[e->x][e->y];
-	    if (q->klings <= 0)
-	    {
-		unschedule(e);
-		q->qsystemname = e->systemname;
+	    ev = schedule(FREPRO, expran(1.0 * game.intime));
+	    /* see if current distress call still active */
+	    q = &game.state.galaxy[ev->quadrant.x][ev->quadrant.y];
+	    if (q->klingons <= 0) {
+		q->status = secure;
 		break;
 	    }
-	    xresched(e, E_REPRO, 1);
 	    /* reproduce one Klingon */
-	    ix = e->x;
-	    iy = e->y;
-	    if (Now.klings == 127)
+	    w = ev->quadrant;
+	    if (game.state.remkl >=MAXKLGAME)
 		break;		/* full right now */
-	    if (q->klings >= MAXKLQUAD)
+	    /* this quadrant not ok, pick an adjacent one */
+	    for (i = w.x - 1; i <= w.x + 1; i++)
 	    {
-		/* this quadrant not ok, pick an adjacent one */
-		for (i = ix - 1; i <= ix + 1; i++)
+		for (j = w.y - 1; j <= w.y + 1; j++)
 		{
-		    if (!VALID_QUADRANT(i))
+		    if (!VALID_QUADRANT(i, j))
 			continue;
-		    for (j = iy - 1; j <= iy + 1; j++)
-		    {
-			if (!VALID_QUADRANT(j))
-			    continue;
-			q = &Quad[i][j];
-			/* check for this quad ok (not full & no snova) */
-			if (q->klings >= MAXKLQUAD || q->stars < 0)
-			    continue;
-			break;
-		    }
-		    if (j <= iy + 1)
-			break;
+		    q = &game.state.galaxy[w.x][w.y];
+		    /* check for this quad ok (not full & no snova) */
+		    if (q->klingons >= MAXKLQUAD || !q->supernova)
+			continue;
+		    goto foundit;
 		}
-		if (j > iy + 1)
-		    /* cannot create another yet */
-		    break;
-		ix = i;
-		iy = j;
 	    }
+	    break;	/* search for eligible quadrant failed */
+	foundit:
+	    w.x = i;
+	    w.y = j;
+
 	    /* deliver the child */
-	    game.remkl++;
-	    if (ix == game.quadrant.x && iy == game.quadrant.y)
-		newkling(++game.klhere, &ixhold, &iyhold);
+	    game.state.remkl++;
+	    q->klingons++;
+	    if (same(game.quadrant, w))
+		newkling(++game.klhere, &hold);
 
 	    /* recompute time left */
 	    game.state.remtime = game.state.remres/(game.state.remkl+4*game.state.remcom);
 	    break;
-#endif /* EXPERIMENTAL */
 	}
     }
 }
@@ -527,10 +537,10 @@ void wait(void)
 
     /* Alternate resting periods (events) with attacks */
 
-    game.resting = 1;
+    game.resting = true;
     do {
-	if (delay <= 0) game.resting = 0;
-	if (game.resting == 0) {
+	if (delay <= 0) game.resting = false;
+	if (!game.resting) {
 	    prout(_("%d stardates left."), (int)game.state.remtime);
 	    return;
 	}
@@ -554,7 +564,7 @@ void wait(void)
 	// leave if quadrant supernovas
 	(!game.state.galaxy[game.quadrant.x][game.quadrant.y].supernova);
 
-    game.resting = 0;
+    game.resting = false;
     game.optime = 0;
 }
 
@@ -619,7 +629,7 @@ void nova(int ix, int iy)
 			game.quad[scratch.x][scratch.y] = IHDOT;
 			break;
 		    case IHP: /* Destroy planet */
-			game.state.galaxy[game.quadrant.x][game.quadrant.y].planet = NULL;
+			game.state.galaxy[game.quadrant.x][game.quadrant.y].planet = NOPLANET;
 			game.state.nplankl++;
 			crmena(1, IHP, 2, scratch);
 			prout(_(" destroyed."));
@@ -654,7 +664,7 @@ void nova(int ix, int iy)
 				double diff = 2000.0 - game.shield;
 				game.energy -= diff;
 				game.shield = 0.0;
-				game.shldup = 0;
+				game.shldup = false;
 				prout(_("***Shields knocked out."));
 				game.damage[DSHIELD] += 0.005*game.damfac*Rand()*diff;
 			    }
@@ -775,15 +785,13 @@ void snova(int insx, int insy)
 		}
 		if (num <=0) break;
 	    }
-#ifdef DEBUG
-	    if (game.idebug) {
-		proutn("Super nova here?");
+	    if (idebug) {
+		proutn("=== Super nova here?");
 		if (ja()==1) {
 		    nq.x = game.quadrant.x;
 		    nq.y = game.quadrant.y;
 		}
 	    }
-#endif
 	}
 
 	if (nq.x != game.quadrant.y || nq.y != game.quadrant.y || game.justin != 0) {