Merge branch 'master' into actions-arithmetic

diff --combined actions.c
index baebd0c45e629e613e99385096022fbe15c57711,346d04a7b604534115060d79a39b2c1980581951..8b4f938aa694f2afe91e9c1c1ccb3b66838a4514
--- 1/actions.c
--- 2/actions.c
+++ b/actions.c
@@@ -78,7 -78,7 +78,7 @@@ static int attack(FILE *input, long ver
                game.dseen[i]=false;
            }
        }
 -      spk=spk+1+1/k;  /* FIXME: Arithmetic on message numbers */
 +      spk=k == 2 ? OGRE_PANIC1 : OGRE_PANIC2;
        RSPEAK(spk);
        return GO_CLEAROBJ;
      }
@@@ -614,7 -614,7 +614,7 @@@ static int fly(token_t verb, token_t ob
      return GO_TERMINATE;
  }
  
- static int inven(token_t obj)
+ static int inven(void)
  /* Inventory. If object, treat same as find.  Else report on current burden. */
  {
      int spk=NO_CARRY;
@@@ -1018,8 -1018,8 +1018,8 @@@ int action(FILE *input, enum speechpar
        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;
@@@ -1087,7 -1087,7 +1087,7 @@@
                    case 16: /* TOSS  */ return GO_UNKNOWN; 
                    case 17: /* QUIT  */ return quit(input);   
                    case 18: /* FIND  */ return GO_UNKNOWN; 
-                   case 19: /* INVEN */ return inven(obj);   
+                   case 19: /* INVEN */ return inven();
                    case 20: /* FEED  */ return GO_UNKNOWN; 
                    case 21: /* FILL  */ return fill(verb, obj);   
                    case 22: /* BLAST */ return blast();