From: Eric S. Raymond Date: Tue, 13 Jun 2017 16:47:34 +0000 (-0400) Subject: Move awqy from FORTRANISH conditionals. X-Git-Tag: 1.1~346 X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=commitdiff_plain;h=1a12a3acf226dd6e788f9a7d0ca5313449837f39 Move awqy from FORTRANISH conditionals. --- diff --git a/actions.c b/actions.c index 1e1e223..d14e643 100644 --- a/actions.c +++ b/actions.c @@ -129,17 +129,18 @@ static int bigwords(long foo) if (game.place[EGGS]==PLAC[EGGS] || (TOTING(EGGS) && game.loc==PLAC[EGGS])) { RSPEAK(spk); return GO_CLEAROBJ; + } else { + /* Bring back troll if we steal the eggs back from him before + * crossing. */ + if (game.place[EGGS]==0 && game.place[TROLL]==0 && game.prop[TROLL]==0) + game.prop[TROLL]=1; + k=2; + if (HERE(EGGS))k=1; + if (game.loc == PLAC[EGGS])k=0; + MOVE(EGGS,PLAC[EGGS]); + PSPEAK(EGGS,k); + return GO_CLEAROBJ; } - /* Bring back troll if we steal the eggs back from him before - * crossing. */ - if (game.place[EGGS]==0 && game.place[TROLL]==0 && game.prop[TROLL]==0) - game.prop[TROLL]=1; - k=2; - if (HERE(EGGS))k=1; - if (game.loc == PLAC[EGGS])k=0; - MOVE(EGGS,PLAC[EGGS]); - PSPEAK(EGGS,k); - return GO_CLEAROBJ; } }