Moved potion.c globals to instance_globals.

This commit is contained in:
Bart House
2018-11-23 11:23:03 -08:00
parent d37a91a6b8
commit d3c192e5a8
15 changed files with 74 additions and 84 deletions

View File

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