From c5f9086da0a21a75f1e3c9c780fd3ad2d4f18459 Mon Sep 17 00:00:00 2001 From: Jaka Kranjc Date: Sat, 5 Apr 2014 20:17:26 +0200 Subject: [PATCH] AREImporter: fixed regression from 833056d and bugs from 31d4d4b1 iwd1 also uses IWD2ScriptName, so too much code was run, breaking avatar removal in particular, making both iwd/how unfinishable thanks go to merbie for bisecting --- gemrb/plugins/AREImporter/AREImporter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gemrb/plugins/AREImporter/AREImporter.cpp b/gemrb/plugins/AREImporter/AREImporter.cpp index 8b082ddd81..ab1203761d 100644 --- a/gemrb/plugins/AREImporter/AREImporter.cpp +++ b/gemrb/plugins/AREImporter/AREImporter.cpp @@ -1038,7 +1038,7 @@ Map* AREImporter::GetMap(const char *ResRef, bool day_or_night) ab->SetScriptName(DefaultName); } //IWD2 specific hacks - if (core->HasFeature(GF_IWD2_SCRIPTNAME)) { + if (core->HasFeature(GF_3ED_RULES)) { //This flag is used for something else in IWD2 if (Flags&AF_NAME_OVERRIDE) { ab->BaseStats[IE_EA]=EA_EVILCUTOFF;