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

miscellaneous reformatting

Browse Source 
Some new code was using 3.4.3 era formatting (operators at end of
first half of a continued line rather than at start of second half).
Also a few cases of 'g.' prefix making lines be too wide.  I imagine
there will be a lot more of these over time.
This commit is contained in:
PatR
2019-12-30 18:37:42 -08:00
parent 31fadff2c1
commit 6e90c4deed
4 changed files with 82 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/pickup.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 pickup.c $NHDT-Date: 1576282488 2019/12/14 00:14:48 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.237 $ */
/* NetHack 3.6 pickup.c $NHDT-Date: 1577759853 2019/12/31 02:37:33 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.257 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2012. */
/* NetHack may be freely redistributed. See license for details. */
@@ -1719,6 +1719,7 @@ int cindex, ccount; /* index of this container (1..N), number of them (N) */
return 0;
if (cobj->olocked) {
struct obj *unlocktool;
if (ccount < 2)
pline("%s locked.",
cobj->lknown ? "It is" : "Hmmm, it turns out to be");
@@ -1728,10 +1729,10 @@ int cindex, ccount; /* index of this container (1..N), number of them (N) */
pline("Hmmm, %s turns out to be locked.", the(xname(cobj)));
cobj->lknown = 1;
if (flags.autounlock &&
((unlocktool = carrying(SKELETON_KEY)) ||
(unlocktool = carrying(LOCK_PICK)) ||
(unlocktool = carrying(CREDIT_CARD)))) {
if (flags.autounlock
&& ((unlocktool = carrying(SKELETON_KEY)) != 0
|| (unlocktool = carrying(LOCK_PICK)) != 0
|| (unlocktool = carrying(CREDIT_CARD)) != 0)) {
/* pass ox and oy to avoid direction prompt */
pick_lock(unlocktool, cobj->ox, cobj->oy, cobj);
}