archives/open-adventure
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Prevent game from uttering solecisms about the "floor" when outside.

Browse source
This commit is contained in:
Eric S. Raymond 2017-07-12 00:19:16 -04:00
parent bd1b893263
commit 4a4c113624
4 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
misc.c
View file

@ -171,8 +171,17 @@ void vspeak(const char* msg, bool blank, va_list ap)
long previous_arg = 0;
for (int i = 0; i < msglen; i++) {
if (msg[i] != '%') {
*renderp++ = msg[i];
size--;
/* Ugh. Least obtrusive way to deal with artifacts "on the floor"
* being dropped outside of both cave and building. */
if (strncmp(msg + i, "floor", 5) == 0 && strchr(" .", msg[i+5]) && !INSIDE(game.loc)) {
strcpy(renderp, "ground");
renderp += 6;
i += 4;
size -= 5;
} else {
*renderp++ = msg[i];
size--;
}
} else {
long arg = va_arg(ap, long);
if (arg == -1)