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

linearized extinguish

Browse source
This commit is contained in:
NHOrus 2017-07-04 14:33:30 +03:00
parent 8cbb8afcbe
commit 3c636e27e2
1 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

24
actions.c
View file

@ -582,9 +582,7 @@ static int extinguish(token_t verb, int obj)
obj = LAMP; obj = LAMP;
if (HERE(URN) && game.prop[URN] == URN_LIT) if (HERE(URN) && game.prop[URN] == URN_LIT)
obj = URN; obj = URN;
if (obj == INTRANSITIVE || if (obj == INTRANSITIVE)
(HERE(LAMP) && game.prop[LAMP] == LAMP_BRIGHT &&
HERE(URN) && game.prop[URN] == URN_LIT))
return GO_UNKNOWN; return GO_UNKNOWN;
} }
@ -594,20 +592,24 @@ static int extinguish(token_t verb, int obj)
} else { } else {
pspeak(URN, change, URN_DARK, true); pspeak(URN, change, URN_DARK, true);
} }
return GO_CLEAROBJ;
}
} else if (obj == LAMP) { if (obj == LAMP) {
state_change(LAMP, LAMP_DARK); state_change(LAMP, LAMP_DARK);
rspeak(DARK(game.loc) ? rspeak(DARK(game.loc) ?
PITCH_DARK : PITCH_DARK :
NO_MESSAGE); NO_MESSAGE);
return GO_CLEAROBJ;
} else if (obj == DRAGON ||
obj == VOLCANO) {
rspeak(BEYOND_POWER);
} else {
rspeak(actions[verb].message);
} }
if (obj == DRAGON ||
obj == VOLCANO) {
rspeak(BEYOND_POWER);
return GO_CLEAROBJ;
}
rspeak(actions[verb].message);
return GO_CLEAROBJ; return GO_CLEAROBJ;
} }