aboutsummaryrefslogtreecommitdiff
path: root/src/game/ObjectMgr.cpp
diff options
context:
space:
mode:
authorMachiavelli <none@none>2010-03-10 16:00:17 +0100
committerMachiavelli <none@none>2010-03-10 16:00:17 +0100
commitd8fdf47c173306bff49517dd1645b30a612840e1 (patch)
treeacb0123c5f97785afc9a241595ebd4d82f466164 /src/game/ObjectMgr.cpp
parentc603afb23e5d505dbbf15ae85dc3006b28e1d30a (diff)
Overlooked ObjectMgr changes to reflect group table structure updates. Fixes issue #1046
--HG-- branch : trunk
Diffstat (limited to 'src/game/ObjectMgr.cpp')
-rw-r--r--src/game/ObjectMgr.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp
index a26ea9d80b1..2ba3942ed4a 100644
--- a/src/game/ObjectMgr.cpp
+++ b/src/game/ObjectMgr.cpp
@@ -3405,7 +3405,7 @@ void ObjectMgr::LoadGroups()
group = NULL;
leaderGuid = 0;
// 2 3 4 1 1
- result = CharacterDatabase.Query("SELECT memberGuid, assistant, subgroup, leaderGuid FROM group_member ORDER BY leaderGuid");
+ result = CharacterDatabase.Query("SELECT memberGuid, memberFlags, subgroup, leaderGuid FROM group_member ORDER BY leaderGuid");
if(!result)
{
barGoLink bar2( 1 );
@@ -3431,7 +3431,7 @@ void ObjectMgr::LoadGroups()
}
}
- if(!group->LoadMemberFromDB(fields[0].GetUInt32(), fields[2].GetUInt8(), fields[1].GetBool()))
+ if(!group->LoadMemberFromDB(fields[0].GetUInt32(), fields[1].GetUInt8(), fields[2].GetUInt8()))
{
sLog.outErrorDb("Incorrect entry in group_member table : member %d cannot be added to player %d's group!", fields[0].GetUInt32(), fields[3].GetUInt32());
CharacterDatabase.PExecute("DELETE FROM group_member WHERE memberGuid = '%d'", fields[0].GetUInt32());