--- deliantra/server/include/config.h	2006/04/28 13:56:26	1.16
+++ deliantra/server/include/config.h	2006/11/26 19:48:49	1.21
@@ -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,9 +410,9 @@
  */
 
 /* How many ticks till maps are swapped out */
-#define MAP_MAXTIMEOUT	1000
+#define MAP_MAXTIMEOUT	300
 /* At least that many ticks before swapout */
-#define MAP_MINTIMEOUT  500
+#define MAP_MINTIMEOUT  300
 
 /*
  * MAP_MAXRESET is the maximum time a map can have before being reset.  It
@@ -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
@@ -534,7 +529,7 @@
  * warranted.
  */
 
-#define SOCKETBUFSIZE 128*1024
+#define SOCKETBUFSIZE 256*1024
 
 /*
  * Your tmp-directory should be large enough to hold the uncompressed
@@ -608,8 +603,7 @@
 #define	BANISHFILE  "banish_file"
 
 #define MAX_ERRORS	25	/* Bail out if more are received during tick */
-#define STARTMAX        500     /* How big array of objects to start with */
-#define OBJ_EXPAND      100     /* 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 */
 
@@ -687,7 +681,7 @@
  * saves pretty well spread out (in a fairly random fashion.)
  */
 
-#define AUTOSAVE 500
+#define AUTOSAVE 1000
 
 /* Often, emergency save fails because the memory corruption that caused
  * the crash has trashed the characters too. Define NO_EMERGENCY_SAVE