ef_verify: Fix error message in verify_land_chr()

[empserver] / src / lib / common / ef_verify.c

diff --git a/src/lib/common/ef_verify.c b/src/lib/common/ef_verify.c
index f1159d6729743673c16241966dffe42e52c0756b..c5c057ea9535ef48ef535ac60aa356a577b84015 100644 (file)
--- a/src/lib/common/ef_verify.c
+++ b/src/lib/common/ef_verify.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2015, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2017, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -28,7 +28,7 @@
  *
  *  Known contributors to this file:
  *     Ron Koenderink, 2005
- *     Markus Armbruster, 2006-2015
+ *     Markus Armbruster, 2006-2016
  */
 
 #include <config.h>
@@ -37,10 +37,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "empobj.h"
-#include "file.h"
 #include "misc.h"
 #include "nsc.h"
 #include "product.h"
+#include "xdump.h"
 
 static void verify_fail(int, int, struct castr *, int, char *, ...)
     ATTRIBUTE((format (printf, 5, 6)));
@@ -72,15 +72,15 @@ verify_ca(int type)
     struct castr *ca = ef_cadef(type);
     int i;
 
-    for (i = 0; ca[i].ca_name; i++) {
+    for (i = 0; ca && ca[i].ca_name; i++) {
        /*
-        * Virtual selectors must be NSC_EXTRA, because xundump can't
-        * cope with them without setter methods.  Exception: if
-        * EFF_MEM is not set, xundump doesn't touch the table.
+        * Virtual selectors can't be used in xundump, since we lack a
+        * setter to go with ca_get().
         */
-       if (CANT_HAPPEN((ef_flags(type) & EFF_MEM)
-                       && ca[i].ca_get && !(ca[i].ca_flags & NSC_EXTRA)))
-           ca[i].ca_flags |= NSC_EXTRA;
+       if (CANT_HAPPEN(xundumpable(type)
+                       && ca[i].ca_get
+                       && ca[i].ca_dump <= CA_DUMP_CONST))
+           ca[i].ca_dump = CA_DUMP_ONLY;
     }
     return 0;
 }
@@ -97,7 +97,7 @@ verify_tabref(int type, int row, struct castr *ca, int idx, long val)
        if (CANT_HAPPEN(ca_sym != symbol_ca))
            return -1;
        for (i = 0; i < (int)sizeof(long) * 8; i++) {
-           if (val & (1L << i)) {
+           if (val & (1UL << i)) {
                if (!symbol_by_value(1L << i, ef_ptr(tabno, 0))) {
                    verify_fail(type, row, ca, idx,
                                "bit %d is not in symbol table %s",
@@ -160,7 +160,7 @@ verify_row(int type, int row)
     if (!empobj_in_use(type, row_ref))
        goto out;
 
-    for (i = 0; ca[i].ca_name; ++i) {
+    for (i = 0; ca && ca[i].ca_name; ++i) {
        if (ca[i].ca_get)
            continue;           /* virtual */
        n = CA_ARRAY_LEN(&ca[i]);
@@ -175,7 +175,7 @@ verify_row(int type, int row)
                continue;
            }
            if (ca[i].ca_table == type && i == 0) {
-               /* uid */
+               /* UID */
                if (val.val_as.lng != row) {
                    verify_fail(type, row, &ca[i], j,
                                "value is %ld instead of %d",
@@ -201,8 +201,6 @@ verify_table(int type)
     int retval = 0;
     int i;
 
-    if (!ef_cadef(type))
-       return 0;
     verify_ca(type);
     for (i = 0; i < ef_nelem(type); i++)
        retval |= verify_row(type, i);
@@ -360,6 +358,25 @@ verify_plane_chr(void)
     return retval;
 }
 
+static int
+verify_land_chr(void)
+{
+    int retval = 0;
+    int i;
+
+    for (i = 0; lchr[i].l_name; i++) {
+       if (!lchr[i].l_name[0])
+           continue;
+       if ((lchr[i].l_flags & L_SPY) && lchr[i].l_item[I_MILIT]) {
+           verify_fail(EF_LAND_CHR, i, NULL, 0,
+                       "flag %s requires zero milit",
+                       symbol_by_value(L_SPY, land_chr_flags));
+           retval = -1;
+       }
+    }
+    return retval;
+}
+
 static int
 verify_products(void)
 {
@@ -397,6 +414,7 @@ ef_verify_config(void)
     /* Special checks */
     retval |= verify_ship_chr();
     retval |= verify_plane_chr();
+    retval |= verify_land_chr();
     retval |= verify_products();
     return retval;
 }