pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-26 22:02:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for compilers w/o C++11 uniform initialization

Browse Source
This commit is contained in:
Michael Cook (mackal) 2014-11-26 19:04:20 -05:00
parent c5c778f575
commit 2814130aad
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
common/item.cpp
View File

@ -1816,28 +1816,26 @@ bool ItemInst::CanTransform(const Item_Struct *ItemToTry, const Item_Struct *Con
} }
} }
static std::map<std::string, int> types = { static std::map<std::string, int> types;
{ "itemtransfig1hp", 2 }, types["itemtransfig1hp"] = 2;
{ "itemtransfig1hs", 0 }, types["itemtransfig1hs"] = 0;
{ "itemtransfig2hb", 4 }, types["itemtransfig2hb"] = 4;
{ "itemtransfig2hp", 35 }, types["itemtransfig2hp"] = 35;
{ "itemtransfig2hs", 1 }, types["itemtransfig2hs"] = 1;
{ "itemtransfigblunt", 3 }, types["itemtransfigblunt"] = 3;
{ "itemtransfigbow", 5 }, types["itemtransfigbow"] = 5;
{ "itemtransfighth", 45 }, types["itemtransfighth"] = 45;
{ "itemtransfigshield", 8 }, types["itemtransfigshield"] = 8;
{ "itemtransfigslashing", 0 } types["itemtransfigslashing"] = 0;
};
auto i = types.find(MakeLowerString(Container->CharmFile)); auto i = types.find(MakeLowerString(Container->CharmFile));
if (i != types.end() && i->second == ItemToTry->ItemType) if (i != types.end() && i->second == ItemToTry->ItemType)
return true; return true;
static std::map<std::string, int> typestwo = { static std::map<std::string, int> typestwo;
{ "itemtransfigblunt", 4 }, typestwo["itemtransfigblunt"] = 4;
{ "itemtransfigslashing", 1 } typestwo["itemtransfigslashing"] = 1;
};
i = typestwo.find(MakeLowerString(Container->CharmFile)); i = typestwo.find(MakeLowerString(Container->CharmFile));
if (i != typestwo.end() && i->second == ItemToTry->ItemType) if (i != typestwo.end() && i->second == ItemToTry->ItemType)
return true; return true;