ef_verify: Reject invalid plane flag combinations

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

diff --git a/src/lib/common/ef_verify.c b/src/lib/common/ef_verify.c
index 041a92f0a3e30ee24aa6b8257879b6fea2cda26b..71d437c25ba80d498689a347f70b2347f246660d 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-2016, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2021, 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-2016
+ *     Markus Armbruster, 2006-2021
  */
 
 #include <config.h>
@@ -72,7 +72,7 @@ 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 can't be used in xundump, since we lack a
         * setter to go with ca_get().
@@ -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);
@@ -344,16 +342,71 @@ static int
 verify_plane_chr(void)
 {
     int retval = 0;
-    int i;
+    int i, flags, accepted_flags;
+    char buf[1024];
 
     for (i = 0; plchr[i].pl_name; i++) {
        if (!plchr[i].pl_name[0])
            continue;
-       if ((plchr[i].pl_flags & (P_M | P_V)) == P_M) {
+       flags = plchr[i].pl_flags;
+       accepted_flags = P_V | P_K | P_L;
+       if (flags & P_M) {
+           /* missile */
+           accepted_flags |= P_M | P_E;
+           if (flags & P_N)
+               accepted_flags |=  P_N;
+           else if (flags & P_O)
+               accepted_flags |=  P_O;
+           else if (flags & P_F)
+               accepted_flags |=  P_F;
+           else
+               accepted_flags |=  P_T | P_MAR;
+           if (!(flags & P_V)) {
+               verify_fail(EF_PLANE_CHR, i, NULL, 0,
+                           "flag %s requires flag %s",
+                           symbol_by_value(P_M, plane_chr_flags),
+                           symbol_by_value(P_V, plane_chr_flags));
+               retval = -1;
+           }
+       } else if (flags & P_O) {
+           /* satellite */
+           accepted_flags |= P_O | P_S | P_I;
+       } else {
+           /* plane */
+           accepted_flags |= P_B | P_T | P_F | P_C | P_S | P_I | P_A | P_P
+               | P_ESC | P_MINE | P_SWEEP;
+           if ((flags & (P_P | P_C)) == P_P) {
+               verify_fail(EF_PLANE_CHR, i, NULL, 0,
+                           "flag %s requires flag %s",
+                           symbol_by_value(P_P, plane_chr_flags),
+                           symbol_by_value(P_C, plane_chr_flags));
+               retval = -1;
+           }
+       }
+       if (flags & ~accepted_flags) {
+           symbol_set_fmt(buf, sizeof(buf), flags & ~accepted_flags,
+                          plane_chr_flags, ", ", 1);
            verify_fail(EF_PLANE_CHR, i, NULL, 0,
-                       "flag %s requires flag %s",
-                       symbol_by_value(P_M, plane_chr_flags),
-                       symbol_by_value(P_V, plane_chr_flags));
+                       "invalid flag combination, can't have %s", buf);
+           retval = -1;
+       }
+    }
+    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;
        }
     }
@@ -397,6 +450,7 @@ ef_verify_config(void)
     /* Special checks */
     retval |= verify_ship_chr();
     retval |= verify_plane_chr();
+    retval |= verify_land_chr();
     retval |= verify_products();
     return retval;
 }