decl.{c,h} bookkeeping tidbit

     Move the declaration of `current_wand' to where the other struct obj
pointers are, after decl.h's `#include "obj.h"'.

diff --git a/include/decl.h b/include/decl.h
index e72c24da8004a7597227e960f5084f021e94aad6..cce90e69a424d5ec4b527f73206b5501bd40c810 100644 (file)
--- a/include/decl.h
+++ b/include/decl.h
@@ -216,7 +216,6 @@ E NEARDATA boolean in_mklev;
 E NEARDATA boolean stoned;
 E NEARDATA boolean unweapon;
 E NEARDATA boolean mrg_to_wielded;
-E NEARDATA struct obj *current_wand;
 E NEARDATA boolean defer_see_monsters;
 
 E NEARDATA boolean in_steed_dismounting;
@@ -249,6 +248,7 @@ E NEARDATA struct obj *uchain;              /* defined only when punished */
 E NEARDATA struct obj *uball;
 E NEARDATA struct obj *migrating_objs;
 E NEARDATA struct obj *billobjs;
+E NEARDATA struct obj *current_wand;
 E NEARDATA struct obj zeroobj;         /* init'd and defined in decl.c */
 E NEARDATA anything zeroany;           /* init'd and defined in decl.c */
 

diff --git a/src/decl.c b/src/decl.c
index 27524c5299b769e2adc59cbf2aa847bb3cb84413..1aa5f65464af0767a00bc9153e44be762027704d 100644 (file)
--- a/src/decl.c
+++ b/src/decl.c
@@ -120,7 +120,6 @@ NEARDATA boolean stoned = FALSE;    /* done to monsters hit by 'c' */
 NEARDATA boolean unweapon = FALSE;
 NEARDATA boolean mrg_to_wielded = FALSE;
                         /* weapon picked is merged with wielded one */
-NEARDATA struct obj *current_wand = 0; /* wand currently zapped/applied */
 
 NEARDATA boolean in_steed_dismounting = FALSE;
 
@@ -158,6 +157,7 @@ NEARDATA struct obj *invent = (struct obj *)0,
        *ublindf = (struct obj *)0,
        *uchain = (struct obj *)0,
        *uball = (struct obj *)0;
+NEARDATA struct obj *current_wand = 0; /* wand currently zapped/applied */
 
 #ifdef TEXTCOLOR
 /*