Update copyright notice

[empserver] / src / lib / commands / work.c

diff --git a/src/lib/commands/work.c b/src/lib/commands/work.c
index 68bab5fa804e2c23e18ee417fe6e08101c68716d..ea9b0042a9a1ebef368d08624949b4055b9dc786 100644 (file)
--- a/src/lib/commands/work.c
+++ b/src/lib/commands/work.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,29 +19,23 @@
  *
  *  ---
  *
- *  See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- *  related information and legal notices. It is expected that any future
- *  projects/authors will amend these files as needed.
+ *  See files README, COPYING and CREDITS in the root of the source
+ *  tree for related information and legal notices.  It is expected
+ *  that future projects/authors will amend these files as needed.
  *
  *  ---
  *
  *  work.c: Implementation of the work command
- * 
+ *
  *  Known contributors to this file:
- *   
+ *     Markus Armbruster, 2008
  */
 
-#include "misc.h"
-#include "player.h"
-#include "var.h"
-#include "xy.h"
-#include "sect.h"
+#include <config.h>
+
+#include "commands.h"
 #include "land.h"
-#include "nat.h"
-#include "nsc.h"
-#include "file.h"
 #include "optlist.h"
-#include "commands.h"
 
 static int buildeff(struct sctstr *, int, double *);
 
@@ -53,11 +47,12 @@ work(void)
     struct sctstr sect;
     struct lndstr land;
     int work_amt, eff_amt, w;
-    s_char *p;
-    coord donex = 0, doney = 1;
-    s_char buf[1024];
+    char *p;
+    char buf[1024];
+    double cost;
+    struct natstr *natp = getnatp(player->cnum);
 
-    if (!snxtitem(&ni, EF_LAND, player->argp[1]))
+    if (!snxtitem(&ni, EF_LAND, player->argp[1], NULL))
        return RET_SYN;
     p = getstarg(player->argp[2], "Amount: ", buf);
     if (p == 0 || *p == 0)
@@ -68,13 +63,9 @@ work(void)
        return RET_FAIL;
     }
     nunits = 0;
-    while (nxtitem(&ni, (s_char *)&land)) {
+    while (nxtitem(&ni, &land)) {
        if (!player->owner || land.lnd_own == 0)
            continue;
-       if (land.lnd_type < 0 || land.lnd_type > lnd_maxno) {
-           pr("bad unit type %d (#%d)\n", land.lnd_type, ni.cur);
-           continue;
-       }
        if (!(lchr[(int)land.lnd_type].l_flags & L_ENGINEER))
            continue;
        if (land.lnd_mobil <= 0) {
@@ -83,31 +74,38 @@ work(void)
        }
        getsect(land.lnd_x, land.lnd_y, &sect);
        if (sect.sct_effic >= 100 && sect.sct_type == sect.sct_newtype) {
-           if (sect.sct_x != donex || sect.sct_y != doney)
-               pr("%s is %d%% efficient\n",
-                  xyas(sect.sct_x, sect.sct_y, player->cnum),
-                  sect.sct_effic);
-           /* not perfect, but it'll do -KHS */
-           donex = sect.sct_x;
-           doney = sect.sct_y;
+           pr("Nothing to do for %s in %s\n",
+              prland(&land), xyas(sect.sct_x, sect.sct_y, player->cnum));
            continue;
        }
-       eff_amt = min(land.lnd_mobil, work_amt);
-       w = ldround(((double)eff_amt * land.lnd_effic / 600.0), 1);
+       eff_amt = MIN(land.lnd_mobil, work_amt);
+       w = (eff_amt * land.lnd_effic) / 600;
        if (w < 1) {
-           pr("%s doesn't work enough to change efficiency (try increasing amount)\n", prland(&land));
+           pr("%s doesn't work enough to change efficiency (try increasing amount)\n",
+              prland(&land));
            continue;
        }
-       nunits++;
-       eff_amt = ((6 * buildeff(&sect, w, &player->dolcost)) /
-                  (land.lnd_effic / 100.0));
+       cost = 0.0;
+       w = buildeff(&sect, w, &cost);
+       if (w == 0) {
+           pr("%s can't change efficiency in %s\n",
+              prland(&land), xyas(land.lnd_x, land.lnd_y, player->cnum));
+           continue;
+       }
+       if (player->dolcost + cost > natp->nat_money) {
+           pr("You can't afford to work that much in %s!\n",
+              xyas(land.lnd_x, land.lnd_y, player->cnum));
+           break;
+       }
+       player->dolcost += cost;
        land.lnd_mission = 0;
-       land.lnd_mobil -= eff_amt;
+       land.lnd_mobil -= roundavg(w * 600.0 / land.lnd_effic);
+       nunits++;
        pr("%s %s efficiency at %s to %d\n",
           prland(&land),
           sect.sct_type == sect.sct_newtype ? "raised" : "lowered",
           xyas(land.lnd_x, land.lnd_y, player->cnum),
-          (int)sect.sct_effic);
+          sect.sct_effic);
        putland(land.lnd_uid, &land);
        putsect(&sect);
     }
@@ -125,7 +123,7 @@ work(void)
 static int
 buildeff(struct sctstr *sp, int work, double *money)
 {
-    register int work_cost;
+    int work_cost;
     int n, hcms, lcms;
     int effdone = 0;
 
@@ -144,8 +142,6 @@ buildeff(struct sctstr *sp, int work, double *money)
            sp->sct_type = sp->sct_newtype;
        }
        sp->sct_effic = n;
-       if (!opt_DEFENSE_INFRA)
-           sp->sct_defense = sp->sct_effic;
        work -= work_cost;
        *money += work_cost;
        effdone += work_cost;