[7314] Not set GR_RIGHT_WITHDRAW_GOLD_LOCK flag for guild masters, remove in DB. Author: Zerg2000

--HG--
branch : trunk

sql/characters.sql

@@ -21,7 +21,7 @@
 
 DROP TABLE IF EXISTS `character_db_version`;
 CREATE TABLE `character_db_version` (
-  `required_7307_01_characters_arena_team_member` bit(1) default NULL
+  `required_7314_01_characters_guild_rank` bit(1) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Last applied sql update to DB';
 
 --

sql/updates/7314_01_characters_guild_rank.sql

@@ -0,0 +1,3 @@
+ALTER TABLE character_db_version CHANGE COLUMN required_7307_01_characters_arena_team_member required_7314_01_characters_guild_rank bit;
+
+UPDATE guild_rank SET rights = rights & ~0x00020000;

src/game/Guild.h

@@ -53,11 +53,11 @@ enum GuildRankRights
     GR_RIGHT_VIEWOFFNOTE        = 0x00004040,
     GR_RIGHT_EOFFNOTE           = 0x00008040,
     GR_RIGHT_MODIFY_GUILD_INFO  = 0x00010040,
-    GR_RIGHT_REPAIR_FROM_GUILD  = 0x00020000,               // unused in 2.4.x?, Remove money withdraw capacity
+    GR_RIGHT_WITHDRAW_GOLD_LOCK = 0x00020000,               // remove money withdraw capacity
     GR_RIGHT_WITHDRAW_REPAIR    = 0x00040000,               // withdraw for repair
     GR_RIGHT_WITHDRAW_GOLD      = 0x00080000,               // withdraw gold
     GR_RIGHT_CREATE_GUILD_EVENT = 0x00100000,               // wotlk
-    GR_RIGHT_ALL                = 0x001FF1FF
+    GR_RIGHT_ALL                = 0x001DF1FF
 };
 
 enum Typecommand

src/game/GuildHandler.cpp

@@ -663,7 +663,7 @@ void WorldSession::HandleGuildRankOpcode(WorldPacket& recvPacket)
     guild->SetRankName(rankId, rankname);
 
     if(rankId==GR_GUILDMASTER)                              // prevent loss leader rights
-        rights |= GR_RIGHT_ALL;
+        rights = GR_RIGHT_ALL;
 
     guild->SetRankRights(rankId, rights);
 

src/shared/revision_nr.h

@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "7313"
+ #define REVISION_NR "7314"
 #endif // __REVISION_NR_H__