X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=src%2Fsst.c;h=16199e6df68ccb8acd5fd54b1fcf2ab7e4b7f966;hp=96e5edb68b34f4af481980f8c9ca80b134faf68e;hb=ad1478c7cc24b761592a1e355015b44b243aeeda;hpb=a0afd227763655ee0ecd7ef5faea92d63d5c5ba6

diff --git a/src/sst.c b/src/sst.c
index 96e5edb..16199e6 100644
--- a/src/sst.c
+++ b/src/sst.c
@@ -175,7 +175,7 @@ static char line[128], *linep = line;
 
 struct game game;
 coord thing;
-int iqhere, iqengry;
+bool iqhere, iqengry;
 int iscore, iskill;	// Common PLAQ
 double aaitem;
 double perdate;
@@ -409,7 +409,7 @@ static void makemoves(void)
 		makechart();
 		continue;
 	    }
-	    game.ididit=0;
+	    game.ididit = false;
 	    clrscr();
 	    setwnd(message_window);
 	    clrscr();
@@ -531,7 +531,7 @@ static void makemoves(void)
 	    abandn();
 	    break;
 	case DESTRUCT:			// Self Destruct
-	    dstrct();
+	    selfdestruct();
 	    break;
 	case SAVE:			// Save Game
 	    freeze(false);
@@ -656,7 +656,7 @@ int main(int argc, char **argv)
 
 	if (game.tourn && game.alldone) {
 	    proutn("Do you want your score recorded?");
-	    if (ja()) {
+	    if (ja() == true) {
 		chew2();
 		freeze(false);
 	    }
@@ -702,9 +702,9 @@ char *cramlc(enum loctype key, coord w)
     return buf;
 }
 
-void crmena(int i, int enemy, int key, coord w) 
+void crmena(bool stars, int enemy, enum loctype key, coord w) 
 {
-    if (i == 1) proutn("***");
+    if (stars) proutn("***");
     cramen(enemy);
     proutn(" at ");
     proutn(cramlc(key, w));
@@ -842,27 +842,27 @@ int isit(char *s)
 void debugme(void) 
 {
     proutn("Reset levels? ");
-    if (ja() != 0) {
+    if (ja() == true) {
 	if (game.energy < game.inenrg) game.energy = game.inenrg;
 	game.shield = game.inshld;
 	game.torps = game.intorps;
 	game.lsupres = game.inlsr;
     }
     proutn("Reset damage? ");
-    if (ja() != 0) {
+    if (ja() == true) {
 	int i;
 	for (i=0; i < NDEVICES; i++) 
 	    if (game.damage[i] > 0.0) 
 		game.damage[i] = 0.0;
     }
     proutn("Toggle debug flag? ");
-    if (ja() != 0) {
+    if (ja() == true) {
 	idebug = !idebug;
 	if (idebug) prout("Debug output ON");
 	else prout("Debug output OFF");
     }
     proutn("Cause selective damage? ");
-    if (ja() != 0) {
+    if (ja() == true) {
 	int i, key;
 	for (i=0; i < NDEVICES; i++) {
 	    proutn("Kill ");
@@ -876,7 +876,7 @@ void debugme(void)
 	}
     }
     proutn("Examine/change events? ");
-    if (ja() != 0) {
+    if (ja() == true) {
 	event *ev;
 	coord w;
 	int i;
@@ -938,7 +938,7 @@ void debugme(void)
 	chew();
     }
     proutn("Induce supernova here? ");
-    if (ja()) {
+    if (ja() == true) {
 	game.state.galaxy[game.quadrant.x][game.quadrant.y].supernova = true;
 	atover(true);
     }