Core/Misc: Rename POI field Unknown905 to WMOGroupId
Port From (https://github.com/TrinityCore/TrinityCore/commit/25fd57c768cb3ddee8206f399dcdacafbd021842)
This commit is contained in:
@@ -323,7 +323,7 @@ namespace Game.Misc
|
|||||||
packet.Pos = pointOfInterest.Pos;
|
packet.Pos = pointOfInterest.Pos;
|
||||||
packet.Icon = pointOfInterest.Icon;
|
packet.Icon = pointOfInterest.Icon;
|
||||||
packet.Importance = pointOfInterest.Importance;
|
packet.Importance = pointOfInterest.Importance;
|
||||||
packet.Unknown905 = pointOfInterest.Unknown905;
|
packet.WMOGroupID = pointOfInterest.WMOGroupID;
|
||||||
|
|
||||||
_session.SendPacket(packet);
|
_session.SendPacket(packet);
|
||||||
}
|
}
|
||||||
@@ -754,7 +754,7 @@ namespace Game.Misc
|
|||||||
public uint Flags;
|
public uint Flags;
|
||||||
public uint Importance;
|
public uint Importance;
|
||||||
public string Name;
|
public string Name;
|
||||||
public uint Unknown905;
|
public uint WMOGroupID;
|
||||||
}
|
}
|
||||||
|
|
||||||
public class PointOfInterestLocale
|
public class PointOfInterestLocale
|
||||||
|
|||||||
@@ -744,7 +744,7 @@ namespace Game
|
|||||||
pointsOfInterestStorage.Clear(); // need for reload case
|
pointsOfInterestStorage.Clear(); // need for reload case
|
||||||
|
|
||||||
// 0 1 2 3 4 5 6 7 8
|
// 0 1 2 3 4 5 6 7 8
|
||||||
var result = DB.World.Query("SELECT ID, PositionX, PositionY, PositionZ, Icon, Flags, Importance, Name, Unknown905 FROM points_of_interest");
|
var result = DB.World.Query("SELECT ID, PositionX, PositionY, PositionZ, Icon, Flags, Importance, Name, WMOGroupID FROM points_of_interest");
|
||||||
if (result.IsEmpty())
|
if (result.IsEmpty())
|
||||||
{
|
{
|
||||||
Log.outInfo(LogFilter.ServerLoading, "Loaded 0 Points of Interest definitions. DB table `points_of_interest` is empty.");
|
Log.outInfo(LogFilter.ServerLoading, "Loaded 0 Points of Interest definitions. DB table `points_of_interest` is empty.");
|
||||||
@@ -763,7 +763,7 @@ namespace Game
|
|||||||
POI.Flags = result.Read<uint>(5);
|
POI.Flags = result.Read<uint>(5);
|
||||||
POI.Importance = result.Read<uint>(6);
|
POI.Importance = result.Read<uint>(6);
|
||||||
POI.Name = result.Read<string>(7);
|
POI.Name = result.Read<string>(7);
|
||||||
POI.Unknown905 = result.Read<uint>(8);
|
POI.WMOGroupID = result.Read<uint>(8);
|
||||||
|
|
||||||
if (!GridDefines.IsValidMapCoord(POI.Pos.X, POI.Pos.Y, POI.Pos.Z))
|
if (!GridDefines.IsValidMapCoord(POI.Pos.X, POI.Pos.Y, POI.Pos.Z))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -215,7 +215,7 @@ namespace Game.Networking.Packets
|
|||||||
_worldPacket.WriteVector3(Pos);
|
_worldPacket.WriteVector3(Pos);
|
||||||
_worldPacket.WriteUInt32(Icon);
|
_worldPacket.WriteUInt32(Icon);
|
||||||
_worldPacket.WriteUInt32(Importance);
|
_worldPacket.WriteUInt32(Importance);
|
||||||
_worldPacket.WriteUInt32(Unknown905);
|
_worldPacket.WriteUInt32(WMOGroupID);
|
||||||
_worldPacket.WriteBits(Flags, 14);
|
_worldPacket.WriteBits(Flags, 14);
|
||||||
_worldPacket.WriteBits(Name.GetByteCount(), 6);
|
_worldPacket.WriteBits(Name.GetByteCount(), 6);
|
||||||
_worldPacket.FlushBits();
|
_worldPacket.FlushBits();
|
||||||
@@ -227,7 +227,7 @@ namespace Game.Networking.Packets
|
|||||||
public Vector3 Pos;
|
public Vector3 Pos;
|
||||||
public uint Icon;
|
public uint Icon;
|
||||||
public uint Importance;
|
public uint Importance;
|
||||||
public uint Unknown905;
|
public uint WMOGroupID;
|
||||||
public string Name;
|
public string Name;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user