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

diff --git a/src/events.c b/src/events.c
index b82aff7..7e5c411 100644
--- a/src/events.c
+++ b/src/events.c
@@ -147,7 +147,7 @@ void events(void)
 	    prout(_("   surveillance reports are coming in."));
 	    skip(1);
 	    if (!game.iseenit) {
-		attakreport(false);
+		attackreport(false);
 		game.iseenit = true;
 	    }
 	    rechart();
@@ -159,7 +159,7 @@ void events(void)
 	switch (evcode) {
 	case FSNOVA: /* Supernova */
 	    pause_game(true);
-	    snova(false, NULL);
+	    supernova(false, NULL);
 	    schedule(FSNOVA, expran(0.5*game.intime));
 	    if (game.state.galaxy[game.quadrant.x][game.quadrant.y].supernova)
 		return;
@@ -374,7 +374,7 @@ void events(void)
 	    schedule(FSCMOVE, 0.2777);
 	    if (!game.ientesc && !istract && game.isatb != 1 &&
 			(!game.iscate || !game.justin)) 
-		scom();
+		supercommander();
 	    break;
 	case FDSPROB: /* Move deep space probe */
 	    schedule(FDSPROB, 0.01);
@@ -423,7 +423,7 @@ void events(void)
 	    game.proben--; // One less to travel
 	    if (game.proben == 0 && game.isarmed && pdest->stars) {
 		/* lets blow the sucker! */
-		snova(true, &game.probec);
+		supernova(true, &game.probec);
 		unschedule(FDSPROB);
 		if (game.state.galaxy[game.quadrant.x][game.quadrant.y].supernova) 
 		    return;
@@ -434,10 +434,10 @@ void events(void)
 	    /* try a whole bunch of times to find something suitable */
 	    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 */
+		// 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
 		w = randplace(GALSIZE);
 		q = &game.state.galaxy[w.x][w.y];
 	    } while (--i &&
@@ -488,10 +488,8 @@ void events(void)
 	    }
 	    break;
 	case FREPRO:		/* Klingon reproduces */
-	    /*
-	     * If we ever switch to a real event queue, we'll need to
-	     * explicitly retrieve and restore the x and y.
-	     */
+	    // If we ever switch to a real event queue, we'll need to
+	    // explicitly retrieve and restore the x and y.
 	    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];
@@ -635,7 +633,7 @@ void nova(coord nov)
 
     if (Rand() < 0.05) {
 	/* Wow! We've supernova'ed */
-	snova(false, &nov);
+	supernova(false, &nov);
 	return;
     }
 
@@ -674,7 +672,7 @@ void nova(coord nov)
 		    case IHSTAR: /* Affect another star */
 			if (Rand() < 0.05) {
 			    /* This star supernovas */
-			    snova(false, &scratch);
+			    supernova(false, &scratch);
 			    return;
 			}
 			top2++;
@@ -814,7 +812,7 @@ void nova(coord nov)
 }
 	
 	
-void snova(bool induced, coord *w) 
+void supernova(bool induced, coord *w) 
 /* star goes supernova */
 {
     int num = 0, nrmdead, npdead, kldead;
@@ -832,7 +830,8 @@ void snova(bool induced, coord *w)
 		stars += game.state.galaxy[nq.x][nq.y].stars;
 	    }
 	}
-	if (stars == 0) return; /* nothing to supernova exists */
+	if (stars == 0)
+	    return; /* nothing to supernova exists */
 	num = Rand()*stars + 1;
 	for_quadrants(nq.x) {
 	    for_quadrants(nq.y) {