From d8e893ec598f9d973bfd6899d65931106e3267ba Mon Sep 17 00:00:00 2001 From: Eric Barr Date: Wed, 5 Feb 2014 16:20:23 -0700 Subject: [PATCH] Fixed string concat in macros --- .../compiled/game/creation/default_pc_hairstyles.mif | 6 +++--- .../old_profession_default/default_pc_hairstyles.mif | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sku.0/sys.shared/compiled/game/creation/default_pc_hairstyles.mif b/sku.0/sys.shared/compiled/game/creation/default_pc_hairstyles.mif index 2ce3ef5ec..1673a2c0d 100644 --- a/sku.0/sys.shared/compiled/game/creation/default_pc_hairstyles.mif +++ b/sku.0/sys.shared/compiled/game/creation/default_pc_hairstyles.mif @@ -1,8 +1,8 @@ #define STRINGER(a) cstring #a #define PLAYER_TEMPLATE_NAME(templateName) \ -chunk "NAME" { STRINGER(object/creature/player/shared_##templateName.iff) } +chunk "NAME" { STRINGER(object/creature/player/shared_templateName.iff) } #define DEFAULT_HAIR(templateName) \ -chunk "DEFA" { STRINGER(object/tangible/hair/##templateName.iff) } +chunk "DEFA" { STRINGER(object/tangible/hair/templateName.iff) } //The hairstyles avaiable at creation are now located in datatables/customization/hair_assets_skill_mods.tab @@ -58,7 +58,7 @@ form "HAIR" cstring "object/tangible/hair/human/shared_hair_human_male_s39.iff" cstring "object/tangible/hair/human/shared_hair_human_male_s40.iff" cstring "object/tangible/hair/human/shared_hair_human_male_s41.iff" - + } } form "PTMP" diff --git a/sku.0/sys.shared/compiled/game/creation/old_profession_default/default_pc_hairstyles.mif b/sku.0/sys.shared/compiled/game/creation/old_profession_default/default_pc_hairstyles.mif index e65f41014..369a9ae6e 100644 --- a/sku.0/sys.shared/compiled/game/creation/old_profession_default/default_pc_hairstyles.mif +++ b/sku.0/sys.shared/compiled/game/creation/old_profession_default/default_pc_hairstyles.mif @@ -1,8 +1,8 @@ #define STRINGER(a) cstring #a #define PLAYER_TEMPLATE_NAME(templateName) \ -chunk "NAME" { STRINGER(object/creature/player/shared_##templateName.iff) } +chunk "NAME" { STRINGER(object/creature/player/shared_templateName.iff) } #define DEFAULT_HAIR(templateName) \ -chunk "DEFA" { STRINGER(object/tangible/hair/##templateName.iff) } +chunk "DEFA" { STRINGER(object/tangible/hair/templateName.iff) } form "HAIR" {