--- deliantra/server/include/living.h	2006/09/08 16:51:44	1.2
+++ deliantra/server/include/living.h	2007/08/07 21:58:25	1.17
@@ -1,44 +1,46 @@
 /*
- * static char *rcsid_living_h =
- *   "$Id$";
+ * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ * 
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992,2007 Frank Tore Johansen
+ * 
+ * Crossfire TRT is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * The authors can be reached via e-mail to <crossfire@schmorp.de>
  */
 
-/*
-    CrossFire, A Multiplayer game for X-windows
-
-    Copyright (C) 2002 Mark Wedel & Crossfire Development Team
-    Copyright (C) 1992 Frank Tore Johansen
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    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-devel@real-time.com
-*/
-
 #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
+#include <cassert>
+
+#include <util.h>
+
+// corresponds to some arrays in common/living.C
+enum {
+  STR,
+  DEX,
+  CON,
+  INT,
+  WIS,
+  POW,
+  CHA,
+  NUM_STATS
+};
 
-#define MAXLEVEL      110
+#define MAXLEVEL      110 //TODO: remove
 
 /* Changed from NO_STAT to NO_STAT_VAL to fix conlfict on
  * AIX systems
@@ -63,21 +65,52 @@
 extern const int cleric_chance[MAX_STAT + 1];
 extern const int fear_bonus[MAX_STAT + 1];
 
-ACC_CLASS (living)
+/* Mostly used by "alive" objects */
+INTERFACE_CLASS (living)
 struct living
-{ /* Mostly used by "alive" objects */
-  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 */
-  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. */
-  sint64        ACC (RW, exp);		/* Experience.  Killers gain 1/10. */
-  sint16        ACC (RW, food);		/* How much food in stomach.  0 = starved. */
-  sint16        ACC (RW, dam);		/* How much damage this object does when hitting */
-  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. */
+
+  // this method enforces field ordering and should not normally result in
+  // any code being generated strictly speaking, c++ compilers may reorder
+  // stat fields, so check for it and declare those compilers unsupported.
+  void check_ordering () const
+  {
+    assert ((sint8 *)&Str - (sint8 *)&Str == STR);
+    assert ((sint8 *)&Dex - (sint8 *)&Str == DEX);
+    assert ((sint8 *)&Con - (sint8 *)&Str == CON);
+    assert ((sint8 *)&Int - (sint8 *)&Str == INT);
+    assert ((sint8 *)&Wis - (sint8 *)&Str == WIS);
+    assert ((sint8 *)&Pow - (sint8 *)&Str == POW);
+    assert ((sint8 *)&Cha - (sint8 *)&Str == CHA);
+  }
+
+  sint8 &stat (int index)
+  {
+    check_ordering ();
+    return ((sint8 *)&Str)[index];
+  }
+
+  sint8 stat (int index) const
+  {
+    check_ordering ();
+    return ((const sint8 *)&Str)[index];
+  }
 };
 
 #endif