From 533b72eff609dc9cdc3af1de9591dcfc410981eb Mon Sep 17 00:00:00 2001
From: Capostrophic <alexdobrohotov@yandex.ru>
Date: Fri, 31 Aug 2018 00:36:30 +0300
Subject: [PATCH] Cache weapon type strings

---
 apps/openmw/mwclass/weapon.cpp             | 37 ++++++++++++----------
 apps/openmw/mwmechanics/spellpriority.cpp  |  4 +--
 apps/openmw/mwmechanics/weaponpriority.cpp |  2 +-
 3 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/apps/openmw/mwclass/weapon.cpp b/apps/openmw/mwclass/weapon.cpp
index 294aebd94b..466ae47162 100644
--- a/apps/openmw/mwclass/weapon.cpp
+++ b/apps/openmw/mwclass/weapon.cpp
@@ -268,24 +268,27 @@ namespace MWClass
         {
             text += "\n#{sType} ";
 
-            std::map <int, std::pair <std::string, std::string> > mapping;
-            mapping[ESM::Weapon::ShortBladeOneHand] = std::make_pair("sSkillShortblade", "sOneHanded");
-            mapping[ESM::Weapon::LongBladeOneHand] = std::make_pair("sSkillLongblade", "sOneHanded");
-            mapping[ESM::Weapon::LongBladeTwoHand] = std::make_pair("sSkillLongblade", "sTwoHanded");
-            mapping[ESM::Weapon::BluntOneHand] = std::make_pair("sSkillBluntweapon", "sOneHanded");
-            mapping[ESM::Weapon::BluntTwoClose] = std::make_pair("sSkillBluntweapon", "sTwoHanded");
-            mapping[ESM::Weapon::BluntTwoWide] = std::make_pair("sSkillBluntweapon", "sTwoHanded");
-            mapping[ESM::Weapon::SpearTwoWide] = std::make_pair("sSkillSpear", "sTwoHanded");
-            mapping[ESM::Weapon::AxeOneHand] = std::make_pair("sSkillAxe", "sOneHanded");
-            mapping[ESM::Weapon::AxeTwoHand] = std::make_pair("sSkillAxe", "sTwoHanded");
-            mapping[ESM::Weapon::MarksmanBow] = std::make_pair("sSkillMarksman", "");
-            mapping[ESM::Weapon::MarksmanCrossbow] = std::make_pair("sSkillMarksman", "");
-            mapping[ESM::Weapon::MarksmanThrown] = std::make_pair("sSkillMarksman", "");
-            mapping[ESM::Weapon::Arrow] = std::make_pair("sSkillMarksman", "");
-            mapping[ESM::Weapon::Bolt] = std::make_pair("sSkillMarksman", "");
+            static std::map <int, std::pair <std::string, std::string> > mapping;
+            if (mapping.empty())
+            {
+                mapping[ESM::Weapon::ShortBladeOneHand] = std::make_pair("sSkillShortblade", "sOneHanded");
+                mapping[ESM::Weapon::LongBladeOneHand] = std::make_pair("sSkillLongblade", "sOneHanded");
+                mapping[ESM::Weapon::LongBladeTwoHand] = std::make_pair("sSkillLongblade", "sTwoHanded");
+                mapping[ESM::Weapon::BluntOneHand] = std::make_pair("sSkillBluntweapon", "sOneHanded");
+                mapping[ESM::Weapon::BluntTwoClose] = std::make_pair("sSkillBluntweapon", "sTwoHanded");
+                mapping[ESM::Weapon::BluntTwoWide] = std::make_pair("sSkillBluntweapon", "sTwoHanded");
+                mapping[ESM::Weapon::SpearTwoWide] = std::make_pair("sSkillSpear", "sTwoHanded");
+                mapping[ESM::Weapon::AxeOneHand] = std::make_pair("sSkillAxe", "sOneHanded");
+                mapping[ESM::Weapon::AxeTwoHand] = std::make_pair("sSkillAxe", "sTwoHanded");
+                mapping[ESM::Weapon::MarksmanBow] = std::make_pair("sSkillMarksman", "");
+                mapping[ESM::Weapon::MarksmanCrossbow] = std::make_pair("sSkillMarksman", "");
+                mapping[ESM::Weapon::MarksmanThrown] = std::make_pair("sSkillMarksman", "");
+                mapping[ESM::Weapon::Arrow] = std::make_pair("sSkillMarksman", "");
+                mapping[ESM::Weapon::Bolt] = std::make_pair("sSkillMarksman", "");
+            }
 
-            std::string type = mapping[ref->mBase->mData.mType].first;
-            std::string oneOrTwoHanded = mapping[ref->mBase->mData.mType].second;
+            const std::string type = mapping[ref->mBase->mData.mType].first;
+            const std::string oneOrTwoHanded = mapping[ref->mBase->mData.mType].second;
 
             text += store.get<ESM::GameSetting>().find(type)->mValue.getString() +
                 ((oneOrTwoHanded != "") ? ", " + store.get<ESM::GameSetting>().find(oneOrTwoHanded)->mValue.getString() : "");
diff --git a/apps/openmw/mwmechanics/spellpriority.cpp b/apps/openmw/mwmechanics/spellpriority.cpp
index b437561627..f55b30d7cd 100644
--- a/apps/openmw/mwmechanics/spellpriority.cpp
+++ b/apps/openmw/mwmechanics/spellpriority.cpp
@@ -403,8 +403,8 @@ namespace MWMechanics
                     return 10000.f * priority
                             - (toHeal - (current.getModified()-current.getCurrent())); // prefer the most fitting potion
                 }
-
-                return 0.f;
+                else
+                    return -10000.f * priority; // Save for later
             }
             break;
 
diff --git a/apps/openmw/mwmechanics/weaponpriority.cpp b/apps/openmw/mwmechanics/weaponpriority.cpp
index 8d09bd8d19..61d348e14f 100644
--- a/apps/openmw/mwmechanics/weaponpriority.cpp
+++ b/apps/openmw/mwmechanics/weaponpriority.cpp
@@ -31,7 +31,7 @@ namespace MWMechanics
 
         if (type != -1 && weapon->mData.mType != type)
             return 0.f;
-        
+
         const MWBase::World* world = MWBase::Environment::get().getWorld();
         const MWWorld::Store<ESM::GameSetting>& gmst = world->getStore().get<ESM::GameSetting>();