]> git.pond.sub.org Git - empserver/commitdiff
(prod, upd_buildeff): Truncated work to even before sector building.
authorMarkus Armbruster <armbru@pond.sub.org>
Thu, 8 Apr 2004 16:31:31 +0000 (16:31 +0000)
committerMarkus Armbruster <armbru@pond.sub.org>
Thu, 8 Apr 2004 16:31:31 +0000 (16:31 +0000)
Fix.

src/lib/commands/prod.c
src/lib/update/sect.c

index 38a52b7244006f830308481ce066104d81bc228d..d2fbc75474088c9968be25b6ddb85087dd39fb0c 100644 (file)
@@ -141,7 +141,7 @@ prod(void)
            }
            if (work > 999) work = 999;
        }
-       bwork = (int)((double)work / 2.0);
+       bwork = work / 2;
 
        if (sect.sct_off)
            continue;
@@ -207,7 +207,7 @@ prod(void)
            bwork -= twork;
            eff += twork;
        }
-       work = work / 2 + bwork;
+       work = (work + 1) / 2 + bwork;
        if (eff < 60 || (type != SCT_ENLIST && eff < 61))
            continue;
 
index 4ddd27b62b676d5b6765d5cbf283b30bd07e8ba3..e9247813d11fdbe2df0da45588111e7147a621f8 100644 (file)
@@ -91,7 +91,7 @@ upd_buildeff(struct natstr *np, register struct sctstr *sp, int *workp,
             short *vec, int etu, int *desig, int sctwork, int *cost)
 {
     register int work_cost = 0;
-    int buildeff_work = (int)(*workp / 2);
+    int buildeff_work = *workp / 2;
     int n, hcms, lcms, neweff;
     u_char old_type = *desig;
 
@@ -159,7 +159,7 @@ upd_buildeff(struct natstr *np, register struct sctstr *sp, int *workp,
            }
        }
     }
-    *workp = *workp / 2 + buildeff_work;
+    *workp = (*workp + 1) / 2 - buildeff_work;
 
     return neweff;
 }