projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix value, add check for linked locations
[open-adventure.git]
/
saveresume.c
diff --git
a/saveresume.c
b/saveresume.c
index 8a33c3e992fa8e217825c17f3a5cf9fa54e32fec..e4d9959aeaa59e460f99bbc11fc30fcbedfd2426 100644
(file)
--- a/
saveresume.c
+++ b/
saveresume.c
@@
-186,7
+186,7
@@
bool is_valid(struct game_t valgame)
/* Check that properties of objects aren't beyond expected */
for (int obj = 0; obj <= NOBJECTS; obj++) {
/* Check that properties of objects aren't beyond expected */
for (int obj = 0; obj <= NOBJECTS; obj++) {
- if (
game.prop[obj] < STATE_NOTFOUND ||
game.prop[obj] > 1) {
+ if (
valgame.prop[obj] < STATE_NOTFOUND || val
game.prop[obj] > 1) {
switch (obj) {
case RUG:
case DRAGON:
switch (obj) {
case RUG:
case DRAGON:
@@
-199,18
+199,24
@@
bool is_valid(struct game_t valgame)
case EGGS:
case VASE:
case CHAIN:
case EGGS:
case VASE:
case CHAIN:
- if (game.prop[obj] == 2) // There are multiple different states, but it's convenient to clump them together
+ if (
val
game.prop[obj] == 2) // There are multiple different states, but it's convenient to clump them together
continue;
case BEAR:
continue;
case BEAR:
- if (game.prop[BEAR] == CONTENTED_BEAR || game.prop[BEAR] == BEAR_DEAD)
+ if (
val
game.prop[BEAR] == CONTENTED_BEAR || game.prop[BEAR] == BEAR_DEAD)
continue;
default:
continue;
default:
- printf("%i", obj);
return false;
}
}
}
return false;
}
}
}
+ /* Check that we have objects at locations */
+ for (loc_t loc = LOC_NOWHERE; loc <= NLOCATIONS; loc++) {
+ if (valgame.atloc[loc] < NO_OBJECT || valgame.atloc[loc] > NLOCATIONS) {
+ return false;
+ }
+ }
+
return true;
}
return true;
}