- /* Bounds check for locations
- */
- if ( valgame.chloc < -1 || valgame.chloc > NLOCATIONS ||
- valgame.chloc < -1 || valgame.chloc > NLOCATIONS ||
- valgame.loc < -1 || valgame.loc > NLOCATIONS ||
- valgame.newloc < -1 || valgame.newloc > NLOCATIONS ||
- valgame.oldloc < -1 || valgame.oldloc > NLOCATIONS ||
- valgame.oldloc < -1 || valgame.oldloc > NLOCATIONS) {
+ /* Prevent division by zero */
+ if (valgame->abbnum == 0) {
+ return false;
+ }
+
+ /* Check for RNG overflow. Truncate */
+ if (valgame->lcg_x >= LCG_M) {
+ valgame->lcg_x %= LCG_M;
+ }
+
+ /* Check for RNG underflow. Transpose */
+ if (valgame->lcg_x < LCG_M) {
+ valgame->lcg_x = LCG_M + (valgame->lcg_x % LCG_M);
+ }
+
+ /* Bounds check for locations */
+ if ( valgame->chloc < -1 || valgame->chloc > NLOCATIONS ||
+ valgame->chloc2 < -1 || valgame->chloc2 > NLOCATIONS ||
+ valgame->loc < 0 || valgame->loc > NLOCATIONS ||
+ valgame->newloc < 0 || valgame->newloc > NLOCATIONS ||
+ valgame->oldloc < 0 || valgame->oldloc > NLOCATIONS ||
+ valgame->oldlc2 < 0 || valgame->oldlc2 > NLOCATIONS) {
+ return false;
+ }
+ /* 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) {
+ return false;
+ }
+ }
+
+ for (int i = 0; i <= NOBJECTS; i++) {
+ if (valgame->place[i] < -1 || valgame->place[i] > NLOCATIONS ||
+ valgame->fixed[i] < -1 || valgame->fixed[i] > NLOCATIONS) {
+ return false;
+ }
+ }
+
+ /* Bounds check for dwarves */
+ if (valgame->dtotal < 0 || valgame->dtotal > NDWARVES ||
+ valgame->dkill < 0 || valgame->dkill > NDWARVES) {
+ return false;
+ }
+
+ /* Validate that we didn't die too many times in save */
+ if (valgame->numdie >= NDEATHS) {