From 31420c03a8443b729cc850acdad4f32845379f85 Mon Sep 17 00:00:00 2001 From: shennetsind Date: Thu, 11 Apr 2013 16:53:30 -0300 Subject: Missing stuff from the merges done earlier Signed-off-by: shennetsind --- npc/re/cities/malangdo.txt | 2 +- src/common/mmo.h | 2 +- src/map/script.c | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/npc/re/cities/malangdo.txt b/npc/re/cities/malangdo.txt index e6732b754..f6fd3f14d 100644 --- a/npc/re/cities/malangdo.txt +++ b/npc/re/cities/malangdo.txt @@ -204,7 +204,7 @@ izlude,182,218,4 script Odgnalam#iz 554,{ warp "malangdo",217,85; close; } -alberta,200,151,4 duplicate(Odgnalam#Izlude) Odgnalam#Alberta 554 +alberta,200,151,4 duplicate(Odgnalam#iz) Odgnalam#Alberta 554 malangdo,219,86,4 script Kong#malang 545,{ mes "[Kong]"; 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) **/ -- cgit v1.2.3-70-g09d2