X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=saveresume.c;h=799e7af0b90225016ef03bb49150793cb439c529;hp=4378324c3b3fd5bf00437587727563c4f953e496;hb=0dd40bba32c9b5225e4d2126a50b7d6516791d06;hpb=25424a01dbe9a2b3c2c8cd2d9f8412a7bb63da09 diff --git a/saveresume.c b/saveresume.c index 4378324..799e7af 100644 --- a/saveresume.c +++ b/saveresume.c @@ -134,18 +134,27 @@ bool is_valid(struct game_t valgame) * valid: no states are outside minimal or maximal value */ - /* Bounds check for locations - */ - if ( valgame.chloc < -1 || valgame.chloc > NLOCATIONS || - valgame.chloc < -1 || valgame.chloc > NLOCATIONS || - valgame.loc < -1 || valgame.loc > NLOCATIONS || + /* Prevent division by zero */ + if (valgame.abbnum == 0) { + return false; + } + + /* Prevent RNG substitution. Why we are saving PRNG parameters? */ + + if (valgame.lcg_a != game.lcg_a || valgame.lcg_c != game.lcg_c || valgame.lcg_m != game.lcg_m) { + return false; + } + + /* Bounds check for locations */ + if ( valgame.chloc < -1 || valgame.chloc > NLOCATIONS || + valgame.chloc2 < -1 || valgame.chloc2 > 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) { + valgame.oldlc2 < -1 || valgame.oldlc2 > NLOCATIONS) { return false; } - /* Bounds check for location arrays - */ + /* 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) { @@ -162,7 +171,7 @@ bool is_valid(struct game_t valgame) /* Bounds check for dwarves */ if (valgame.dtotal < 0 || valgame.dtotal > NDWARVES || - valgame.dkill < 0 || valgame.dkill > NDWARVES) { + valgame.dkill < 0 || valgame.dkill > NDWARVES) { return false; }