COPYING duplicates information from README. Remove. Move GPL from

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

diff --git a/src/lib/commands/lten.c b/src/lib/commands/lten.c
index b7f0fc1cf3fd9340b5176bed6e7e2dbf946c3025..16e75217b1030fe0bc187087e63a1b5eee77f9a3 100644 (file)
--- a/src/lib/commands/lten.c
+++ b/src/lib/commands/lten.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.
  *
  *  ---
  *
@@ -35,6 +35,8 @@
  *     Steve McClure, 1998
  */
 
+#include <config.h>
+
 #include "misc.h"
 #include "player.h"
 #include "plague.h"
@@ -122,8 +124,8 @@ ltend(void)
                    amt = 0;
 
                /* take from target and give to tender */
-               transfer = min(ontarget, -amt);
-               transfer = min(maxtender - ontender, transfer);
+               transfer = MIN(ontarget, -amt);
+               transfer = MIN(maxtender - ontender, transfer);
                if (transfer == 0)
                    continue;
                target.lnd_item[ip->i_vtype] = ontarget - transfer;
@@ -131,8 +133,8 @@ ltend(void)
                total += transfer;
            } else {
                /* give to target from tender */
-               transfer = min(ontender, amt);
-               transfer = min(transfer, maxtarget - ontarget);
+               transfer = MIN(ontender, amt);
+               transfer = MIN(transfer, maxtarget - ontarget);
                if (transfer == 0)
                    continue;
                target.lnd_item[ip->i_vtype] = ontarget + transfer;