--- deliantra/server/include/object.h	2007/01/06 14:42:30	1.80
+++ deliantra/server/include/object.h	2007/01/07 02:39:14	1.81
@@ -30,7 +30,7 @@
 #include "cfperl.h"
 #include "shstr.h"
 
-typedef uint32 tag_t;
+typedef int tag_t;
 #define NUM_BODY_LOCATIONS      12
 #define BODY_ARMS               1
 
@@ -214,21 +214,15 @@
 
 struct object : zero_initialised, object_copy
 {
-  typedef unordered_vector<object *> vector;
-
   // These variables are not changed by ->copy_to
   maptile_ptr ACC (RW, map);	/* Pointer to the map in which this object is present */
 
-  tag_t ACC (RW, count);	/* Generation count for this object */
   UUID ACC (RW, uuid);          // Unique Identifier, survives saves etc.
+  int ACC (RO, count);	        // index into objects
+  int ACC (RO, active);         // index into actives
 
   player_ptr ACC (RW, contr);	/* Pointer to the player which control this object */
-  object *ACC (RW, next);	/* Pointer to the next object in the free/used list */
-  object *ACC (RW, prev);	/* Pointer to the previous object in the free/used list */
-  object *ACC (RW, active_next);/* Next & previous object in the 'active' */
-  object *ACC (RW, active_prev);/* List.  This is used in process_events */
-                                /* so that the entire object list does not */
-                                /* need to be gone through. */
+
   object *ACC (RW, below);	/* Pointer to the object stacked below this one */
   object *ACC (RW, above);	/* Pointer to the object stacked above this one */
                                 /* Note: stacked in the *same* environment */
@@ -340,7 +334,6 @@
   // handles both inventory and map "positions"
   MTH object *insert_at (object *where, object *originator = 0, int flags = 0);
 
-  MTH bool active () const;
   MTH void activate   ();
   MTH void deactivate ();
   MTH void activate_recursive   ();
@@ -405,6 +398,20 @@
   ~object ();
 };
 
+typedef object_vector<object, &object::count > objectvec;
+typedef object_vector<object, &object::active> activevec;
+
+extern objectvec objects;
+extern activevec actives;
+
+#define for_all_objects(var)			\
+  for (int _i = 0; _i < objects.size (); ++_i)	\
+    declvar (object *, var, objects [_i])
+
+#define for_all_actives(var)			\
+  for (int _i = 0; _i < actives.size (); ++_i)	\
+    declvar (object *, var, actives [_i])
+
 typedef struct oblnk
 {				/* Used to link together several objects */
   object_ptr ob;
@@ -450,13 +457,8 @@
 						 */
 };
 
-extern object *objects;
-extern object *active_objects;
-
-extern int nrofallocobjects;
-
 /* This returns TRUE if the object is something that
- * should be displayed in the look window
+ * should be displayed in the floorbox window
  */
 #define LOOK_OBJ(ob) (!ob->invisible && ob->type != PLAYER && ob->type != EVENT_CONNECTOR)