fix spelling of accidentally; from Zapher

[bsdgames-darwin.git] / atc / input.c

diff --git a/atc/input.c b/atc/input.c
index 64b202a1c654d2064b9d41735bb445fea25c154b..44310133cdedf0ff93d03854ec87c9f1d316faca 100644 (file)
--- a/atc/input.c
+++ b/atc/input.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: input.c,v 1.19 2005/08/10 17:53:28 rpaulo Exp $        */
+/*     $NetBSD: input.c,v 1.21 2006/10/07 18:29:02 elad Exp $  */
 
 /*-
  * Copyright (c) 1990, 1993
@@ -46,7 +46,7 @@
 #if 0
 static char sccsid[] = "@(#)input.c    8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: input.c,v 1.19 2005/08/10 17:53:28 rpaulo Exp $");
+__RCSID("$NetBSD: input.c,v 1.21 2006/10/07 18:29:02 elad Exp $");
 #endif
 #endif /* not lint */
 
@@ -207,6 +207,7 @@ push(int ruleno, int ch)
 {
        int     newstate, newpos;
 
+       assert(level < (MAXDEPTH - 1));
        (void)sprintf(T_STR, st[T_STATE].rule[ruleno].str, tval);
        T_RULE = ruleno;
        T_CH = ch;
@@ -516,28 +517,40 @@ descend(int c __attribute__((__unused__)))
 const char *
 setalt(int c)
 {
-       if ((p.altitude == c - '0') && (p.new_altitude == p.altitude))
+       int newalt = c - '0';
+       if ((p.altitude == newalt) && (p.new_altitude == p.altitude))
                return ("Already at that altitude");
-       p.new_altitude = c - '0';
+       if (p.new_altitude == newalt) {
+               return ("Already going to that altitude");
+       }
+       p.new_altitude = newalt;
        return (NULL);
 }
 
 const char *
 setrelalt(int c)
 {
+       int newalt;
+
        if (c == 0)
                return ("altitude not changed");
 
        switch (dir) {
        case D_UP:
-               p.new_altitude = p.altitude + c - '0';
+               newalt = p.altitude + c - '0';
                break;
        case D_DOWN:
-               p.new_altitude = p.altitude - (c - '0');
+               newalt = p.altitude - (c - '0');
                break;
        default:
                return ("Unknown case in setrelalt!  Get help!");
        }
+
+       if (p.new_altitude == newalt)
+               return ("Already going to that altitude");
+
+       p.new_altitude = newalt;
+
        if (p.new_altitude < 0)
                return ("Altitude would be too low");
        else if (p.new_altitude > 9)