From 2814130aad846a65f9679a22a4cec1ea96352f24 Mon Sep 17 00:00:00 2001 From: "Michael Cook (mackal)" Date: Wed, 26 Nov 2014 19:04:20 -0500 Subject: [PATCH] Fix for compilers w/o C++11 uniform initialization --- common/item.cpp | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/common/item.cpp b/common/item.cpp index f23d87665..af661626a 100644 --- a/common/item.cpp +++ b/common/item.cpp @@ -1816,28 +1816,26 @@ bool ItemInst::CanTransform(const Item_Struct *ItemToTry, const Item_Struct *Con } } - static std::map types = { - { "itemtransfig1hp", 2 }, - { "itemtransfig1hs", 0 }, - { "itemtransfig2hb", 4 }, - { "itemtransfig2hp", 35 }, - { "itemtransfig2hs", 1 }, - { "itemtransfigblunt", 3 }, - { "itemtransfigbow", 5 }, - { "itemtransfighth", 45 }, - { "itemtransfigshield", 8 }, - { "itemtransfigslashing", 0 } - }; + static std::map types; + types["itemtransfig1hp"] = 2; + types["itemtransfig1hs"] = 0; + types["itemtransfig2hb"] = 4; + types["itemtransfig2hp"] = 35; + types["itemtransfig2hs"] = 1; + types["itemtransfigblunt"] = 3; + types["itemtransfigbow"] = 5; + types["itemtransfighth"] = 45; + types["itemtransfigshield"] = 8; + types["itemtransfigslashing"] = 0; auto i = types.find(MakeLowerString(Container->CharmFile)); if (i != types.end() && i->second == ItemToTry->ItemType) return true; - static std::map typestwo = { - { "itemtransfigblunt", 4 }, - { "itemtransfigslashing", 1 } - }; - + static std::map typestwo; + typestwo["itemtransfigblunt"] = 4; + typestwo["itemtransfigslashing"] = 1; + i = typestwo.find(MakeLowerString(Container->CharmFile)); if (i != typestwo.end() && i->second == ItemToTry->ItemType) return true;