Update copyright notice

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

diff --git a/src/lib/commands/marc.c b/src/lib/commands/marc.c
index e4e288cc577f6fc72dc2b3ca307b1bbb17632090..af2491079c577a0ccdd62b67cd39d66275444d12 100644 (file)
--- a/src/lib/commands/marc.c
+++ b/src/lib/commands/marc.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2007, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2021, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
@@ -26,21 +25,17 @@
  *  ---
  *
  *  marc.c: March units around
- * 
+ *
  *  Known contributors to this file:
  *     Thomas Ruschak
  *     Ken Stevens, 1995 (rewrite)
  *     Ron Koenderink, 2006-2007
+ *     Markus Armbruster, 2006-2015
  */
 
 #include <config.h>
 
-#include <ctype.h>
 #include "commands.h"
-#include "file.h"
-#include "map.h"
-#include "path.h"
-#include "empobj.h"
 #include "unit.h"
 
 int
@@ -48,16 +43,13 @@ march(void)
 {
     struct nstr_item ni_land;
     struct emp_qelem land_list;
-    double minmob, maxmob;
-    int together;
 
-    if (!snxtitem(&ni_land, EF_LAND, player->argp[1]))
+    if (!snxtitem(&ni_land, EF_LAND, player->argp[1], NULL))
        return RET_SYN;
     lnd_sel(&ni_land, &land_list);
-    lnd_mar(&land_list, &minmob, &maxmob, &together, player->cnum);
     if (QEMPTY(&land_list)) {
        pr("No lands\n");
        return RET_FAIL;
     }
-    return do_unit_move(&land_list, &together, &minmob, &maxmob);
+    return unit_move(&land_list);
 }