X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=src%2Fevents.c;h=b82aff7caa9b65addeaf47cdb725b20cf5c64722;hp=466867c83e511076aeb7b649a20f4714a1d9048e;hb=9aef5f5aae5fde0ed2b462945750c7aee59b3c1e;hpb=2ea1ffb97cc0cdb13d8f4d42547a4e15245adfb2

diff --git a/src/events.c b/src/events.c
index 466867c..b82aff7 100644
--- a/src/events.c
+++ b/src/events.c
@@ -62,11 +62,13 @@ void events(void)
 {
     int evcode, i=0, j, k, l;
     double fintim = game.state.date + game.optime, datemin, xtime, repair, yank=0;
-    bool radio_was_broken, ictbeam = false, ipage = false, istract = false;
+    bool radio_was_broken, ictbeam = false, istract = false;
     struct quadrant *pdest, *q;
     coord w, hold;
     event *ev, *ev2;
 
+    pause_reset();
+
     if (idebug) {
 	prout("=== EVENTS from %.2f to %.2f:", game.state.date, fintim);
 	for (i = 1; i < NEVENTS; i++) {
@@ -97,7 +99,8 @@ void events(void)
     for (;;) {
 	/* Select earliest extraneous event, evcode==0 if no events */
 	evcode = FSPY;
-	if (game.alldone) return;
+	if (game.alldone)
+	    return;
 	datemin = fintim;
 	for (l = 1; l < NEVENTS; l++)
 	    if (game.future[l].date < datemin) {
@@ -127,11 +130,13 @@ void events(void)
 		return;
 	    }
 	    game.lsupres -= xtime;
-	    if (game.damage[DLIFSUP] <= xtime) game.lsupres = game.inlsr;
+	    if (game.damage[DLIFSUP] <= xtime)
+		game.lsupres = game.inlsr;
 	}
 	/* Fix devices */
 	repair = xtime;
-	if (game.condition == docked) repair /= game.docfac;
+	if (game.condition == docked)
+	    repair /= game.docfac;
 	/* Don't fix Deathray here */
 	for (l=0; l<NDEVICES; l++)
 	    if (game.damage[l] > 0.0 && l != DDRAY)
@@ -153,16 +158,16 @@ void events(void)
 	game.optime -= xtime;
 	switch (evcode) {
 	case FSNOVA: /* Supernova */
-	    if (!ipage) pause_game(1);
-	    ipage=true;
+	    pause_game(true);
 	    snova(false, NULL);
 	    schedule(FSNOVA, expran(0.5*game.intime));
-	    if (game.state.galaxy[game.quadrant.x][game.quadrant.y].supernova) return;
+	    if (game.state.galaxy[game.quadrant.x][game.quadrant.y].supernova)
+		return;
 	    break;
 	case FSPY: /* Check with spy to see if S.C. should tractor beam */
 	    if (game.state.nscrem == 0 ||
 		ictbeam || istract ||
-		game.condition==docked || game.isatb==1 || game.iscate==1) return;
+		game.condition==docked || game.isatb==1 || game.iscate) return;
 	    if (game.ientesc ||
 		(game.energy < 2000 && game.torps < 4 && game.shield < 1250) ||
 		(damaged(DPHASER) && (damaged(DPHOTON) || game.torps < 4)) ||
@@ -174,7 +179,8 @@ void events(void)
 		yank = distance(game.state.kscmdr, game.quadrant);
 		/********* fall through to FTBEAM code ***********/
 	    }
-	    else return;
+	    else
+		return;
 	case FTBEAM: /* Tractor beam */
 	    if (evcode==FTBEAM) {
 		if (game.state.remcom == 0) {
@@ -192,29 +198,29 @@ void events(void)
 	    }
 	    /* tractor beaming cases merge here */
 	    yank = sqrt(yank);
-	    if (!ipage) pause_game(1);
-	    ipage=true;
+	    pause_game(true);
 	    game.optime = (10.0/(7.5*7.5))*yank; /* 7.5 is yank rate (warp 7.5) */
-	    ictbeam = 1;
+	    ictbeam = true;
 	    skip(1);
 	    proutn("***");
 	    crmshp();
 	    prout(_(" caught in long range tractor beam--"));
 	    /* If Kirk & Co. screwing around on planet, handle */
 	    atover(true); /* atover(true) is Grab */
-	    if (game.alldone) return;
+	    if (game.alldone)
+		return;
 	    if (game.icraft) { /* Caught in Galileo? */
 		finish(FSTRACTOR);
 		return;
 	    }
 	    /* Check to see if shuttle is aboard */
-	    if (game.iscraft==0) {
+	    if (game.iscraft == offship) {
 		skip(1);
 		if (Rand() > 0.5) {
 		    prout(_("Galileo, left on the planet surface, is captured"));
 		    prout(_("by aliens and made into a flying McDonald's."));
 		    game.damage[DSHUTTL] = -10;
-		    game.iscraft = -1;
+		    game.iscraft = removed;
 		}
 		else {
 		    prout(_("Galileo, left on the planet surface, is well hidden."));
@@ -224,7 +230,7 @@ void events(void)
 		game.quadrant = game.state.kscmdr;
 	    else
 		game.quadrant = game.state.kcmdr[i];
-	    game.sector = iran(QUADSIZE);
+	    game.sector = randplace(QUADSIZE);
 	    crmshp();
 	    proutn(_(" is pulled to "));
 	    proutn(cramlc(quadrant, game.quadrant));
@@ -236,21 +242,24 @@ void events(void)
 	    }
 	    if (!game.shldup) {
 		if (!damaged(DSHIELD) && game.shield > 0) {
-		    doshield(2); /* Shldsup */
-		    game.shldchg=0;
+		    doshield(true); /* raise shields */
+		    game.shldchg=false;
 		}
-		else prout(_("(Shields not currently useable.)"));
+		else
+		    prout(_("(Shields not currently useable.)"));
 	    }
 	    newqad(false);
 	    /* Adjust finish time to time of tractor beaming */
 	    fintim = game.state.date+game.optime;
-	    attack(0);
-	    if (game.state.remcom <= 0) unschedule(FTBEAM);
-	    else schedule(FTBEAM, game.optime+expran(1.5*game.intime/game.state.remcom));
+	    attack(false);
+	    if (game.state.remcom <= 0)
+		unschedule(FTBEAM);
+	    else 
+		schedule(FTBEAM, game.optime+expran(1.5*game.intime/game.state.remcom));
 	    break;
 	case FSNAP: /* Snapshot of the universe (for time warp) */
 	    game.snapsht = game.state;
-	    game.state.snap = 1;
+	    game.state.snap = true;
 	    schedule(FSNAP, expran(0.5 * game.intime));
 	    break;
 	case FBATTAK: /* Commander attacks starbase */
@@ -269,7 +278,8 @@ void events(void)
 			i = 1;
 			break;
 		    }
-		if (i == 1) break;
+		if (i == 1)
+		    break;
 	    }
 	    if (j>game.state.rembase) {
 		/* no match found -- try later */
@@ -287,8 +297,7 @@ void events(void)
 	    if (!damaged(DRADIO) && game.condition != docked) 
 		break; /* No warning :-( */
 	    game.iseenit = true;
-	    if (!ipage) pause_game(1);
-	    ipage = true;
+	    pause_game(true);
 	    skip(1);
 	    proutn(_("Lt. Uhura-  \"Captain, the starbase in "));
 	    prout(cramlc(quadrant, game.battle));
@@ -317,7 +326,7 @@ void events(void)
 		if (i > game.state.remcom || game.state.rembase == 0 ||
 		    !game.state.galaxy[game.battle.x][game.battle.y].starbase) {
 		    /* No action to take after all */
-		    game.battle.x = game.battle.y = 0;
+		    invalidate(game.battle);
 		    break;
 		}
 	    }
@@ -335,8 +344,7 @@ void events(void)
 	    else if (game.state.rembase != 1 &&
 		     (!damaged(DRADIO) || game.condition == docked)) {
 		/* Get word via subspace radio */
-		if (!ipage) pause_game(1);
-		ipage = true;
+		pause_game(true);		    
 		skip(1);
 		prout(_("Lt. Uhura-  \"Captain, Starfleet Command reports that"));
 		proutn(_("   the starbase in "));
@@ -344,7 +352,8 @@ void events(void)
 		prout(_(" has been destroyed by"));
 		if (game.isatb == 2) 
 		    prout(_("the Klingon Super-Commander"));
-		else prout(_("a Klingon Commander"));
+		else
+		    prout(_("a Klingon Commander"));
 		game.state.chart[game.battle.x][game.battle.y].starbase = false;
 	    }
 	    /* Remove Starbase from galaxy */
@@ -358,15 +367,14 @@ void events(void)
 		game.battle = hold;
 		game.isatb = 0;
 	    }
-	    else {
-		game.battle.x = game.battle.y = 0;
-	    }
+	    else
+		invalidate(game.battle);
 	    break;
 	case FSCMOVE: /* Supercommander moves */
 	    schedule(FSCMOVE, 0.2777);
 	    if (!game.ientesc && !istract && game.isatb != 1 &&
-			(game.iscate != 1 || !game.justin)) 
-		scom(&ipage);
+			(!game.iscate || !game.justin)) 
+		scom();
 	    break;
 	case FDSPROB: /* Move deep space probe */
 	    schedule(FDSPROB, 0.01);
@@ -381,8 +389,7 @@ void events(void)
 		    game.state.galaxy[game.probec.x][game.probec.y].supernova) {
 		    // Left galaxy or ran into supernova
 		    if (!damaged(DRADIO) || game.condition == docked) {
-			if (ipage==0) pause_game(1);
-			ipage = 1;
+			pause_game(true);
 			skip(1);
 			proutn(_("Lt. Uhura-  \"The deep space probe "));
 			if (!VALID_QUADRANT(j, i))
@@ -395,8 +402,7 @@ void events(void)
 		    break;
 		}
 		if (!damaged(DRADIO) || game.condition == docked) {
-		    if (ipage==0) pause_game(1);
-		    ipage = 1;
+		    pause_game(true);
 		    skip(1);
 		    proutn(_("Lt. Uhura-  \"The deep space probe is now in "));
 		    proutn(cramlc(quadrant, game.probec));
@@ -432,7 +438,7 @@ void events(void)
 		   which has some stars which are inhabited and
 		   not already under attack, which is not
 		   supernova'ed, and which has some Klingons in it */
-		w = iran(GALSIZE);
+		w = randplace(GALSIZE);
 		q = &game.state.galaxy[w.x][w.y];
 	    } while (--i &&
 		     (same(game.quadrant, w) || q->planet == NOPLANET ||
@@ -453,7 +459,7 @@ void events(void)
 	    if (!damaged(DRADIO) || game.condition == docked)
 	    {
 		prout("Uhura- Captain, %s in %s reports it is under attack",
-		      systemname(q->planet), cramlc(quadrant, w));
+		      systnames[q->planet], cramlc(quadrant, w));
 		prout("by a Klingon invasion fleet.");
 		if (cancelrest())
 		    return;
@@ -477,7 +483,7 @@ void events(void)
 	    if (!damaged(DRADIO) || game.condition == docked)
 	    {
 		prout("Uhura- We've lost contact with starsystem %s",
-		      systemname(q->planet));
+		      systnames[q->planet]);
 		prout("in %s.\n", cramlc(quadrant, ev->quadrant));
 	    }
 	    break;
@@ -531,11 +537,11 @@ void events(void)
 	    {
 		if (same(game.quadrant, w)) {
 		    prout("Spock- sensors indicate the Klingons have");
-		    prout("launched a warship from %s.",systemname(q->planet));
+		    prout("launched a warship from %s.", systnames[q->planet]);
 		} else {
 		    prout("Uhura- Starfleet reports increased Klingon activity");
 		    if (q->planet != NOPLANET)
-			proutn("near %s", systemname(q->planet));
+			proutn("near %s", systnames[q->planet]);
 		    prout("in %s.\n", cramlc(quadrant, w));
 		}
 	    }
@@ -554,7 +560,8 @@ void wait(void)
     game.ididit = false;
     for (;;) {
 	key = scan();
-	if (key  != IHEOL) break;
+	if (key  != IHEOL)
+	    break;
 	proutn(_("How long? "));
     }
     chew();
@@ -563,17 +570,20 @@ void wait(void)
 	return;
     }
     origTime = delay = aaitem;
-    if (delay <= 0.0) return;
+    if (delay <= 0.0)
+	return;
     if (delay >= game.state.remtime || game.nenhere != 0) {
 	proutn(_("Are you sure? "));
-	if (ja() == false) return;
+	if (ja() == false)
+	    return;
     }
 
     /* Alternate resting periods (events) with attacks */
 
     game.resting = true;
     do {
-	if (delay <= 0) game.resting = false;
+	if (delay <= 0)
+	    game.resting = false;
 	if (!game.resting) {
 	    prout(_("%d stardates left."), (int)game.state.remtime);
 	    return;
@@ -582,14 +592,18 @@ void wait(void)
 
 	if (game.nenhere) {
 	    double rtime = 1.0 + Rand();
-	    if (rtime < temp) temp = rtime;
+	    if (rtime < temp)
+		temp = rtime;
 	    game.optime = temp;
 	}
-	if (game.optime < delay) attack(0);
-	if (game.alldone) return;
+	if (game.optime < delay)
+	    attack(false);
+	if (game.alldone)
+	    return;
 	events();
 	game.ididit = true;
-	if (game.alldone) return;
+	if (game.alldone)
+	    return;
 	delay -= temp;
 	/* Repair Deathray if long rest at starbase */
 	if (origTime-delay >= 9.99 && game.condition == docked)
@@ -602,6 +616,14 @@ void wait(void)
     game.optime = 0;
 }
 
+/*
+ *	A nova occurs.  It is the result of having a star hit with a
+ *	photon torpedo, or possibly of a probe warhead going off.
+ *	Stars that go nova cause stars which surround them to undergo
+ *	the same probabilistic process.  Klingons next to them are
+ *	destroyed.  And if the starship is next to it, it gets zapped.
+ *	If the zap is too much, it gets destroyed.
+ */
 void nova(coord nov) 
 /* star goes nova */
 {
@@ -634,10 +656,12 @@ void nova(coord nov)
 	for (mm = bot; mm <= top; mm++) 
 	    for (nn = 1; nn <= 3; nn++)  /* nn,j represents coordinates around current */
 		for (j = 1; j <= 3; j++) {
-		    if (j==2 && nn== 2) continue;
+		    if (j==2 && nn== 2)
+			continue;
 		    scratch.x = hits[mm][1]+nn-2;
 		    scratch.y = hits[mm][2]+j-2;
-		    if (!VALID_SECTOR(scratch.y, scratch.x)) continue;
+		    if (!VALID_SECTOR(scratch.y, scratch.x))
+			continue;
 		    iquad = game.quad[scratch.x][scratch.y];
 		    switch (iquad) {
 		    // case IHDOT:	/* Empty space ends reaction
@@ -667,9 +691,10 @@ void nova(coord nov)
 			game.state.nplankl++;
 			crmena(true, IHP, sector, scratch);
 			prout(_(" destroyed."));
-			DESTROY(&game.state.plnets[game.iplnet]);
-			game.iplnet = game.plnet.x = game.plnet.y = 0;
-			if (game.landed == 1) {
+			DESTROY(&game.state.planets[game.iplnet]);
+			game.iplnet = 0;
+			invalidate(game.plnet);
+			if (game.landed) {
 			    finish(FPNOVA);
 			    return;
 			}
@@ -682,7 +707,7 @@ void nova(coord nov)
 				break;
 			game.state.baseq[i] = game.state.baseq[game.state.rembase];
 			game.state.rembase--;
-			game.base.x = game.base.y = 0;
+			invalidate(game.base);
 			game.state.basekl++;
 			newcnd();
 			crmena(true, IHB, sector, scratch);
@@ -693,7 +718,8 @@ void nova(coord nov)
 		    case IHF:
 			prout(_("***Starship buffeted by nova."));
 			if (game.shldup) {
-			    if (game.shield >= 2000.0) game.shield -= 2000.0;
+			    if (game.shield >= 2000.0)
+				game.shield -= 2000.0;
 			    else {
 				double diff = 2000.0 - game.shield;
 				game.energy -= diff;
@@ -703,7 +729,8 @@ void nova(coord nov)
 				game.damage[DSHIELD] += 0.005*game.damfac*Rand()*diff;
 			    }
 			}
-			else game.energy -= 2000.0;
+			else
+			    game.energy -= 2000.0;
 			if (game.energy <= 0) {
 			    finish(FNOVA);
 			    return;
@@ -720,7 +747,8 @@ void nova(coord nov)
 		    case IHS:
 		    case IHR:
 			for_local_enemies(ll)
-			    if (same(game.ks[ll], scratch)) break;
+			    if (same(game.ks[ll], scratch))
+				break;
 			game.kpower[ll] -= 800.0; /* If firepower is lost, die */
 			if (game.kpower[ll] <= 0.0) {
 			    deadkl(scratch, iquad, scratch);
@@ -768,16 +796,19 @@ void nova(coord nov)
 
     /* Starship affected by nova -- kick it away. */
     game.dist = kount*0.1;
-    if (icx) icx = (icx < 0 ? -1 : 1);
-    if (icy) icy = (icy < 0 ? -1 : 1);
+    if (icx)
+	icx = (icx < 0 ? -1 : 1);
+    if (icy)
+	icy = (icy < 0 ? -1 : 1);
     game.direc = course[3*(icx+1)+icy+2];
-    if (game.direc == 0.0) game.dist = 0.0;
-    if (game.dist == 0.0) return;
+    if (game.direc == 0.0)
+	game.dist = 0.0;
+    if (game.dist == 0.0)
+	return;
     game.optime = 10.0*game.dist/16.0;
     skip(1);
     prout(_("Force of nova displaces starship."));
-    game.iattak=2;	/* Eliminates recursion problem */
-    imove();
+    imove(true);
     game.optime = 10.0*game.dist/16.0;
     return;
 }
@@ -806,9 +837,11 @@ void snova(bool induced, coord *w)
 	for_quadrants(nq.x) {
 	    for_quadrants(nq.y) {
 		num -= game.state.galaxy[nq.x][nq.y].stars;
-		if (num <= 0) break;
+		if (num <= 0)
+		    break;
 	    }
-	    if (num <=0) break;
+	    if (num <=0)
+		break;
 	}
 	if (idebug) {
 	    proutn("=== Super nova here?");
@@ -834,16 +867,18 @@ void snova(bool induced, coord *w)
 	    for_sectors(ns.y) {
 		if (game.quad[ns.x][ns.y]==IHSTAR) {
 		    num--;
-		    if (num==0) break;
+		    if (num==0)
+			break;
 		}
 	    }
-	    if (num==0) break;
+	    if (num==0)
+		break;
 	}
 
 	skip(1);
 	prouts(_("***RED ALERT!  RED ALERT!"));
 	skip(1);
-	prout(_("***Incipient supernova detected at "), cramlc(sector, ns));
+	prout(_("***Incipient supernova detected at %s"), cramlc(sector, ns));
 	if (square(ns.x-game.sector.x) + square(ns.y-game.sector.y) <= 2.1) {
 	    proutn(_("Emergency override attempts t"));
 	    prouts("***************");
@@ -858,7 +893,8 @@ void snova(bool induced, coord *w)
     game.state.galaxy[nq.x][nq.y].klingons = 0;
     if (same(nq, game.state.kscmdr)) {
 	/* did in the Supercommander! */
-	game.state.nscrem = game.state.kscmdr.x = game.state.kscmdr.y = game.isatb = game.iscate = 0;
+	game.state.nscrem = game.state.kscmdr.x = game.state.kscmdr.y = game.isatb =  0;
+	game.iscate = false;
 	unschedule(FSCMOVE);
 	unschedule(FSCDBAS);
     }
@@ -867,10 +903,11 @@ void snova(bool induced, coord *w)
 	for (l = 1; l <= maxloop; l++) {
 	    if (same(game.state.kcmdr[l], nq)) {
 		game.state.kcmdr[l] = game.state.kcmdr[game.state.remcom];
-		game.state.kcmdr[game.state.remcom].x = game.state.kcmdr[game.state.remcom].y = 0;
+		invalidate(game.state.kcmdr[game.state.remcom]);
 		game.state.remcom--;
 		kldead--;
-		if (game.state.remcom==0) unschedule(FTBEAM);
+		if (game.state.remcom==0)
+		    unschedule(FTBEAM);
 		break;
 	    }
 	}
@@ -884,8 +921,8 @@ void snova(bool induced, coord *w)
     if (npdead) {
 	int loop;
 	for (loop = 0; loop < game.inplan; loop++)
-	    if (same(game.state.plnets[loop].w, nq)) {
-		DESTROY(&game.state.plnets[loop]);
+	    if (same(game.state.planets[loop].w, nq)) {
+		DESTROY(&game.state.planets[loop]);
 	    }
     }
     /* Destroy any base in supernovaed quadrant */
@@ -894,7 +931,7 @@ void snova(bool induced, coord *w)
 	for (loop = 1; loop <= maxloop; loop++)
 	    if (same(game.state.baseq[loop], nq)) {
 		game.state.baseq[loop] = game.state.baseq[game.state.rembase];
-		game.state.baseq[game.state.rembase].x = game.state.baseq[game.state.rembase].y = 0;
+		invalidate(game.state.baseq[game.state.rembase]);
 		game.state.rembase--;
 		break;
 	    }
@@ -911,13 +948,15 @@ void snova(bool induced, coord *w)
     /* If supernova destroys last Klingons give special message */
     if (KLINGREM==0 && !same(nq, game.quadrant)) {
 	skip(2);
-	if (!induced) prout(_("Lucky you!"));
+	if (!induced)
+	    prout(_("Lucky you!"));
 	proutn(_("A supernova in %s has just destroyed the last Klingons."),
 	       cramlc(quadrant, nq));
 	finish(FWON);
 	return;
     }
     /* if some Klingons remain, continue or die in supernova */
-    if (game.alldone) finish(FSNOVAED);
+    if (game.alldone)
+	finish(FSNOVAED);
     return;
 }