Replace more #defines with enums.

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

diff --git a/src/planets.c b/src/planets.c
index 2eed37c0846c5282d98a794d93ec554c0960821d..1589a86720997cdc37473358cc3619aaa6278665 100644 (file)
--- a/src/planets.c
+++ b/src/planets.c
@@ -181,7 +181,7 @@ void beam(void)
        prout(_("The shuttle craft Galileo is here!"));
     }
     if (game.landed!=1 && game.imine) {
-       game.icrystl = 1;
+       game.icrystl = true;
        game.cryprob = 0.05;
     }
     game.imine = false;
@@ -209,7 +209,7 @@ void mine(void)
        prout(_("You've already mined enough crystals for this trip."));
        return;
     }
-    if (game.icrystl == 1 && game.cryprob == 0.05) {
+    if (game.icrystl && game.cryprob == 0.05) {
        proutn(_("With all those fresh crystals aboard the "));
        crmshp();
        skip(1);
@@ -229,13 +229,13 @@ void usecrystals(void)
     game.ididit = false;
     skip(1);
     chew();
-    if (game.icrystl!=1) {
+    if (!game.icrystl) {
        prout(_("No dilithium crystals available."));
        return;
     }
     if (game.energy >= 1000) {
        prout(_("Spock-  \"Captain, Starfleet Regulations prohibit such an operation"));
-       prout(_("  except when condition Yellow exists."));
+       prout(_("  except when Condition Yellow exists."));
        return;
     }
     prout(_("Spock- \"Captain, I must warn you that loading"));
@@ -306,7 +306,7 @@ void shuttle(void)
        prout(_("You will have to beam down to retrieve the shuttle craft."));
        return;
     }
-    if (game.shldup || game.condit == IHDOCKED) {
+    if (game.shldup || game.condition == docked) {
        prout(_("Shuttle craft cannot pass through shields."));
        return;
     }
@@ -357,14 +357,14 @@ void shuttle(void)
            skip(1);
            prout(_("The short hop begins . . ."));
            game.state.plnets[game.iplnet].known=known;
-           game.icraft = 1;
+           game.icraft = true;
            skip(1);
            game.landed = -1;
            if (consumeTime()) return;
            game.iscraft = 1;
-           game.icraft = 0;
+           game.icraft = false;
            if (game.imine) {
-               game.icrystl = 1;
+               game.icrystl = true;
                game.cryprob = 0.05;
            }
            game.imine = false;
@@ -380,12 +380,12 @@ void shuttle(void)
        skip(1);
        prouts(_("The hangar doors open; the trip begins."));
        skip(1);
-       game.icraft = 1;
+       game.icraft = true;
        game.iscraft = 0;
        if (consumeTime()) return;
        game.state.plnets[game.iplnet].known = shuttle_down;
        game.landed = 1;
-       game.icraft = 0;
+       game.icraft = false;
        prout(_("Trip complete"));
        return;
     }
@@ -436,7 +436,7 @@ void deathray(void)
        prouts(_("Sulu- \"Captain!  It's working!\""));
        skip(2);
        while (game.nenhere > 0)
-           deadkl(game.ks[1], 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]);
        prout(_("Ensign Chekov-  \"Congratulations, Captain!\""));
        if (KLINGREM == 0) finish(FWON);
        if ((game.options & OPTION_PLAIN) == 0) {