From 06853548e03d8ee49af2845e451a98925db2b3ba Mon Sep 17 00:00:00 2001 From: "nethack.rankin" Date: Sat, 3 Mar 2007 05:07:53 +0000 Subject: [PATCH] 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"'. --- include/decl.h | 2 +- src/decl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/decl.h b/include/decl.h index e72c24da8..cce90e69a 100644 --- 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 27524c529..1aa5f6546 100644 --- 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 /*