summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcodemaster <codemaster@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-11-24 22:24:23 +0000
committercodemaster <codemaster@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-11-24 22:24:23 +0000
commit4037e93e4fc65c1be4beb632074beeadd413ffc3 (patch)
tree78f71289f3d841f96b672324578883d2f56a4eaf
parentf622539b5865e948eff27f7dd5bc84dbe1d088d6 (diff)
downloadhercules-4037e93e4fc65c1be4beb632074beeadd413ffc3.tar.gz
hercules-4037e93e4fc65c1be4beb632074beeadd413ffc3.tar.bz2
hercules-4037e93e4fc65c1be4beb632074beeadd413ffc3.tar.xz
hercules-4037e93e4fc65c1be4beb632074beeadd413ffc3.zip
- Updated to most of jA's 1067Added free()'s
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/athena@353 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--src/common/mmo.h20
-rw-r--r--src/common/timer.c11
2 files changed, 29 insertions, 2 deletions
diff --git a/src/common/mmo.h b/src/common/mmo.h
index 865468a16..5483e30d2 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -291,6 +291,26 @@ enum {
};
+enum {
+ GD_SKILLBASE=10000,
+ GD_APPROVAL=10000,
+ GD_KAFRACONTACT=10001,
+ GD_GUARDIANRESEARCH=10002,
+ GD_CHARISMA=10003,
+ GD_GUARDUP=10003,
+ GD_EXTENSION=10004,
+ GD_GLORYGUILD=10005,
+ GD_LEADERSHIP=10006,
+ GD_GLORYWOUNDS=10007,
+ GD_SOULCOLD=10008,
+ GD_HAWKEYES=10009,
+ GD_BATTLEORDER=10010,
+ GD_REGENERATION=10011,
+ GD_RESTORE=10012,
+ GD_EMERGENCYCALL=10013,
+ GD_DEVELOPMENT=10014,
+};
+
#ifndef _WIN32
#ifndef strcmpi
#define strcmpi strcasecmp
diff --git a/src/common/timer.c b/src/common/timer.c
index 3c5f92d9a..97c162e7f 100644
--- a/src/common/timer.c
+++ b/src/common/timer.c
@@ -20,6 +20,12 @@
#include "memwatch.h"
#endif
+// If the server shows no reaction when processing thousands of monsters
+
+// or connected by many clients, please increase TIMER_MIN_INTERVEL.
+
+#define TIMER_MIN_INTERVEL 50
+
static struct TimerData* timer_data;
static int timer_data_max,timer_data_num;
static int* free_timer_list;
@@ -301,8 +307,9 @@ int do_timer(unsigned int tick)
}
}
- if (nextmin<10)
- nextmin = 10;
+ if(nextmin < TIMER_MIN_INTERVEL)
+
+ nextmin = TIMER_MIN_INTERVEL;
return nextmin;
}