Remove the wait command, it's been broken and restricted to deity

since Empire 2, ca. 1995:
(wai): Remove.
(player_coms): Update accordingly.

diff --git a/include/prototypes.h b/include/prototypes.h
index dd6d7f75d4a2c60acc4289889bfca0e9178eee5e..ef024eb14af621bf99791e543c2d378371bf7ef7 100644 (file)
--- a/include/prototypes.h
+++ b/include/prototypes.h
@@ -246,7 +246,6 @@ int turn(void);
 int upda(void);
 int upgr(void);
 int vers(void);
-int wai(void);
 int wall(void);
 int wing(void);
 int wipe(void);

diff --git a/info/wait.t b/info/wait.t
deleted file mode 100644 (file)
index c488fb4..0000000
--- a/info/wait.t
+++ /dev/null
@@ -1,25 +0,0 @@
-.TH Command WAIT
-.NA wait "Wait for a telegram"
-.LV Expert
-.SY "wait"
-The wait command is used to wait until new telegrams are received.
-It's most common use is to wait for an attack, or a reply of some sort.
-.s1
-.EX "wait"
-.nf
-You have a new telegram waiting ...
-.fi
-.EX
-.sp
-When telegrams arrive you are informed with:
-.NF
-\*QYou have a new telegram waiting ...\*U   if there is just one new one, or
-\*QYou have ten new telegrams waiting ...\*U   if there are ten of them, or
-\*QYou have several new telegrams waiting ...\*U   if there are very many.
-.FI
-.s1
-The wait command will eventually time out.
-.s1
-WAIT COMMAND IS DISABLED IN THE NEW SERVER.
-.s1
-.SA "telegram, wire, Obsolete"

diff --git a/src/lib/commands/wai.c b/src/lib/commands/wai.c
deleted file mode 100644 (file)
index 16e4b94..0000000
--- a/src/lib/commands/wai.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- *  Empire - A multi-player, client/server Internet based war game.
- *  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
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  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
- *
- *  ---
- *
- *  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.
- *
- *  ---
- *
- *  wai.c: Wait for telegrams and announcements
- * 
- *  Known contributors to this file:
- *   
- */
-
-#include <config.h>
-
-#include "commands.h"
-#include "empio.h"
-
-int
-wai(void)
-{
-    struct natstr *np;
-
-    np = getnatp(player->cnum);
-    io_output(player->iop, IO_WAIT);
-    if (np->nat_ann == 0 && np->nat_tgms == 0) {
-       player->waiting++;
-       io_input(player->iop, IO_WAIT);
-       player->waiting--;
-    }
-    if (player->aborted || io_eof(player->iop))
-       return RET_OK;
-    if (np->nat_ann != 0)
-       player->argp[0] = "wire";
-    if (np->nat_tgms != 0)
-       player->argp[0] = "read";
-    return rea();
-}

diff --git a/src/lib/player/empmod.c b/src/lib/player/empmod.c
index efbdca1564e28e6b2442db6a393c9cb589a87464..7d1d14f0255605306b7b247a0c2830fcbd4052c1 100644 (file)
--- a/src/lib/player/empmod.c
+++ b/src/lib/player/empmod.c
@@ -271,7 +271,6 @@ struct cmndstr player_coms[] = {
     {"upgrade <s|p|l> <SHIPS|PLANES|UNITS>",
      1, upgr, C_MOD, NORM + MONEY + CAP},
     {"version", 0, vers, 0, VIS},
-    {"wait", 0, wai, C_MOD, GOD},
     {"wall [<message>]", 0, wall, C_MOD, NORM},
     {"wingadd <WING> <PLANES>", 1, wing, C_MOD, NORM},
     {"wipe <SECTS>", 1, wipe, C_MOD, NORM},