X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=src%2Fmoving.c;h=a8eb87b3ab6769876c61efb262865576e3408cd1;hp=44a4945040bf8c006f255cf84b19f1188964a2be;hb=4acfd92e4eadf66c2bc3786c4ea688c2fe8d0139;hpb=9ae916e9144e84ef1de4a86ea73a45a2bc4cc1be

diff --git a/src/moving.c b/src/moving.c
index 44a4945..a8eb87b 100644
--- a/src/moving.c
+++ b/src/moving.c
@@ -109,7 +109,8 @@ void imove(bool novapush)
 		    prout(_("YOU WILL BE DESTROYED."));
 		}
 		/* Compute final position in new quadrant */
-		if (trbeam) return; /* Don't bother if we are to be beamed */
+		if (trbeam) /* Don't bother if we are to be beamed */
+		    return;
 		game.quadrant.x = (w.x+(QUADSIZE-1))/QUADSIZE;
 		game.quadrant.y = (w.y+(QUADSIZE-1))/QUADSIZE;
 		game.sector.x = w.x - QUADSIZE*(game.quadrant.x-1);
@@ -199,7 +200,7 @@ no_quad_change:
 	    game.kavgd[m] = 0.5 * (finald+game.kdist[m]);
 	    game.kdist[m] = finald;
 	}
-	sortkl();
+	sortklings();
 	if (!game.state.galaxy[game.quadrant.x][game.quadrant.y].supernova)
 	    attack(false);
 	for_local_enemies(m) game.kavgd[m] = game.kdist[m];
@@ -241,7 +242,7 @@ void dock(bool verbose)
 	(is_scheduled(FCDBAS) || game.isatb == 1) && !game.iseenit) {
 	/* get attack report from base */
 	prout(_("Lt. Uhura- \"Captain, an important message from the starbase:\""));
-	attakreport(false);
+	attackreport(false);
 	game.iseenit = true;
     }
 }
@@ -249,7 +250,7 @@ void dock(bool verbose)
 /* 
  * This program originally required input in terms of a (clock)
  * direction and distance. Somewhere in history, it was changed to
- * cartesian coordinates. So we need to convert. I think
+ * cartesian coordinates. So we need to convert.  Probably
  * "manual" input should still be done this way -- it's a real
  * pain if the computer isn't working! Manual mode is still confusing
  * because it involves giving x and y motions, yet the coordinates
@@ -267,9 +268,8 @@ static void getcd(bool isprobe, int akey)
     coord incr;
     bool iprompt = false;
 
-    /* Get course direction and distance. If user types bad values, return
-       with DIREC = -1.0. */
-
+    // Get course direction and distance. If user types bad values, return
+    // with DIREC = -1.0.
     game.direc = -1.0;
 	
     if (game.landed && !isprobe) {
@@ -437,7 +437,7 @@ static void getcd(bool isprobe, int akey)
 		
 
 
-void impuls(void) 
+void impulse(void) 
 /* move under impulse power */
 {
     double power;
@@ -564,7 +564,11 @@ void warp(bool timewarp)
 		   100.0*game.optime/game.state.remtime);
 	    prout(_(" percent of our"));
 	    proutn(_("  remaining time.  Are you sure this is wise?\" "));
-	    if (ja() == false) { game.ididit = false; game.optime=0; return;}
+	    if (ja() == false) {
+		game.ididit = false;
+		game.optime=0; 
+		return;
+	    }
 	}
     }
     /* Entry WARPX */
@@ -641,7 +645,7 @@ void warp(bool timewarp)
 
 
 
-void setwrp(void) 
+void setwarp(void) 
 /* change the warp factor */
 {
     int key;
@@ -823,7 +827,7 @@ void timwrp()
 	   when on planet, which would give us two Galileos! */
 	gotit = false;
 	for (l = 0; l < game.inplan; l++) {
-	    if (game.state.plnets[l].known == shuttle_down) {
+	    if (game.state.planets[l].known == shuttle_down) {
 		gotit = true;
 		if (game.iscraft == onship && game.ship==IHE) {
 		    prout(_("Checkov-  \"Security reports the Galileo has disappeared, Sir!"));
@@ -831,8 +835,8 @@ void timwrp()
 		}
 	    }
 	}
-	/* Likewise, if in the original time the Galileo was abandoned, but
-	   was on ship earlier, it would have vanished -- lets restore it */
+	// Likewise, if in the original time the Galileo was abandoned, but
+	// was on ship earlier, it would have vanished -- let's restore it.
 	if (game.iscraft == offship && !gotit && game.damage[DSHUTTL] >= 0.0) {
 	    prout(_("Checkov-  \"Security reports the Galileo has reappeared in the dock!\""));
 	    game.iscraft = onship;
@@ -1061,27 +1065,27 @@ void mayday(void)
 }
 
 /*
-**  Abandon Ship
-**
-**	The ship is abandoned.  If your current ship is the Faire
-**	Queene, or if your shuttlecraft is dead, you're out of
-**	luck.  You need the shuttlecraft in order for the captain
-**	(that's you!!) to escape.
-**
-**	Your crew can beam to an inhabited starsystem in the
-**	quadrant, if there is one and if the transporter is working.
-**	If there is no inhabited starsystem, or if the transporter
-**	is out, they are left to die in outer space.
-**
-**	If there are no starbases left, you are captured by the
-**	Klingons, who torture you mercilessly.  However, if there
-**	is at least one starbase, you are returned to the
-**	Federation in a prisoner of war exchange.  Of course, this
-**	can't happen unless you have taken some prisoners.
-**
-*/
+ *  Abandon Ship
+ *
+ *	The ship is abandoned.  If your current ship is the Faire
+ *	Queene, or if your shuttlecraft is dead, you're out of
+ *	luck.  You need the shuttlecraft in order for the captain
+ *	(that's you!!) to escape.
+ *
+ *	Your crew can beam to an inhabited starsystem in the
+ *	quadrant, if there is one and if the transporter is working.
+ *	If there is no inhabited starsystem, or if the transporter
+ *	is out, they are left to die in outer space.
+ *
+ *	If there are no starbases left, you are captured by the
+ *	Klingons, who torture you mercilessly.  However, if there
+ *	is at least one starbase, you are returned to the
+ *	Federation in a prisoner of war exchange.  Of course, this
+ *	can't happen unless you have taken some prisoners.
+ *
+ */
 
-void abandn(void) 
+void abandon(void) 
 /* abandon ship */
 {
     int nb, l;
@@ -1165,7 +1169,8 @@ void abandn(void)
 		if (VALID_SECTOR(game.sector.x, game.sector.y) &&
 		    game.quad[game.sector.x][game.sector.y] == IHDOT) break;
 	    }
-	    if (l < QUADSIZE+1) break; /* found a spot */
+	    if (l < QUADSIZE+1)
+		break; /* found a spot */
 	    game.sector.x=QUADSIZE/2;
 	    game.sector.y=QUADSIZE/2;
 	    newqad(true);