Update copyright notice.

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

diff --git a/src/lib/commands/map.c b/src/lib/commands/map.c
index 43cda4b15a75679abd3846fd625cbcd380162e12..249492aa21c77fa1e71bb5d66393b1c801f36224 100644 (file)
--- a/src/lib/commands/map.c
+++ b/src/lib/commands/map.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2005, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2007, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,9 +19,9 @@
  *
  *  ---
  *
- *  See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- *  related information and legal notices. It is expected that any future
- *  projects/authors will amend these files as needed.
+ *  See files README, COPYING and CREDITS in the root of the source
+ *  tree for related information and legal notices.  It is expected
+ *  that future projects/authors will amend these files as needed.
  *
  *  ---
  *
@@ -34,39 +34,31 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "nat.h"
-#include "file.h"
-#include "player.h"
-#include "map.h"
-#include "ship.h"
-#include "land.h"
-#include "xy.h"
-#include "nsc.h"
 #include "commands.h"
+#include "land.h"
+#include "map.h"
 #include "optlist.h"
+#include "ship.h"
 
 int
 map(void)
 {
-    register s_char *b;
-    int unit_type = 0;
+    int unit_type = EF_BAD;
     int bmap = 0;
-    struct natstr *np;
-    s_char *str;
-    struct nstr_sect ns;
-    s_char origin = '\0';
-    int map_flags = 0;
-    int i;
-    s_char what[64];
-    s_char buf[1024];
+    char *str;
+    char buf[1024];
+    char prompt[128];
 
     if (**player->argp != 'm') {
        if (**player->argp == 'b')
            bmap = 'b';
-       else if (**player->argp == 'n')
-           bmap = 'n';
-       else {
+       else if (**player->argp == 'n') {
+           unit_type = EF_NUKE;
+           if (player->argp[0][1] == 'b')
+               bmap = 'b';
+           else
+               bmap = 'n';
+       } else {
            if (**player->argp == 'l')
                unit_type = EF_LAND;
            else if (**player->argp == 'p')
@@ -82,66 +74,21 @@ map(void)
        }
     }
 
-    if (player->argp[1] == (s_char *)0) {
-       if ((str = getstring("(sects)? ", buf)) == 0)
+    if (player->argp[1] == NULL) {
+       if (unit_type == EF_BAD) {
+           str = getstring("(sects)? ", buf);
+       } else {
+           sprintf(prompt, "(sects, %s)? ", ef_nameof(unit_type));
+           str = getstring(prompt, buf);
+       }
+
+       if (!str || !*str)
            return RET_SYN;
-    } else {
+    } else
        str = player->argp[1];
-    }
 
-    np = getnatp(player->cnum);
-    if (*str == '*') {
-       sprintf(what, "%d:%d,%d:%d",
-               -WORLD_X / 2, WORLD_X / 2 - 1,
-               -WORLD_Y / 2, WORLD_Y / 2 - 1);
-       if (!snxtsct(&ns, what))
-           return RET_FAIL;
-    } else if (!snxtsct(&ns, str)) {
-       i = atoi(str);
-       if (unit_map(unit_type, i, &ns, &origin))
-           return RET_FAIL;
-    }
-    b = player->argp[2];
-    while (b != (s_char *)0 && (*b)) {
-       switch (*b) {
-       case 's':
-       case 'S':
-           map_flags |= MAP_SHIP;
-           break;
-       case 'l':
-       case 'L':
-           map_flags |= MAP_LAND;
-           break;
-       case 'p':
-       case 'P':
-           map_flags |= MAP_PLANE;
-           break;
-       case 'h':
-       case 'H':
-           map_flags |= MAP_HIGH;
-           break;
-       case '*':
-           map_flags |= MAP_ALL;
-           break;
-       case 't':
-           if (bmap != 'b')
-               goto bad_flag;
-           bmap = 't';
-           *(b + 1) = 0;
-           break;
-       case 'r':
-           if (bmap != 'b')
-               goto bad_flag;
-           bmap = 'r';
-           *(b + 1) = 0;
-           break;
-       default:
-       bad_flag:
-           pr("Bad flag %c!\n", *b);
-           break;
-       }
-       b++;
-    }
+    if (unit_type == EF_BAD)
+       unit_type = EF_SHIP;
 
-    return draw_map(bmap, origin, map_flags, &ns);
+    return do_map(bmap, unit_type, str, player->argp[2]);
 }