X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=src%2Fmoving.c;h=99c18916da63bfaea1a42a31084b3d08ea53e4b0;hb=093f7d420e9cf92fbaf751f57a199c56562ae4b5;hp=222f86fea524ea19c05318b98685fbbe54583d67;hpb=0e9bdbb882f74cad6af644e3e1b530f9ffbf5e8d;p=super-star-trek.git diff --git a/src/moving.c b/src/moving.c index 222f86f..99c1891 100644 --- 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;