New debug-mode support.

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

diff --git a/src/planets.c b/src/planets.c
index 723e5e9a7ab92e24d6a8360076fa6010a1142bcc..c1fdb16ba9ad5ac69813e75a4185ae2c3481477c 100644 (file)
--- a/src/planets.c
+++ b/src/planets.c
@@ -27,7 +27,8 @@ static int consumeTime(void)
 
 void preport(void) 
 {
-    int iknow = 0, i;
+    bool iknow = false;
+    int i;
     skip(1);
     chew();
     prout("Spock-  \"Planet report follows, Captain.\"");
@@ -35,14 +36,11 @@ void preport(void)
     for (i = 0; i < game.inplan; i++) {
        if ((game.state.plnets[i].known != unknown
            && game.state.plnets[i].crystals != 0)
-#ifdef DEBUG
-           || ( game.idebug && game.state.plnets[i].x !=0)
-#endif
+           || (idebug && game.state.plnets[i].w.x !=0)
            ) {
-           iknow = 1;
-#ifdef DEBUG
-           if (game.idebug && game.state.plnets[i].known==unknown) proutn("(Unknown) ");
-#endif
+           iknow = true;
+           if (idebug && game.state.plnets[i].known==unknown)
+               proutn("(Unknown) ");
            proutn(cramlc(quadrant, game.state.plnets[i].w));
            proutn("   class ");
            proutn(classes[game.state.plnets[i].pclass]);
@@ -443,7 +441,7 @@ void deathray(void)
        prouts("Sulu- \"Captain!  It's working!\"");
        skip(2);
        while (game.nenhere > 0)
-           deadkl(game.ks[1].x,game.ks[1].y,game.quad[game.ks[1].x][game.ks[1].y],game.ks[1].x,game.ks[1].y);
+           deadkl(game.ks[1], game.quad[game.ks[1].x][game.ks[1].y],game.ks[1].x,game.ks[1].y);
        prout("Ensign Chekov-  \"Congratulations, Captain!\"");
        if (KLINGREM == 0) finish(FWON);
        if ((game.options & OPTION_PLAIN) == 0) {