X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=main.c;h=fbd7de04dd5cd7d69fce6cd65d1578759c5984f5;hb=d4fc7a88b4aac2f72013e7c681c907de09db349d;hp=3d4962ab9e6433117ae53358ab21ce5be2d6053e;hpb=14486d67d447afc40a3c57362a9e37324992452f;p=open-adventure.git

diff --git a/main.c b/main.c
index 3d4962a..fbd7de0 100644
--- a/main.c
+++ b/main.c
@@ -248,8 +248,8 @@ static void checkhints(FILE *cmdin)
 		SETPRM(1,HINTS[hint][2],HINTS[hint][2]);
 		RSPEAK(HINT_COST);
 		game.hinted[hint]=YES(cmdin,WANT_HINT,HINTS[hint][4],OK_MAN);
-		if (game.hinted[hint] && game.limit > 30)
-		    game.limit=game.limit+30*HINTS[hint][2];
+		if (game.hinted[hint] && game.limit > WARNTIME)
+		    game.limit += WARNTIME*HINTS[hint][2];
 	    }
 	}
     }
@@ -831,7 +831,7 @@ static void lampcheck(void)
      *  Second is for other cases of lamp dying.  12400 is when it
      *  goes out.  Even then, he can explore outside for a while
      *  if desired. */
-    if (game.limit<=30 && HERE(BATTER) && game.prop[BATTER]==0 && HERE(LAMP))
+    if (game.limit <= WARNTIME && HERE(BATTER) && game.prop[BATTER]==0 && HERE(LAMP))
     {
 	RSPEAK(REPLACE_BATTERIES);
 	game.prop[BATTER]=1;
@@ -844,7 +844,7 @@ static void lampcheck(void)
 	game.prop[LAMP]=0;
 	if (HERE(LAMP))
 	    RSPEAK(LAMP_OUT);
-    } else if (game.limit <= 30) {
+    } else if (game.limit <= WARNTIME) {
 	if (!game.lmwarn && HERE(LAMP)) {
 	    game.lmwarn=true;
 	    int spk=GET_BATTERIES;
@@ -1058,7 +1058,7 @@ static bool do_command(FILE *cmdin)
 	if (i == -1) {
 	    /* Gee, I don't understand. */
 	    if (fallback_handler(rawbuf))
-		return true;
+		continue;
 	    SETPRM(1,WD1,WD1X);
 	    RSPEAK(DONT_KNOW);
 	    goto L2600;