Revert an incorrect bool type change.

diff --git a/src/setup.c b/src/setup.c
index bbfbb67a42181da97b641dbbd75f900f423adf6c..5c67f231cdf980fe3a999e5343a945d700f8fb0c 100644 (file)
--- a/src/setup.c
+++ b/src/setup.c
@@ -220,8 +220,7 @@ void setup(int needprompt)
     game.battle.x = game.battle.y = 0;
     game.state.date = game.indate = 100.0*(int)(31.0*Rand()+20.0);
     game.nkinks = game.nhelp = game.resting = game.casual = 0;
     game.battle.x = game.battle.y = 0;
     game.state.date = game.indate = 100.0*(int)(31.0*Rand()+20.0);
     game.nkinks = game.nhelp = game.resting = game.casual = 0;

-    game.isatb = game.iscate = true;
-    game.imine = game.icrystl = game.icraft = game.state.nplankl = 0;
+    game.isatb = game.iscate = game.imine = game.icrystl = game.icraft = game.state.nplankl = 0;

     game.state.starkl = game.state.basekl = 0;
     game.iscraft = 1;
     game.landed = -1;
     game.state.starkl = game.state.basekl = 0;
     game.iscraft = 1;
     game.landed = -1;

diff --git a/src/sst.h b/src/sst.h
index c4a7a99e32b8eef6de34bd8538fc3e464628fc28..eece90c2d2268aa419921b8e1005156ed6619b79 100644 (file)
--- a/src/sst.h
+++ b/src/sst.h
@@ -208,10 +208,8 @@ struct game {
        justin,         // just entered quadrant
        alldone,        // game is now finished
        neutz,          // Romulan Neutral Zone
        justin,         // just entered quadrant
        alldone,        // game is now finished
        neutz,          // Romulan Neutral Zone

-       isatb,          // =1 if super commander is attacking base

        isarmed,        // probe is armed
        isarmed,        // probe is armed

-       thawed,         // thawed game
-       iscate;         // super commander is here
+       thawed;         // thawed game

     int inkling,       // Initial number of klingons
        inbase,         // Initial number of bases
        incom,          // Initial number of commanders
     int inkling,       // Initial number of klingons
        inbase,         // Initial number of bases
        incom,          // Initial number of commanders


@@ -241,6 +239,8 @@ struct game {
        icraft,         // Kirk in Galileo
        ientesc,        // attempted escape from supercommander
        iscraft,        // =1 if craft on ship, -1 if removed from game
        icraft,         // Kirk in Galileo
        ientesc,        // attempted escape from supercommander
        iscraft,        // =1 if craft on ship, -1 if removed from game

+       isatb,          // =1 if super commander is attacking base
+       iscate,         // super commander is here

 #ifdef DEBUG
        idebug,         // debug mode
 #endif
 #ifdef DEBUG
        idebug,         // debug mode
 #endif