From f1bcd2c5bc935959d1b1c3fa96316426dba2b16c Mon Sep 17 00:00:00 2001 From: Brian Date: Wed, 30 Jun 2010 12:46:19 -0600 Subject: [PATCH 1/9] * Fix expected client build --HG-- branch : trunk --- src/server/authserver/Authentication/AuthCodes.h | 2 +- src/server/game/Entities/Object/Updates/UpdateFields.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/server/authserver/Authentication/AuthCodes.h b/src/server/authserver/Authentication/AuthCodes.h index eb6e4abfb08..883f8d2edd2 100644 --- a/src/server/authserver/Authentication/AuthCodes.h +++ b/src/server/authserver/Authentication/AuthCodes.h @@ -80,7 +80,7 @@ enum LoginResult //3.3.2 build 11403 //3.3.3a build 11723 -#define POST_BC_ACCEPTED_CLIENT_BUILD {11723, 11403, 11159, 10571, 10505, 10146, 9947, 8606, 0} +#define POST_BC_ACCEPTED_CLIENT_BUILD {12213, 11723, 11403, 11159, 10571, 10505, 10146, 9947, 8606, 0} #define PRE_BC_ACCEPTED_CLIENT_BUILD {5875, 6005, 0} #define POST_BC_EXP_FLAG 0x2 diff --git a/src/server/game/Entities/Object/Updates/UpdateFields.h b/src/server/game/Entities/Object/Updates/UpdateFields.h index 5f819375677..09c2b3805c4 100644 --- a/src/server/game/Entities/Object/Updates/UpdateFields.h +++ b/src/server/game/Entities/Object/Updates/UpdateFields.h @@ -21,7 +21,7 @@ #ifndef _UPDATEFIELDS_AUTO_H #define _UPDATEFIELDS_AUTO_H -// Auto generated for version 3, 3, 3, 11723 +// Auto generated for version 3, 3, 3, 12213 enum EObjectFields { From 27958838bf522e92257a9f0c6a359b5c52c474e6 Mon Sep 17 00:00:00 2001 From: Brian Date: Wed, 30 Jun 2010 12:58:00 -0600 Subject: [PATCH 2/9] * Update / Add some opcodes * Thanks TOM_RUS --HG-- branch : trunk --- src/server/game/Server/Protocol/Opcodes.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h index 6e2fb0b6db1..ef328c70586 100644 --- a/src/server/game/Server/Protocol/Opcodes.h +++ b/src/server/game/Server/Protocol/Opcodes.h @@ -1343,7 +1343,11 @@ enum Opcodes SMSG_UNKNOWN_1304 = 0x518, // something with player movement (move event 58?), speed packet UMSG_UNKNOWN_1305 = 0x519, // not found UMSG_UNKNOWN_1306 = 0x51A, // not found - NUM_MSG_TYPES = 0x51B + CMSG_COMMENTATOR_SKIRMISH_QUEUE_COMMAND = 0x51B, // lua: CommentatorSetSkirmishMatchmakingMode/CommentatorRequestSkirmishQueueData/CommentatorRequestSkirmishMode/CommentatorStartSkirmishMatch + SMSG_UNKNOWN_1308 = 0x51C, // event EVENT_COMMENTATOR_SKIRMISH_QUEUE_REQUEST, CGCommentator::QueueNode + SMSG_UNKNOWN_1309 = 0x51D, // event EVENT_COMMENTATOR_SKIRMISH_QUEUE_REQUEST + SMSG_UNKNOWN_1310 = 0x51E, // some compressed packet? + NUM_MSG_TYPES = 0x51F }; /// Player state From 9b7da805f8223be50fa510e7aa8bd94259d4a245 Mon Sep 17 00:00:00 2001 From: Brian Date: Wed, 30 Jun 2010 13:02:43 -0600 Subject: [PATCH 3/9] * Some update to chat enums * Thanks TOM_RUS --HG-- branch : trunk --- src/server/game/Entities/Player/SocialMgr.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/server/game/Entities/Player/SocialMgr.h b/src/server/game/Entities/Player/SocialMgr.h index dbed6e93006..9b1176baab9 100644 --- a/src/server/game/Entities/Player/SocialMgr.h +++ b/src/server/game/Entities/Player/SocialMgr.h @@ -43,7 +43,8 @@ enum SocialFlag { SOCIAL_FLAG_FRIEND = 0x01, SOCIAL_FLAG_IGNORED = 0x02, - SOCIAL_FLAG_MUTED = 0x04 // guessed + SOCIAL_FLAG_MUTED = 0x04, // guessed + SOCAIL_FLAG_RAF = 0x08 // Recruit A Friend }; struct FriendInfo @@ -112,7 +113,7 @@ enum FriendsResult }; #define SOCIALMGR_FRIEND_LIMIT 50 -#define SOCIALMGR_IGNORE_LIMIT 25 +#define SOCIALMGR_IGNORE_LIMIT 50 class PlayerSocial { From b0df141c54597cc5af55b4268880af40f62c428d Mon Sep 17 00:00:00 2001 From: Brian Date: Wed, 30 Jun 2010 13:05:23 -0600 Subject: [PATCH 4/9] * Another opcode update * Thanks TOM_RUS --HG-- branch : trunk --- src/server/game/Server/Protocol/Opcodes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h index ef328c70586..44a06ddb8d3 100644 --- a/src/server/game/Server/Protocol/Opcodes.h +++ b/src/server/game/Server/Protocol/Opcodes.h @@ -1244,7 +1244,7 @@ enum Opcodes SMSG_ITEM_REFUND_RESULT = 0x4B5, // refund item result CMSG_CORPSE_MAP_POSITION_QUERY = 0x4B6, // CMSG, uint32 SMSG_CORPSE_MAP_POSITION_QUERY_RESPONSE = 0x4B7, // SMSG, 3*float+float - CMSG_LFG_SET_ROLES_2 = 0x4B8, // not found + UMSG_UNKNOWN_1208 = 0x4B8, // not found UMSG_UNKNOWN_1209 = 0x4B9, // not found CMSG_CALENDAR_CONTEXT_EVENT_SIGNUP = 0x4BA, // CMSG, uint64, lua: CalendarContextEventSignUp SMSG_CALENDAR_ACTION_PENDING = 0x4BB, // SMSG, calendar related EVENT_CALENDAR_ACTION_PENDING From 4d00596e95a04e274d4a8bbb3222f4ffa60e601d Mon Sep 17 00:00:00 2001 From: Brian Date: Wed, 30 Jun 2010 13:11:44 -0600 Subject: [PATCH 5/9] * Update for 3.3.5a --HG-- branch : trunk --- src/server/authserver/Authentication/AuthCodes.h | 2 +- src/server/game/Entities/Object/Updates/UpdateFields.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/server/authserver/Authentication/AuthCodes.h b/src/server/authserver/Authentication/AuthCodes.h index 883f8d2edd2..802b7b78f1b 100644 --- a/src/server/authserver/Authentication/AuthCodes.h +++ b/src/server/authserver/Authentication/AuthCodes.h @@ -80,7 +80,7 @@ enum LoginResult //3.3.2 build 11403 //3.3.3a build 11723 -#define POST_BC_ACCEPTED_CLIENT_BUILD {12213, 11723, 11403, 11159, 10571, 10505, 10146, 9947, 8606, 0} +#define POST_BC_ACCEPTED_CLIENT_BUILD {12340, 11723, 11403, 11159, 10571, 10505, 10146, 9947, 8606, 0} #define PRE_BC_ACCEPTED_CLIENT_BUILD {5875, 6005, 0} #define POST_BC_EXP_FLAG 0x2 diff --git a/src/server/game/Entities/Object/Updates/UpdateFields.h b/src/server/game/Entities/Object/Updates/UpdateFields.h index 09c2b3805c4..1b334967688 100644 --- a/src/server/game/Entities/Object/Updates/UpdateFields.h +++ b/src/server/game/Entities/Object/Updates/UpdateFields.h @@ -21,7 +21,7 @@ #ifndef _UPDATEFIELDS_AUTO_H #define _UPDATEFIELDS_AUTO_H -// Auto generated for version 3, 3, 3, 12213 +// Auto generated for version 3, 3, 3, 12340 enum EObjectFields { From 38316ca97bee09412efe5f1b87e21bfb194232be Mon Sep 17 00:00:00 2001 From: Brian Date: Wed, 30 Jun 2010 13:14:23 -0600 Subject: [PATCH 6/9] * Fix authentication for the new client * Thanks TOM_RUS --HG-- branch : trunk --- src/server/game/Server/WorldSocket.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/server/game/Server/WorldSocket.cpp b/src/server/game/Server/WorldSocket.cpp index ac4900a0fd3..f7b128fb761 100644 --- a/src/server/game/Server/WorldSocket.cpp +++ b/src/server/game/Server/WorldSocket.cpp @@ -768,7 +768,7 @@ int WorldSocket::HandleAuthSession (WorldPacket& recvPacket) // NOTE: ATM the socket is singlethread, have this in mind ... uint8 digest[20]; uint32 clientSeed; - uint32 unk2, unk3; + uint32 unk2, unk3, unk5, unk6, unk7; uint64 unk4; uint32 BuiltNumberClient; uint32 id, security; @@ -797,6 +797,7 @@ int WorldSocket::HandleAuthSession (WorldPacket& recvPacket) recvPacket >> account; recvPacket >> unk3; recvPacket >> clientSeed; + recvPacket >> unk5 >> unk6 >> unk7; recvPacket >> unk4; recvPacket.read (digest, 20); From baf108e5ccc0ee42efcefa4a87e2784421df15c5 Mon Sep 17 00:00:00 2001 From: Brian Date: Fri, 2 Jul 2010 01:48:49 -0600 Subject: [PATCH 7/9] * Updated DBC file checks for 3.3.5a --HG-- branch : trunk --- src/server/game/DataStores/DBCStores.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/server/game/DataStores/DBCStores.cpp b/src/server/game/DataStores/DBCStores.cpp index bc127cb309c..4ddccd735f5 100755 --- a/src/server/game/DataStores/DBCStores.cpp +++ b/src/server/game/DataStores/DBCStores.cpp @@ -592,13 +592,13 @@ void LoadDBCStores(const std::string& dataPath) } // Check loaded DBC files proper version - if (!sAreaStore.LookupEntry(3617) || // last area (areaflag) added in 3.3.3a - !sCharTitlesStore.LookupEntry(177) || // last char title added in 3.3.3a - !sGemPropertiesStore.LookupEntry(1629) || // last added spell in 3.3.3a - !sItemStore.LookupEntry(54860) || // last gem property added in 3.3.3a - !sItemExtendedCostStore.LookupEntry(2997) || // last item extended cost added in 3.3.3a - !sMapStore.LookupEntry(724) || // last map added in 3.3.3a - !sSpellStore.LookupEntry(76567) ) // last client known item added in 3.3.3a + if (!sAreaStore.LookupEntry(3617) || // last area (areaflag) added in 3.3.5a + !sCharTitlesStore.LookupEntry(177) || // last char title added in 3.3.5a + !sGemPropertiesStore.LookupEntry(1629) || // last added spell in 3.3.5a + !sItemStore.LookupEntry(56806) || // last gem property added in 3.3.5a + !sItemExtendedCostStore.LookupEntry(2997) || // last item extended cost added in 3.3.5a + !sMapStore.LookupEntry(724) || // last map added in 3.3.5a + !sSpellStore.LookupEntry(80864) ) // last client known item added in 3.3.5a { sLog.outError("\nYou have _outdated_ DBC files. Please extract correct versions from current using client."); exit(1); From 168b4ecad16a95da99e806098323cf3b59c3f105 Mon Sep 17 00:00:00 2001 From: Brian Date: Thu, 8 Jul 2010 05:59:15 -0600 Subject: [PATCH 8/9] * Prepare SQL directories --HG-- branch : trunk rename : sql/updates/8770_world_areatrigger_scripts.sql => sql/updates/3.3.3a_old/8770_world_areatrigger_scripts.sql rename : sql/updates/8770_world_script_waypoints.sql => sql/updates/3.3.3a_old/8770_world_script_waypoints.sql rename : sql/updates/8770_world_scriptname.sql => sql/updates/3.3.3a_old/8770_world_scriptname.sql rename : sql/updates/8790_world_locales_item_set_names.sql => sql/updates/3.3.3a_old/8790_world_locales_item_set_names.sql rename : sql/updates/8816_world_spell_bonus_data.sql => sql/updates/3.3.3a_old/8816_world_spell_bonus_data.sql rename : sql/updates/8821_world_spell_dbc.sql => sql/updates/3.3.3a_old/8821_world_spell_dbc.sql rename : sql/updates/8836_world_spell_linked_spell.sql => sql/updates/3.3.3a_old/8836_world_spell_linked_spell.sql rename : sql/updates/8842_world_script_texts.sql => sql/updates/3.3.3a_old/8842_world_script_texts.sql rename : sql/updates/8842_world_scriptname.sql => sql/updates/3.3.3a_old/8842_world_scriptname.sql rename : sql/updates/8843_world_scriptname.sql => sql/updates/3.3.3a_old/8843_world_scriptname.sql --- .../{ => 3.3.3a_old}/8770_world_areatrigger_scripts.sql | 0 sql/updates/{ => 3.3.3a_old}/8770_world_script_waypoints.sql | 0 sql/updates/{ => 3.3.3a_old}/8770_world_scriptname.sql | 0 .../{ => 3.3.3a_old}/8790_world_locales_item_set_names.sql | 0 sql/updates/{ => 3.3.3a_old}/8816_world_spell_bonus_data.sql | 0 sql/updates/{ => 3.3.3a_old}/8821_world_spell_dbc.sql | 0 sql/updates/{ => 3.3.3a_old}/8836_world_spell_linked_spell.sql | 0 sql/updates/{ => 3.3.3a_old}/8842_world_script_texts.sql | 0 sql/updates/{ => 3.3.3a_old}/8842_world_scriptname.sql | 0 sql/updates/{ => 3.3.3a_old}/8843_world_scriptname.sql | 0 sql/updates/3.3.5a_old/CMakeLists.txt | 3 +++ sql/updates/3.3.5a_old/xxxx_realmd_realmlist.sql | 3 +++ sql/updates/CMakeLists.txt | 1 + 13 files changed, 7 insertions(+) rename sql/updates/{ => 3.3.3a_old}/8770_world_areatrigger_scripts.sql (100%) rename sql/updates/{ => 3.3.3a_old}/8770_world_script_waypoints.sql (100%) rename sql/updates/{ => 3.3.3a_old}/8770_world_scriptname.sql (100%) rename sql/updates/{ => 3.3.3a_old}/8790_world_locales_item_set_names.sql (100%) rename sql/updates/{ => 3.3.3a_old}/8816_world_spell_bonus_data.sql (100%) rename sql/updates/{ => 3.3.3a_old}/8821_world_spell_dbc.sql (100%) rename sql/updates/{ => 3.3.3a_old}/8836_world_spell_linked_spell.sql (100%) rename sql/updates/{ => 3.3.3a_old}/8842_world_script_texts.sql (100%) rename sql/updates/{ => 3.3.3a_old}/8842_world_scriptname.sql (100%) rename sql/updates/{ => 3.3.3a_old}/8843_world_scriptname.sql (100%) create mode 100644 sql/updates/3.3.5a_old/CMakeLists.txt create mode 100644 sql/updates/3.3.5a_old/xxxx_realmd_realmlist.sql diff --git a/sql/updates/8770_world_areatrigger_scripts.sql b/sql/updates/3.3.3a_old/8770_world_areatrigger_scripts.sql similarity index 100% rename from sql/updates/8770_world_areatrigger_scripts.sql rename to sql/updates/3.3.3a_old/8770_world_areatrigger_scripts.sql diff --git a/sql/updates/8770_world_script_waypoints.sql b/sql/updates/3.3.3a_old/8770_world_script_waypoints.sql similarity index 100% rename from sql/updates/8770_world_script_waypoints.sql rename to sql/updates/3.3.3a_old/8770_world_script_waypoints.sql diff --git a/sql/updates/8770_world_scriptname.sql b/sql/updates/3.3.3a_old/8770_world_scriptname.sql similarity index 100% rename from sql/updates/8770_world_scriptname.sql rename to sql/updates/3.3.3a_old/8770_world_scriptname.sql diff --git a/sql/updates/8790_world_locales_item_set_names.sql b/sql/updates/3.3.3a_old/8790_world_locales_item_set_names.sql similarity index 100% rename from sql/updates/8790_world_locales_item_set_names.sql rename to sql/updates/3.3.3a_old/8790_world_locales_item_set_names.sql diff --git a/sql/updates/8816_world_spell_bonus_data.sql b/sql/updates/3.3.3a_old/8816_world_spell_bonus_data.sql similarity index 100% rename from sql/updates/8816_world_spell_bonus_data.sql rename to sql/updates/3.3.3a_old/8816_world_spell_bonus_data.sql diff --git a/sql/updates/8821_world_spell_dbc.sql b/sql/updates/3.3.3a_old/8821_world_spell_dbc.sql similarity index 100% rename from sql/updates/8821_world_spell_dbc.sql rename to sql/updates/3.3.3a_old/8821_world_spell_dbc.sql diff --git a/sql/updates/8836_world_spell_linked_spell.sql b/sql/updates/3.3.3a_old/8836_world_spell_linked_spell.sql similarity index 100% rename from sql/updates/8836_world_spell_linked_spell.sql rename to sql/updates/3.3.3a_old/8836_world_spell_linked_spell.sql diff --git a/sql/updates/8842_world_script_texts.sql b/sql/updates/3.3.3a_old/8842_world_script_texts.sql similarity index 100% rename from sql/updates/8842_world_script_texts.sql rename to sql/updates/3.3.3a_old/8842_world_script_texts.sql diff --git a/sql/updates/8842_world_scriptname.sql b/sql/updates/3.3.3a_old/8842_world_scriptname.sql similarity index 100% rename from sql/updates/8842_world_scriptname.sql rename to sql/updates/3.3.3a_old/8842_world_scriptname.sql diff --git a/sql/updates/8843_world_scriptname.sql b/sql/updates/3.3.3a_old/8843_world_scriptname.sql similarity index 100% rename from sql/updates/8843_world_scriptname.sql rename to sql/updates/3.3.3a_old/8843_world_scriptname.sql diff --git a/sql/updates/3.3.5a_old/CMakeLists.txt b/sql/updates/3.3.5a_old/CMakeLists.txt new file mode 100644 index 00000000000..63cb6eab23e --- /dev/null +++ b/sql/updates/3.3.5a_old/CMakeLists.txt @@ -0,0 +1,3 @@ +FILE(GLOB _SQL_335 *.sql) + +INSTALL(FILES ${_SQL_333} DESTINATION share/trinity/sql/updates/3.3.5a_old) diff --git a/sql/updates/3.3.5a_old/xxxx_realmd_realmlist.sql b/sql/updates/3.3.5a_old/xxxx_realmd_realmlist.sql new file mode 100644 index 00000000000..c6622d5ce1e --- /dev/null +++ b/sql/updates/3.3.5a_old/xxxx_realmd_realmlist.sql @@ -0,0 +1,3 @@ +UPDATE `realmlist` SET `gamebuild`=12340 WHERE `id`=1; +ALTER TABLE `realmlist` CHANGE COLUMN `gamebuild` `gamebuild` int(11) unsigned NOT NULL default '12340'; + diff --git a/sql/updates/CMakeLists.txt b/sql/updates/CMakeLists.txt index 0d2d6cd6bfa..fca7e740f90 100644 --- a/sql/updates/CMakeLists.txt +++ b/sql/updates/CMakeLists.txt @@ -4,6 +4,7 @@ add_subdirectory(3.1.3_old) add_subdirectory(3.2.2a_old) add_subdirectory(3.3.2_old) add_subdirectory(3.3.3a_old) +add_subdirectory(3.3.5a_old) FILE(GLOB _SQL_UPDATES *.sql) From 09c84f0a24d9345695610b5884220fb28d425c33 Mon Sep 17 00:00:00 2001 From: Brian Date: Thu, 8 Jul 2010 07:13:35 -0600 Subject: [PATCH 9/9] * Fix typo --HG-- branch : trunk --- src/server/game/Entities/Player/SocialMgr.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/game/Entities/Player/SocialMgr.h b/src/server/game/Entities/Player/SocialMgr.h index 9b1176baab9..1f40fcf28e9 100644 --- a/src/server/game/Entities/Player/SocialMgr.h +++ b/src/server/game/Entities/Player/SocialMgr.h @@ -44,7 +44,7 @@ enum SocialFlag SOCIAL_FLAG_FRIEND = 0x01, SOCIAL_FLAG_IGNORED = 0x02, SOCIAL_FLAG_MUTED = 0x04, // guessed - SOCAIL_FLAG_RAF = 0x08 // Recruit A Friend + SOCIAL_FLAG_RAF = 0x08 // Recruit A Friend }; struct FriendInfo