Another rollup patch.

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

diff --git a/src/events.c b/src/events.c
index f47d420241aef19fba60326d557d8056d068ceec..a35c690e4f61e735de9e18625959427fbd7f8d85 100644 (file)
--- a/src/events.c
+++ b/src/events.c
@@ -111,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;
@@ -528,7 +529,8 @@ 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)
            {