Update copyright notice

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

diff --git a/src/lib/subs/maps.c b/src/lib/subs/maps.c
index 99d5bccac24a7e7b264a66163c19ea92b7ac5fd0..1d1aa0359f9cc4c107326bd096932c5364d8cb42 100644 (file)
--- a/src/lib/subs/maps.c
+++ b/src/lib/subs/maps.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2012, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2015, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -45,7 +45,6 @@
 #include "misc.h"
 #include "nat.h"
 #include "nsc.h"
-#include "nuke.h"
 #include "optlist.h"
 #include "plane.h"
 #include "player.h"
@@ -91,7 +90,7 @@ do_map(int bmap, int unit_type, char *arg1, char *arg2)
        return res;
 
     map_flags = parse_map_flags(bmap, arg2);
-    if (map_flags < 0) 
+    if (map_flags < 0)
        return RET_SYN;
 
     if (map_flags & MAP_BMAP_REVERT)
@@ -144,7 +143,7 @@ parse_map_flags(int bmap, char *str)
     case 0:   map_flags = 0;
     }
 
-    if (!str)
+    if (!str || !*str)
        return map_flags;
 
     /* special case "revert" */
@@ -341,7 +340,7 @@ draw_map(char origin, int map_flags, struct nstr_sect *nsp)
 
        yval = yrel(np, y);
        wmap[i][nsp->range.width] = '\0';
-       pr("%4d %s %-4d\n", yval, wmap[i], yval);
+       pr("%4d %s %d\n", yval, wmap[i], yval);
        if (y >= WORLD_Y)
            y -= WORLD_Y;
     }
@@ -380,7 +379,6 @@ bmnxtsct(struct nstr_sect *np)
        np->id = sctoff(np->x, np->y);
        return 1;
     }
-    /*NOTREACHED*/
 }
 
 /*
@@ -452,7 +450,7 @@ display_region_map(int bmap, int unit_type, coord curx, coord cury,
            return res;
 
        map_flags = parse_map_flags(bmap, arg2);
-       if (map_flags < 0) 
+       if (map_flags < 0)
            return RET_SYN;
     } else {
        snxtsct_around(&ns, curx, cury);