diff options
| -rw-r--r-- | sql/updates/world/6.x/2016_08_01_05_world.sql | 1 | ||||
| -rw-r--r-- | src/server/game/Entities/GameObject/GameObject.h | 2 | ||||
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 6 | ||||
| -rw-r--r-- | src/server/game/Handlers/QueryHandler.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Server/Packets/QueryPackets.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Server/Packets/QueryPackets.h | 2 |
6 files changed, 8 insertions, 7 deletions
diff --git a/sql/updates/world/6.x/2016_08_01_05_world.sql b/sql/updates/world/6.x/2016_08_01_05_world.sql new file mode 100644 index 00000000000..b4f9c144e00 --- /dev/null +++ b/sql/updates/world/6.x/2016_08_01_05_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 a26d0fac250..ae91170442c 100644 --- a/src/server/game/Entities/GameObject/GameObject.h +++ b/src/server/game/Entities/GameObject/GameObject.h @@ -43,7 +43,7 @@ struct GameObjectTemplate uint32 faction; uint32 flags; float size; - int32 unkInt32; + int32 RequiredLevel; union { // 0 GAMEOBJECT_TYPE_DOOR diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index f2eaebd5fc8..ae81cf9a6c4 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -6617,7 +6617,7 @@ void ObjectMgr::LoadGameObjectTemplate() go.size = db2go->Size; memset(go.raw.data, 0, sizeof(go.raw.data)); memcpy(go.raw.data, db2go->Data, std::min(sizeof(db2go->Data), sizeof(go.raw.data))); - go.unkInt32 = 0; + go.RequiredLevel = 0; go.ScriptId = 0; } @@ -6628,7 +6628,7 @@ void ObjectMgr::LoadGameObjectTemplate() // 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 "Data13, Data14, Data15, Data16, Data17, Data18, Data19, Data20, Data21, Data22, Data23, Data24, Data25, Data26, Data27, Data28, " // 39 40 41 42 43 44 45 - "Data29, Data30, Data31, Data32, unkInt32, AIName, ScriptName " + "Data29, Data30, Data31, Data32, RequiredLevel, AIName, ScriptName " "FROM gameobject_template"); if (!result) @@ -6661,7 +6661,7 @@ void ObjectMgr::LoadGameObjectTemplate() for (uint8 i = 0; i < MAX_GAMEOBJECT_DATA; ++i) got.raw.data[i] = fields[10 + i].GetUInt32(); - got.unkInt32 = fields[43].GetInt32(); + got.RequiredLevel = fields[43].GetInt32(); got.AIName = fields[44].GetString(); got.ScriptId = GetScriptId(fields[45].GetString()); diff --git a/src/server/game/Handlers/QueryHandler.cpp b/src/server/game/Handlers/QueryHandler.cpp index c493c58ec0c..ab377060563 100644 --- a/src/server/game/Handlers/QueryHandler.cpp +++ b/src/server/game/Handlers/QueryHandler.cpp @@ -158,7 +158,7 @@ void WorldSession::HandleGameObjectQueryOpcode(WorldPackets::Query::QueryGameObj stats.QuestItems.push_back(item); memcpy(stats.Data, gameObjectInfo->raw.data, MAX_GAMEOBJECT_DATA * sizeof(int32)); - stats.Expansion = gameObjectInfo->unkInt32; + stats.RequiredLevel = gameObjectInfo->RequiredLevel; } SendPacket(response.Write()); diff --git a/src/server/game/Server/Packets/QueryPackets.cpp b/src/server/game/Server/Packets/QueryPackets.cpp index aa7a970d125..d7eb1d576a2 100644 --- a/src/server/game/Server/Packets/QueryPackets.cpp +++ b/src/server/game/Server/Packets/QueryPackets.cpp @@ -325,7 +325,7 @@ WorldPacket const* WorldPackets::Query::QueryGameObjectResponse::Write() for (int32 questItem : Stats.QuestItems) statsData << int32(questItem); - statsData << int32(Stats.Expansion); + statsData << int32(Stats.RequiredLevel); } _worldPacket << uint32(statsData.size()); diff --git a/src/server/game/Server/Packets/QueryPackets.h b/src/server/game/Server/Packets/QueryPackets.h index 2d6e488e4be..5527d4648eb 100644 --- a/src/server/game/Server/Packets/QueryPackets.h +++ b/src/server/game/Server/Packets/QueryPackets.h @@ -237,7 +237,7 @@ namespace WorldPackets uint32 Data[MAX_GAMEOBJECT_DATA]; float Size = 0.0f; std::vector<int32> QuestItems; - uint32 Expansion = 0; + uint32 RequiredLevel = 0; }; class QueryGameObjectResponse final : public ServerPacket |