summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-04-11 16:53:30 -0300
committershennetsind <ind@henn.et>2013-04-11 16:53:30 -0300
commit31420c03a8443b729cc850acdad4f32845379f85 (patch)
treed39d88c3f1a379409a50a84700f9e77064b0d144 /src
parentdbb062c2f3657746a36feebc190c736ddcaa3881 (diff)
downloadhercules-31420c03a8443b729cc850acdad4f32845379f85.tar.gz
hercules-31420c03a8443b729cc850acdad4f32845379f85.tar.bz2
hercules-31420c03a8443b729cc850acdad4f32845379f85.tar.xz
hercules-31420c03a8443b729cc850acdad4f32845379f85.zip
Missing stuff from the merges done earlier
Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'src')
-rw-r--r--src/common/mmo.h2
-rw-r--r--src/map/script.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/common/mmo.h b/src/common/mmo.h
index 7d1928201..bd6b29f76 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -98,7 +98,7 @@
#define MAX_GUILDSKILL 15 // increased max guild skills because of new skills [Sara-chan]
#define MAX_GUILDLEVEL 50
#define MAX_GUARDIANS 8 //Local max per castle. [Skotlex]
-#define MAX_QUEST_DB 2350 //Max quests that the server will load
+#define MAX_QUEST_DB 2400 //Max quests that the server will load
#define MAX_QUEST_OBJECTIVES 3 //Max quest objectives for a quest
// for produce
diff --git a/src/map/script.c b/src/map/script.c
index 0a33c1eef..4ba5cc669 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -17855,6 +17855,7 @@ struct script_function buildin_func[] = {
BUILDIN_DEF2(cleanmap,"cleanarea","siiii"),
BUILDIN_DEF(npcskill,"viii"),
BUILDIN_DEF(itemeffect,"v"),
+ BUILDIN_DEF(delequip,"i"),
/**
* @commands (script based)
**/