nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

eliminate implicit concatenation of strings

Browse Source 
Explicitly combine adjacent string literals so that pre-ANSI compilers
still have a chance to compile the code.  I thought these had already
been dealt with, but I kept stumbling across them while reformatting,
so am trying to get them all out of the way now.
This commit is contained in:
PatR
2015-11-06 15:57:23 -08:00
parent 99925ff155
commit 449084fa6c
10 changed files with 216 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/sp_lev.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 sp_lev.c $NHDT-Date: 1446713642 2015/11/05 08:54:02 $ $NHDT-Branch: master $:$NHDT-Revision: 1.66 $ */
/* NetHack 3.6 sp_lev.c $NHDT-Date: 1446854235 2015/11/06 23:57:15 $ $NHDT-Branch: master $:$NHDT-Revision: 1.69 $ */
/* Copyright (c) 1989 by Jean-Christophe Collet */
/* NetHack may be freely redistributed. See license for details. */
@@ -1652,8 +1652,8 @@ struct mkroom *croom;
break;
}
default:
impossible("create_monster: unimplemented mon appear type "
"[%d,\"%s\"]",
impossible(
"create_monster: unimplemented mon appear type [%d,\"%s\"]",
m->appear, m->appear_as.str);
break;
}
@@ -1841,8 +1841,8 @@ struct mkroom *croom;
remove_object(otmp);
if (mpickobj(invent_carrying_monster, otmp)) {
if (inuse > -1) {
impossible("container given to monster was merged or "
"deallocated.");
impossible(
"container given to monster was merged or deallocated.");
for (ci = inuse; ci < container_idx - 1; ci++)
container_obj[ci] = container_obj[ci + 1];
container_obj[container_idx] = NULL;