Merge

--HG--
branch : trunk

1 files changed, 55 insertions, 23 deletions

diff --git a/src/game/Opcodes.h b/src/game/Opcodes.h
index fbf3e9a72a1..3c2b004ec1f 100644
--- a/src/game/Opcodes.h
+++ b/src/game/Opcodes.h
@@ -347,15 +347,15 @@ enum Opcodes
     SMSG_SPELL_COOLDOWN                             = 0x134,
     SMSG_COOLDOWN_EVENT                             = 0x135,
     CMSG_CANCEL_AURA                                = 0x136,
-    SMSG_UPDATE_AURA_DURATION_OBSOLETE              = 0x137,
+    SMSG_EQUIPMENT_SET_SAVED                        = 0x137,
     SMSG_PET_CAST_FAILED                            = 0x138,
     MSG_CHANNEL_START                               = 0x139,
     MSG_CHANNEL_UPDATE                              = 0x13A,
     CMSG_CANCEL_CHANNELLING                         = 0x13B,
     SMSG_AI_REACTION                                = 0x13C,
     CMSG_SET_SELECTION                              = 0x13D,
-    CMSG_SET_TARGET_OBSOLETE                        = 0x13E,
-    CMSG_UNUSED                                     = 0x13F,
+    CMSG_EQUIPMENT_SET_DELETE                       = 0x13E,
+    CMSG_INSTANCE_LOCK_RESPONSE                     = 0x13F,
     CMSG_UNUSED2                                    = 0x140,
     CMSG_ATTACKSWING                                = 0x141,
     CMSG_ATTACKSTOP                                 = 0x142,
@@ -367,7 +367,7 @@ enum Opcodes
     SMSG_ATTACKSWING_DEADTARGET                     = 0x148,
     SMSG_ATTACKSWING_CANT_ATTACK                    = 0x149,
     SMSG_ATTACKERSTATEUPDATE                        = 0x14A,
-    SMSG_VICTIMSTATEUPDATE_OBSOLETE                 = 0x14B,
+    SMSG_BATTLEFIELD_PORT_DENIED                    = 0x14B,
     SMSG_DAMAGE_DONE_OBSOLETE                       = 0x14C,
     SMSG_DAMAGE_TAKEN_OBSOLETE                      = 0x14D,
     SMSG_CANCEL_COMBAT                              = 0x14E,
@@ -695,7 +695,7 @@ enum Opcodes
     CMSG_BUYBACK_ITEM                               = 0x290,
     SMSG_SERVER_MESSAGE                             = 0x291,
     CMSG_MEETINGSTONE_JOIN                          = 0x292,
-    CMSG_MEETINGSTONE_LEAVE                         = 0x293,
+    CMSG_MEETINGSTONE_LEAVE                         = 0x293, // SMSG?
     CMSG_MEETINGSTONE_CHEAT                         = 0x294,
     SMSG_MEETINGSTONE_SETQUEUE                      = 0x295,
     CMSG_MEETINGSTONE_INFO                          = 0x296,
@@ -1216,24 +1216,56 @@ enum Opcodes
     SMSG_PET_LEARNED_SPELL                          = 0x499,
     SMSG_PET_REMOVED_SPELL                          = 0x49A,
     CMSG_CHANGE_SEATS_ON_CONTROLLED_VEHICLE         = 0x49B,
-    CMSG_HEARTH_AND_RESURRECT                       = 0x49C,
-    SMSG_ON_CANCEL_EXPECTED_RIDE_VEHICLE_AURA       = 0x49D,
-    SMSG_CRITERIA_DELETED                           = 0x49E,
-    SMSG_ACHIEVEMENT_DELETED                        = 0x49F,
-    CMSG_SERVER_INFO_QUERY                          = 0x4A0,
-    SMSG_SERVER_INFO_RESPONSE                       = 0x4A1,
-    CMSG_CHECK_LOGIN_CRITERIA                       = 0x4A2,
-    SMSG_SERVER_BUCK_DATA_START                     = 0x4A3,
-    CMSG_QUERY_VEHICLE_STATUS                       = 0x4A4,
-    SMSG_PET_GUIDS                                  = 0x4A5,
-    SMSG_CLIENTCACHE_VERSION                        = 0x4A6,
-    UMSG_UNKNOWN_1191                               = 0x4A7,
-    UMSG_UNKNOWN_1192                               = 0x4A8,
-    UMSG_UNKNOWN_1193                               = 0x4A9,
-    UMSG_UNKNOWN_1194                               = 0x4AA,
-    UMSG_UNKNOWN_1195                               = 0x4AB,
-    UMSG_UNKNOWN_1196                               = 0x4AC,
-    NUM_MSG_TYPES                                   = 0x4AD
+    CMSG_HEARTH_AND_RESURRECT                       = 0x49C, // not changed in 3.1
+    SMSG_ON_CANCEL_EXPECTED_RIDE_VEHICLE_AURA       = 0x49D, // not changed 9626
+    SMSG_CRITERIA_DELETED                           = 0x49E, // not changed 9626
+    SMSG_ACHIEVEMENT_DELETED                        = 0x49F, // not changed 9626
+    CMSG_SERVER_INFO_QUERY                          = 0x4A0, // not found
+    SMSG_SERVER_INFO_RESPONSE                       = 0x4A1, // not found
+    CMSG_CHECK_LOGIN_CRITERIA                       = 0x4A2, // not found
+    SMSG_SERVER_BUCK_DATA_START                     = 0x4A3, // not found
+    CMSG_QUERY_VEHICLE_STATUS                       = 0x4A4, // not found
+    UMSG_UNKNOWN_1189                               = 0x4A5, // not found, old SMSG_PET_GUIDS
+    SMSG_UNKNOWN_1190                               = 0x4A6, // smsg unk, old SMSG_CLIENTCACHE_VERSION
+    SMSG_UNKNOWN_1191                               = 0x4A7, // smsg guid+uint32 (vehicle)
+    CMSG_UNKNOWN_1192                               = 0x4A8, // cmsg uint64
+    CMSG_EJECT_PASSENGER                            = 0x4A9, // cmsg uint64
+    SMSG_PET_GUIDS                                  = 0x4AA, // shifted+5
+    SMSG_CLIENTCACHE_VERSION                        = 0x4AB, // shifted+5
+    UMSG_UNKNOWN_1196                               = 0x4AC, // not found
+    UMSG_UNKNOWN_1197                               = 0x4AD, // not found
+    UMSG_UNKNOWN_1198                               = 0x4AE, // not found
+    UMSG_UNKNOWN_1199                               = 0x4AF, // not found
+    UMSG_UNKNOWN_1200                               = 0x4B0, // not found
+    UMSG_UNKNOWN_1201                               = 0x4B1, // not found
+    SMSG_UNKNOWN_1202                               = 0x4B2, // refund something
+    CMSG_UNKNOWN_1203                               = 0x4B3, // refund request?
+    CMSG_UNKNOWN_1204                               = 0x4B4, // lua: ContainerRefundItemPurchase
+    SMSG_UNKNOWN_1205                               = 0x4B5, // refund something
+    CMSG_UNKNOWN_1206                               = 0x4B6, // CMSG, uint32
+    SMSG_UNKNOWN_1207                               = 0x4B7, // SMSG, string+float
+    CMSG_LFG_SET_ROLES                              = 0x4B8, // CMSG, empty, lua: SetLFGRoles
+    UMSG_UNKNOWN_1209                               = 0x4B9, // not found
+    CMSG_UNKNOWN_1210                               = 0x4BA, // CMSG, uint64, lua: CalendarContextEventSignUp
+    SMSG_UNKNOWN_1211                               = 0x4BB, // SMSG, calendar related
+    SMSG_EQUIPMENT_SET_LIST                         = 0x4BC, // SMSG, equipment manager list?
+    CMSG_EQUIPMENT_SET_SAVE                         = 0x4BD, // CMSG, lua: SaveEquipmentSet
+    CMSG_UNKNOWN_1214                               = 0x4BE, // CMSG, missle?
+    SMSG_UNKNOWN_1215                               = 0x4BF, // SMSG, uint64, uint8, 3 x float
+    SMSG_TALENTS_INFO                               = 0x4C0, // SMSG, talents related
+    CMSG_LEARN_PREVIEW_TALENTS                      = 0x4C1, // CMSG, lua: LearnPreviewTalents (for player?)
+    CMSG_LEARN_PREVIEW_TALENTS_PET                  = 0x4C2, // CMSG, lua: LearnPreviewTalents (for pet?)
+    UMSG_UNKNOWN_1219                               = 0x4C3, // not found
+    UMSG_UNKNOWN_1220                               = 0x4C4, // not found
+    UMSG_UNKNOWN_1221                               = 0x4C5, // not found
+    UMSG_UNKNOWN_1222                               = 0x4C6, // not found
+    SMSG_UNKNOWN_1223                               = 0x4C7, // uint64, arena pet?
+    SMSG_UNKNOWN_1224                               = 0x4C8, // uint32 "Can't change arena team..."
+    UMSG_UNKNOWN_1225                               = 0x4C9, // not found
+    UMSG_UNKNOWN_1226                               = 0x4CA, // not found
+    CMSG_EQUIPMENT_SET_USE                          = 0x4CB, // CMSG, lua: UseEquipmentSet
+    SMSG_EQUIPMENT_SET_USE_RESULT                   = 0x4CC, // SMSG, UseEquipmentSetResult?
+    NUM_MSG_TYPES                                   = 0x4CD
 };
 
 /// Player state