mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-28 19:21:04 +00:00
Code Issues Projects Releases Wiki Activity

Do not initialize map every call

Browse Source
This commit is contained in:
Andrei Kortunov 2018-08-27 13:33:50 +04:00
parent c280a71b33
commit b0ac0b0b22
2 changed files with 73 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -138,6 +138,7 @@
Task #4605: Optimize skinning Task #4605: Optimize skinning
Task #4606: Support Rapture3D's OpenAL driver Task #4606: Support Rapture3D's OpenAL driver
Task #4613: Incomplete type errors when compiling with g++ on OSX 10.9 Task #4613: Incomplete type errors when compiling with g++ on OSX 10.9
Task #4621: Optimize combat AI
0.44.0 0.44.0
------ ------

11
components/esm/loadmgef.cpp
View File

@ -274,7 +274,9 @@ short MagicEffect::getResistanceEffect(short effect)
// Source https://wiki.openmw.org/index.php?title=Research:Magic#Effect_attribute // Source https://wiki.openmw.org/index.php?title=Research:Magic#Effect_attribute
// <Effect, Effect providing resistance against first effect> // <Effect, Effect providing resistance against first effect>
std::map<short, short> effects; static std::map<short, short> effects;
if (effects.empty())
{
effects[DisintegrateArmor] = Sanctuary; effects[DisintegrateArmor] = Sanctuary;
effects[DisintegrateWeapon] = Sanctuary; effects[DisintegrateWeapon] = Sanctuary;
@ -310,6 +312,7 @@ short MagicEffect::getResistanceEffect(short effect)
effects[Corprus] = ResistCorprusDisease; effects[Corprus] = ResistCorprusDisease;
effects[Poison] = ResistPoison; effects[Poison] = ResistPoison;
effects[Paralyze] = ResistParalysis; effects[Paralyze] = ResistParalysis;
}
if (effects.find(effect) != effects.end()) if (effects.find(effect) != effects.end())
return effects[effect]; return effects[effect];
@ -319,8 +322,9 @@ short MagicEffect::getResistanceEffect(short effect)
short MagicEffect::getWeaknessEffect(short effect) short MagicEffect::getWeaknessEffect(short effect)
{ {
std::map<short, short> effects; static std::map<short, short> effects;
if (effects.empty())
{
for (int i=0; i<5; ++i) for (int i=0; i<5; ++i)
effects[DrainAttribute+i] = WeaknessToMagicka; effects[DrainAttribute+i] = WeaknessToMagicka;
for (int i=0; i<5; ++i) for (int i=0; i<5; ++i)
@ -354,6 +358,7 @@ short MagicEffect::getWeaknessEffect(short effect)
effects[Poison] = WeaknessToPoison; effects[Poison] = WeaknessToPoison;
effects[Paralyze] = -1; effects[Paralyze] = -1;
}
if (effects.find(effect) != effects.end()) if (effects.find(effect) != effects.end())
return effects[effect]; return effects[effect];