pull in the recent unconditionals merge from master
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
/* NetHack 3.5 monst.h $Date$ $Revision$ */
|
||||
/* NetHack 3.5 monst.h $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
|
||||
/* NetHack 3.5 monst.h $Date: 2009/05/06 10:44:55 $ $Revision: 1.14 $ */
|
||||
/* SCCS Id: @(#)monst.h 3.5 2006/09/06 */
|
||||
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
|
||||
/* NetHack may be freely redistributed. See license for details. */
|
||||
@@ -134,9 +135,6 @@ struct monst {
|
||||
long mtrapseen; /* bitmap of traps we've been trapped in */
|
||||
long mlstmv; /* for catching up with lost time */
|
||||
long mspare1;
|
||||
#ifndef GOLDOBJ
|
||||
#define mgold mspare1
|
||||
#endif
|
||||
struct obj *minvent;
|
||||
|
||||
struct obj *mw;
|
||||
|
||||
Reference in New Issue
Block a user