/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2007, Dave Pare, Jeff Bailey, Thomas Ruschak,
- * Ken Stevens, Steve McClure
+ * Copyright (C) 1986-2021, 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,
* 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/>.
*
* ---
*
* ---
*
* map.c: Display a map of sectors.
- *
+ *
* Known contributors to this file:
* Dave Pare, 1986
* Ken Stevens, 1995
+ * Marc Olzheim, 2004
+ * Markus Armbruster, 2005-2011
*/
#include <config.h>
#include "commands.h"
-#include "land.h"
#include "map.h"
-#include "optlist.h"
-#include "ship.h"
int
-map(void)
+c_map(void)
{
int unit_type = EF_BAD;
int bmap = 0;
- char *str;
+ char *str, *prompt;
char buf[1024];
- char prompt[128];
+ char prompt_buf[128];
if (**player->argp != 'm') {
if (**player->argp == 'b')
}
}
- 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
- str = player->argp[1];
+ if (unit_type == EF_BAD)
+ prompt = "(sects)? ";
+ else {
+ sprintf(prompt_buf, "(sects, %s)? ", ef_nameof(unit_type));
+ prompt = prompt_buf;
+ }
+ str = getstarg(player->argp[1], prompt, buf);
+ if (!str || !*str)
+ return RET_SYN;
if (unit_type == EF_BAD)
unit_type = EF_SHIP;