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

Refactor put() function and calls.

Browse source
This commit is contained in:
Eric S. Raymond 2023-04-07 13:19:51 -04:00
parent ab2779cd93
commit 9cd7c53d78
3 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
advent.h
View file

@ -276,7 +276,7 @@ extern bool silent_yes_or_no(void);
extern bool yes_or_no(const char*, const char*, const char*); extern bool yes_or_no(const char*, const char*, const char*);
extern void juggle(obj_t); extern void juggle(obj_t);
extern void move(obj_t, loc_t); extern void move(obj_t, loc_t);
extern loc_t put(obj_t, loc_t, int); extern void put(obj_t, loc_t, int);
extern void carry(obj_t, loc_t); extern void carry(obj_t, loc_t);
extern void drop(obj_t, loc_t); extern void drop(obj_t, loc_t);
extern int atdwrf(loc_t); extern int atdwrf(loc_t);

24
main.c
View file

@ -863,12 +863,12 @@ static bool closecheck(void)
* objects he might be carrying (lest he have some which * objects he might be carrying (lest he have some which
* could cause trouble, such as the keys). We describe the * could cause trouble, such as the keys). We describe the
* flash of light and trundle back. */ * flash of light and trundle back. */
game.objects[BOTTLE].prop = put(BOTTLE, LOC_NE, EMPTY_BOTTLE); put(BOTTLE, LOC_NE, EMPTY_BOTTLE);
game.objects[PLANT].prop = put(PLANT, LOC_NE, PLANT_THIRSTY); put(PLANT, LOC_NE, PLANT_THIRSTY);
game.objects[OYSTER].prop = put(OYSTER, LOC_NE, STATE_FOUND); put(OYSTER, LOC_NE, STATE_FOUND);
game.objects[LAMP].prop = put(LAMP, LOC_NE, LAMP_DARK); put(LAMP, LOC_NE, LAMP_DARK);
game.objects[ROD].prop = put(ROD, LOC_NE, STATE_FOUND); put(ROD, LOC_NE, STATE_FOUND);
game.objects[DWARF].prop = put(DWARF, LOC_NE, 0); put(DWARF, LOC_NE, 0);
game.loc = LOC_NE; game.loc = LOC_NE;
game.oldloc = LOC_NE; game.oldloc = LOC_NE;
game.newloc = LOC_NE; game.newloc = LOC_NE;
@ -877,13 +877,13 @@ static bool closecheck(void)
move(GRATE, LOC_SW); move(GRATE, LOC_SW);
move(SIGN, LOC_SW); move(SIGN, LOC_SW);
game.objects[SIGN].prop = ENDGAME_SIGN; game.objects[SIGN].prop = ENDGAME_SIGN;
game.objects[SNAKE].prop = put(SNAKE, LOC_SW, SNAKE_CHASED); put(SNAKE, LOC_SW, SNAKE_CHASED);
game.objects[BIRD].prop = put(BIRD, LOC_SW, BIRD_CAGED); put(BIRD, LOC_SW, BIRD_CAGED);
game.objects[CAGE].prop = put(CAGE, LOC_SW, STATE_FOUND); put(CAGE, LOC_SW, STATE_FOUND);
game.objects[ROD2].prop = put(ROD2, LOC_SW, STATE_FOUND); put(ROD2, LOC_SW, STATE_FOUND);
game.objects[PILLOW].prop = put(PILLOW, LOC_SW, STATE_FOUND); put(PILLOW, LOC_SW, STATE_FOUND);
game.objects[MIRROR].prop = put(MIRROR, LOC_NE, STATE_FOUND); put(MIRROR, LOC_NE, STATE_FOUND);
game.objects[MIRROR].fixed = LOC_SW; game.objects[MIRROR].fixed = LOC_SW;
for (int i = 1; i <= NOBJECTS; i++) { for (int i = 1; i <= NOBJECTS; i++) {

4
misc.c
View file

@ -595,12 +595,12 @@ void move(obj_t object, loc_t where)
drop(object, where); drop(object, where);
} }
loc_t put(obj_t object, loc_t where, int pval) void put(obj_t object, loc_t where, int pval)
/* put() is the same as move(), except it returns a value used to set up the /* put() is the same as move(), except it returns a value used to set up the
* negated game.prop values for the repository objects. */ * negated game.prop values for the repository objects. */
{ {
move(object, where); move(object, where);
return (-1) - pval;; // Needs to stay sinchronized with STASHED game.objects[object].prop = (-1) - pval;; // Needs to stay synchronized with STASHED
} }
void carry(obj_t object, loc_t where) void carry(obj_t object, loc_t where)