Core/Guilds: Fixed saving bank withdraw limits for tabs 7 and 8

6 files changed, 29 insertions, 7 deletions

diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql
index 330b6936104..e9703fe0b28 100644
--- a/sql/base/characters_database.sql
+++ b/sql/base/characters_database.sql
@@ -1815,6 +1815,10 @@ CREATE TABLE `guild_member` (
   `BankRemSlotsTab4` int(10) unsigned NOT NULL DEFAULT '0',
   `BankResetTimeTab5` int(10) unsigned NOT NULL DEFAULT '0',
   `BankRemSlotsTab5` int(10) unsigned NOT NULL DEFAULT '0',
+  `BankResetTimeTab6` int(10) unsigned NOT NULL DEFAULT '0',
+  `BankRemSlotsTab6` int(10) unsigned NOT NULL DEFAULT '0',
+  `BankResetTimeTab7` int(10) unsigned NOT NULL DEFAULT '0',
+  `BankRemSlotsTab7` int(10) unsigned NOT NULL DEFAULT '0',
   UNIQUE KEY `guid_key` (`guid`),
   KEY `guildid_key` (`guildid`),
   KEY `guildid_rank_key` (`guildid`,`rank`)
diff --git a/sql/updates/characters/2012_08_23_00_characters_guild_member.sql b/sql/updates/characters/2012_08_23_00_characters_guild_member.sql
new file mode 100644
index 00000000000..cdd4781c0c0
--- /dev/null
+++ b/sql/updates/characters/2012_08_23_00_characters_guild_member.sql
@@ -0,0 +1,4 @@
+ALTER TABLE guild_member ADD BankResetTimeTab6 INT(10) unsigned DEFAULT '0' AFTER BankRemSlotsTab5;
+ALTER TABLE guild_member ADD BankRemSlotsTab6 INT(10) unsigned DEFAULT '0' AFTER BankResetTimeTab6;
+ALTER TABLE guild_member ADD BankResetTimeTab7 INT(10) unsigned DEFAULT '0' AFTER BankRemSlotsTab6;
+ALTER TABLE guild_member ADD BankRemSlotsTab7 INT(10) unsigned DEFAULT '0' AFTER BankResetTimeTab7;
diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp
index 4f8b64d7226..0bab8ab2418 100644
--- a/src/server/game/Guilds/Guild.cpp
+++ b/src/server/game/Guilds/Guild.cpp
@@ -575,12 +575,12 @@ bool Guild::Member::LoadFromDB(Field* fields)
         m_bankRemaining[i].value                    = fields[8 + i * 2].GetUInt32();
     }
 
-    SetStats(fields[19].GetString(),
-             fields[20].GetUInt8(),                         // characters.level
-             fields[21].GetUInt8(),                         // characters.class
-             fields[22].GetUInt16(),                        // characters.zone
-             fields[23].GetUInt32());                       // characters.account
-    m_logoutTime    = fields[24].GetUInt32();               // characters.logout_time
+    SetStats(fields[23].GetString(),
+             fields[24].GetUInt8(),                         // characters.level
+             fields[25].GetUInt8(),                         // characters.class
+             fields[26].GetUInt16(),                        // characters.zone
+             fields[27].GetUInt32());                       // characters.account
+    m_logoutTime    = fields[28].GetUInt32();               // characters.logout_time
 
     if (!CheckStats())
         return false;
diff --git a/src/server/game/Guilds/GuildMgr.cpp b/src/server/game/Guilds/GuildMgr.cpp
index 4d7e2ebd4c6..473fe32ec27 100644
--- a/src/server/game/Guilds/GuildMgr.cpp
+++ b/src/server/game/Guilds/GuildMgr.cpp
@@ -190,7 +190,9 @@ void GuildMgr::LoadGuilds()
                                                      "BankResetTimeTab0, BankRemSlotsTab0, BankResetTimeTab1, BankRemSlotsTab1, BankResetTimeTab2, BankRemSlotsTab2, "
                                                      //   13                 14                15                 16                17                 18
                                                      "BankResetTimeTab3, BankRemSlotsTab3, BankResetTimeTab4, BankRemSlotsTab4, BankResetTimeTab5, BankRemSlotsTab5, "
-                                                     //   19      20       21       22      23         24
+                                                     //   19                 20                21                 22
+                                                     "BankResetTimeTab6, BankRemSlotsTab6, BankResetTimeTab7, BankRemSlotsTab7, "
+                                                     //   23      24       25       26      27         28
                                                      "c.name, c.level, c.class, c.zone, c.account, c.logout_time "
                                                      "FROM guild_member gm LEFT JOIN characters c ON c.guid = gm.guid ORDER BY guildid ASC");
 
diff --git a/src/server/shared/Database/Implementation/CharacterDatabase.cpp b/src/server/shared/Database/Implementation/CharacterDatabase.cpp
index 39cdbf50ca9..368e70a758c 100755
--- a/src/server/shared/Database/Implementation/CharacterDatabase.cpp
+++ b/src/server/shared/Database/Implementation/CharacterDatabase.cpp
@@ -210,6 +210,8 @@ void CharacterDatabaseConnection::DoPrepareStatements()
     PREPARE_STATEMENT(CHAR_UPD_GUILD_MEMBER_BANK_REM_SLOTS3, "UPDATE guild_member SET BankRemSlotsTab3 = ? WHERE guildid = ? AND guid = ?", CONNECTION_ASYNC)
     PREPARE_STATEMENT(CHAR_UPD_GUILD_MEMBER_BANK_REM_SLOTS4, "UPDATE guild_member SET BankRemSlotsTab4 = ? WHERE guildid = ? AND guid = ?", CONNECTION_ASYNC)
     PREPARE_STATEMENT(CHAR_UPD_GUILD_MEMBER_BANK_REM_SLOTS5, "UPDATE guild_member SET BankRemSlotsTab5 = ? WHERE guildid = ? AND guid = ?", CONNECTION_ASYNC)
+    PREPARE_STATEMENT(CHAR_UPD_GUILD_MEMBER_BANK_REM_SLOTS6, "UPDATE guild_member SET BankRemSlotsTab6 = ? WHERE guildid = ? AND guid = ?", CONNECTION_ASYNC)
+    PREPARE_STATEMENT(CHAR_UPD_GUILD_MEMBER_BANK_REM_SLOTS7, "UPDATE guild_member SET BankRemSlotsTab7 = ? WHERE guildid = ? AND guid = ?", CONNECTION_ASYNC)
     // 0: uint32, 1: uint32, 2: uint32, 3: uint32
     PREPARE_STATEMENT(CHAR_UPD_GUILD_MEMBER_BANK_TIME_REM_SLOTS0, "UPDATE guild_member SET BankResetTimeTab0 = ?, BankRemSlotsTab0 = ? WHERE guildid = ? AND guid = ?", CONNECTION_ASYNC)
     PREPARE_STATEMENT(CHAR_UPD_GUILD_MEMBER_BANK_TIME_REM_SLOTS1, "UPDATE guild_member SET BankResetTimeTab1 = ?, BankRemSlotsTab1 = ? WHERE guildid = ? AND guid = ?", CONNECTION_ASYNC)
@@ -217,6 +219,8 @@ void CharacterDatabaseConnection::DoPrepareStatements()
     PREPARE_STATEMENT(CHAR_UPD_GUILD_MEMBER_BANK_TIME_REM_SLOTS3, "UPDATE guild_member SET BankResetTimeTab3 = ?, BankRemSlotsTab3 = ? WHERE guildid = ? AND guid = ?", CONNECTION_ASYNC)
     PREPARE_STATEMENT(CHAR_UPD_GUILD_MEMBER_BANK_TIME_REM_SLOTS4, "UPDATE guild_member SET BankResetTimeTab4 = ?, BankRemSlotsTab4 = ? WHERE guildid = ? AND guid = ?", CONNECTION_ASYNC)
     PREPARE_STATEMENT(CHAR_UPD_GUILD_MEMBER_BANK_TIME_REM_SLOTS5, "UPDATE guild_member SET BankResetTimeTab5 = ?, BankRemSlotsTab5 = ? WHERE guildid = ? AND guid = ?", CONNECTION_ASYNC)
+    PREPARE_STATEMENT(CHAR_UPD_GUILD_MEMBER_BANK_TIME_REM_SLOTS6, "UPDATE guild_member SET BankResetTimeTab6 = ?, BankRemSlotsTab6 = ? WHERE guildid = ? AND guid = ?", CONNECTION_ASYNC)
+    PREPARE_STATEMENT(CHAR_UPD_GUILD_MEMBER_BANK_TIME_REM_SLOTS7, "UPDATE guild_member SET BankResetTimeTab7 = ?, BankRemSlotsTab7 = ? WHERE guildid = ? AND guid = ?", CONNECTION_ASYNC)
     // 0: uint32, 1: uint8
     PREPARE_STATEMENT(CHAR_UPD_GUILD_RANK_BANK_TIME0, "UPDATE guild_member SET BankResetTimeTab0 = 0 WHERE guildid = ? AND rank = ?", CONNECTION_ASYNC)
     PREPARE_STATEMENT(CHAR_UPD_GUILD_RANK_BANK_TIME1, "UPDATE guild_member SET BankResetTimeTab1 = 0 WHERE guildid = ? AND rank = ?", CONNECTION_ASYNC)
@@ -224,6 +228,8 @@ void CharacterDatabaseConnection::DoPrepareStatements()
     PREPARE_STATEMENT(CHAR_UPD_GUILD_RANK_BANK_TIME3, "UPDATE guild_member SET BankResetTimeTab3 = 0 WHERE guildid = ? AND rank = ?", CONNECTION_ASYNC)
     PREPARE_STATEMENT(CHAR_UPD_GUILD_RANK_BANK_TIME4, "UPDATE guild_member SET BankResetTimeTab4 = 0 WHERE guildid = ? AND rank = ?", CONNECTION_ASYNC)
     PREPARE_STATEMENT(CHAR_UPD_GUILD_RANK_BANK_TIME5, "UPDATE guild_member SET BankResetTimeTab5 = 0 WHERE guildid = ? AND rank = ?", CONNECTION_ASYNC)
+    PREPARE_STATEMENT(CHAR_UPD_GUILD_RANK_BANK_TIME6, "UPDATE guild_member SET BankResetTimeTab6 = 0 WHERE guildid = ? AND rank = ?", CONNECTION_ASYNC)
+    PREPARE_STATEMENT(CHAR_UPD_GUILD_RANK_BANK_TIME7, "UPDATE guild_member SET BankResetTimeTab7 = 0 WHERE guildid = ? AND rank = ?", CONNECTION_ASYNC)
     PREPARE_STATEMENT(CHAR_SEL_CHAR_DATA_FOR_GUILD, "SELECT name, level, class, zone, account FROM characters WHERE guid = ?", CONNECTION_SYNCH)
     PREPARE_STATEMENT(CHAR_DEL_GUILD_ACHIEVEMENT, "DELETE FROM guild_achievement WHERE guildId = ? AND achievement = ?", CONNECTION_SYNCH)
     PREPARE_STATEMENT(CHAR_INS_GUILD_ACHIEVEMENT, "INSERT INTO guild_achievement (guildId, achievement, date, guids) VALUES (?, ?, ?, ?)", CONNECTION_SYNCH)
diff --git a/src/server/shared/Database/Implementation/CharacterDatabase.h b/src/server/shared/Database/Implementation/CharacterDatabase.h
index 91b043dbdbd..8c7042ad926 100755
--- a/src/server/shared/Database/Implementation/CharacterDatabase.h
+++ b/src/server/shared/Database/Implementation/CharacterDatabase.h
@@ -207,18 +207,24 @@ enum CharacterDatabaseStatements
     CHAR_UPD_GUILD_MEMBER_BANK_TIME_REM_SLOTS3,
     CHAR_UPD_GUILD_MEMBER_BANK_TIME_REM_SLOTS4,
     CHAR_UPD_GUILD_MEMBER_BANK_TIME_REM_SLOTS5,
+    CHAR_UPD_GUILD_MEMBER_BANK_TIME_REM_SLOTS6,
+    CHAR_UPD_GUILD_MEMBER_BANK_TIME_REM_SLOTS7,
     CHAR_UPD_GUILD_MEMBER_BANK_REM_SLOTS0,
     CHAR_UPD_GUILD_MEMBER_BANK_REM_SLOTS1,
     CHAR_UPD_GUILD_MEMBER_BANK_REM_SLOTS2,
     CHAR_UPD_GUILD_MEMBER_BANK_REM_SLOTS3,
     CHAR_UPD_GUILD_MEMBER_BANK_REM_SLOTS4,
     CHAR_UPD_GUILD_MEMBER_BANK_REM_SLOTS5,
+    CHAR_UPD_GUILD_MEMBER_BANK_REM_SLOTS6,
+    CHAR_UPD_GUILD_MEMBER_BANK_REM_SLOTS7,
     CHAR_UPD_GUILD_RANK_BANK_TIME0,
     CHAR_UPD_GUILD_RANK_BANK_TIME1,
     CHAR_UPD_GUILD_RANK_BANK_TIME2,
     CHAR_UPD_GUILD_RANK_BANK_TIME3,
     CHAR_UPD_GUILD_RANK_BANK_TIME4,
     CHAR_UPD_GUILD_RANK_BANK_TIME5,
+    CHAR_UPD_GUILD_RANK_BANK_TIME6,
+    CHAR_UPD_GUILD_RANK_BANK_TIME7,
     CHAR_SEL_CHAR_DATA_FOR_GUILD,
     CHAR_DEL_GUILD_ACHIEVEMENT,
     CHAR_INS_GUILD_ACHIEVEMENT,