Merge git://github.com/TrinityCore/TrinityCore into mmaps

Conflicts:
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
	src/server/game/Movement/Spline/MoveSplineInit.cpp

5 files changed, 65 insertions, 101 deletions

diff --git a/src/server/shared/Database/Implementation/CharacterDatabase.cpp b/src/server/shared/Database/Implementation/CharacterDatabase.cpp
index d9b517c098f..db9a5646a69 100644
--- a/src/server/shared/Database/Implementation/CharacterDatabase.cpp
+++ b/src/server/shared/Database/Implementation/CharacterDatabase.cpp
@@ -169,10 +169,9 @@ void CharacterDatabaseConnection::DoPrepareStatements()
     PREPARE_STATEMENT(CHAR_INS_GUILD_BANK_ITEM, "INSERT INTO guild_bank_item (guildid, TabId, SlotId, item_guid) VALUES (?, ?, ?, ?)", CONNECTION_ASYNC)
     PREPARE_STATEMENT(CHAR_DEL_GUILD_BANK_ITEM, "DELETE FROM guild_bank_item WHERE guildid = ? AND TabId = ? AND SlotId = ?", CONNECTION_ASYNC) // 0: uint32, 1: uint8, 2: uint8
     PREPARE_STATEMENT(CHAR_DEL_GUILD_BANK_ITEMS, "DELETE FROM guild_bank_item WHERE guildid = ?", CONNECTION_ASYNC) // 0: uint32
-    PREPARE_STATEMENT(CHAR_INS_GUILD_BANK_RIGHT_DEFAULT, "INSERT INTO guild_bank_right (guildid, TabId, rid) VALUES (?, ?, ?)", CONNECTION_ASYNC) // 0: uint32, 1: uint8, 2: uint8
     // 0: uint32, 1: uint8, 2: uint8, 3: uint8, 4: uint32
-    PREPARE_STATEMENT(CHAR_INS_GUILD_BANK_RIGHT, "INSERT INTO guild_bank_right (guildid, TabId, rid, gbright, SlotPerDay) VALUES (?, ?, ?, ?, ?)", CONNECTION_ASYNC)
-    PREPARE_STATEMENT(CHAR_DEL_GUILD_BANK_RIGHT, "DELETE FROM guild_bank_right WHERE guildid = ? AND TabId = ? AND rid = ?", CONNECTION_ASYNC) // 0: uint32, 1: uint8, 2: uint8
+    PREPARE_STATEMENT(CHAR_INS_GUILD_BANK_RIGHT, "INSERT INTO guild_bank_right (guildid, TabId, rid, gbright, SlotPerDay) VALUES (?, ?, ?, ?, ?) "
+        "ON DUPLICATE KEY UPDATE gbright = VALUES(gbright), SlotPerDay = VALUES(SlotPerDay)", CONNECTION_ASYNC)
     PREPARE_STATEMENT(CHAR_DEL_GUILD_BANK_RIGHTS, "DELETE FROM guild_bank_right WHERE guildid = ?", CONNECTION_ASYNC) // 0: uint32
     PREPARE_STATEMENT(CHAR_DEL_GUILD_BANK_RIGHTS_FOR_RANK, "DELETE FROM guild_bank_right WHERE guildid = ? AND rid = ?", CONNECTION_ASYNC) // 0: uint32, 1: uint8
     // 0-1: uint32, 2-3: uint8, 4-5: uint32, 6: uint16, 7: uint8, 8: uint64
@@ -198,32 +197,15 @@ void CharacterDatabaseConnection::DoPrepareStatements()
     PREPARE_STATEMENT(CHAR_UPD_GUILD_BANK_MONEY, "UPDATE guild SET BankMoney = ? WHERE guildid = ?", CONNECTION_ASYNC) // 0: uint64, 1: uint32
     // 0: uint8, 1: uint32, 2: uint8, 3: uint32
     PREPARE_STATEMENT(CHAR_UPD_GUILD_BANK_EVENTLOG_TAB, "UPDATE guild_bank_eventlog SET TabId = ? WHERE guildid = ? AND TabId = ? AND LogGuid = ?", CONNECTION_ASYNC)
-    PREPARE_STATEMENT(CHAR_UPD_GUILD_MEMBER_BANK_REM_MONEY, "UPDATE guild_member SET BankRemMoney = ? WHERE guildid = ? AND guid = ?", CONNECTION_ASYNC) // 0: uint32, 1: uint32, 2: uint32
-    PREPARE_STATEMENT(CHAR_UPD_GUILD_MEMBER_BANK_TIME_MONEY, "UPDATE guild_member SET BankResetTimeMoney = ?, BankRemMoney = ? WHERE guildid = ? AND guid = ?", CONNECTION_ASYNC) // 0: uint32, 1: uint32, 2: uint32, 3: uint32
-    PREPARE_STATEMENT(CHAR_UPD_GUILD_RANK_BANK_RESET_TIME, "UPDATE guild_member SET BankResetTimeMoney = 0 WHERE guildid = ? AND rank = ?", CONNECTION_ASYNC) // 0: uint32, 1: uint8
     PREPARE_STATEMENT(CHAR_UPD_GUILD_RANK_BANK_MONEY, "UPDATE guild_rank SET BankMoneyPerDay = ? WHERE rid = ? AND guildid = ?", CONNECTION_ASYNC) // 0: uint32, 1: uint8, 2: uint32
     PREPARE_STATEMENT(CHAR_UPD_GUILD_BANK_TAB_TEXT, "UPDATE guild_bank_tab SET TabText = ? WHERE guildid = ? AND TabId = ?", CONNECTION_ASYNC) // 0: string, 1: uint32, 2: uint8
+
+    PREPARE_STATEMENT(CHAR_INS_GUILD_MEMBER_WITHDRAW,
+        "INSERT INTO guild_member_withdraw (guid, tab0, tab1, tab2, tab3, tab4, tab5, money) VALUES (?, ?, ?, ?, ?, ?, ?, ?) "
+        "ON DUPLICATE KEY UPDATE tab0 = VALUES (tab0), tab1 = VALUES (tab1), tab2 = VALUES (tab2), tab3 = VALUES (tab3), tab4 = VALUES (tab4), tab5 = VALUES (tab5)", CONNECTION_ASYNC)
+    PREPARE_STATEMENT(CHAR_DEL_GUILD_MEMBER_WITHDRAW, "TRUNCATE guild_member_withdraw", CONNECTION_ASYNC)
+
     // 0: uint32, 1: uint32, 2: uint32
-    PREPARE_STATEMENT(CHAR_UPD_GUILD_MEMBER_BANK_REM_SLOTS0, "UPDATE guild_member SET BankRemSlotsTab0 = ? WHERE guildid = ? AND guid = ?", CONNECTION_ASYNC)
-    PREPARE_STATEMENT(CHAR_UPD_GUILD_MEMBER_BANK_REM_SLOTS1, "UPDATE guild_member SET BankRemSlotsTab1 = ? WHERE guildid = ? AND guid = ?", CONNECTION_ASYNC)
-    PREPARE_STATEMENT(CHAR_UPD_GUILD_MEMBER_BANK_REM_SLOTS2, "UPDATE guild_member SET BankRemSlotsTab2 = ? WHERE guildid = ? AND guid = ?", CONNECTION_ASYNC)
-    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)
-    // 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)
-    PREPARE_STATEMENT(CHAR_UPD_GUILD_MEMBER_BANK_TIME_REM_SLOTS2, "UPDATE guild_member SET BankResetTimeTab2 = ?, BankRemSlotsTab2 = ? WHERE guildid = ? AND guid = ?", CONNECTION_ASYNC)
-    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)
-    // 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)
-    PREPARE_STATEMENT(CHAR_UPD_GUILD_RANK_BANK_TIME2, "UPDATE guild_member SET BankResetTimeTab2 = 0 WHERE guildid = ? AND rank = ?", CONNECTION_ASYNC)
-    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_SEL_CHAR_DATA_FOR_GUILD, "SELECT name, level, class, zone, account FROM characters WHERE guid = ?", CONNECTION_SYNCH)
 
     // Chat channel handling
diff --git a/src/server/shared/Database/Implementation/CharacterDatabase.h b/src/server/shared/Database/Implementation/CharacterDatabase.h
index 88018997e4b..e421a7917ca 100644
--- a/src/server/shared/Database/Implementation/CharacterDatabase.h
+++ b/src/server/shared/Database/Implementation/CharacterDatabase.h
@@ -173,9 +173,7 @@ enum CharacterDatabaseStatements
     CHAR_INS_GUILD_BANK_ITEM,
     CHAR_DEL_GUILD_BANK_ITEM,
     CHAR_DEL_GUILD_BANK_ITEMS,
-    CHAR_INS_GUILD_BANK_RIGHT_DEFAULT,
     CHAR_INS_GUILD_BANK_RIGHT,
-    CHAR_DEL_GUILD_BANK_RIGHT,
     CHAR_DEL_GUILD_BANK_RIGHTS,
     CHAR_DEL_GUILD_BANK_RIGHTS_FOR_RANK,
     CHAR_INS_GUILD_BANK_EVENTLOG,
@@ -196,29 +194,10 @@ enum CharacterDatabaseStatements
     CHAR_UPD_GUILD_BANK_TAB_INFO,
     CHAR_UPD_GUILD_BANK_MONEY,
     CHAR_UPD_GUILD_BANK_EVENTLOG_TAB,
-    CHAR_UPD_GUILD_MEMBER_BANK_REM_MONEY,
-    CHAR_UPD_GUILD_MEMBER_BANK_TIME_MONEY,
-    CHAR_UPD_GUILD_RANK_BANK_RESET_TIME,
     CHAR_UPD_GUILD_RANK_BANK_MONEY,
     CHAR_UPD_GUILD_BANK_TAB_TEXT,
-    CHAR_UPD_GUILD_MEMBER_BANK_TIME_REM_SLOTS0,
-    CHAR_UPD_GUILD_MEMBER_BANK_TIME_REM_SLOTS1,
-    CHAR_UPD_GUILD_MEMBER_BANK_TIME_REM_SLOTS2,
-    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_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_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_INS_GUILD_MEMBER_WITHDRAW,
+    CHAR_DEL_GUILD_MEMBER_WITHDRAW,
     CHAR_SEL_CHAR_DATA_FOR_GUILD,
 
     CHAR_SEL_CHANNEL,
diff --git a/src/server/shared/Logging/Appender.cpp b/src/server/shared/Logging/Appender.cpp
index 348ec4b3c7c..0bfcc8abbd2 100644
--- a/src/server/shared/Logging/Appender.cpp
+++ b/src/server/shared/Logging/Appender.cpp
@@ -217,6 +217,8 @@ char const* Appender::getLogFilterTypeString(LogFilterType type)
             return "SERVER LOADING";
         case LOG_FILTER_OPCODES:
             return "OPCODE";
+        case LOG_FILTER_SOAP:
+            return "SOAP";
         default:
             break;
     }
diff --git a/src/server/shared/Logging/Appender.h b/src/server/shared/Logging/Appender.h
index 5c4b009ef67..89d0016ce2b 100644
--- a/src/server/shared/Logging/Appender.h
+++ b/src/server/shared/Logging/Appender.h
@@ -25,51 +25,52 @@
 
 enum LogFilterType
 {
-    LOG_FILTER_GENERAL,                                    // This one should only be used inside Log.cpp
-    LOG_FILTER_UNITS,                                      // Anything related to units that doesn't fit in other categories. ie. creature formations
-    LOG_FILTER_PETS,
-    LOG_FILTER_VEHICLES,
-    LOG_FILTER_TSCR,                                       // C++ AI, instance scripts, etc.
-    LOG_FILTER_DATABASE_AI,                                // SmartAI, EventAI, Creature* * AI
-    LOG_FILTER_MAPSCRIPTS,
-    LOG_FILTER_NETWORKIO,
-    LOG_FILTER_SPELLS_AURAS,
-    LOG_FILTER_ACHIEVEMENTSYS,
-    LOG_FILTER_CONDITIONSYS,
-    LOG_FILTER_POOLSYS,
-    LOG_FILTER_AUCTIONHOUSE,
-    LOG_FILTER_BATTLEGROUND,
-    LOG_FILTER_OUTDOORPVP,
-    LOG_FILTER_CHATSYS,
-    LOG_FILTER_LFG,
-    LOG_FILTER_MAPS,
-    LOG_FILTER_PLAYER,                                     // Any player log that does not fit in other player filters
-    LOG_FILTER_PLAYER_LOADING,                             // Debug output from Player::_Load functions
-    LOG_FILTER_PLAYER_ITEMS,
-    LOG_FILTER_PLAYER_SKILLS,
-    LOG_FILTER_PLAYER_CHATLOG,
-    LOG_FILTER_LOOT,
-    LOG_FILTER_GUILD,
-    LOG_FILTER_TRANSPORTS,
-    LOG_FILTER_SQL,
-    LOG_FILTER_GMCOMMAND,
-    LOG_FILTER_REMOTECOMMAND,
-    LOG_FILTER_WARDEN,
-    LOG_FILTER_AUTHSERVER,
-    LOG_FILTER_WORLDSERVER,
-    LOG_FILTER_GAMEEVENTS,
-    LOG_FILTER_CALENDAR,
-    LOG_FILTER_CHARACTER,
-    LOG_FILTER_ARENAS,
-    LOG_FILTER_SQL_DRIVER,
-    LOG_FILTER_SQL_DEV,
-    LOG_FILTER_PLAYER_DUMP,
-    LOG_FILTER_BATTLEFIELD,
-    LOG_FILTER_SERVER_LOADING,
-    LOG_FILTER_OPCODES
+    LOG_FILTER_GENERAL                           =  0,     // This one should only be used inside Log.cpp
+    LOG_FILTER_UNITS                             =  1,     // Anything related to units that doesn't fit in other categories. ie. creature formations
+    LOG_FILTER_PETS                              =  2,
+    LOG_FILTER_VEHICLES                          =  3,
+    LOG_FILTER_TSCR                              =  4,     // C++ AI, instance scripts, etc.
+    LOG_FILTER_DATABASE_AI                       =  5,     // SmartAI, EventAI, Creature* * AI
+    LOG_FILTER_MAPSCRIPTS                        =  6,
+    LOG_FILTER_NETWORKIO                         =  7,
+    LOG_FILTER_SPELLS_AURAS                      =  8,
+    LOG_FILTER_ACHIEVEMENTSYS                    =  9,
+    LOG_FILTER_CONDITIONSYS                      = 10,
+    LOG_FILTER_POOLSYS                           = 11,
+    LOG_FILTER_AUCTIONHOUSE                      = 12,
+    LOG_FILTER_BATTLEGROUND                      = 13,
+    LOG_FILTER_OUTDOORPVP                        = 14,
+    LOG_FILTER_CHATSYS                           = 15,
+    LOG_FILTER_LFG                               = 16,
+    LOG_FILTER_MAPS                              = 17,
+    LOG_FILTER_PLAYER                            = 18,     // Any player log that does not fit in other player filters
+    LOG_FILTER_PLAYER_LOADING                    = 19,     // Debug output from Player::_Load functions
+    LOG_FILTER_PLAYER_ITEMS                      = 20,
+    LOG_FILTER_PLAYER_SKILLS                     = 21,
+    LOG_FILTER_PLAYER_CHATLOG                    = 22,
+    LOG_FILTER_LOOT                              = 23,
+    LOG_FILTER_GUILD                             = 24,
+    LOG_FILTER_TRANSPORTS                        = 25,
+    LOG_FILTER_SQL                               = 26,
+    LOG_FILTER_GMCOMMAND                         = 27,
+    LOG_FILTER_REMOTECOMMAND                     = 28,
+    LOG_FILTER_WARDEN                            = 29,
+    LOG_FILTER_AUTHSERVER                        = 30,
+    LOG_FILTER_WORLDSERVER                       = 31,
+    LOG_FILTER_GAMEEVENTS                        = 32,
+    LOG_FILTER_CALENDAR                          = 33,
+    LOG_FILTER_CHARACTER                         = 34,
+    LOG_FILTER_ARENAS                            = 35,
+    LOG_FILTER_SQL_DRIVER                        = 36,
+    LOG_FILTER_SQL_DEV                           = 37,
+    LOG_FILTER_PLAYER_DUMP                       = 38,
+    LOG_FILTER_BATTLEFIELD                       = 39,
+    LOG_FILTER_SERVER_LOADING                    = 40,
+    LOG_FILTER_OPCODES                           = 41,
+    LOG_FILTER_SOAP                              = 42
 };
 
-const uint8 MaxLogFilter = uint8(LOG_FILTER_OPCODES) + 1;
+const uint8 MaxLogFilter = 43;
 
 // Values assigned have their equivalent in enum ACE_Log_Priority
 enum LogLevel
@@ -95,12 +96,12 @@ enum AppenderType
 
 enum AppenderFlags
 {
-    APPENDER_FLAGS_NONE                 = 0x00,
-    APPENDER_FLAGS_PREFIX_TIMESTAMP     = 0x01,
-    APPENDER_FLAGS_PREFIX_LOGLEVEL      = 0x02,
-    APPENDER_FLAGS_PREFIX_LOGFILTERTYPE = 0x04,
-    APPENDER_FLAGS_USE_TIMESTAMP        = 0x08, // only used by FileAppender
-    APPENDER_FLAGS_MAKE_FILE_BACKUP     = 0x10  // only used by FileAppender
+    APPENDER_FLAGS_NONE                          = 0x00,
+    APPENDER_FLAGS_PREFIX_TIMESTAMP              = 0x01,
+    APPENDER_FLAGS_PREFIX_LOGLEVEL               = 0x02,
+    APPENDER_FLAGS_PREFIX_LOGFILTERTYPE          = 0x04,
+    APPENDER_FLAGS_USE_TIMESTAMP                 = 0x08, // only used by FileAppender
+    APPENDER_FLAGS_MAKE_FILE_BACKUP              = 0x10  // only used by FileAppender
 };
 
 struct LogMessage
diff --git a/src/server/shared/Logging/Log.cpp b/src/server/shared/Logging/Log.cpp
index 4538fc75c1e..d8914ac8ee0 100755
--- a/src/server/shared/Logging/Log.cpp
+++ b/src/server/shared/Logging/Log.cpp
@@ -435,10 +435,10 @@ void Log::outCharDump(char const* str, uint32 accountId, uint32 guid, char const
        << ")\n" << str << "\n== END DUMP ==\n";
 
     LogMessage* msg = new LogMessage(LOG_LEVEL_INFO, LOG_FILTER_PLAYER_DUMP, ss.str());
-    ss.clear();
-    ss << guid << '_' << name;
+    std::ostringstream param;
+    param << guid << '_' << name;
 
-    msg->param1 = ss.str();
+    msg->param1 = param.str();
 
     write(msg);
 }