X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=src%2Fevents.c;h=eef7033591b947bba23f293b9f829c77d3eebb88;hb=2b37ecca0c3bb58ae15b492f536303776eda9d73;hp=5f1c6008604957c805d8960105454b9e13d9050b;hpb=fec5bf04131385b55dc3b0ad9c7d8d245a7d07da;p=super-star-trek.git

diff --git a/src/events.c b/src/events.c
index 5f1c600..eef7033 100644
--- a/src/events.c
+++ b/src/events.c
@@ -42,11 +42,12 @@ void postpone(int evtype, double offset)
 }
 
 static bool cancelrest(void)
+/* rest period is interrupted by event */
 {
     if (game.resting) {
 	skip(1);
 	proutn(_("Mr. Spock-  \"Captain, shall we cancel the rest period?\""));
-	if (ja()) {
+	if (ja() == true) {
 	    game.resting = false;
 	    game.optime = 0.0;
 	    return true;
@@ -57,6 +58,7 @@ static bool cancelrest(void)
 }
 
 void events(void) 
+/* run through the event queue looking for things to do */
 {
     int istract=0, evcode, i=0, j, k, l;
     double fintim = game.state.date + game.optime, datemin, xtime, repair, yank=0;
@@ -139,7 +141,7 @@ void events(void)
 	    prout(_("   surveillance reports are coming in."));
 	    skip(1);
 	    if (game.iseenit==0) {
-		attakreport(0);
+		attakreport(false);
 		game.iseenit = 1;
 	    }
 	    rechart();
@@ -198,7 +200,7 @@ void events(void)
 	    crmshp();
 	    prout(_(" caught in long range tractor beam--"));
 	    /* If Kirk & Co. screwing around on planet, handle */
-	    atover(1); /* atover(1) is Grab */
+	    atover(true); /* atover(true) is Grab */
 	    if (game.alldone) return;
 	    if (game.icraft == 1) { /* Caught in Galileo? */
 		finish(FSTRACTOR);
@@ -543,11 +545,12 @@ void events(void)
 
 				
 void wait(void) 
+/* wait on events */
 {
     int key;
     double temp, delay, origTime;
 
-    game.ididit = 0;
+    game.ididit = false;
     for (;;) {
 	key = scan();
 	if (key  != IHEOL) break;
@@ -562,7 +565,7 @@ void wait(void)
     if (delay <= 0.0) return;
     if (delay >= game.state.remtime || game.nenhere != 0) {
 	proutn(_("Are you sure? "));
-	if (ja() == 0) return;
+	if (ja() == false) return;
     }
 
     /* Alternate resting periods (events) with attacks */
@@ -584,7 +587,7 @@ void wait(void)
 	if (game.optime < delay) attack(0);
 	if (game.alldone) return;
 	events();
-	game.ididit = 1;
+	game.ididit = true;
 	if (game.alldone) return;
 	delay -= temp;
 	/* Repair Deathray if long rest at starbase */
@@ -599,6 +602,7 @@ void wait(void)
 }
 
 void nova(int ix, int iy) 
+/* star goes nova */
 {
     static double course[] =
 	{0.0, 10.5, 12.0, 1.5, 9.0, 0.0, 3.0, 7.5, 6.0, 4.5};
@@ -615,7 +619,7 @@ void nova(int ix, int iy)
 
     /* handle initial nova */
     game.quad[ix][iy] = IHDOT;
-    crmena(1, IHSTAR, 2, nov);
+    crmena(false, IHSTAR, sector, nov);
     prout(_(" novas."));
     game.state.galaxy[game.quadrant.x][game.quadrant.y].stars--;
     game.state.starkl++;
@@ -654,14 +658,14 @@ void nova(int ix, int iy)
 			hits[top2][2]=scratch.y;
 			game.state.galaxy[game.quadrant.x][game.quadrant.y].stars -= 1;
 			game.state.starkl++;
-			crmena(1, IHSTAR, 2, scratch);
+			crmena(true, IHSTAR, sector, scratch);
 			prout(_(" novas."));
 			game.quad[scratch.x][scratch.y] = IHDOT;
 			break;
 		    case IHP: /* Destroy planet */
 			game.state.galaxy[game.quadrant.x][game.quadrant.y].planet = NOPLANET;
 			game.state.nplankl++;
-			crmena(1, IHP, 2, scratch);
+			crmena(true, IHP, sector, scratch);
 			prout(_(" destroyed."));
 			DESTROY(&game.state.plnets[game.iplnet]);
 			game.iplnet = game.plnet.x = game.plnet.y = 0;
@@ -681,7 +685,7 @@ void nova(int ix, int iy)
 			game.base.x = game.base.y = 0;
 			game.state.basekl++;
 			newcnd();
-			crmena(1, IHB, 2, scratch);
+			crmena(true, IHB, sector, scratch);
 			prout(_(" destroyed."));
 			game.quad[scratch.x][scratch.y] = IHDOT;
 			break;
@@ -724,7 +728,7 @@ void nova(int ix, int iy)
 			}
 			newc.x = scratch.x + scratch.x - hits[mm][1];
 			newc.y = scratch.y + scratch.y - hits[mm][2];
-			crmena(1, iquad, 2, scratch);
+			crmena(true, iquad, sector, scratch);
 			proutn(_(" damaged"));
 			if (!VALID_SECTOR(newc.x, newc.y)) {
 			    /* can't leave quadrant */
@@ -734,7 +738,7 @@ void nova(int ix, int iy)
 			iquad1 = game.quad[newc.x][newc.y];
 			if (iquad1 == IHBLANK) {
 			    proutn(_(", blasted into "));
-			    crmena(0, IHBLANK, 2, newc);
+			    crmena(false, IHBLANK, sector, newc);
 			    skip(1);
 			    deadkl(scratch, iquad, newc.x, newc.y);
 			    break;
@@ -782,10 +786,11 @@ void nova(int ix, int iy)
 	
 	
 void snova(int insx, int insy) 
+/* star goes supernova */
 {
     int comdead, nsx, nsy, num=0, kldead, iscdead;
     int nrmdead, npdead;
-    int incipient=0;
+    bool incipient = false;
     coord nq;
 
     nq.x = nq.y = 0;
@@ -817,7 +822,7 @@ void snova(int insx, int insy)
 	    }
 	    if (idebug) {
 		proutn("=== Super nova here?");
-		if (ja()==1) {
+		if (ja() == true) {
 		    nq.x = game.quadrant.x;
 		    nq.y = game.quadrant.y;
 		}
@@ -835,7 +840,7 @@ void snova(int insx, int insy)
 	}
 	else {
 	    /* we are in the quadrant! */
-	    incipient = 1;
+	    incipient = true;
 	    num = Rand()* game.state.galaxy[nq.x][nq.y].stars + 1;
 	    for_sectors(nsx) {
 		for_sectors(nsy) {
@@ -849,7 +854,7 @@ void snova(int insx, int insy)
 	}
     }
     else {
-	incipient = 1;
+	incipient = true;
     }
 
     if (incipient) {
@@ -900,18 +905,18 @@ void snova(int insx, int insy)
     game.state.nromrem -= nrmdead;
     npdead = num - nrmdead*10;
     if (npdead) {
-	int l;
-	for (l = 0; l < game.inplan; l++)
-	    if (same(game.state.plnets[l].w, nq)) {
-		DESTROY(&game.state.plnets[l]);
+	int loop;
+	for (loop = 0; loop < game.inplan; loop++)
+	    if (same(game.state.plnets[loop].w, nq)) {
+		DESTROY(&game.state.plnets[loop]);
 	    }
     }
     /* Destroy any base in supernovaed quadrant */
     if (game.state.rembase) {
-	int maxloop = game.state.rembase, l;
-	for (l = 1; l <= maxloop; l++)
-	    if (same(game.state.baseq[l], nq)) {
-		game.state.baseq[l] = game.state.baseq[game.state.rembase];
+	int maxloop = game.state.rembase, loop;
+	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;
 		game.state.rembase--;
 		break;
@@ -927,7 +932,7 @@ void snova(int insx, int insy)
     if (same(game.quadrant, nq) || !damaged(DRADIO) || game.condit == IHDOCKED)
 	game.state.galaxy[nq.x][nq.y].supernova = true;
     /* If supernova destroys last Klingons give special message */
-    if (KLINGREM==0 && (nq.x != game.quadrant.x || nq.y != game.quadrant.y)) {
+    if (KLINGREM==0 && !same(nq, game.quadrant)) {
 	skip(2);
 	if (insx == 0) prout(_("Lucky you!"));
 	proutn(_("A supernova in %s has just destroyed the last Klingons."),