diff options
| author | Shauren <shauren.trinity@gmail.com> | 2011-11-23 19:17:33 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2011-11-23 19:17:33 +0100 |
| commit | 358b33239aea4e7b5b81f829e0b0079e3ab03830 (patch) | |
| tree | 1d18bf9c3269a826dc82dc2542a050068aa3ac88 /src/server/game/Instances/InstanceSaveMgr.cpp | |
| parent | f091360940322c5b674c93e80b59af66881f9953 (diff) | |
Core: Fixed remaining C6246: Local declaration of 'x' hides declaration of the same name in outer scope. from previous commit
Diffstat (limited to 'src/server/game/Instances/InstanceSaveMgr.cpp')
| -rwxr-xr-x | src/server/game/Instances/InstanceSaveMgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Instances/InstanceSaveMgr.cpp b/src/server/game/Instances/InstanceSaveMgr.cpp index 57e5818a9ff..7a2368161d8 100755 --- a/src/server/game/Instances/InstanceSaveMgr.cpp +++ b/src/server/game/Instances/InstanceSaveMgr.cpp @@ -309,11 +309,11 @@ void InstanceSaveManager::LoadResetTimes() while (result->NextRow()); // update reset time for normal instances with the max creature respawn time + X hours - if (PreparedQueryResult result = CharacterDatabase.Query(CharacterDatabase.GetPreparedStatement(CHAR_GET_MAX_CREATURE_RESPAWNS))) + if (PreparedQueryResult result2 = CharacterDatabase.Query(CharacterDatabase.GetPreparedStatement(CHAR_GET_MAX_CREATURE_RESPAWNS))) { do { - Field* fields = result->Fetch(); + Field* fields = result2->Fetch(); uint32 instance = fields[1].GetUInt32(); time_t resettime = time_t(fields[0].GetUInt32() + 2 * HOUR); InstResetTimeMapDiffType::iterator itr = instResetTime.find(instance); |
