Small cleanups discovered during Python translation.
[super-star-trek.git] / src / events.c
index b4b61214b14cecd18efcb09c2c836c9b7c9aa153..37a02d1bc92c93d81fc432fdd8a181e85fc26b32 100644 (file)
@@ -22,7 +22,7 @@ int is_scheduled(int evtype)
     return game.future[evtype].date != FOREVER;
 }
 
-extern double scheduled(int evtype)
+double scheduled(int evtype)
 /* when will this event happen? */
 {
     return game.future[evtype].date;
@@ -36,7 +36,7 @@ event *schedule(int evtype, double offset)
 }
 
 void postpone(int evtype, double offset)
-/* poistpone a scheduled event */
+/* postpone a scheduled event */
 {
     game.future[evtype].date += offset;
 }
@@ -67,8 +67,6 @@ void events(void)
     coord w, hold;
     event *ev, *ev2;
 
-    pause_reset();
-
     if (idebug) {
        prout("=== EVENTS from %.2f to %.2f:", game.state.date, fintim);
        for (i = 1; i < NEVENTS; i++) {
@@ -82,7 +80,7 @@ void events(void)
            case FSCDBAS: proutn("=== SC Base Destroy "); break;
            case FDSPROB: proutn("=== Probe Move      "); break;
            case FDISTR:  proutn("=== Distress Call   "); break;
-           case FENSLV:  proutn("=== Enlavement      "); break;
+           case FENSLV:  proutn("=== Enslavement     "); break;
            case FREPRO:  proutn("=== Klingon Build   "); break;
            }
            if (is_scheduled(i))
@@ -113,7 +111,8 @@ void events(void)
        game.state.date = datemin;
        /* Decrement Federation resources and recompute remaining time */
        game.state.remres -= (game.state.remkl+4*game.state.remcom)*xtime;
-       game.state.remtime = game.state.remres/(game.state.remkl+4*game.state.remcom);
+       game.state.remtime = game.state.remkl + game.state.remcom > 0 ?
+               game.state.remres/(game.state.remkl + 4*game.state.remcom) : 99;
        if (game.state.remtime <=0) {
            finish(FDEPLETE);
            return;
@@ -158,7 +157,7 @@ void events(void)
        game.optime -= xtime;
        switch (evcode) {
        case FSNOVA: /* Supernova */
-           pause_game(true);
+           announce();
            supernova(false, NULL);
            schedule(FSNOVA, expran(0.5*game.intime));
            if (game.state.galaxy[game.quadrant.x][game.quadrant.y].supernova)
@@ -167,7 +166,8 @@ void events(void)
        case FSPY: /* Check with spy to see if S.C. should tractor beam */
            if (game.state.nscrem == 0 ||
                ictbeam || istract ||
-               game.condition==docked || game.isatb==1 || game.iscate) return;
+               game.condition==docked || game.isatb==1 || game.iscate)
+               return;
            if (game.ientesc ||
                (game.energy < 2000 && game.torps < 4 && game.shield < 1250) ||
                (damaged(DPHASER) && (damaged(DPHOTON) || game.torps < 4)) ||
@@ -198,7 +198,7 @@ void events(void)
            }
            /* tractor beaming cases merge here */
            yank = sqrt(yank);
-           pause_game(true);
+           announce();
            game.optime = (10.0/(7.5*7.5))*yank; /* 7.5 is yank rate (warp 7.5) */
            ictbeam = true;
            skip(1);
@@ -297,7 +297,7 @@ void events(void)
            if (!damaged(DRADIO) && game.condition != docked) 
                break; /* No warning :-( */
            game.iseenit = true;
-           pause_game(true);
+           announce();
            skip(1);
            proutn(_("Lt. Uhura-  \"Captain, the starbase in "));
            prout(cramlc(quadrant, game.battle));
@@ -344,7 +344,7 @@ void events(void)
            else if (game.state.rembase != 1 &&
                     (!damaged(DRADIO) || game.condition == docked)) {
                /* Get word via subspace radio */
-               pause_game(true);                   
+               announce();
                skip(1);
                prout(_("Lt. Uhura-  \"Captain, Starfleet Command reports that"));
                proutn(_("   the starbase in "));
@@ -389,7 +389,7 @@ void events(void)
                    game.state.galaxy[game.probec.x][game.probec.y].supernova) {
                    // Left galaxy or ran into supernova
                    if (!damaged(DRADIO) || game.condition == docked) {
-                       pause_game(true);
+                       announce();
                        skip(1);
                        proutn(_("Lt. Uhura-  \"The deep space probe "));
                        if (!VALID_QUADRANT(j, i))
@@ -402,7 +402,7 @@ void events(void)
                    break;
                }
                if (!damaged(DRADIO) || game.condition == docked) {
-                   pause_game(true);
+                   announce();
                    skip(1);
                    proutn(_("Lt. Uhura-  \"The deep space probe is now in "));
                    proutn(cramlc(quadrant, game.probec));
@@ -442,6 +442,7 @@ void events(void)
                q = &game.state.galaxy[w.x][w.y];
            } while (--i &&
                     (same(game.quadrant, w) || q->planet == NOPLANET ||
+                     game.state.planets[q->planet].inhabited == UNINHABITED ||
                      q->supernova || q->status!=secure || q->klingons<=0));
            if (i == 0) {
                /* can't seem to find one; ignore this call */
@@ -458,9 +459,9 @@ void events(void)
            /* tell the captain about it if we can */
            if (!damaged(DRADIO) || game.condition == docked)
            {
-               prout("Uhura- Captain, %s in %s reports it is under attack",
+               prout(_("Uhura- Captain, %s in %s reports it is under attack"),
                      systnames[q->planet], cramlc(quadrant, w));
-               prout("by a Klingon invasion fleet.");
+               prout(_("by a Klingon invasion fleet."));
                if (cancelrest())
                    return;
            }
@@ -482,9 +483,9 @@ void events(void)
            /* report the disaster if we can */
            if (!damaged(DRADIO) || game.condition == docked)
            {
-               prout("Uhura- We've lost contact with starsystem %s",
+               prout(_("Uhura- We've lost contact with starsystem %s"),
                      systnames[q->planet]);
-               prout("in %s.\n", cramlc(quadrant, ev->quadrant));
+               prout(_("in %s.\n"), cramlc(quadrant, ev->quadrant));
            }
            break;
        case FREPRO:            /* Klingon reproduces */
@@ -529,18 +530,19 @@ void events(void)
                newkling(++game.klhere);
 
            /* recompute time left */
-           game.state.remtime = game.state.remres/(game.state.remkl+4*game.state.remcom);
+           game.state.remtime = game.state.remkl + game.state.remcom > 0 ?
+                   game.state.remres/(game.state.remkl + 4*game.state.remcom) : 99;
            /* report the disaster if we can */
            if (!damaged(DRADIO) || game.condition == docked)
            {
                if (same(game.quadrant, w)) {
-                   prout("Spock- sensors indicate the Klingons have");
-                   prout("launched a warship from %s.", systnames[q->planet]);
+                   prout(_("Spock- sensors indicate the Klingons have"));
+                   prout(_("launched a warship from %s."), systnames[q->planet]);
                } else {
-                   prout("Uhura- Starfleet reports increased Klingon activity");
+                   prout(_("Uhura- Starfleet reports increased Klingon activity"));
                    if (q->planet != NOPLANET)
-                       proutn("near %s", systnames[q->planet]);
-                   prout("in %s.\n", cramlc(quadrant, w));
+                       proutn(_("near %s"), systnames[q->planet]);
+                   prout(_("in %s.\n"), cramlc(quadrant, w));
                }
            }
            break;
@@ -815,7 +817,7 @@ void nova(coord nov)
 void supernova(bool induced, coord *w) 
 /* star goes supernova */
 {
-    int num = 0, nrmdead, npdead, kldead;
+    int num = 0, nrmdead, npdead = 0, kldead, loop;
     coord nq;
 
     if (w != NULL) 
@@ -914,13 +916,12 @@ void supernova(bool induced, coord *w)
     nrmdead = game.state.galaxy[nq.x][nq.y].romulans;
     game.state.galaxy[nq.x][nq.y].romulans = 0;
     game.state.nromrem -= nrmdead;
-    npdead = num - nrmdead*10;
-    if (npdead) {
-       int loop;
-       for (loop = 0; loop < game.inplan; loop++)
-           if (same(game.state.planets[loop].w, nq)) {
-               game.state.planets[loop].pclass = destroyed;
-           }
+    /* Destroy planets */
+    for (loop = 0; loop < game.inplan; loop++) {
+       if (same(game.state.planets[loop].w, nq)) {
+           game.state.planets[loop].pclass = destroyed;
+           npdead++;
+       }
     }
     /* Destroy any base in supernovaed quadrant */
     if (game.state.rembase) {
@@ -943,7 +944,7 @@ void supernova(bool induced, coord *w)
     if (same(game.quadrant, nq) || !damaged(DRADIO) || game.condition == docked)
        game.state.galaxy[nq.x][nq.y].supernova = true;
     /* If supernova destroys last Klingons give special message */
-    if (KLINGREM==0 && !same(nq, game.quadrant)) {
+    if ((game.state.remkl + game.state.remcom + game.state.nscrem)==0 && !same(nq, game.quadrant)) {
        skip(2);
        if (!induced)
            prout(_("Lucky you!"));