Skip to content

Commit 39499b6

Browse files
committed
Properly name CastCaption and UnkString
Named after CGGameObject_C::GetOpenText CGGameObject_C::GetCloseText
1 parent 8a86fea commit 39499b6

16 files changed

Lines changed: 43 additions & 43 deletions

File tree

WowPacketParser.Proto/PacketStructures/structures.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -735,7 +735,7 @@ message PacketQueryGameObjectResponse {
735735
uint32 model = 4;
736736
string name = 5;
737737
string iconName = 6;
738-
string castCaption = 7;
738+
string openingText = 7;
739739
repeated int32 data = 8;
740740
float size = 9;
741741
repeated uint32 items = 10;

WowPacketParser/Parsing/Parsers/GameObjectHandler.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ public static void HandleGameObjectQueryResponse(Packet packet)
4141
gameObject.Name = name[0];
4242

4343
gameObject.IconName = packet.ReadCString("Icon Name");
44-
gameObject.CastCaption = packet.ReadCString("Cast Caption");
45-
gameObject.UnkString = packet.ReadCString("Unk String");
44+
gameObject.OpeningText = packet.ReadCString("Opening Text");
45+
gameObject.ClosingText = packet.ReadCString("Closing Text");
4646

4747
gameObject.Data = new int?[ClientVersion.AddedInVersion(ClientVersionBuild.V4_0_6_13596) ? 32 : 24];
4848
for (int i = 0; i < gameObject.Data.Length; i++)
@@ -78,7 +78,7 @@ public static void HandleGameObjectQueryResponse(Packet packet)
7878
query.Model = gameObject.DisplayID.Value;
7979
query.Name = gameObject.Name;
8080
query.IconName = gameObject.IconName;
81-
query.CastCaption = gameObject.CastCaption;
81+
query.OpeningText = gameObject.OpeningText;
8282
foreach (var data in gameObject.Data)
8383
query.Data.Add(data.Value);
8484
}

WowPacketParser/Store/Objects/GameObjectTemplate.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ public sealed record GameObjectTemplate : IDataModel
2323
public string IconName;
2424

2525
[DBFieldName("castBarCaption", LocaleConstant.enUS)] // ToDo: Add locale support
26-
public string CastCaption;
26+
public string OpeningText;
2727

2828
[DBFieldName("unk1")]
29-
public string UnkString;
29+
public string ClosingText;
3030

3131
[DBFieldName("size")]
3232
public float? Size;

WowPacketParserModule.V2_5_1_38707/Parsers/QueryHandler.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,8 +236,8 @@ public static void HandleGameObjectQueryResponse1141(Packet packet)
236236
gameObject.Name = name[0];
237237

238238
gameObject.IconName = packet.ReadCString("Icon Name");
239-
gameObject.CastCaption = packet.ReadCString("Cast Caption");
240-
gameObject.UnkString = packet.ReadCString("Unk String");
239+
gameObject.OpeningText = packet.ReadCString("Opening Text");
240+
gameObject.ClosingText = packet.ReadCString("Closing Text");
241241

242242
gameObject.Data = new int?[35];
243243
for (int i = 0; i < gameObject.Data.Length; i++)

WowPacketParserModule.V3_4_0_45166/Parsers/QueryHandler.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -439,8 +439,8 @@ public static void HandleGameObjectQueryResponse1141(Packet packet)
439439
gameObject.Name = name[0];
440440

441441
gameObject.IconName = packet.ReadCString("Icon Name");
442-
gameObject.CastCaption = packet.ReadCString("Cast Caption");
443-
gameObject.UnkString = packet.ReadCString("Unk String");
442+
gameObject.OpeningText = packet.ReadCString("Opening Text");
443+
gameObject.ClosingText = packet.ReadCString("Closing Text");
444444

445445
gameObject.Data = new int?[35];
446446
for (int i = 0; i < gameObject.Data.Length; i++)
@@ -481,7 +481,7 @@ public static void HandleGameObjectQueryResponse1141(Packet packet)
481481
query.Model = gameObject.DisplayID.Value;
482482
query.Name = gameObject.Name;
483483
query.IconName = gameObject.IconName;
484-
query.CastCaption = gameObject.CastCaption;
484+
query.OpeningText = gameObject.OpeningText;
485485
query.Size = gameObject.Size.Value;
486486
foreach (var data in gameObject.Data)
487487
query.Data.Add(data.Value);

WowPacketParserModule.V4_4_0_54481/Parsers/QueryHandler.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -276,8 +276,8 @@ public static void HandleGameObjectQueryResponse1141(Packet packet)
276276
gameObject.Name = name[0];
277277

278278
gameObject.IconName = packet.ReadCString("Icon Name");
279-
gameObject.CastCaption = packet.ReadCString("Cast Caption");
280-
gameObject.UnkString = packet.ReadCString("Unk String");
279+
gameObject.OpeningText = packet.ReadCString("Opening Text");
280+
gameObject.ClosingText = packet.ReadCString("Closing Text");
281281

282282
gameObject.Data = new int?[35];
283283
for (int i = 0; i < gameObject.Data.Length; i++)
@@ -318,7 +318,7 @@ public static void HandleGameObjectQueryResponse1141(Packet packet)
318318
query.Model = gameObject.DisplayID.Value;
319319
query.Name = gameObject.Name;
320320
query.IconName = gameObject.IconName;
321-
query.CastCaption = gameObject.CastCaption;
321+
query.OpeningText = gameObject.OpeningText;
322322
query.Size = gameObject.Size.Value;
323323
foreach (var data in gameObject.Data)
324324
query.Data.Add(data.Value);

WowPacketParserModule.V5_3_0_16981/Parsers/GameObjectHandler.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ public static void HandleGameObjectQueryResponse(Packet packet)
4141
gameObject.Name = name[0];
4242

4343
gameObject.IconName = packet.ReadCString("Icon Name");
44-
gameObject.CastCaption = packet.ReadCString("Cast Caption");
45-
gameObject.UnkString = packet.ReadCString("Unk String");
44+
gameObject.OpeningText = packet.ReadCString("Opening Text");
45+
gameObject.ClosingText = packet.ReadCString("Closing Text");
4646

4747
gameObject.Data = new int?[32];
4848
for (int i = 0; i < gameObject.Data.Length; i++)
@@ -80,7 +80,7 @@ public static void HandleGameObjectQueryResponse(Packet packet)
8080
query.Model = gameObject.DisplayID.Value;
8181
query.Name = gameObject.Name;
8282
query.IconName = gameObject.IconName;
83-
query.CastCaption = gameObject.CastCaption;
83+
query.OpeningText = gameObject.OpeningText;
8484
query.Size = gameObject.Size.Value;
8585
query.RequiredLevel = gameObject.RequiredLevel.Value;
8686
foreach (var data in gameObject.Data)

WowPacketParserModule.V5_4_0_17359/Parsers/GameObjectHandler.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ public static void HandleGameObjectQueryResponse(Packet packet)
3737
gameObject.Name = name[0];
3838

3939
gameObject.IconName = packet.ReadCString("Icon Name");
40-
gameObject.CastCaption = packet.ReadCString("Cast Caption");
41-
gameObject.UnkString = packet.ReadCString("Unk String");
40+
gameObject.OpeningText = packet.ReadCString("Opening Text");
41+
gameObject.ClosingText = packet.ReadCString("Closing Text");
4242

4343
gameObject.Data = new int?[32];
4444
for (int i = 0; i < gameObject.Data.Length; i++)
@@ -68,7 +68,7 @@ public static void HandleGameObjectQueryResponse(Packet packet)
6868
query.Model = gameObject.DisplayID.Value;
6969
query.Name = gameObject.Name;
7070
query.IconName = gameObject.IconName;
71-
query.CastCaption = gameObject.CastCaption;
71+
query.OpeningText = gameObject.OpeningText;
7272
query.Size = gameObject.Size.Value;
7373
query.RequiredLevel = gameObject.RequiredLevel.Value;
7474
foreach (var data in gameObject.Data)

WowPacketParserModule.V5_4_1_17538/Parsers/GameObjectHandler.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ public static void HandleGameObjectQueryResponse(Packet packet)
3636
gameObject.Name = name[0];
3737

3838
gameObject.IconName = packet.ReadCString("Icon Name");
39-
gameObject.CastCaption = packet.ReadCString("Cast Caption");
40-
gameObject.UnkString = packet.ReadCString("Unk String");
39+
gameObject.OpeningText = packet.ReadCString("Opening Text");
40+
gameObject.ClosingText = packet.ReadCString("Closing Text");
4141

4242
gameObject.Data = new int?[32];
4343
for (int i = 0; i < gameObject.Data.Length; i++)
@@ -69,7 +69,7 @@ public static void HandleGameObjectQueryResponse(Packet packet)
6969
query.Model = gameObject.DisplayID.Value;
7070
query.Name = gameObject.Name;
7171
query.IconName = gameObject.IconName;
72-
query.CastCaption = gameObject.CastCaption;
72+
query.OpeningText = gameObject.OpeningText;
7373
query.Size = gameObject.Size.Value;
7474
query.RequiredLevel = gameObject.RequiredLevel.Value;
7575
foreach (var data in gameObject.Data)

WowPacketParserModule.V5_4_2_17658/Parsers/GameObjectHandler.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ public static void HandleGameObjectQueryResponse(Packet packet)
5252
gameObject.Name = name[0];
5353

5454
gameObject.IconName = packet.ReadCString("Icon Name");
55-
gameObject.CastCaption = packet.ReadCString("Cast Caption");
56-
gameObject.UnkString = packet.ReadCString("Unk String");
55+
gameObject.OpeningText = packet.ReadCString("Opening Text");
56+
gameObject.ClosingText = packet.ReadCString("Closing Text");
5757

5858
gameObject.Data = new int?[32];
5959
for (int i = 0; i < gameObject.Data.Length; i++)
@@ -85,7 +85,7 @@ public static void HandleGameObjectQueryResponse(Packet packet)
8585
query.Model = gameObject.DisplayID.Value;
8686
query.Name = gameObject.Name;
8787
query.IconName = gameObject.IconName;
88-
query.CastCaption = gameObject.CastCaption;
88+
query.OpeningText = gameObject.OpeningText;
8989
query.Size = gameObject.Size.Value;
9090
query.RequiredLevel = gameObject.RequiredLevel.Value;
9191
foreach (var data in gameObject.Data)

0 commit comments

Comments
 (0)