X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=saveresume.c;h=4378324c3b3fd5bf00437587727563c4f953e496;hp=724ca001b2c61dd3110fe26686c99e6eea05e832;hb=25424a01dbe9a2b3c2c8cd2d9f8412a7bb63da09;hpb=ad9c53abdbc8e6da18909a5b6bf65a7fe8b10b71

diff --git a/saveresume.c b/saveresume.c
index 724ca00..4378324 100644
--- a/saveresume.c
+++ b/saveresume.c
@@ -162,7 +162,7 @@ bool is_valid(struct game_t valgame)
 
     /*  Bounds check for dwarves */
     if (valgame.dtotal < 0 || valgame.dtotal > NDWARVES ||
-        valgame.dkill < 0 || valgame.dkill > NDWARVVES) {
+        valgame.dkill < 0 || valgame.dkill > NDWARVES) {
         return false;
     }
 
@@ -184,6 +184,44 @@ bool is_valid(struct game_t valgame)
         return false;
     }
 
+    /* Check that properties of objects aren't beyond expected */
+    for (obj_t obj = 0; obj <= NOBJECTS; obj++) {
+        if (valgame.prop[obj] < STATE_NOTFOUND || valgame.prop[obj] > 1) {
+            switch (obj) {
+            case RUG:
+            case DRAGON:
+            case BIRD:
+            case BOTTLE:
+            case PLANT:
+            case PLANT2:
+            case TROLL:
+            case URN:
+            case EGGS:
+            case VASE:
+            case CHAIN:
+                if (valgame.prop[obj] == 2) // There are multiple different states, but it's convenient to clump them together
+                    continue;
+            case BEAR:
+                if (valgame.prop[BEAR] == CONTENTED_BEAR || game.prop[BEAR] == BEAR_DEAD)
+                    continue;
+            default:
+                return false;
+            }
+        }
+    }
+
+    /* Check that values in linked lists for objects in locations are inside bounds */
+    for (loc_t loc = LOC_NOWHERE; loc <= NLOCATIONS; loc++) {
+        if (valgame.atloc[loc] < NO_OBJECT || valgame.atloc[loc] > NOBJECTS * 2) {
+            return false;
+        }
+    }
+    for (obj_t obj = 0; obj <= NOBJECTS * 2; obj++ ) {
+        if (valgame.link[obj] < NO_OBJECT || valgame.link[obj] > NOBJECTS * 2) {
+            return false;
+        }
+    }
+
     return true;
 }