From 2d03e7fb9e442a00d73555ac70f594bb08913929 Mon Sep 17 00:00:00 2001 From: Lemongrass3110 Date: Thu, 31 Dec 2015 04:12:19 +0100 Subject: [PATCH] Migrated all equip position constants to source exports --- db/const.txt | 22 ---------------------- src/map/script_constants.h | 29 +++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 22 deletions(-) diff --git a/db/const.txt b/db/const.txt index a4249a0617..f542ac1468 100644 --- a/db/const.txt +++ b/db/const.txt @@ -247,28 +247,6 @@ bSubSkill 2077 bSubDefEle 2078 bStateNoRecoverRace 2079 -EQI_HEAD_TOP 1 -EQI_ARMOR 2 -EQI_HAND_L 3 -EQI_HAND_R 4 -EQI_GARMENT 5 -EQI_SHOES 6 -EQI_ACC_L 7 -EQI_ACC_R 8 -EQI_HEAD_MID 9 -EQI_HEAD_LOW 10 -EQI_COSTUME_HEAD_LOW 11 -EQI_COSTUME_HEAD_MID 12 -EQI_COSTUME_HEAD_TOP 13 -EQI_COSTUME_GARMENT 14 -EQI_AMMO 15 -EQI_SHADOW_ARMOR 16 -EQI_SHADOW_WEAPON 17 -EQI_SHADOW_SHIELD 18 -EQI_SHADOW_SHOES 19 -EQI_SHADOW_ACC_R 20 -EQI_SHADOW_ACC_L 21 - LOOK_BASE 0 LOOK_HAIR 1 LOOK_WEAPON 2 diff --git a/src/map/script_constants.h b/src/map/script_constants.h index 51cdaf36fd..7d15607d07 100644 --- a/src/map/script_constants.h +++ b/src/map/script_constants.h @@ -423,6 +423,35 @@ export_constant(CELL_CHKMAELSTROM); export_constant(CELL_CHKICEWALL); + /* equip positions */ + export_constant(EQI_HEAD_TOP); + export_constant(EQI_ARMOR); + export_constant(EQI_HAND_L); + export_constant(EQI_HAND_R); + export_constant(EQI_GARMENT); + export_constant(EQI_SHOES); + export_constant(EQI_ACC_L); + export_constant(EQI_ACC_R); + export_constant(EQI_HEAD_MID); + export_constant(EQI_HEAD_LOW); + export_constant(EQI_COSTUME_LOW); + // For backwards compatability + script_set_constant("EQI_COSTUME_HEAD_LOW",EQI_COSTUME_LOW,false); // TODO: Check if this is used anywhere and remove if possible + export_constant(EQI_COSTUME_MID); + // For backwards compatability + script_set_constant("EQI_COSTUME_HEAD_MID",EQI_COSTUME_MID,false); // TODO: Check if this is used anywhere and remove if possible + export_constant(EQI_COSTUME_TOP); + // For backwards compatability + script_set_constant("EQI_COSTUME_HEAD_TOP",EQI_COSTUME_TOP,false); // TODO: Check if this is used anywhere and remove if possible + export_constant(EQI_COSTUME_GARMENT); + export_constant(EQI_AMMO); + export_constant(EQI_SHADOW_ARMOR ); + export_constant(EQI_SHADOW_WEAPON); + export_constant(EQI_SHADOW_SHIELD); + export_constant(EQI_SHADOW_SHOES); + export_constant(EQI_SHADOW_ACC_R); + export_constant(EQI_SHADOW_ACC_L); + /* status options */ export_constant(OPTION_NOTHING); export_constant(OPTION_SIGHT);