From 5b789412e72cfe03cf4142765faee2c0d7ced9a7 Mon Sep 17 00:00:00 2001 From: Lemongrass3110 Date: Sat, 2 Jan 2016 00:59:13 +0100 Subject: [PATCH] Migrated all mercenary guild constants to source exports --- db/const.txt | 4 ---- src/map/script_constants.h | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/db/const.txt b/db/const.txt index 26344174b3..977f910b88 100644 --- a/db/const.txt +++ b/db/const.txt @@ -733,10 +733,6 @@ MOB_ELEMENT 20 MOB_MODE 21 MOB_MVPEXP 22 -ARCH_MERC_GUILD 0 -SPEAR_MERC_GUILD 1 -SWORD_MERC_GUILD 2 - EF_NONE -1 EF_HIT1 0 EF_HIT2 1 diff --git a/src/map/script_constants.h b/src/map/script_constants.h index 2a7f7945fb..f86cd5080b 100644 --- a/src/map/script_constants.h +++ b/src/map/script_constants.h @@ -2255,6 +2255,11 @@ export_constant(BG_AREA); export_constant(BG_AREA_WOS); + /* mercenary guilds */ + export_constant(ARCH_MERC_GUILD); + export_constant(SPEAR_MERC_GUILD); + export_constant(SWORD_MERC_GUILD); + /* status options */ export_constant(OPTION_NOTHING); export_constant(OPTION_SIGHT);