4 files changed, 11 insertions, 11 deletions

diff --git a/src/Enchantments.cpp b/src/Enchantments.cpp
index 52ebc5e3e..8eda97eba 100644
--- a/src/Enchantments.cpp
+++ b/src/Enchantments.cpp
@@ -1170,20 +1170,20 @@ void cEnchantments::CheckEnchantmentConflictsFromVector(
 
 
 
-cEnchantments cEnchantments::GetRandomEnchantmentFromVector(cWeightedEnchantments & a_Enchantments)
+cEnchantments cEnchantments::GetRandomEnchantmentFromVector(const cWeightedEnchantments & a_Enchantments)
 {
 	int AllWeights = 0;
-	for (cWeightedEnchantments::iterator it = a_Enchantments.begin(); it != a_Enchantments.end(); ++it)
+	for (const auto & Enchantment: a_Enchantments)
 	{
-		AllWeights += (*it).m_Weight;
+		AllWeights += Enchantment.m_Weight;
 	}
 	int RandomNumber = GetRandomProvider().RandInt(AllWeights - 1);
-	for (cWeightedEnchantments::iterator it = a_Enchantments.begin(); it != a_Enchantments.end(); ++it)
+	for (const auto & Enchantment: a_Enchantments)
 	{
-		RandomNumber -= (*it).m_Weight;
+		RandomNumber -= Enchantment.m_Weight;
 		if (RandomNumber < 0)
 		{
-			return (*it).m_Enchantments;
+			return Enchantment.m_Enchantments;
 		}
 	}
 
diff --git a/src/Enchantments.h b/src/Enchantments.h
index cdd1f640e..40dbee038 100644
--- a/src/Enchantments.h
+++ b/src/Enchantments.h
@@ -140,7 +140,7 @@ public:
 	static void CheckEnchantmentConflictsFromVector(cWeightedEnchantments & a_Enchantments, const cEnchantments & a_FirstEnchantment);
 
 	/** Gets random enchantment from Vector and returns it */
-	static cEnchantments GetRandomEnchantmentFromVector(cWeightedEnchantments & a_Enchantments);
+	static cEnchantments GetRandomEnchantmentFromVector(const cWeightedEnchantments & a_Enchantments);
 
 	/** Selects one enchantment from a Vector using cNoise. Mostly used for generators.
 	Uses the enchantments' weights for the random distribution.
diff --git a/src/Entities/Pawn.cpp b/src/Entities/Pawn.cpp
index b872cdfac..550d86e35 100644
--- a/src/Entities/Pawn.cpp
+++ b/src/Entities/Pawn.cpp
@@ -470,7 +470,7 @@ void cPawn::StopEveryoneFromTargetingMe()
 
 
 
-std::map<cEntityEffect::eType, cEntityEffect *> cPawn::GetEntityEffects()
+std::map<cEntityEffect::eType, cEntityEffect *> cPawn::GetEntityEffects() const
 {
 	std::map<cEntityEffect::eType, cEntityEffect *> Effects;
 	for (auto & Effect : m_EntityEffects)
@@ -484,7 +484,7 @@ std::map<cEntityEffect::eType, cEntityEffect *> cPawn::GetEntityEffects()
 
 
 
-cEntityEffect * cPawn::GetEntityEffect(cEntityEffect::eType a_EffectType)
+cEntityEffect * cPawn::GetEntityEffect(cEntityEffect::eType a_EffectType) const
 {
 	auto itr = m_EntityEffects.find(a_EffectType);
 	return (itr != m_EntityEffects.end()) ? itr->second.get() : nullptr;
diff --git a/src/Entities/Pawn.h b/src/Entities/Pawn.h
index f68db63e9..f4b1cbbbf 100644
--- a/src/Entities/Pawn.h
+++ b/src/Entities/Pawn.h
@@ -66,10 +66,10 @@ public:
 	void TargetingMe(cMonster * a_Monster);
 
 	/** Returns all entity effects */
-	std::map<cEntityEffect::eType, cEntityEffect *> GetEntityEffects();
+	std::map<cEntityEffect::eType, cEntityEffect *> GetEntityEffects() const;
 
 	/** Returns the entity effect, if it is currently applied or nullptr if not. */
-	cEntityEffect * GetEntityEffect(cEntityEffect::eType a_EffectType);
+	cEntityEffect * GetEntityEffect(cEntityEffect::eType a_EffectType) const;
 
 protected:
 	typedef std::map<cEntityEffect::eType, std::unique_ptr<cEntityEffect>> tEffectMap;