From 76ae611601585ab41082fd9ad7e4bd3100d3f81e Mon Sep 17 00:00:00 2001 From: Ovalord <1Don7H4v3@m41L.com> Date: Mon, 15 Jan 2018 17:25:50 +0100 Subject: [PATCH] Core/Gameobjects: renamed UnkInt32 to RequiredLevel --- sql/updates/world/4.3.4/custom_2018_01_15_01_world.sql | 1 + src/server/game/Entities/GameObject/GameObject.h | 2 +- src/server/game/Globals/ObjectMgr.cpp | 4 ++-- src/server/game/Handlers/QueryHandler.cpp | 4 +--- 4 files changed, 5 insertions(+), 6 deletions(-) create mode 100644 sql/updates/world/4.3.4/custom_2018_01_15_01_world.sql diff --git a/sql/updates/world/4.3.4/custom_2018_01_15_01_world.sql b/sql/updates/world/4.3.4/custom_2018_01_15_01_world.sql new file mode 100644 index 0000000000..b4f9c144e0 --- /dev/null +++ b/sql/updates/world/4.3.4/custom_2018_01_15_01_world.sql @@ -0,0 +1 @@ +ALTER TABLE `gameobject_template` CHANGE `unkInt32` `RequiredLevel` int(10) NOT NULL DEFAULT '0'; diff --git a/src/server/game/Entities/GameObject/GameObject.h b/src/server/game/Entities/GameObject/GameObject.h index d9ce62e1bb..c2076a13ac 100644 --- a/src/server/game/Entities/GameObject/GameObject.h +++ b/src/server/game/Entities/GameObject/GameObject.h @@ -44,7 +44,7 @@ struct GameObjectTemplate std::string castBarCaption; std::string unk1; float size; - int32 unkInt32; + int32 RequiredLevel; union // different GO types have different data field { //0 GAMEOBJECT_TYPE_DOOR diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 16c538911e..c57deb6290 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -6912,7 +6912,7 @@ void ObjectMgr::LoadGameObjectTemplate() // 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 "Data13, Data14, Data15, Data16, Data17, Data18, Data19, Data20, Data21, Data22, Data23, Data24, Data25, Data26, Data27, Data28, " // 37 38 39 40 41 42 - "Data29, Data30, Data31, unkInt32, AIName, ScriptName " + "Data29, Data30, Data31, RequiredLevel, AIName, ScriptName " "FROM gameobject_template"); if (!result) @@ -6943,7 +6943,7 @@ void ObjectMgr::LoadGameObjectTemplate() for (uint8 i = 0; i < MAX_GAMEOBJECT_DATA; ++i) got.raw.data[i] = fields[8 + i].GetUInt32(); - got.unkInt32 = fields[40].GetInt32(); + got.RequiredLevel = fields[40].GetInt32(); got.AIName = fields[41].GetString(); got.ScriptId = GetScriptId(fields[42].GetCString()); diff --git a/src/server/game/Handlers/QueryHandler.cpp b/src/server/game/Handlers/QueryHandler.cpp index 068681af90..5073788320 100644 --- a/src/server/game/Handlers/QueryHandler.cpp +++ b/src/server/game/Handlers/QueryHandler.cpp @@ -211,9 +211,7 @@ void WorldSession::HandleGameObjectQueryOpcode(WorldPacket& recvData) data << info->unk1; // 2.0.3, string data.append(info->raw.data, MAX_GAMEOBJECT_DATA); data << float(info->size); // go size - - data << int32(info->unkInt32); // 4.x, unknown - + data << int32(info->RequiredLevel); // 4.x, Required level GameObjectQuestItemList const* items = sObjectMgr->GetGameObjectQuestItemList(entry); if (items)