From: Eric S. Raymond <esr@thyrsus.com>
Date: Mon, 18 Sep 2006 08:05:56 +0000 (+0000)
Subject: Revert an incorrect bool type change.
X-Git-Tag: 2.0~243
X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=commitdiff_plain;h=d5b31ded06283b5ae9788716c7753108d23b777c

Revert an incorrect bool type change.
---

diff --git a/src/setup.c b/src/setup.c
index bbfbb67..5c67f23 100644
--- 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.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;
diff --git a/src/sst.h b/src/sst.h
index c4a7a99..eece90c 100644
--- 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
-	isatb,		// =1 if super commander is attacking base
 	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
@@ -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
+	isatb,		// =1 if super commander is attacking base
+	iscate,		// super commander is here
 #ifdef DEBUG
 	idebug,		// debug mode
 #endif