--- deliantra/server/include/living.h	2006/12/22 16:34:00	1.8
+++ deliantra/server/include/living.h	2011/04/23 04:56:48	1.26
@@ -1,29 +1,37 @@
 /*
-    CrossFire, A Multiplayer game for X-windows
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
+ * 
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992 Frank Tore Johansen
+ * 
+ * Deliantra is free software: you can redistribute it and/or modify it under
+ * the terms of the Affero 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 Affero GNU General Public License
+ * and 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 <support@deliantra.net>
+ */
 
-    Copyright (C) 2002 Mark Wedel & Crossfire Development Team
-    Copyright (C) 1992 Frank Tore Johansen
+#ifndef LIVING_H
+#define LIVING_H
 
-    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.
+#include <cassert>
 
-    The authors can be reached via e-mail at crossfire@schmorp.de
-*/
+#include <util.h>
 
-#ifndef LIVING_H
-#define LIVING_H
+//+GPL
 
+// corresponds to some arrays in common/living.C
 enum {
   STR,
   DEX,
@@ -35,8 +43,6 @@
   NUM_STATS
 };
 
-#define MAXLEVEL      110
-
 /* Changed from NO_STAT to NO_STAT_VAL to fix conlfict on
  * AIX systems
  */
@@ -61,25 +67,53 @@
 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. */
-  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. */
+  sint64 ACC (RW, exp);		/* Experience. */
+  sint32 ACC (RW, food);	/* How much food in stomach.  0 = starved. */
 
-  sint16        ACC (RW, grace);		/* Grace.  Used to invoke clerical prayers. */
-  sint16        ACC (RW, maxgrace);	/* Grace.  Used to invoke clerical prayers. */
+  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. */
+
+//-GPL
+
+  // 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