Merge remote branch 'origin/master' into 330

This commit is contained in:
tomrus88 2010-03-27 20:02:17 +03:00
commit 5a89e063c8
10 changed files with 151 additions and 190 deletions

View file

@ -2088,8 +2088,8 @@ void BattleGroundMgr::LoadBattleEventIndexes()
uint32 count = 0;
QueryResult *result =
// 0 1 2 3 4 5 6
WorldDatabase.PQuery( "SELECT data.typ, data.guid1, data.ev1 AS ev1, data.ev2 AS ev2, data.map AS m, data.guid2, description.map, "
// 0 1 2 3 4 5 6
WorldDatabase.Query( "SELECT data.typ, data.guid1, data.ev1 AS ev1, data.ev2 AS ev2, data.map AS m, data.guid2, description.map, "
// 7 8 9
"description.event1, description.event2, description.description "
"FROM "