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

decl.{c,h} bookkeeping tidbit

Browse Source 
Move the declaration of `current_wand' to where the other struct obj
pointers are, after decl.h's `#include "obj.h"'.
This commit is contained in:
nethack.rankin
2007-03-03 05:07:53 +00:00
parent 4091076bb8
commit 06853548e0
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/decl.h
View File

@@ -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 */

2
src/decl.c
View File

@@ -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
/*