From 87aa7465fb2a5bb853bd75400ca947e71e076a49 Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Thu, 4 Jun 2009 16:09:01 -0500
Subject: [PATCH] *A missing part of previous patch.

--HG--
branch : trunk
---
 src/game/BattleGround.cpp             | 2 +-
 src/game/Group.cpp                    | 2 +-
 src/trinitycore/trinitycore.conf.dist | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/game/BattleGround.cpp b/src/game/BattleGround.cpp
index c14d399e3f1..3fd554c5163 100644
--- a/src/game/BattleGround.cpp
+++ b/src/game/BattleGround.cpp
@@ -1843,7 +1843,7 @@ void BattleGround::SetHoliday(bool is_holiday)
 
 int32 BattleGround::GetObjectType(uint64 guid)
 {
-    for(uint32 i = 0;i <= m_BgObjects.size(); i++)
+    for(uint32 i = 0; i < m_BgObjects.size(); ++i)
         if(m_BgObjects[i] == guid)
             return i;
     sLog.outError("BattleGround: cheating? a player used a gameobject which isnt supposed to be a usable object!");
diff --git a/src/game/Group.cpp b/src/game/Group.cpp
index a9d06091619..24e5601abe8 100644
--- a/src/game/Group.cpp
+++ b/src/game/Group.cpp
@@ -1197,7 +1197,7 @@ void Group::_setLeader(const uint64 &guid)
 
 void Group::_removeRolls(const uint64 &guid)
 {
-    for (Rolls::iterator it = RollId.begin(); it < RollId.end(); ++it)
+    for (Rolls::iterator it = RollId.begin(); it != RollId.end(); ++it)
     {
         Roll* roll = *it;
         Roll::PlayerVote::iterator itr2 = roll->playerVote.find(guid);
diff --git a/src/trinitycore/trinitycore.conf.dist b/src/trinitycore/trinitycore.conf.dist
index c9e184c58f2..30b1c723e0a 100644
--- a/src/trinitycore/trinitycore.conf.dist
+++ b/src/trinitycore/trinitycore.conf.dist
@@ -1588,7 +1588,7 @@ Ra.Secure = 1
 #       The start time of the first battle after server starts (default: 30 minutes)
 #   OutdoorPvP.Wintergrasp.BattleTime = 30
 #       Time limit of a battle
-#   OutdoorPvP.Wintergrasp.BattleInterval
+#   OutdoorPvP.Wintergrasp.Interval
 #       Interval between battles (default: 150 minutes)
 #
 #   ForbiddenMaps
@@ -1634,7 +1634,7 @@ PvPToken.ItemID = 29434
 PvPToken.ItemCount = 1
 OutdoorPvP.Wintergrasp.StartTime = 30
 OutdoorPvP.Wintergrasp.BattleTime = 30
-OutdoorPvP.Wintergrasp.BattleInterval = 150
+OutdoorPvP.Wintergrasp.Interval = 150
 NoResetTalentsCost = 0
 ShowKickInWorld = 0
 RecordUpdateTimeDiffInterval = 60000