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

Eliminated multiple reassigments

Browse source
This commit is contained in:
NHOrus 2017-07-07 10:20:32 +03:00
parent d51da9d0b8
commit 51b6b52dc8
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
actions.c
View file

@ -205,11 +205,13 @@ static int bigwords(long id)
* crossing. */ * crossing. */
if (game.place[EGGS] == LOC_NOWHERE && game.place[TROLL] == LOC_NOWHERE && game.prop[TROLL] == TROLL_UNPAID) if (game.place[EGGS] == LOC_NOWHERE && game.place[TROLL] == LOC_NOWHERE && game.prop[TROLL] == TROLL_UNPAID)
game.prop[TROLL] = TROLL_PAIDONCE; game.prop[TROLL] = TROLL_PAIDONCE;
int k = EGGS_DONE; int k;
if (HERE(EGGS)) if (HERE(EGGS))
k = EGGS_VANISHED; k = EGGS_VANISHED;
if (game.loc == objects[EGGS].plac) else if (game.loc == objects[EGGS].plac)
k = EGGS_HERE; k = EGGS_HERE;
else
k = EGGS_DONE;
move(EGGS, objects[EGGS].plac); move(EGGS, objects[EGGS].plac);
pspeak(EGGS, look, k, true); pspeak(EGGS, look, k, true);
return GO_CLEAROBJ; return GO_CLEAROBJ;
@ -470,11 +472,13 @@ static int discard(verb_t verb, obj_t obj)
game.prop[CAVITY] = CAVITY_FULL; game.prop[CAVITY] = CAVITY_FULL;
if (HERE(RUG) && ((obj == EMERALD && game.prop[RUG] != RUG_HOVER) || if (HERE(RUG) && ((obj == EMERALD && game.prop[RUG] != RUG_HOVER) ||
(obj == RUBY && game.prop[RUG] == RUG_HOVER))) { (obj == RUBY && game.prop[RUG] == RUG_HOVER))) {
int spk = RUG_RISES; int spk;
if (TOTING(RUG))
spk = RUG_WIGGLES;
if (obj == RUBY) if (obj == RUBY)
spk = RUG_SETTLES; spk = RUG_SETTLES;
else if (TOTING(RUG))
spk = RUG_WIGGLES;
else
spk = RUG_RISES;
rspeak(spk); rspeak(spk);
if (spk != RUG_WIGGLES) { if (spk != RUG_WIGGLES) {
int k = (game.prop[RUG] == RUG_HOVER) ? RUG_FLOOR : RUG_HOVER; int k = (game.prop[RUG] == RUG_HOVER) ? RUG_FLOOR : RUG_HOVER;