X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=src%2Fevents.c;h=3fc27e61b67d9701c95cf80b8f98c16d14ff4650;hb=b45b4cfdbae07f0103fae675c2f8d17cdbab2352;hp=1c5ec94dbce929ff21b98cf04da42cd3315851a8;hpb=0f68a074434296ae409accdc39ba0142600ea255;p=super-star-trek.git

diff --git a/src/events.c b/src/events.c
index 1c5ec94..3fc27e6 100644
--- 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;
@@ -453,7 +453,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 +477,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 +531,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 +585,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;