(produce_sect, finish_sects): Move stop order expiry to end of update,

so that stopped sectors don't repair units.  The update sequence
masked this bug until its change in src/lib/update/main.c rev. 1.25,
but use of budget priorities (gone since rev. 1.24) could unmask it.

diff --git a/src/lib/update/finish.c b/src/lib/update/finish.c
index d5d8c27cc3a0793a9fa24b436cc2884116a773be..28aab7b967e1d0f6fd26a5cf4baf6cdccb93024c 100644 (file)
--- a/src/lib/update/finish.c
+++ b/src/lib/update/finish.c
@@ -162,6 +162,8 @@ finish_sects(int etu)
        if (infptr->path)
            free(infptr->path);
 #endif /* SAVE_FINISH_PATHS */
+
+       sp->sct_off = 0;
     }
     logerror("done importing\n");
 

diff --git a/src/lib/update/sect.c b/src/lib/update/sect.c
index f0105ac8399c4c4161e669e956198d67492257ec..ea7238b28da9d38477d77b0e57562db88b7623e6 100644 (file)
--- a/src/lib/update/sect.c
+++ b/src/lib/update/sect.c
@@ -314,11 +314,8 @@ produce_sect(int natnum, int etu, int *bp, long p_sect[][2])
        bp_disable_cachepath();
        bp_clear_cachepath();
 
-       if (sp->sct_off || np->nat_money < 0) {
-           if (!player->simulation)
-               sp->sct_off = 0;
+       if (sp->sct_off || np->nat_money < 0)
            continue;
-       }
 
        neweff = sp->sct_effic;
        amount = 0;