More boolean cleanups.

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

diff --git a/src/events.c b/src/events.c
index 079fea41ef72529ff8d1f6022b4cd187ce2717ec..3281291ed6a96c80b1cdb03f300740ddd4b90c89 100644 (file)
--- a/src/events.c
+++ b/src/events.c
@@ -112,6 +112,11 @@ void events(void)
            finish(FDEPLETE);
            return;
        }
+       /* Any crew left alive? */
+       if (game.state.crew <=0) {
+           finish(FCREW);
+           return;
+       }
        /* Is life support adequate? */
        if (damaged(DLIFSUP) && game.condit != IHDOCKED) {
            if (game.lsupres < xtime && game.damage[DLIFSUP] > game.lsupres) {
@@ -134,7 +139,7 @@ void events(void)
            prout(_("   surveillance reports are coming in."));
            skip(1);
            if (game.iseenit==0) {
-               attakreport(0);
+               attakreport(false);
                game.iseenit = 1;
            }
            rechart();
@@ -193,7 +198,7 @@ void events(void)
            crmshp();
            prout(_(" caught in long range tractor beam--"));
            /* If Kirk & Co. screwing around on planet, handle */
-           atover(1); /* atover(1) is Grab */
+           atover(true); /* atover(true) is Grab */
            if (game.alldone) return;
            if (game.icraft == 1) { /* Caught in Galileo? */
                finish(FSTRACTOR);
@@ -233,7 +238,7 @@ void events(void)
                }
                else prout(_("(Shields not currently useable.)"));
            }
-           newqad(0);
+           newqad(false);
            /* Adjust finish time to time of tractor beaming */
            fintim = game.state.date+game.optime;
            attack(0);