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.
This commit is contained in:
parent
433e787de8
commit
97241e87d7
6 changed files with 11 additions and 9 deletions
|
@ -1050,8 +1050,8 @@ arbitrary_messages: !!omap
|
||||||
- ONE_HIT: 'One of them gets you!'
|
- ONE_HIT: 'One of them gets you!'
|
||||||
- NONE_HIT: 'None of them hits you!'
|
- NONE_HIT: 'None of them hits you!'
|
||||||
- DONT_KNOW: 'Sorry, I don''t know the word "%s".'
|
- DONT_KNOW: 'Sorry, I don''t know the word "%s".'
|
||||||
- WHAT_DO: 'What do you want to do with the %L?'
|
- 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 here.'
|
- 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?'
|
- DO_WHAT: '%C what?'
|
||||||
- OKEY_DOKEY: 'Okay, "%s".'
|
- OKEY_DOKEY: 'Okay, "%s".'
|
||||||
- GARNERED_POINTS: 'You have garnered %d out of a possible %d points, using %d turn%S.'
|
- GARNERED_POINTS: 'You have garnered %d out of a possible %d points, using %d turn%S.'
|
||||||
|
|
2
misc.c
2
misc.c
|
@ -101,6 +101,8 @@ void vspeak(const char* msg, va_list ap)
|
||||||
size--;
|
size--;
|
||||||
} else {
|
} else {
|
||||||
long arg = va_arg(ap, long);
|
long arg = va_arg(ap, long);
|
||||||
|
if (arg == -1)
|
||||||
|
arg = 0;
|
||||||
i++;
|
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.
|
// 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') {
|
if (msg[i] == 'd') {
|
||||||
|
|
|
@ -1289,9 +1289,9 @@ There are some keys on the ground here.
|
||||||
|
|
||||||
There is food here.
|
There is food here.
|
||||||
|
|
||||||
> drop pillo
|
> drop pillow
|
||||||
|
|
||||||
I see no pillo here.
|
I see no pillow here.
|
||||||
|
|
||||||
> drop vase
|
> drop vase
|
||||||
|
|
||||||
|
|
|
@ -210,7 +210,7 @@ e
|
||||||
u
|
u
|
||||||
n
|
n
|
||||||
plugh
|
plugh
|
||||||
drop pillo
|
drop pillow
|
||||||
drop vase
|
drop vase
|
||||||
drop trident
|
drop trident
|
||||||
drop ebony
|
drop ebony
|
||||||
|
|
|
@ -1289,9 +1289,9 @@ There are some keys on the ground here.
|
||||||
|
|
||||||
There is food here.
|
There is food here.
|
||||||
|
|
||||||
> drop pillo
|
> drop pillow
|
||||||
|
|
||||||
I see no pillo here.
|
I see no pillow here.
|
||||||
|
|
||||||
> drop vase
|
> drop vase
|
||||||
|
|
||||||
|
|
|
@ -210,7 +210,7 @@ e
|
||||||
u
|
u
|
||||||
n
|
n
|
||||||
plugh
|
plugh
|
||||||
drop pillo
|
drop pillow
|
||||||
drop vase
|
drop vase
|
||||||
drop trident
|
drop trident
|
||||||
drop ebony
|
drop ebony
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue