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

Revert "Moved potion.c globals to instance_globals."

Browse Source 
This reverts commit d3c192e5a8.
This commit is contained in:
nhmall
2018-11-23 22:16:54 -05:00
parent 6f3f1caee3
commit 2fb68024fe
15 changed files with 84 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/artifact.c
View File

@@ -14,6 +14,8 @@
* the contents, just the total size.
*/
extern boolean notonhead; /* for long worms */
#define get_artifact(o) \
(((o) && (o)->oartifact) ? &artilist[(int) (o)->oartifact] : 0)
@@ -1252,7 +1254,7 @@ int dieroll; /* needed for Magicbane and vorpal blades */
}
if (!youdefend) {
/* allow normal cutworm() call to add extra damage */
if (g.notonhead)
if (notonhead)
return FALSE;
if (bigmonst(mdef->data)) {
@@ -1295,7 +1297,7 @@ int dieroll; /* needed for Magicbane and vorpal blades */
return FALSE;
wepdesc = artilist[ART_VORPAL_BLADE].name;
if (!youdefend) {
if (!has_head(mdef->data) || g.notonhead || u.uswallow) {
if (!has_head(mdef->data) || notonhead || u.uswallow) {
if (youattack)
pline("Somehow, you miss %s wildly.", mon_nam(mdef));
else if (vis)