COPYING duplicates information from README. Remove. Move GPL from

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

diff --git a/src/lib/commands/work.c b/src/lib/commands/work.c
index 0fa4d57b5a9296fcda812b56810cf2b9f391526d..998489d8c81056a3d8d89021fda2a968dbc4b887 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-2005, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,9 +19,9 @@
  *
  *  ---
  *
- *  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.
  *
  *  ---
  *
@@ -31,6 +31,8 @@
  *   
  */
 
+#include <config.h>
+
 #include "misc.h"
 #include "player.h"
 #include "xy.h"
@@ -70,10 +72,6 @@ work(void)
     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) {
@@ -91,7 +89,7 @@ work(void)
            doney = sect.sct_y;
            continue;
        }
-       eff_amt = min(land.lnd_mobil, work_amt);
+       eff_amt = MIN(land.lnd_mobil, work_amt);
        w = ldround(((double)eff_amt * land.lnd_effic / 600.0), 1);
        if (w < 1) {
            pr("%s doesn't work enough to change efficiency (try increasing amount)\n", prland(&land));