archives/open-adventure
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Magic-number elimination.

Browse source
This commit is contained in:
Eric S. Raymond 2017-07-05 21:45:55 -04:00
parent da1f251524
commit 146abeae17
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
actions.c
View file

@ -112,19 +112,22 @@ static int attack(struct command_t *command)
} }
state_change(DRAGON, DRAGON_DEAD); state_change(DRAGON, DRAGON_DEAD);
game.prop[RUG] = RUG_FLOOR; game.prop[RUG] = RUG_FLOOR;
/* FIXME: Arithmetic on location values */ /* Hardcoding LOC_SECRET5 as the dragon's death location is ugly.
int k = (objects[DRAGON].plac + objects[DRAGON].fixd) / 2; * The way it was computed before was wirse; it depended on the
* two dragon locations being LOC_SECRET4 and LOC_SECRET6 and
* LOC_SECRET5 being right between them.
*/
move(DRAGON + NOBJECTS, -1); move(DRAGON + NOBJECTS, -1);
move(RUG + NOBJECTS, 0); move(RUG + NOBJECTS, 0);
move(DRAGON, k); move(DRAGON, LOC_SECRET5);
move(RUG, k); move(RUG, LOC_SECRET5);
drop(BLOOD, k); drop(BLOOD, LOC_SECRET5);
for (obj = 1; obj <= NOBJECTS; obj++) { for (obj = 1; obj <= NOBJECTS; obj++) {
if (game.place[obj] == objects[DRAGON].plac || if (game.place[obj] == objects[DRAGON].plac ||
game.place[obj] == objects[DRAGON].fixd) game.place[obj] == objects[DRAGON].fixd)
move(obj, k); move(obj, LOC_SECRET5);
} }
game.loc = k; game.loc = LOC_SECRET5;
return GO_MOVE; return GO_MOVE;
} }
@ -475,7 +478,6 @@ static int discard(token_t verb, token_t obj, bool just_do_it)
spk = RUG_SETTLES; spk = RUG_SETTLES;
rspeak(spk); rspeak(spk);
if (spk != RUG_WIGGLES) { if (spk != RUG_WIGGLES) {
/* FIXME: Arithmetic on state numbers */
int k = (game.prop[RUG] == RUG_HOVER) ? RUG_FLOOR : RUG_HOVER; int k = (game.prop[RUG] == RUG_HOVER) ? RUG_FLOOR : RUG_HOVER;
game.prop[RUG] = k; game.prop[RUG] = k;
if (k == RUG_HOVER) if (k == RUG_HOVER)

4
make_dungeon.py
View file

@ -444,9 +444,7 @@ def get_objects(obj):
immovable = attr.get("immovable", False) immovable = attr.get("immovable", False)
try: try:
if type(locs) == str: if type(locs) == str:
locs = [locnames.index(locs), -1 if immovable else 0] locs = [locs, -1 if immovable else 0]
else:
locs = [locnames.index(x) for x in locs]
except IndexError: except IndexError:
sys.stderr.write("dungeon: unknown object location in %s\n" % locs) sys.stderr.write("dungeon: unknown object location in %s\n" % locs)
sys.exit(1) sys.exit(1)