mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-04-30 17:41:25 +00:00
Code Issues Releases Wiki Activity

Replace boost::array with c++11

Browse source
This commit is contained in:
scrawl 2015-07-10 15:50:34 +02:00
parent b2a1c940b0
commit fc17e47ecb
5 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwgui/charactercreation.cpp
View file

@ -535,7 +535,7 @@ namespace MWGui
{ {
if (mGenerateClassStep == 10) if (mGenerateClassStep == 10)
{ {
static boost::array<ClassPoint, 23> classes = { { static std::array<ClassPoint, 23> classes = { {
{"Acrobat", {6, 2, 2}}, {"Acrobat", {6, 2, 2}},
{"Agent", {6, 1, 3}}, {"Agent", {6, 1, 3}},
{"Archer", {3, 5, 2}}, {"Archer", {3, 5, 2}},

4
apps/openmw/mwgui/review.cpp
View file

@ -202,9 +202,9 @@ namespace MWGui
std::set<int> skillSet; std::set<int> skillSet;
std::copy(major.begin(), major.end(), std::inserter(skillSet, skillSet.begin())); std::copy(major.begin(), major.end(), std::inserter(skillSet, skillSet.begin()));
std::copy(minor.begin(), minor.end(), std::inserter(skillSet, skillSet.begin())); std::copy(minor.begin(), minor.end(), std::inserter(skillSet, skillSet.begin()));
boost::array<ESM::Skill::SkillEnum, ESM::Skill::Length>::const_iterator end = ESM::Skill::sSkillIds.end(); std::array<ESM::Skill::SkillEnum, ESM::Skill::Length>::const_iterator end = ESM::Skill::sSkillIds.end();
mMiscSkills.clear(); mMiscSkills.clear();
for (boost::array<ESM::Skill::SkillEnum, ESM::Skill::Length>::const_iterator it = ESM::Skill::sSkillIds.begin(); it != end; ++it) for (std::array<ESM::Skill::SkillEnum, ESM::Skill::Length>::const_iterator it = ESM::Skill::sSkillIds.begin(); it != end; ++it)
{ {
int skill = *it; int skill = *it;
if (skillSet.find(skill) == skillSet.end()) if (skillSet.find(skill) == skillSet.end())

4
apps/openmw/mwgui/statswindow.cpp
View file

@ -215,9 +215,9 @@ namespace MWGui
std::set<int> skillSet; std::set<int> skillSet;
std::copy(major.begin(), major.end(), std::inserter(skillSet, skillSet.begin())); std::copy(major.begin(), major.end(), std::inserter(skillSet, skillSet.begin()));
std::copy(minor.begin(), minor.end(), std::inserter(skillSet, skillSet.begin())); std::copy(minor.begin(), minor.end(), std::inserter(skillSet, skillSet.begin()));
boost::array<ESM::Skill::SkillEnum, ESM::Skill::Length>::const_iterator end = ESM::Skill::sSkillIds.end(); std::array<ESM::Skill::SkillEnum, ESM::Skill::Length>::const_iterator end = ESM::Skill::sSkillIds.end();
mMiscSkills.clear(); mMiscSkills.clear();
for (boost::array<ESM::Skill::SkillEnum, ESM::Skill::Length>::const_iterator it = ESM::Skill::sSkillIds.begin(); it != end; ++it) for (std::array<ESM::Skill::SkillEnum, ESM::Skill::Length>::const_iterator it = ESM::Skill::sSkillIds.begin(); it != end; ++it)
{ {
int skill = *it; int skill = *it;
if (skillSet.find(skill) == skillSet.end()) if (skillSet.find(skill) == skillSet.end())

2
components/esm/loadskil.cpp
View file

@ -97,7 +97,7 @@ namespace ESM
"stealth_speechcraft.dds", "stealth_speechcraft.dds",
"stealth_handtohand.dds", "stealth_handtohand.dds",
}; };
const boost::array<Skill::SkillEnum, Skill::Length> Skill::sSkillIds = {{ const std::array<Skill::SkillEnum, Skill::Length> Skill::sSkillIds = {{
Block, Block,
Armorer, Armorer,
MediumArmor, MediumArmor,

4
components/esm/loadskil.hpp
View file

@ -3,7 +3,7 @@
#include <string> #include <string>
#include <boost/array.hpp> #include <array>
#include "defs.hpp" #include "defs.hpp"
@ -76,7 +76,7 @@ struct Skill
static const std::string sSkillNames[Length]; static const std::string sSkillNames[Length];
static const std::string sSkillNameIds[Length]; static const std::string sSkillNameIds[Length];
static const std::string sIconNames[Length]; static const std::string sIconNames[Length];
static const boost::array<SkillEnum, Length> sSkillIds; static const std::array<SkillEnum, Length> sSkillIds;
void load(ESMReader &esm); void load(ESMReader &esm);
void save(ESMWriter &esm) const; void save(ESMWriter &esm) const;