diff options
| author | Machiavelli <none@none> | 2010-08-26 21:02:39 +0200 |
|---|---|---|
| committer | Machiavelli <none@none> | 2010-08-26 21:02:39 +0200 |
| commit | 11de1d43695c289effc5dccb4663d16f927cb657 (patch) | |
| tree | 226da1db79f76e3da88c588bf866ebc01921ed8c /src/server/game/Globals/ObjectMgr.cpp | |
| parent | 082592034f5618ef914f638cfc88ca7fce2fd186 (diff) | |
| parent | e3c2bdb72279392639d6b8b1c0e75958a78f5c6a (diff) | |
Merge
--HG--
branch : trunk
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.cpp')
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index d01e65f12dc..3929c980a53 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -416,7 +416,7 @@ void ObjectMgr::AddLocaleString(std::string& s, LocaleConstant locale, StringVec int idx = GetOrNewIndexForLocale(locale); if (idx >= 0) { - if (int(data.size()) <= idx) + if (data.size() <= size_t(idx)) data.resize(idx + 1); data[idx] = s; |