Checkpoint with several changes, committed so Stas can play with debug code.

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

diff --git a/src/moving.c b/src/moving.c
index 48c08a210449561ff4a81ea8f5ac9daaac619205..01958a144e6cfaaa982496cc9922fbc275312773 100644 (file)
--- a/src/moving.c
+++ b/src/moving.c
@@ -2,7 +2,7 @@
 #include "sstlinux.h"
 #include "sst.h"
 
-static void getcd(int, int);
+static void getcd(bool, int);
 
 void imove(void) 
 {
@@ -14,7 +14,7 @@ void imove(void)
     w.x = w.y = 0;
     if (game.inorbit) {
        prout("Helmsman Sulu- \"Leaving standard orbit.\"");
-       game.inorbit = FALSE;
+       game.inorbit = false;
     }
 
     angle = ((15.0 - game.direc) * 0.5235988);
@@ -246,7 +246,7 @@ void dock(int l)
     }
 }
 
-static void getcd(int isprobe, int akey) {
+static void getcd(bool isprobe, int akey) {
        /* 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
@@ -446,7 +446,7 @@ void impuls(void)
     }
 
     if (game.energy > 30.0) {
-       getcd(FALSE, 0);
+       getcd(false, 0);
        if (game.direc == -1.0) return;
        power = 20.0 + 100.0*game.dist;
     }
@@ -489,12 +489,12 @@ void impuls(void)
 }
 
 
-void warp(int i) 
+void warp(bool timewarp) 
 {
     int blooey=0, twarp=0, iwarp;
     double power;
 
-    if (i!=2) { /* Not WARPX entry */
+    if (!timewarp) { /* Not WARPX entry */
        game.ididit = 0;
        if (game.damage[DWARPEN] > 10.0) {
            chew();
@@ -511,7 +511,7 @@ void warp(int i)
        }
                        
        /* Read in course and distance */
-       getcd(FALSE, 0);
+       getcd(false, 0);
        if (game.direc == -1.0) return;
 
        /* Make sure starship has enough energy for the trip */
@@ -565,13 +565,11 @@ void warp(int i)
        }
        /* Decide if time warp will occur */
        if (0.5*game.dist*pow(7.0,game.warpfac-10.0) > Rand()) twarp=1;
-#ifdef DEBUG
-       if (game.idebug &&game.warpfac==10 && twarp==0) {
+       if (idebug && game.warpfac==10 && twarp==0) {
            blooey=0;
-           proutn("Force time warp? ");
+           proutn("=== Force time warp? ");
            if (ja()==1) twarp=1;
        }
-#endif
        if (blooey || twarp) {
            /* If time warp or engine damage, check path */
            /* If it is obstructed, don't do warp or damage */
@@ -734,7 +732,7 @@ void atover(int igrab)
        skip(1);
        prout("safely out of quadrant.");
        if (game.damage[DRADIO] == 0.0)
-           game.state.galaxy[game.quadrant.x][game.quadrant.y].charted = TRUE;
+           game.state.galaxy[game.quadrant.x][game.quadrant.y].charted = true;
        /* Try to use warp engines */
        if (game.damage[DWARPEN]) {
            skip(1);
@@ -751,10 +749,10 @@ void atover(int igrab)
        if (distreq < game.dist) game.dist = distreq;
        game.optime = 10.0*game.dist/game.wfacsq;
        game.direc = 12.0*Rand();       /* How dumb! */
-       game.justin = 0;
-       game.inorbit = 0;
-       warp(2);
-       if (game.justin == 0) {
+       game.justin = false;
+       game.inorbit = false;
+       warp(true);
+       if (!game.justin) {
            /* This is bad news, we didn't leave quadrant. */
            if (game.alldone) return;
            skip(1);
@@ -869,16 +867,16 @@ void probe(void)
        if (ja()==0) return;
     }
 
-    game.isarmed = FALSE;
+    game.isarmed = false;
     if (key == IHALPHA && strcmp(citem,"armed") == 0) {
-       game.isarmed = TRUE;
+       game.isarmed = true;
        key = scan();
     }
     else if (key == IHEOL) {
        proutn("Arm NOVAMAX warhead? ");
        game.isarmed = ja();
     }
-    getcd(TRUE, key);
+    getcd(true, key);
     if (game.direc == -1.0) return;
     game.nprobes--;
     angle = ((15.0 - game.direc) * 0.5235988);
@@ -943,8 +941,7 @@ void mayday(void)
            }
        }
        /* Since starbase not in quadrant, set up new quadrant */
-       game.quadrant.x = game.state.baseq[line].x;
-       game.quadrant.y = game.state.baseq[line].y;
+       game.quadrant = game.state.baseq[line];
        newqad(1);
     }
     /* dematerialize starship */