--- deliantra/server/include/living.h	2006/12/15 20:07:02	1.6
+++ deliantra/server/include/living.h	2007/01/06 14:42:30	1.11
@@ -1,6 +1,7 @@
 /*
     CrossFire, A Multiplayer game for X-windows
 
+    Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
     Copyright (C) 2002 Mark Wedel & Crossfire Development Team
     Copyright (C) 1992 Frank Tore Johansen
 
@@ -18,20 +19,23 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    The authors can be reached via e-mail at crossfire.de
+    The authors can be reached via e-mail at crossfire@schmorp.de
 */
 
 #ifndef LIVING_H
 #define LIVING_H
 
-#define STR 0
-#define DEX 1
-#define CON 2
-#define WIS 3
-#define CHA 4
-#define INT 5
-#define POW 6
-#define NUM_STATS 7
+// corresponds to some arrays in common/living.C
+enum {
+  STR,
+  DEX,
+  CON,
+  INT,
+  WIS,
+  POW,
+  CHA,
+  NUM_STATS
+};
 
 #define MAXLEVEL      110
 
@@ -59,22 +63,25 @@
 extern const int fear_bonus[MAX_STAT + 1];
 
 /* Mostly used by "alive" objects */
-ACC_CLASS (living)
+INTERFACE_CLASS (living)
 struct living
 {
-  sint64        ACC (RW, exp);		/* Experience. */
-  sint16        ACC (RW, hp);		/* Hit Points. */
-  sint16        ACC (RW, maxhp);
-  sint16        ACC (RW, sp);		/* Spell points.  Used to cast mage spells. */
-  sint16        ACC (RW, maxsp);		/* Max spell points. */
-  sint16        ACC (RW, grace);		/* Grace.  Used to invoke clerical prayers. */
-  sint16        ACC (RW, maxgrace);	/* Grace.  Used to invoke clerical prayers. */
-  sint32        ACC (RW, food);		/* How much food in stomach.  0 = starved. */
-  sint16        ACC (RW, dam);		/* How much damage this object does when hitting */
-  // 16 free bits
-  sint8		ACC (RW, Str), ACC (RW, Dex), ACC (RW, Con), ACC (RW, Wis), ACC (RW, Cha), ACC (RW, Int), ACC (RW, Pow);
-  sint8	        ACC (RW, wc), ACC (RW, ac);	/* Weapon Class and Armour Class */
-  sint8	        ACC (RW, luck);		/* Affects thaco and ac from time to time */
+  sint64 ACC (RW, exp);		/* Experience. */
+  sint32 ACC (RW, food);	/* How much food in stomach.  0 = starved. */
+
+  sint8	 ACC (RW, Str), ACC (RW, Dex), ACC (RW, Con), ACC (RW, Int), ACC (RW, Wis), ACC (RW, Pow), ACC (RW, Cha);
+  sint8	 ACC (RW, wc), ACC (RW, ac);	/* Weapon Class and Armour Class */
+  sint8	 ACC (RW, luck);	/* Affects thaco and ac from time to time */
+  sint16 ACC (RW, dam);		/* How much damage this object does when hitting */
+
+  sint16 ACC (RW, hp);		/* Hit Points. */
+  sint16 ACC (RW, maxhp);
+
+  sint16 ACC (RW, sp);		/* Spell points.  Used to cast mage spells. */
+  sint16 ACC (RW, maxsp);	/* Max spell points. */
+
+  sint16 ACC (RW, grace);	/* Grace.  Used to invoke clerical prayers. */
+  sint16 ACC (RW, maxgrace);	/* Grace.  Used to invoke clerical prayers. */
 };
 
 #endif