From 03fd67aaf517a32cbf77150cfb480aee92231a35 Mon Sep 17 00:00:00 2001 From: Zerg2000 Date: Sat, 21 Feb 2009 10:05:17 +0300 Subject: [PATCH] [7314] Not set GR_RIGHT_WITHDRAW_GOLD_LOCK flag for guild masters, remove in DB. Signed-off-by: VladimirMangos --- sql/characters.sql | 2 +- sql/updates/7314_01_characters_guild_rank.sql | 3 +++ sql/updates/Makefile.am | 2 ++ src/game/Guild.h | 4 ++-- src/game/GuildHandler.cpp | 2 +- src/shared/revision_nr.h | 2 +- 6 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 sql/updates/7314_01_characters_guild_rank.sql diff --git a/sql/characters.sql b/sql/characters.sql index e0d7ccee0..3827a1541 100644 --- a/sql/characters.sql +++ b/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'; -- diff --git a/sql/updates/7314_01_characters_guild_rank.sql b/sql/updates/7314_01_characters_guild_rank.sql new file mode 100644 index 000000000..54cf219fc --- /dev/null +++ b/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; \ No newline at end of file diff --git a/sql/updates/Makefile.am b/sql/updates/Makefile.am index 821252f10..7eebb046b 100644 --- a/sql/updates/Makefile.am +++ b/sql/updates/Makefile.am @@ -182,6 +182,7 @@ pkgdata_DATA = \ 7303_01_mangos_pools.sql \ 7307_01_characters_arena_team_member.sql \ 7312_01_mangos_mangos_string.sql \ + 7314_01_characters_guild_rank.sql \ README ## Additional files to include when running 'make dist' @@ -344,4 +345,5 @@ EXTRA_DIST = \ 7303_01_mangos_pools.sql \ 7307_01_characters_arena_team_member.sql \ 7312_01_mangos_mangos_string.sql \ + 7314_01_characters_guild_rank.sql \ README diff --git a/src/game/Guild.h b/src/game/Guild.h index 393c14653..ec764bef6 100644 --- a/src/game/Guild.h +++ b/src/game/Guild.h @@ -51,11 +51,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 diff --git a/src/game/GuildHandler.cpp b/src/game/GuildHandler.cpp index f71223603..7a2e17cca 100644 --- a/src/game/GuildHandler.cpp +++ b/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); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 2c87187e7..4d9e7509f 100644 --- a/src/shared/revision_nr.h +++ b/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__