--- deliantra/server/include/config.h	2006/05/31 23:30:56	1.17
+++ deliantra/server/include/config.h	2006/09/16 22:06:17	1.20
@@ -1,9 +1,4 @@
 /*
- * static char *rcsid_config_h =
- *   "$Id$";
- */
-
-/*
     CrossFire, A Multiplayer game for X-windows
 
     Copyright (C) 2002 Mark Wedel & Crossfire Development Team
@@ -415,7 +410,7 @@
  */
 
 /* How many ticks till maps are swapped out */
-#define MAP_MAXTIMEOUT	500
+#define MAP_MAXTIMEOUT	300
 /* At least that many ticks before swapout */
 #define MAP_MINTIMEOUT  300
 
@@ -435,7 +430,7 @@
 /* Maximum time to reset. */
 #define MAP_MAXRESET	7200
 /* Default time to reset. */
-#define MAP_DEFAULTRESET       7200
+#define MAP_DEFAULTRESET       3600
 
 /*
  * MAX_OBJECTS is no hard limit.  If this limit is exceeded, crossfire
@@ -451,7 +446,7 @@
  * 25000 is about 8.5 MB
  */
 
-#define MAX_OBJECTS	200000
+#define MAX_OBJECTS	400000
 
 /*
  * Max objects low water mark (lwm).  If defined, the map swapping strategy
@@ -608,8 +603,7 @@
 #define	BANISHFILE  "banish_file"
 
 #define MAX_ERRORS	25	/* Bail out if more are received during tick */
-#define STARTMAX        4000    /* How big array of objects to start with */
-#define OBJ_EXPAND      500     /* How big steps to use when expanding array */
+#define OBJ_EXPAND      5000    /* How big steps to use when expanding array */
 
 #define HIGHSCORE_LENGTH 1000	/* How many entries there are room for */