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

revert box naming

Browse Source
This commit is contained in:
nhmall
2018-03-19 07:13:07 -04:00
parent b85b7b93f0
commit 7238803b25
3 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/lock.c
View File

@@ -548,18 +548,9 @@ doforce()
xlock.box = (struct obj *) 0;
for (otmp = level.objects[u.ux][u.uy]; otmp; otmp = otmp->nexthere)
if (Is_box(otmp)) {
if (otmp->obroken) {
There("is %s here%s.", doname(otmp),
/* The displayed name will have already stated
* "with a broken lock" if otmp->lknown is already set
* so suppress the additional notification about the
* lock in that case. */
!otmp->lknown ? ", but its lock is already broken" : "");
otmp->lknown = 1;
continue;
} else if (!otmp->olocked) {
There("is %s here, but its lock is already unlocked.",
doname(otmp));
if (otmp->obroken || !otmp->olocked) {
There("is %s here, but its lock is already %s.", doname(otmp),
otmp->obroken ? "broken" : "unlocked");
otmp->lknown = 1;
continue;
}

8
src/objnam.c
View File

@@ -995,10 +995,10 @@ unsigned doname_flags;
if (lknown && Is_box(obj)) {
if (obj->obroken)
/* 3.6.0 used an "unlockable" prefix here but that could be
misunderstood to mean "capable of being unlocked" rather
than the intended "not capable of being locked" */
Strcat(bp, " with a broken lock");
/* 3.6.0 used "unlockable" here but that could be misunderstood
to mean "capable of being unlocked" rather than the intended
"not capable of being locked" */
Strcat(prefix, "broken ");
else if (obj->olocked)
Strcat(prefix, "locked ");
else