License upgrade to GPL version 3 or later

[empserver] / src / lib / subs / paths.c

diff --git a/src/lib/subs/paths.c b/src/lib/subs/paths.c
index ae77fbb15977e28cd61e16637ab961de70c4fe31..546d11dd79f459b9e143b40cf01f459f2b2c5b15 100644 (file)
--- a/src/lib/subs/paths.c
+++ b/src/lib/subs/paths.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2009, 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/>.
  *
  *  ---
  *
@@ -28,7 +27,7 @@
  *  path.c: Routines associated with paths, directions, etc.
  *
  *  Known contributors to this file:
- *     Markus Armbruster, 2005-2008
+ *     Markus Armbruster, 2005-2009
  */
 
 #include <config.h>
@@ -58,11 +57,11 @@ direrr(char *stop_msg, char *view_msg, char *map_msg)
     pr(" %c %c\n", dirch[DIR_UL], dirch[DIR_UR]);
     pr("%c   %c\n", dirch[DIR_L], dirch[DIR_R]);
     pr(" %c %c\n", dirch[DIR_DL], dirch[DIR_DR]);
-    if (stop_msg != 0)
+    if (stop_msg)
        pr(stop_msg, dirch[DIR_STOP]);
-    if (view_msg != 0)
+    if (view_msg)
        pr(view_msg, dirch[DIR_VIEW]);
-    if (map_msg != 0)
+    if (map_msg)
        pr(map_msg, dirch[DIR_MAP]);
 }
 
@@ -110,7 +109,7 @@ getpath(char *buf, char *arg, coord x, coord y, int onlyown,
 
     getsect(x, y, &sect);
 
-  more:
+more:
     while (*p) {
        if (sarg_xy(p, &dx, &dy)) {
            bp = NULL;
@@ -173,7 +172,7 @@ getpath(char *buf, char *arg, coord x, coord y, int onlyown,
     if (p + strlen(bp) + 1 >= buf + MAX_PATH_LEN) {
        pr("Path length may not exceed %d.\n", MAX_PATH_LEN);
        pr("Aborting...\n");
-       bp = NULL;
+       return NULL;
     }
     strcpy(p, bp);
     if (*bp)
@@ -262,7 +261,7 @@ pathrange(coord cx, coord cy, char *pp, int border, struct range *range)
     hy += border;
 
     range->lx = xnorm(lx);
-    range->hx = ynorm(hx - lx < WORLD_X ? hx : lx - 1);
+    range->hx = xnorm(hx - lx < WORLD_X ? hx : lx - 1);
     range->ly = ynorm(ly);
     range->hy = ynorm(hy - ly < WORLD_Y ? hy : ly - 1);
     xysize_range(range);