--- deliantra/server/include/object.h	2007/02/16 19:43:41	1.100
+++ deliantra/server/include/object.h	2007/03/11 02:12:44	1.103
@@ -123,7 +123,7 @@
   arch_ptr ACC (RW, arch);	/* Pointer to archetype */
   arch_ptr ACC (RW, other_arch);/* Pointer used for various things - mostly used for what */
 
-  facetile *ACC (RW, face);	/* Face with colors */
+  int ACC (RW, face);	/* Face with colors */
   float ACC (RW, speed);	/* The overall speed of this object */
   float ACC (RW, speed_left);	/* How much speed is left to spend this round */
   uint32 ACC (RW, nrof);	/* How many of the objects */
@@ -242,7 +242,7 @@
   client_container *seen_by;    // seen by which player/container currently?
 
   bool parse_kv (object_thawer &f); // parse kv pairs, (ab-)used by archetypes, which should not exist at all
-  static object *read (object_thawer &f);
+  static object *read (object_thawer &f, maptile *map = 0); // map argument due to toal design bogosity, must go.
   bool write (object_freezer &f);
 
   MTH static object *create ();
@@ -447,11 +447,11 @@
 extern activevec actives;
 
 #define for_all_objects(var)			\
-  for (int _i = 0; _i < objects.size (); ++_i)	\
+  for (unsigned _i = 0; _i < objects.size (); ++_i)	\
     declvar (object *, var, objects [_i])
 
 #define for_all_actives(var)			\
-  for (int _i = 0; _i < actives.size (); ++_i)	\
+  for (unsigned _i = 0; _i < actives.size (); ++_i)	\
     declvar (object *, var, actives [_i])
 
 typedef struct oblnk