From 40c58c1bb79da8794862ff7f93806f4ff16d5ce6 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Fri, 18 May 2012 15:26:08 +0200
Subject: [PATCH] Issue #256: fixed a capitalisation mistake
---
apps/openmw/mwmechanics/magiceffects.cpp | 11 +++++------
apps/openmw/mwmechanics/magiceffects.hpp | 4 ++--
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/apps/openmw/mwmechanics/magiceffects.cpp b/apps/openmw/mwmechanics/magiceffects.cpp
index 41d898ca8..97c2ec8c8 100644
--- a/apps/openmw/mwmechanics/magiceffects.cpp
+++ b/apps/openmw/mwmechanics/magiceffects.cpp
@@ -94,7 +94,7 @@ namespace MWMechanics
return *this;
}
- for (Collection::const_iterator iter (effects.Begin()); iter!=effects.End(); ++iter)
+ for (Collection::const_iterator iter (effects.begin()); iter!=effects.end(); ++iter)
{
Collection::iterator result = mCollection.find (iter->first);
@@ -128,11 +128,11 @@ namespace MWMechanics
MagicEffects result;
// adding/changing
- for (Collection::const_iterator iter (now.Begin()); iter!=now.End(); ++iter)
+ for (Collection::const_iterator iter (now.begin()); iter!=now.end(); ++iter)
{
Collection::const_iterator other = prev.mCollection.find (iter->first);
- if (other==prev.End())
+ if (other==prev.end())
{
// adding
result.add (iter->first, iter->second);
@@ -145,17 +145,16 @@ namespace MWMechanics
}
// removing
- for (Collection::const_iterator iter (prev.Begin()); iter!=prev.End(); ++iter)
+ for (Collection::const_iterator iter (prev.begin()); iter!=prev.end(); ++iter)
{
Collection::const_iterator other = now.mCollection.find (iter->first);
- if (other==prev.End())
+ if (other==prev.end())
{
result.add (iter->first, EffectParam() - iter->second);
}
}
return result;
-
}
}
diff --git a/apps/openmw/mwmechanics/magiceffects.hpp b/apps/openmw/mwmechanics/magiceffects.hpp
index 26f78ec8a..2f61d7eeb 100644
--- a/apps/openmw/mwmechanics/magiceffects.hpp
+++ b/apps/openmw/mwmechanics/magiceffects.hpp
@@ -61,9 +61,9 @@ namespace MWMechanics
public:
- Collection::const_iterator Begin() const { return mCollection.begin(); }
+ Collection::const_iterator begin() const { return mCollection.begin(); }
- Collection::const_iterator End() const { return mCollection.end(); }
+ Collection::const_iterator end() const { return mCollection.end(); }
void add (const EffectKey& key, const EffectParam& param);