Fix trailing whitespace

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

diff --git a/src/lib/commands/map.c b/src/lib/commands/map.c
index d88ff1dc19e5ffcf38e52c35614137e3845fbcca..d4a0677df5d80670e7e63f97c2572c8cecee84bf 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-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -26,7 +26,7 @@
  *  ---
  *
  *  map.c: Display a map of sectors.
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1986
  *     Ken Stevens, 1995
@@ -34,34 +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 nstr_sect ns;
-    s_char origin = '\0';
-    int map_flags = 0;
+    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')
@@ -77,49 +74,21 @@ map(void)
        }
     }
 
-    if (!snxtsct(&ns, player->argp[1])) {
-       if (unit_map(unit_type, atoi(player->argp[1]), &ns, &origin))
-           return RET_FAIL;
-    }
-    for (b = player->argp[2]; b && *b; 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;
+    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);
        }
-    }
 
-    return draw_map(bmap, origin, map_flags, &ns);
+       if (!str || !*str)
+           return RET_SYN;
+    } else
+       str = player->argp[1];
+
+    if (unit_type == EF_BAD)
+       unit_type = EF_SHIP;
+
+    return do_map(bmap, unit_type, str, player->argp[2]);
 }