diff options
| author | Blaymoira <none@none> | 2008-12-31 16:14:42 +0100 |
|---|---|---|
| committer | Blaymoira <none@none> | 2008-12-31 16:14:42 +0100 |
| commit | e94249cd456826c53a3915dc825634938fa2da3e (patch) | |
| tree | e9644c7882faf8615843239382f5032aff4b76e6 | |
| parent | 2a4ef556e4552209950fe1faf0b18e74842f4d9d (diff) | |
*Changed default settings
*Make configurable the short world sleep time on Linux - by XTZGZoReX
--HG--
branch : trunk
| -rw-r--r-- | configure.ac | 16 | ||||
| -rw-r--r-- | src/trinitycore/WorldRunnable.cpp | 4 | ||||
| -rw-r--r-- | src/trinitycore/trinitycore.conf.dist | 8 |
3 files changed, 22 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 21275cafdcb..691a9d0533d 100644 --- a/configure.ac +++ b/configure.ac @@ -232,6 +232,22 @@ AC_ARG_ENABLE(lc, ]) AC_MSG_RESULT($TRINITYD_ENABLE_LC) +# Enable short world sleep? +AC_MSG_CHECKING(whether we use short world sleep) +TRINITYD_ENABLE_SS=no +AC_ARG_ENABLE(ss, +[ --enable-ss Enable short world sleep], +[ + if test "$enableval" = "yes" ; then + CFLAGS="-DSHORT_SLEEP $CFLAGS" + CXXFLAGS="-DSHORT_SLEEP $CXXFLAGS" + TRINITYD_ENABLE_SS=yes + elif test "$withval" != "no" ; then + AC_MSG_ERROR(Please choose yes or no) + fi +]) +AC_MSG_RESULT($TRINITYD_ENABLE_SS) + ## Check for required header files. AC_HEADER_STDC AC_HEADER_DIRENT diff --git a/src/trinitycore/WorldRunnable.cpp b/src/trinitycore/WorldRunnable.cpp index b57dbc6bce2..3edb96c2e8b 100644 --- a/src/trinitycore/WorldRunnable.cpp +++ b/src/trinitycore/WorldRunnable.cpp @@ -32,10 +32,10 @@ #include "Database/DatabaseEnv.h" -#ifdef WIN32 +#if (defined(SHORT_SLEEP) || defined(WIN32)) #define WORLD_SLEEP_CONST 50 #else -#define WORLD_SLEEP_CONST 100 //Is this still needed?? [On linux some time ago not working 50ms] +#define WORLD_SLEEP_CONST 100 //Is this still needed?? [On linux some time ago not working 50ms] #endif /// Heartbeat for the World diff --git a/src/trinitycore/trinitycore.conf.dist b/src/trinitycore/trinitycore.conf.dist index 615c35d4c3e..db4a22fe223 100644 --- a/src/trinitycore/trinitycore.conf.dist +++ b/src/trinitycore/trinitycore.conf.dist @@ -678,7 +678,7 @@ TalentsInspecting = 1 # ThreatRadius # Radius for creature to evade after being pulled away from combat start point # If ThreatRadius is less than creature aggro radius then aggro radius will be used -# Default: 100 yards +# Default: 60 yards # # Rate.Creature.Aggro # Aggro radius percent or off. @@ -709,7 +709,7 @@ TalentsInspecting = 1 # # Rate.Corpse.Decay.Looted # Controls how long the creature corpse stays after it had been looted, as a multiplier of its Corpse.Decay.* config. -# Default: 0.1 +# Default: 0.5 # # Rate.Creature.Normal.Damage # Rate.Creature.Elite.Elite.Damage @@ -749,7 +749,7 @@ TalentsInspecting = 1 # ################################################################################################################### -ThreatRadius = 100 +ThreatRadius = 60 Rate.Creature.Aggro = 1 CreatureFamilyAssistanceRadius = 10 CreatureFamilyAssistanceDelay = 1500 @@ -759,7 +759,7 @@ Corpse.Decay.RARE = 300 Corpse.Decay.ELITE = 300 Corpse.Decay.RAREELITE = 300 Corpse.Decay.WORLDBOSS = 3600 -Rate.Corpse.Decay.Looted = 0.1 +Rate.Corpse.Decay.Looted = 0.5 Rate.Creature.Normal.Damage = 1 Rate.Creature.Elite.Elite.Damage = 1 Rate.Creature.Elite.RAREELITE.Damage = 1 |