Magic-number elimination.
This commit is contained in:
parent
82c3ae5e65
commit
4d4e8dce96
3 changed files with 6 additions and 24 deletions
23
saveresume.c
23
saveresume.c
|
@ -230,28 +230,7 @@ bool is_valid(struct game_t valgame)
|
|||
/* Check that properties of objects aren't beyond expected */
|
||||
for (obj_t obj = 0; obj <= NOBJECTS; obj++) {
|
||||
if (PROP_IS_INVALID(valgame.objects[obj].prop)) {
|
||||
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.objects[obj].prop == 2) // There are multiple different states, but it's convenient to clump them together
|
||||
continue; // LCOV_EXCL_LINE
|
||||
/* FALLTHRU */
|
||||
case BEAR:
|
||||
if (valgame.objects[BEAR].prop == CONTENTED_BEAR || valgame.objects[BEAR].prop == BEAR_DEAD)
|
||||
continue;
|
||||
/* FALLTHRU */
|
||||
default:
|
||||
return false; // LCOV_EXCL_LINE
|
||||
}
|
||||
return false; // LCOV_EXCL_LINE
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue