License upgrade to GPL version 3 or later

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

diff --git a/src/lib/commands/orde.c b/src/lib/commands/orde.c
index 5151a474b62be014d9a50509b3e54376bd09d03d..145a1f3b00aea62e086748e7ee6ca1ed848ccf16 100644 (file)
--- a/src/lib/commands/orde.c
+++ b/src/lib/commands/orde.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2011, 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/>.
  *
  *  ---
  *
@@ -186,7 +185,7 @@ orde(void)
            sub = sub - 1;;
 
            if (ship.shp_autonav & AN_AUTONAV) {
-               dest = getstarg(player->argp[4], "Start or End? ", buf);
+               dest = getstarg(player->argp[4], "Start or end? ", buf);
                if (!dest)
                    return RET_FAIL;
                switch (*dest) {
@@ -198,8 +197,7 @@ orde(void)
                    i1 = whatitem(player->argp[5], "Commodity? ");
                    if (!i1)
                        return RET_FAIL;
-                   p1 = getstarg(player->argp[6], "Amount? ",
-                                 buf);
+                   p1 = getstarg(player->argp[6], "Amount? ", buf);
                    if (!p1)
                        return RET_SYN;
                    if (!check_ship_ok(&ship))
@@ -211,15 +209,14 @@ orde(void)
                    }
                    ship.shp_tstart[sub] = i1->i_uid;
                    ship.shp_lstart[sub] = level;
-                   pr("Order Set \n");
+                   pr("Order set\n");
                    break;
                case 's':
                case 'S':
                    i1 = whatitem(player->argp[5], "Commodity? ");
                    if (!i1)
                        return RET_FAIL;
-                   p1 = getstarg(player->argp[6], "Amount? ",
-                                 buf);
+                   p1 = getstarg(player->argp[6], "Amount? ", buf);
                    if (!p1)
                        return RET_SYN;
                    if (!check_ship_ok(&ship))
@@ -414,18 +411,16 @@ sorde(void)
            pr("%3d ", ship.shp_own);
        pr("%4d", nb.cur);
        pr(" %-16.16s", mchr[(int)ship.shp_type].m_name);
-       prxy(" %3d,%-3d", ship.shp_x, ship.shp_y, player->cnum);
+       prxy(" %3d,%-3d", ship.shp_x, ship.shp_y);
 
        if (ship.shp_autonav & AN_AUTONAV) {
            /* Destination 1 */
-           prxy(" %3d,%-3d",
-                ship.shp_destx[1], ship.shp_desty[1], player->cnum);
+           prxy(" %3d,%-3d", ship.shp_destx[1], ship.shp_desty[1]);
 
            /* Destination 2 */
            if ((ship.shp_destx[1] != ship.shp_destx[0])
                || (ship.shp_desty[1] != ship.shp_desty[0])) {
-               prxy(" %3d,%-3d",
-                    ship.shp_destx[0], ship.shp_desty[0], player->cnum);
+               prxy(" %3d,%-3d", ship.shp_destx[0], ship.shp_desty[0]);
            } else
                pr("        ");