From 6292d5a8588c69f601e8f4362bb79e5dab9f4a60 Mon Sep 17 00:00:00 2001 From: Olion Date: Tue, 4 Jul 2017 01:35:28 +0300 Subject: [PATCH] SMSG_ITEM_QUERY_SINGLE_RESPONSE a small syntactical elaboration --- src/game/Server/Opcodes.cpp | 2 +- src/game/WorldHandlers/ItemHandler.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/game/Server/Opcodes.cpp b/src/game/Server/Opcodes.cpp index 0332163a..03a1b64d 100644 --- a/src/game/Server/Opcodes.cpp +++ b/src/game/Server/Opcodes.cpp @@ -148,7 +148,7 @@ void Opcodes::BuildOpcodeList() /*0x055*/ StoreOpcode(SMSG_GUILD_QUERY_RESPONSE, "SMSG_GUILD_QUERY_RESPONSE", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide); /*0x056*/ StoreOpcode(CMSG_ITEM_QUERY_SINGLE, "CMSG_ITEM_QUERY_SINGLE", STATUS_LOGGEDIN, PROCESS_INPLACE, &WorldSession::HandleItemQuerySingleOpcode); /*0x057*/ StoreOpcode(CMSG_ITEM_QUERY_MULTIPLE, "CMSG_ITEM_QUERY_MULTIPLE", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL); - /*[-ZERO] Need check */ /*0x058*/ StoreOpcode(SMSG_ITEM_QUERY_SINGLE_RESPONSE, "SMSG_ITEM_QUERY_SINGLE_RESPONSE", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide); + /*0x058*/ StoreOpcode(SMSG_ITEM_QUERY_SINGLE_RESPONSE, "SMSG_ITEM_QUERY_SINGLE_RESPONSE", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide); /*[-ZERO] Need check */ /*0x059*/ StoreOpcode(SMSG_ITEM_QUERY_MULTIPLE_RESPONSE, "SMSG_ITEM_QUERY_MULTIPLE_RESPONSE", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide); /*[-ZERO] Need check */ /*0x05A*/ StoreOpcode(CMSG_PAGE_TEXT_QUERY, "CMSG_PAGE_TEXT_QUERY", STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandlePageTextQueryOpcode); /*[-ZERO] Need check */ /*0x05B*/ StoreOpcode(SMSG_PAGE_TEXT_QUERY_RESPONSE, "SMSG_PAGE_TEXT_QUERY_RESPONSE", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide); diff --git a/src/game/WorldHandlers/ItemHandler.cpp b/src/game/WorldHandlers/ItemHandler.cpp index 2a30b54f..7b2d010a 100644 --- a/src/game/WorldHandlers/ItemHandler.cpp +++ b/src/game/WorldHandlers/ItemHandler.cpp @@ -303,7 +303,7 @@ void WorldSession::HandleItemQuerySingleOpcode(WorldPacket& recv_data) sObjectMgr.GetItemLocaleStrings(pProto->ItemId, loc_idx, &name, &description); // override mount level requirements with the settings from the configuration file - int requiredLevel = pProto->RequiredLevel; + uint32 requiredLevel = pProto->RequiredLevel; switch(pProto->ItemId) { case 1132: //regular mounts case 2411: @@ -341,7 +341,7 @@ void WorldSession::HandleItemQuerySingleOpcode(WorldPacket& recv_data) case 18246: case 18247: case 18248: - requiredLevel = AccountTypes(sWorld.getConfig(CONFIG_UINT32_MIN_TRAIN_MOUNT_LEVEL)); + requiredLevel = sWorld.getConfig(CONFIG_UINT32_MIN_TRAIN_MOUNT_LEVEL); break; case 12302: // epic mounts case 12303: @@ -379,7 +379,7 @@ void WorldSession::HandleItemQuerySingleOpcode(WorldPacket& recv_data) case 18797: case 18798: case 18902: - requiredLevel = AccountTypes(sWorld.getConfig(CONFIG_UINT32_MIN_TRAIN_EPIC_MOUNT_LEVEL)); + requiredLevel = sWorld.getConfig(CONFIG_UINT32_MIN_TRAIN_EPIC_MOUNT_LEVEL); break; } @@ -389,7 +389,7 @@ void WorldSession::HandleItemQuerySingleOpcode(WorldPacket& recv_data) data << pProto->Class; // client known only 0 subclass (and 1-2 obsolute subclasses) data << (pProto->Class == ITEM_CLASS_CONSUMABLE ? uint32(0) : pProto->SubClass); - data << name; + data << name; // max length of any of 4 names: 256 bytes data << uint8(0x00); // pProto->Name2; // blizz not send name there, just uint8(0x00); <-- \0 = empty string = empty name... data << uint8(0x00); // pProto->Name3; // blizz not send name there, just uint8(0x00); data << uint8(0x00); // pProto->Name4; // blizz not send name there, just uint8(0x00);