X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=actions.c;h=80e24e04397afcb3482521151a977a511c882f27;hp=29369de08c1ad87498b1b1a64dbca2b3f81ddbab;hb=adbbd1df2589038da674edbcaf40c0dc585d4079;hpb=d7bb3f61eb324d2fa180eace83879cbf08eab20f

diff --git a/actions.c b/actions.c
index 29369de..80e24e0 100644
--- a/actions.c
+++ b/actions.c
@@ -78,7 +78,9 @@ static int attack(FILE *input, long verb, token_t obj)
 		game.dseen[i]=false;
 	    }
 	}
-	spk=spk+1+1/dwarves;	/* FIXME: Arithmetic on message numbers */
+	spk=dwarves == 2 ? OGRE_PANIC1 : OGRE_PANIC2;
+	RSPEAK(spk);
+	return GO_CLEAROBJ;
     }
     else if (obj == BEAR)
 	/* FIXME: Arithmetic on message numbers */
@@ -1016,8 +1018,8 @@ int action(FILE *input, enum speechpart part, long verb, token_t obj)
 	else if (obj == GRATE) {
 	    if (game.loc == LOC_START || game.loc == LOC_VALLEY || game.loc == LOC_SLIT)
 		obj=DPRSSN;
-	    /* FIXME: Arithmetic on location numbers */
-	    if (game.loc > LOC_BELOWGRATE && game.loc < LOC_MISTHALL)
+	    if (game.loc == LOC_COBBLE || game.loc == LOC_DEBRIS || game.loc == LOC_AWKWARD ||
+		game.loc == LOC_BIRD || game.loc == LOC_PITTOP)
 		obj=ENTRNC;
 	    if (obj != GRATE)
 		return GO_MOVE;