summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2014-03-11 15:31:28 -0300
committershennetsind <ind@henn.et>2014-03-11 15:31:28 -0300
commit568d45bb453cb9e9d9bf8e84e5b11ed6e5873a9e (patch)
tree76309e76d16ba5b61811f33acdaf22bb41f1360a
parent302ba47df72db7f34b9146df81a155bbd29602f4 (diff)
parent238a4f285e8c7f9699a1c2869cb5ab9df09756bb (diff)
downloadhercules-568d45bb453cb9e9d9bf8e84e5b11ed6e5873a9e.tar.gz
hercules-568d45bb453cb9e9d9bf8e84e5b11ed6e5873a9e.tar.bz2
hercules-568d45bb453cb9e9d9bf8e84e5b11ed6e5873a9e.tar.xz
hercules-568d45bb453cb9e9d9bf8e84e5b11ed6e5873a9e.zip
Merge branch 'master' of https://github.com/HerculesWS/Hercules
-rw-r--r--db/const.txt33
-rw-r--r--src/map/script.c34
2 files changed, 34 insertions, 33 deletions
diff --git a/db/const.txt b/db/const.txt
index 8b4e5027b..7136d9678 100644
--- a/db/const.txt
+++ b/db/const.txt
@@ -1367,39 +1367,6 @@ MOB_ELEMENT 20
MOB_MODE 21
MOB_MVPEXP 22
-ALL_CLIENT 0
-ALL_SAMEMAP 1
-AREA 2
-AREA_WOS 3
-AREA_WOC 4
-AREA_WOSC 5
-AREA_CHAT_WOC 6
-CHAT 7
-CHAT_WOS 8
-PARTY 9
-PARTY_WOS 10
-PARTY_SAMEMAP 11
-PARTY_SAMEMAP_WOS 12
-PARTY_AREA 13
-PARTY_AREA_WOS 14
-GUILD 15
-GUILD_WOS 16
-GUILD_SAMEMAP 17
-GUILD_SAMEMAP_WOS 18
-GUILD_AREA 19
-GUILD_AREA_WOS 20
-GUILD_NOBG 21
-DUEL 22
-DUEL_WOS 23
-CHAT_MAINCHAT 24
-SELF 25
-BG 26
-BG_WOS 27
-BG_SAMEMAP 28
-BG_SAMEMAP_WOS 29
-BG_AREA 30
-BG_AREA_WOS 31
-
ARCH_MERC_GUILD 0
SPEAR_MERC_GUILD 1
SWORD_MERC_GUILD 2
diff --git a/src/map/script.c b/src/map/script.c
index fef25b927..c2d9b2278 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -19134,6 +19134,40 @@ void script_hardcoded_constants(void) {
/* status option compounds */
script->set_constant("Option_Dragon",OPTION_DRAGON,false);
script->set_constant("Option_Costume",OPTION_COSTUME,false);
+
+ /* send_target */
+ script->set_constant("ALL_CLIENT",ALL_CLIENT,false);
+ script->set_constant("ALL_SAMEMAP",ALL_SAMEMAP,false);
+ script->set_constant("AREA",AREA,false);
+ script->set_constant("AREA_WOS",AREA_WOS,false);
+ script->set_constant("AREA_WOC",AREA_WOC,false);
+ script->set_constant("AREA_WOSC",AREA_WOSC,false);
+ script->set_constant("AREA_CHAT_WOC",AREA_CHAT_WOC,false);
+ script->set_constant("CHAT",CHAT,false);
+ script->set_constant("CHAT_WOS",CHAT_WOS,false);
+ script->set_constant("PARTY",PARTY,false);
+ script->set_constant("PARTY_WOS",PARTY_WOS,false);
+ script->set_constant("PARTY_SAMEMAP",PARTY_SAMEMAP,false);
+ script->set_constant("PARTY_SAMEMAP_WOS",PARTY_SAMEMAP_WOS,false);
+ script->set_constant("PARTY_AREA",PARTY_AREA,false);
+ script->set_constant("PARTY_AREA_WOS",PARTY_AREA_WOS,false);
+ script->set_constant("GUILD",GUILD,false);
+ script->set_constant("GUILD_WOS",GUILD_WOS,false);
+ script->set_constant("GUILD_SAMEMAP",GUILD_SAMEMAP,false);
+ script->set_constant("GUILD_SAMEMAP_WOS",GUILD_SAMEMAP_WOS,false);
+ script->set_constant("GUILD_AREA",GUILD_AREA,false);
+ script->set_constant("GUILD_AREA_WOS",GUILD_AREA_WOS,false);
+ script->set_constant("GUILD_NOBG",GUILD_NOBG,false);
+ script->set_constant("DUEL",DUEL,false);
+ script->set_constant("DUEL_WOS",DUEL_WOS,false);
+ script->set_constant("SELF",SELF,false);
+ script->set_constant("BG",BG,false);
+ script->set_constant("BG_WOS",BG_WOS,false);
+ script->set_constant("BG_SAMEMAP",BG_SAMEMAP,false);
+ script->set_constant("BG_SAMEMAP_WOS",BG_SAMEMAP_WOS,false);
+ script->set_constant("BG_AREA",BG_AREA,false);
+ script->set_constant("BG_AREA_WOS",BG_AREA_WOS,false);
+ script->set_constant("BG_QUEUE",BG_QUEUE,false);
}
/**