Another rollup patch.

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

diff --git a/src/events.c b/src/events.c
index 1c5ec94dbce929ff21b98cf04da42cd3315851a8..b934b8d88690bd44569cfa4233c3c5bd333c70f6 100644 (file)
--- a/src/events.c
+++ b/src/events.c
@@ -244,7 +244,7 @@ void events(void)
            newqad(false);
            /* Adjust finish time to time of tractor beaming */
            fintim = game.state.date+game.optime;
-           attack(0);
+           attack(false);
            if (game.state.remcom <= 0) unschedule(FTBEAM);
            else schedule(FTBEAM, game.optime+expran(1.5*game.intime/game.state.remcom));
            break;
@@ -317,7 +317,7 @@ void events(void)
                if (i > game.state.remcom || game.state.rembase == 0 ||
                    !game.state.galaxy[game.battle.x][game.battle.y].starbase) {
                    /* No action to take after all */
-                   game.battle.x = game.battle.y = 0;
+                   invalidate(game.battle);
                    break;
                }
            }
@@ -358,9 +358,8 @@ void events(void)
                game.battle = hold;
                game.isatb = 0;
            }
-           else {
-               game.battle.x = game.battle.y = 0;
-           }
+           else
+               invalidate(game.battle);
            break;
        case FSCMOVE: /* Supercommander moves */
            schedule(FSCMOVE, 0.2777);
@@ -453,7 +452,7 @@ void events(void)
            if (!damaged(DRADIO) || game.condition == docked)
            {
                prout("Uhura- Captain, %s in %s reports it is under attack",
-                     systemname(q->planet), cramlc(quadrant, w));
+                     systnames[q->planet], cramlc(quadrant, w));
                prout("by a Klingon invasion fleet.");
                if (cancelrest())
                    return;
@@ -477,7 +476,7 @@ void events(void)
            if (!damaged(DRADIO) || game.condition == docked)
            {
                prout("Uhura- We've lost contact with starsystem %s",
-                     systemname(q->planet));
+                     systnames[q->planet]);
                prout("in %s.\n", cramlc(quadrant, ev->quadrant));
            }
            break;
@@ -531,11 +530,11 @@ void events(void)
            {
                if (same(game.quadrant, w)) {
                    prout("Spock- sensors indicate the Klingons have");
-                   prout("launched a warship from %s.",systemname(q->planet));
+                   prout("launched a warship from %s.", systnames[q->planet]);
                } else {
                    prout("Uhura- Starfleet reports increased Klingon activity");
                    if (q->planet != NOPLANET)
-                       proutn("near %s", systemname(q->planet));
+                       proutn("near %s", systnames[q->planet]);
                    prout("in %s.\n", cramlc(quadrant, w));
                }
            }
@@ -585,7 +584,7 @@ void wait(void)
            if (rtime < temp) temp = rtime;
            game.optime = temp;
        }
-       if (game.optime < delay) attack(0);
+       if (game.optime < delay) attack(false);
        if (game.alldone) return;
        events();
        game.ididit = true;
@@ -676,7 +675,8 @@ void nova(coord nov)
                        crmena(true, IHP, sector, scratch);
                        prout(_(" destroyed."));
                        DESTROY(&game.state.plnets[game.iplnet]);
-                       game.iplnet = game.plnet.x = game.plnet.y = 0;
+                       game.iplnet = 0;
+                       invalidate(game.plnet);
                        if (game.landed) {
                            finish(FPNOVA);
                            return;
@@ -690,7 +690,7 @@ void nova(coord nov)
                                break;
                        game.state.baseq[i] = game.state.baseq[game.state.rembase];
                        game.state.rembase--;
-                       game.base.x = game.base.y = 0;
+                       invalidate(game.base);
                        game.state.basekl++;
                        newcnd();
                        crmena(true, IHB, sector, scratch);
@@ -784,8 +784,7 @@ void nova(coord nov)
     game.optime = 10.0*game.dist/16.0;
     skip(1);
     prout(_("Force of nova displaces starship."));
-    game.iattak=2;     /* Eliminates recursion problem */
-    imove();
+    imove(true);
     game.optime = 10.0*game.dist/16.0;
     return;
 }
@@ -851,7 +850,7 @@ void snova(bool induced, coord *w)
        skip(1);
        prouts(_("***RED ALERT!  RED ALERT!"));
        skip(1);
-       prout(_("***Incipient supernova detected at "), cramlc(sector, ns));
+       prout(_("***Incipient supernova detected at %s"), cramlc(sector, ns));
        if (square(ns.x-game.sector.x) + square(ns.y-game.sector.y) <= 2.1) {
            proutn(_("Emergency override attempts t"));
            prouts("***************");
@@ -876,7 +875,7 @@ void snova(bool induced, coord *w)
        for (l = 1; l <= maxloop; l++) {
            if (same(game.state.kcmdr[l], nq)) {
                game.state.kcmdr[l] = game.state.kcmdr[game.state.remcom];
-               game.state.kcmdr[game.state.remcom].x = game.state.kcmdr[game.state.remcom].y = 0;
+               invalidate(game.state.kcmdr[game.state.remcom]);
                game.state.remcom--;
                kldead--;
                if (game.state.remcom==0) unschedule(FTBEAM);
@@ -903,7 +902,7 @@ void snova(bool induced, coord *w)
        for (loop = 1; loop <= maxloop; loop++)
            if (same(game.state.baseq[loop], nq)) {
                game.state.baseq[loop] = game.state.baseq[game.state.rembase];
-               game.state.baseq[game.state.rembase].x = game.state.baseq[game.state.rembase].y = 0;
+               invalidate(game.state.baseq[game.state.rembase]);
                game.state.rembase--;
                break;
            }