Update copyright notice

[empserver] / src / lib / update / nav_util.c

diff --git a/src/lib/update/nav_util.c b/src/lib/update/nav_util.c
index 58c2a6319026d2d8f7dd3dc4ddffb09f51ce0a7c..5bd62f97ab9449da05305af1ca4ba175a5235595 100644 (file)
--- a/src/lib/update/nav_util.c
+++ b/src/lib/update/nav_util.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-2012, 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/>.
  *
  *  ---
  *
@@ -34,11 +33,8 @@
 #include <config.h>
 
 #include "item.h"
-#include "land.h"
 #include "nsc.h"
-#include "path.h"
 #include "plague.h"
-#include "plane.h"
 #include "ship.h"
 #include "update.h"
 
@@ -68,7 +64,7 @@ load_it(struct shpstr *sp, struct sctstr *psect, int i)
     if (psect->sct_oldown != shipown && comm == I_CIVIL) {
        wu(0, shipown,
           "Ship #%d - unable to load disloyal civilians at %s.",
-          sp->shp_uid, xyas(psect->sct_x, psect->sct_y, psect->sct_own));
+          sp->shp_uid, xyas(psect->sct_x, psect->sct_y, shipown));
        return 0;
     }
     if (comm == I_CIVIL || comm == I_MILIT)
@@ -158,8 +154,7 @@ unload_it(struct shpstr *sp)
        if (sectp->sct_oldown != shipown && comm == I_CIVIL) {
            wu(0, sp->shp_own,
               "Ship #%d - unable to unload civilians into a disloyal sector at %s.",
-              sp->shp_uid, xyas(sectp->sct_x, sectp->sct_y,
-                                sectp->sct_own));
+              sp->shp_uid, xyas(sectp->sct_x, sectp->sct_y, sp->shp_own));
            continue;
        }
        if (comm == I_CIVIL)