[ViewVC] Diff of: cvs/deliantra/server/include/config.h

Comparing deliantra/server/include/config.h (file contents):
Revision 1.16 by pippijn, Fri Apr 28 13:56:26 2006 UTC vs.
Revision 1.22 by pippijn, Mon Dec 11 19:46:46 2006 UTC

-/*
- * static char *rcsid_config_h =
- *   "$Id: config.h,v 1.16 2006/04/28 13:56:26 pippijn Exp $";
- */
 /*
     CrossFire, A Multiplayer game for X-windows
     Copyright (C) 2002 Mark Wedel & Crossfire Development Team
     Copyright (C) 1992 Frank Tore Johansen
  * and so on.)  This can be very useful if you are trying to measure
  * server/bandwidth usage.  It will periodially dump out information
  * which contains usage stats for the last X amount of time.
  * CS_LOGTIME is how often it will print out stats.
  */
-#ifndef WIN32    /* ***win32 we set the following stuff in the IDE */
 #define CS_LOGSTATS
-#endif
-#ifdef CS_LOGSTATS
 #define CS_LOGTIME  600
-#endif
 /* DEBUG generates copious amounts of output.  I tend to change the CC options
  * in the crosssite.def file if I want this.  By default, you probably
  * dont want this defined.
  */
-#ifndef WIN32			/* ***win32 we set the following stuff in the IDE */
 #ifndef DEBUG
 #define DEBUG
-#endif
 #endif
 /*
  * This option creates more core files.  In some areas, there are certain
  * checks done to try and make the program more stable (ie, check
  * parameter for null, return if it is).  These checks are being done
  * in (more-or-less) regular intervals, so an external watchdog
  * program can kill the server if it hangs (for whatever reason).
  * It shouldn't hurt anyone if this is defined but you don't
  * have an watchdog program.
  */
-#ifndef WIN32	/* ***win32 disable watchdog as win32 default */
 #define WATCHDOG
-#endif
 /* Enable the new material code - it needs some work.  You can
  * enable this, and things will work, just you'll see a whole
  * bunch more materials show up, and thus a whole bunch more materials
  * in your inventory, and the sorting for them isn't really good.
 /* LOGFILE specifies which file to log to when playing with the
  * -daemon option.
  */
 #ifndef LOGFILE
-#ifdef WIN32 /* change define path */
-#define LOGFILE "var\\crossfire.log"
-#else
 #define LOGFILE "/var/log/crossfire/logfile"
-#endif
 #endif
 /*
  * MAP_MAXTIMEOUT tells the maximum of ticks until a map is swapped out
  * after a player has left it.  If it is set to 0, maps are
  * velow.  If MINTIMEOUT > MAXTIMEOUT, MAXTIMEOUT will be used for all
  * maps.
  */
 /* 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
  * will override the time value set in the map, if that time is longer than
  * MAP_MAXRESET.  This value is in seconds.  If you are low on space on the
  */
 /* 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
  * will look for maps which are already scheldued for swapping, and
  * promptly swap them out before new maps are being loaded.
  * consumes more memory.  If you have gobs of free memory, a high number
  * might not be a bad idea.  Each object is around 350 bytes right now.
  * 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
  * is a bit different:
  * 1) We only start swapping maps if the number of objects in use is
  * will drop the client connection for falling too far behind.  So if
  * you have very slow client connections, a larger value may be
  * warranted.
  */
-#define SOCKETBUFSIZE 128*1024
+#define SOCKETBUFSIZE 256*1024
 /*
  * Your tmp-directory should be large enough to hold the uncompressed
  * map-files for all who are playing.
  * It ought to be locally mounted, since the function used to generate
  * something that is NFS mounted (but performance may suffer as NFS is
  * slower than local disk)
  */
 /*#define TMPDIR "/home/hugin/a/crossfire/crossfire/tmp"*/
-#ifdef WIN32 /* change define path tmp */
-#define TMPDIR "tmp"
-#else
 #define TMPDIR "/tmp"
-#endif
 /* Directory to use for unique items. This is placed into the 'lib'
  * directory.  Changing this will cause any old unique items file
  * not to be used.
  * These define the players starting map and location on that map, and where
  * emergency saves are defined.  This should be left as is unless you make
  * major changes to the map.
  */
-#ifdef WIN32 /* change define path city */
-#  define EMERGENCY_MAPPATH "\\city\\city"
-#  define EMERGENCY_X 15
-#  define EMERGENCY_Y 19
-#else
-#  define EMERGENCY_MAPPATH "/city/city"
+#define EMERGENCY_MAPPATH "/city/city"
-#  define EMERGENCY_X 15
+#define EMERGENCY_X 15
-#  define EMERGENCY_Y 19
+#define EMERGENCY_Y 19
-#endif
 /*
  * These defines tells where, relative to LIBDIR, the maps, the map-index,
  * archetypes highscore and treaures files and directories can be found.
 #define HIGHSCORE	"highscore"
 #define TREASURES	"treasures"
 #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 */
 #define ARCHTABLE 16384		/* Arch hashtable size */
 #define MAXSTRING 20
  * may not be large enough to save all of them.)  As it is now, it will
  * just set the base tick of when they log on, which should keep the
  * 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
  * to disable emergency saves.  This actually does
  * prevent emergency saves now (Version 0.90.5).

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/include/config.h (file contents): Revision 1.16 by pippijn, Fri Apr 28 13:56:26 2006 UTC vs. Revision 1.22 by pippijn, Mon Dec 11 19:46:46 2006 UTC

Diff Legend

Comparing deliantra/server/include/config.h (file contents):
Revision 1.16 by pippijn, Fri Apr 28 13:56:26 2006 UTC vs.
Revision 1.22 by pippijn, Mon Dec 11 19:46:46 2006 UTC