diff options
| author | kaelima <kaelima@live.se> | 2012-05-30 09:22:56 +0200 |
|---|---|---|
| committer | kaelima <kaelima@live.se> | 2012-05-30 09:22:56 +0200 |
| commit | 774f3cdc9b2861f0ba2bf496a8528e41f0f578c3 (patch) | |
| tree | 8de17fe0abd756fdd42515d175d1b40b638a0357 /src/server/game/Battlegrounds/ArenaTeamMgr.cpp | |
| parent | f40e0d0a9a9e5b43379772f84ea92ea84cedc7d4 (diff) | |
Fixed some merging errors, there could be more, but at least it compiles.
Diffstat (limited to 'src/server/game/Battlegrounds/ArenaTeamMgr.cpp')
| -rw-r--r-- | src/server/game/Battlegrounds/ArenaTeamMgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Battlegrounds/ArenaTeamMgr.cpp b/src/server/game/Battlegrounds/ArenaTeamMgr.cpp index 47282be3a8e..c964f47f495 100644 --- a/src/server/game/Battlegrounds/ArenaTeamMgr.cpp +++ b/src/server/game/Battlegrounds/ArenaTeamMgr.cpp @@ -153,10 +153,10 @@ void ArenaTeamMgr::DistributeArenaPoints() SQLTransaction trans = CharacterDatabase.BeginTransaction(); - PreparedStatement* stmt; - // Cycle that gives points to all players /* + PreparedStatement* stmt; + for (std::map<uint32, uint32>::iterator playerItr = PlayerPoints.begin(); playerItr != PlayerPoints.end(); ++playerItr) { // Add points to player if online |