#include "dungeon.h"
/*
- * Use this to detect endianness mismatch. Can't be unchanges by byte-swapping.
+ * Use this to detect endianness mismatch. Can't be unchanged by byte-swapping.
*/
#define ENDIAN_MAGIC 2317
#endif
FILE *fp = NULL;
- if (game.loc != LOC_START || game.abbrev[LOC_START] != 1) {
+ if (game.loc != LOC_START || game.locs[LOC_START].abbrev != 1) {
rspeak(RESUME_ABANDON);
if (!yes_or_no(arbitrary_messages[THIS_ACCEPTABLE], arbitrary_messages[OK_MAN], arbitrary_messages[OK_MAN]))
return GO_CLEAROBJ;
}
/* Bounds check for location arrays */
for (int i = 0; i <= NDWARVES; i++) {
- if (valgame.dloc[i] < -1 || valgame.dloc[i] > NLOCATIONS ||
- valgame.odloc[i] < -1 || valgame.odloc[i] > NLOCATIONS) {
+ if (valgame.dwarves[i].loc < -1 || valgame.dwarves[i].loc > NLOCATIONS ||
+ valgame.dwarves[i].oldloc < -1 || valgame.dwarves[i].oldloc > NLOCATIONS) {
return false; // LCOV_EXCL_LINE
}
}
/* 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) {
+ if (valgame.locs[loc].atloc < NO_OBJECT || valgame.locs[loc].atloc > NOBJECTS * 2) {
return false; // LCOV_EXCL_LINE
}
}