More boolean cleanups. More consistent use of coord type

[super-star-trek.git] / src / moving.c

diff --git a/src/moving.c b/src/moving.c
index 222f86fea524ea19c05318b98685fbbe54583d67..99c18916da63bfaea1a42a31084b3d08ea53e4b0 100644 (file)
--- a/src/moving.c
+++ b/src/moving.c
@@ -235,7 +235,7 @@ void dock(bool verbose)
     }
     game.condit = IHDOCKED;
     if (verbose) prout(_("Docked."));
-    game.ididit=true;
+    game.ididit = true;
     if (game.energy < game.inenrg) game.energy = game.inenrg;
     game.shield = game.inshld;
     game.torps = game.intorps;
@@ -670,7 +670,7 @@ void setwrp(void)
     game.warpfac = aaitem;
     game.wfacsq=game.warpfac*game.warpfac;
     if (game.warpfac <= oldfac || game.warpfac <= 6.0) {
-       proutn(_("Helmsman Sulu- \"Warp factor %d, Captain.\""),
+       prout(_("Helmsman Sulu- \"Warp factor %d, Captain.\""),
               (int)game.warpfac);
        return;
     }
@@ -945,12 +945,12 @@ void mayday(void)
     game.nhelp++;
     if (game.base.x!=0) {
        /* There's one in this quadrant */
-       ddist = sqrt(square(game.base.x-game.sector.x)+square(game.base.y-game.sector.y));
+       ddist = distance(game.base, game.sector);
     }
     else {
        ddist = FOREVER;
        for_starbases(m) {
-           xdist=10.0*sqrt(square(game.state.baseq[m].x-game.quadrant.x)+square(game.state.baseq[m].y-game.quadrant.y));
+           xdist = QUADSIZE * distance(game.state.baseq[m], game.quadrant);
            if (xdist < ddist) {
                ddist = xdist;
                line = m;