Small update to the group/party system.

- Fixes raid assistant privileges, Fixes issue #248
- Proper designation for Main tank and Main assistant roles
- Remove 2 redundant columns in DB, namely groups.mainTank and groups.mainAssist. These are now defined by the value of group_member.memberFlags

--HG--
branch : trunk

3 files changed, 6 insertions, 3 deletions

diff --git a/sql/characters.sql b/sql/characters.sql
index 4bb7a804094..4c14fb56793 100644
--- a/sql/characters.sql
+++ b/sql/characters.sql
@@ -1247,7 +1247,7 @@ DROP TABLE IF EXISTS `group_member`;
 CREATE TABLE `group_member` (
   `leaderGuid` int(11) unsigned NOT NULL,
   `memberGuid` int(11) unsigned NOT NULL,
-  `assistant` tinyint(1) unsigned NOT NULL,
+  `memberFlags` tinyint(2) unsigned NOT NULL,
   `subgroup` smallint(6) unsigned NOT NULL,
   PRIMARY KEY  (`leaderGuid`,`memberGuid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Groups';
@@ -1271,8 +1271,6 @@ DROP TABLE IF EXISTS `groups`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `groups` (
   `leaderGuid` int(11) unsigned NOT NULL,
-  `mainTank` int(11) unsigned NOT NULL,
-  `mainAssistant` int(11) unsigned NOT NULL,
   `lootMethod` tinyint(4) unsigned NOT NULL,
   `looterGuid` int(11) unsigned NOT NULL,
   `lootThreshold` tinyint(4) unsigned NOT NULL,
diff --git a/sql/updates/7515_characters_group_member.sql b/sql/updates/7515_characters_group_member.sql
new file mode 100644
index 00000000000..e2ffafb5039
--- /dev/null
+++ b/sql/updates/7515_characters_group_member.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `group_member`
+CHANGE `assistant` `memberFlags` tinyint(2) NOT NULL DEFAULT '0';
diff --git a/sql/updates/7515_characters_groups.sql b/sql/updates/7515_characters_groups.sql
new file mode 100644
index 00000000000..cf8f714a739
--- /dev/null
+++ b/sql/updates/7515_characters_groups.sql
@@ -0,0 +1,3 @@
+ALTER TABLE `groups`
+DROP COLUMN `mainTank`,
+DROP COLUMN `mainAssistant`;