Updatefields cleanup, missing byte for loot response, fixed twoopcode…

… definitions, read talentTabId in MSG_LEARN_PREVIEW, read glyphIndex in castspell.
wlasser · Jun 20, 2012 · bd8586b · bd8586b
1 parent 46a1364
commit bd8586b
Show file tree

Hide file tree

Showing 5 changed files with 512 additions and 510 deletions.
diff --git a/src/game/LootMgr.cpp b/src/game/LootMgr.cpp
@@ -759,6 +759,7 @@ ByteBuffer& operator<<(ByteBuffer& b, LootView const& lv)
 
     size_t count_pos = b.wpos();                            // pos of item count byte
     b << uint8(0);                                          // item count placeholder
+    b << uint8(0);
 
     if (lv.permission == NONE_PERMISSION)
         return b;                                           // nothing output more

diff --git a/src/game/Opcodes.cpp b/src/game/Opcodes.cpp
@@ -248,7 +248,7 @@ void InitOpcodeTable()
     OPCODE(CMSG_TRAINER_LIST,                 STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleTrainerListOpcode       );
     OPCODE(SMSG_TRAINER_LIST,                 STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::HandleServerSide              );
     OPCODE(CMSG_BUY_TRAINER_SERVICE,          STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleTrainerBuySpellOpcode   );
-    OPCODE(SMSG_TRAINER_BUY_SUCCEEDED,          STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::HandleServerSide              );
+    OPCODE(SMSG_TRAINER_BUY_SUCCEEDED,        STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::HandleServerSide              );
     OPCODE(SMSG_TRAINER_BUY_FAILED,           STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::HandleServerSide              );
     OPCODE(CMSG_NPC_CACHE,                    STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleNpcTextQueryOpcode      );
     OPCODE(SMSG_NPC_CACHE,                    STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::HandleServerSide              );
@@ -269,7 +269,7 @@ void InitOpcodeTable()
     OPCODE(MSG_SET_DUNGEON_DIFFICULTY,        STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleSetDungeonDifficultyOpcode);
     //OPCODE(SMSG_INSTANCE_DIFFICULTY,          STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::HandleServerSide              );
     OPCODE(SMSG_SEND_UNLEARN_SPELLS,          STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::HandleServerSide              );
-    OPCODE(SMSG_LEARNED_SPELL,                  STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::HandleServerSide              );
+    OPCODE(SMSG_LEARNED_SPELL,                STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::HandleServerSide              );
     OPCODE(SMSG_EQUIPMENT_SET,                STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::HandleServerSide              );
     OPCODE(SMSG_EQUIPMENT_SET_ID,             STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::HandleServerSide              );
     OPCODE(SMSG_EQUIPMENT_SET_RESULT,         STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::HandleServerSide              );
@@ -312,9 +312,9 @@ void InitOpcodeTable()
     OPCODE(SMSG_QUESTGIVER_QUEST_LIST,        STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::HandleServerSide              );
     OPCODE(SMSG_QUESTGIVER_STATUS,            STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::HandleServerSide              );
     OPCODE(CMSG_MOVE_TIME_SKIPPED,            STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleMoveTimeSkippedOpcode   );
-    OPCODE(SMSG_PLAY_SPELL_VISUAL,              STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::HandleServerSide              );
-    OPCODE(SMSG_TALENT_UPDATE                 ,STATUS_LOGGEDIN,PROCESS_THREADUNSAFE, &WorldSession::HandleServerSide              );
-    OPCODE(SMSG_LEVELUP_INFO                  ,STATUS_LOGGEDIN,PROCESS_THREADUNSAFE, &WorldSession::HandleServerSide              );
-    OPCODE(CMSG_LEARN_TALENT                  ,STATUS_LOGGEDIN,PROCESS_THREADUNSAFE, &WorldSession::HandleLearnTalentOpcode       );
-    OPCODE(CMSG_LEARN_PREVIEW_TALENTS         ,STATUS_LOGGEDIN,PROCESS_THREADUNSAFE, &WorldSession::HandleLearnPreviewTalents     );
+    OPCODE(SMSG_PLAY_SPELL_VISUAL,            STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::HandleServerSide              );
+    OPCODE(SMSG_TALENT_UPDATE,                STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::HandleServerSide              );
+    OPCODE(SMSG_LEVELUP_INFO,                 STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::HandleServerSide              );
+    OPCODE(CMSG_LEARN_TALENT,                 STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleLearnTalentOpcode       );
+    OPCODE(CMSG_LEARN_PREVIEW_TALENTS,        STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleLearnPreviewTalents     );
 };
diff --git a/src/game/SkillHandler.cpp b/src/game/SkillHandler.cpp
@@ -39,11 +39,11 @@ void WorldSession::HandleLearnPreviewTalents(WorldPacket& recvPacket)
 {
     DEBUG_LOG("CMSG_LEARN_PREVIEW_TALENTS");
 
-    uint32 talentsCount;
-    recvPacket.read_skip<uint32>();
-    recvPacket >> talentsCount ;
+    uint32 talentsCount, talentTabId;
+    recvPacket >> talentTabId;
+    recvPacket >> talentsCount;
 
-    sLog.outDebug("Number of talents sent with CMSG_LEARN_PREVIEW_TALENTS : %u",talentsCount);
+    sLog.outDebug("Number of talents, tabId sent with CMSG_LEARN_PREVIEW_TALENTS : %u, %u",talentsCount, talentTabId);
 
     uint32 talentId, talentRank;
 

diff --git a/src/game/SpellHandler.cpp b/src/game/SpellHandler.cpp
@@ -337,11 +337,11 @@ void WorldSession::HandleGameobjectReportUse(WorldPacket& recvPacket)
 
 void WorldSession::HandleCastSpellOpcode(WorldPacket& recvPacket)
 {
-    uint32 spellId;
+    uint32 spellId, glyphIndex;
     uint8  cast_count, unk_flags;
     recvPacket >> cast_count;
     recvPacket >> spellId;
-    recvPacket.read_skip<uint32>();
+    recvPacket >> glyphIndex;
     recvPacket >> unk_flags;                                // flags (if 0x02 - some additional data are received)
 
     // ignore for remote control state (for player case)
@@ -440,6 +440,7 @@ void WorldSession::HandleCastSpellOpcode(WorldPacket& recvPacket)
 
     Spell *spell = new Spell(mover, spellInfo, false);
     spell->m_cast_count = cast_count;                       // set count of casts
+    spell->m_glyphIndex = glyphIndex;
     spell->prepare(&targets);
 }