Quick-fix the 'pillo bug'.

Once parsing no longer depends on text being broken up into
5-char tokens, the ugly hack to adventure.yaml must go away.

adventure.yaml

@@ -1050,8 +1050,8 @@ arbitrary_messages:  !!omap
 - ONE_HIT: 'One of them gets you!'
 - NONE_HIT: 'None of them hits you!'
 - DONT_KNOW: 'Sorry, I don''t know the word "%s".'
-- WHAT_DO: 'What do you want to do with the %L?'
-- NO_SEE: 'I see no %L here.'
+- WHAT_DO: 'What do you want to do with the %L%L?' # FIXME: %L%L should become %L once parsing no longer depends on packed tokens
+- NO_SEE: 'I see no %L%L here.' # FIXME: %L%L should become %L once parsing no longer depends on packed tokens
 - DO_WHAT: '%C what?'
 - OKEY_DOKEY: 'Okay, "%s".'
 - GARNERED_POINTS: 'You have garnered %d out of a possible %d points, using %d turn%S.'

misc.c

@@ -101,6 +101,8 @@ void vspeak(const char* msg, va_list ap)
             size--;
         } else {
             long arg = va_arg(ap, long);
+	    if (arg == -1)
+	      arg = 0;
             i++;
             // Integer specifier. In order to accommodate the fact that PARMS can have both legitimate integers *and* packed tokens, stringify everything. Future work may eliminate the need for this.
             if (msg[i] == 'd') {

tests/chainrelock.chk

@@ -1289,9 +1289,9 @@ There are some keys on the ground here.
 
 There is food here.
 
-> drop pillo
+> drop pillow
 
-I see no pillo here.
+I see no pillow here.
 
 > drop vase
 

tests/chainrelock.log

@@ -210,7 +210,7 @@ e
 u
 n
 plugh
-drop pillo
+drop pillow
 drop vase
 drop trident
 drop ebony
@@ -266,4 +266,4 @@ in
 feed bear
 unlock chain
 lock chain
-lock chain
+lock chain

tests/pirate.chk

@@ -1289,9 +1289,9 @@ There are some keys on the ground here.
 
 There is food here.
 
-> drop pillo
+> drop pillow
 
-I see no pillo here.
+I see no pillow here.
 
 > drop vase
 

tests/pirate.log

@@ -210,7 +210,7 @@ e
 u
 n
 plugh
-drop pillo
+drop pillow
 drop vase
 drop trident
 drop ebony