Drop "xdump ver" deprecated in 4.3.12

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

diff --git a/src/lib/commands/xdump.c b/src/lib/commands/xdump.c
index 006b7b32a497153e81d7648b96c4ed63a7aae20b..8d10669e690898d82f5e49ad3b3099c74d15c913 100644 (file)
--- a/src/lib/commands/xdump.c
+++ b/src/lib/commands/xdump.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2011, 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,
@@ -14,8 +14,7 @@
  *  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/>.
  *
  *  ---
  *
@@ -28,7 +27,7 @@
  *  xdump.c: Extended dump
  *
  *  Known contributors to this file:
- *     Markus Armbruster, 2004-2008
+ *     Markus Armbruster, 2004-2011
  */
 
 #include <config.h>
@@ -36,6 +35,7 @@
 #include <ctype.h>
 #include "commands.h"
 #include "empobj.h"
+#include "news.h"
 #include "optlist.h"
 #include "version.h"
 #include "xdump.h"
@@ -113,6 +113,38 @@ xdvisible(int type, void *p)
     }
 }
 
+/*
+ * Dump meta-data for items of type TYPE to XD.
+ * Return RET_SYN when TYPE doesn't have meta-data, else RET_OK.
+ */
+static int
+xdmeta(struct xdstr *xd, int type)
+{
+    struct castr *ca = ef_cadef(type);
+    int i;
+    int n = 0;
+
+    if (!ca)
+       return RET_SYN;
+
+    xdhdr(xd, ef_nameof(type), 1);
+    xdcolhdr(xd, ca);
+
+    for (i = 0; ca[i].ca_name; i++) {
+       if (ca[i].ca_flags & NSC_DEITY && !xd->divine)
+           continue;
+       if (ca[i].ca_flags & NSC_EXTRA)
+           continue;
+       xdflds(xd, mdchr_ca, &ca[i]);
+       xd->pr("\n");
+       n++;
+    }
+
+    xdftr(xd, n);
+
+    return RET_OK;
+}
+
 /*
  * Dump items of type TYPE selected by ARG to XD.
  * Return RET_OK on success, RET_SYN on error.
@@ -179,7 +211,5 @@ xdump(void)
        pr("Access to table %s denied\n", ef_nameof(type));
        return RET_FAIL;
     }
-    if (type == EF_VERSION && !player->argp[2])
-       return xditem(&xd, type, "*"); /* backward compatibility */
     return xditem(&xd, type, player->argp[2]);
 }