From: Eric S. Raymond Date: Tue, 13 Jun 2017 18:33:19 +0000 (-0400) Subject: Fix compiler warnings. X-Git-Tag: 1.1~339 X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;ds=sidebyside;h=bd35d4713988825c8a244c9367734037d5655969;p=open-adventure.git Fix compiler warnings. --- diff --git a/actions.c b/actions.c index 9a68f26..6936fa2 100644 --- a/actions.c +++ b/actions.c @@ -177,6 +177,7 @@ static int blast(void) game.bonus=135; RSPEAK(game.bonus); score(0); + return GO_CLEAROBJ; /* pacify compiler - we never get here */ } static int vbreak(token_t verb, token_t obj) @@ -234,9 +235,9 @@ static int carry(token_t verb, token_t obj) if (obj == RUG && game.prop[RUG] == 2)spk=222; if (obj == SIGN)spk=196; if (obj == MESSAG) { - spk=190; - return GO_CLEAROBJ; + RSPEAK(190); DSTROY(MESSAG); + return GO_CLEAROBJ; } if (game.fixed[obj] != 0) { RSPEAK(spk); diff --git a/main.c b/main.c index b5d190d..5a3f200 100644 --- a/main.c +++ b/main.c @@ -264,7 +264,7 @@ bool spotted_by_pirate(int i) /* The pirate's spotted him. He leaves him alone once we've * found chest. K counts if a treasure is here. If not, and * tally=1 for an unseen chest, let the pirate be spotted. - * Note that game.place(CHEST)=0 might mean that he's thrown + * Note that game.place[CHEST]=0 might mean that he's thrown * it to the troll, but in that case he's seen the chest * (game.prop=0). */ if (game.loc == game.chloc || game.prop[CHEST] >= 0) @@ -273,9 +273,7 @@ bool spotted_by_pirate(int i) for (int j=MINTRS; j<=MAXTRS; j++) { /* Pirate won't take pyramid from plover room or dark * room (too easy!). */ - if (j == PYRAM && (game.loc == PLAC[PYRAM] || game.loc == PLAC[EMRALD])) { - if (HERE(j)) - k=1; + if (j==PYRAM && (game.loc==PLAC[PYRAM] || game.loc==PLAC[EMRALD])) { return true; } if (TOTING(j)) { @@ -297,7 +295,6 @@ bool spotted_by_pirate(int i) game.dloc[PIRATE]=game.chloc; game.odloc[PIRATE]=game.chloc; game.dseen[PIRATE]=false; - return true; } if (HERE(j))