Skip to content

Commit cd71a61

Browse files
ShaurenShauren
committed
Fix wrong SplineFlags enum being used for >= 8.0
1 parent ff5091f commit cd71a61

10 files changed

Lines changed: 34 additions & 43 deletions

File tree

‎WowPacketParserModule.V11_0_0_55666/Parsers/MovementHandler.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
using WowPacketParser.Enums;
22
using WowPacketParser.Misc;
3-
using WowPacketParser.PacketStructures;
43
using WowPacketParser.Parsing;
54
using WowPacketParser.Proto;
65
using WowPacketParserModule.V6_0_2_19033.Enums;
6+
using static WowPacketParserModule.V7_0_3_22248.Enums.ProtoExtensions;
7+
using SplineFlag = WowPacketParserModule.V7_0_3_22248.Enums.SplineFlag;
78

89
namespace WowPacketParserModule.V11_0_0_55666.Parsers
910
{

‎WowPacketParserModule.V1_13_2_31446/Parsers/MovementHandler.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
using Google.Protobuf.WellKnownTypes;
22
using WowPacketParser.Enums;
33
using WowPacketParser.Misc;
4-
using WowPacketParser.PacketStructures;
54
using WowPacketParser.Parsing;
65
using WowPacketParser.Proto;
6+
using static WowPacketParserModule.V7_0_3_22248.Enums.ProtoExtensions;
77
using SplineFacingType = WowPacketParserModule.V6_0_2_19033.Enums.SplineFacingType;
8+
using SplineFlag = WowPacketParserModule.V7_0_3_22248.Enums.SplineFlag;
89

910
namespace WowPacketParserModule.V1_13_2_31446.Parsers
1011
{

‎WowPacketParserModule.V3_4_0_45166/Parsers/MovementHandler.cs‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
1-
using System.Linq;
2-
using Google.Protobuf.WellKnownTypes;
1+
using Google.Protobuf.WellKnownTypes;
2+
using System.Linq;
33
using WowPacketParser.DBC;
44
using WowPacketParser.Enums;
55
using WowPacketParser.Enums.Version;
66
using WowPacketParser.Misc;
7-
using WowPacketParser.PacketStructures;
87
using WowPacketParser.Parsing;
98
using WowPacketParser.Proto;
10-
using WowPacketParser.Store;
11-
using WowPacketParser.Store.Objects;
9+
using static WowPacketParserModule.V7_0_3_22248.Enums.ProtoExtensions;
1210
using CoreParsers = WowPacketParser.Parsing.Parsers;
1311
using MovementFlag = WowPacketParser.Enums.v4.MovementFlag;
1412
using MovementFlag2 = WowPacketParser.Enums.v4.MovementFlag2;
1513
using SplineFacingType = WowPacketParserModule.V6_0_2_19033.Enums.SplineFacingType;
14+
using SplineFlag = WowPacketParserModule.V7_0_3_22248.Enums.SplineFlag;
1615

1716
namespace WowPacketParserModule.V3_4_0_45166.Parsers
1817
{

‎WowPacketParserModule.V4_4_0_54481/Parsers/MovementHandler.cs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
using Google.Protobuf.WellKnownTypes;
2-
using System;
3-
using System.Diagnostics.Eventing.Reader;
42
using System.Linq;
53
using WowPacketParser.DBC;
64
using WowPacketParser.Enums;
75
using WowPacketParser.Enums.Version;
86
using WowPacketParser.Misc;
97
using WowPacketParser.Parsing;
108
using WowPacketParser.Proto;
11-
using WowPacketParser.SQL.Builders;
12-
using WowPacketParser.Store;
13-
using WowPacketParserModule.V7_0_3_22248.Enums;
9+
using static WowPacketParserModule.V7_0_3_22248.Enums.ProtoExtensions;
1410
using CoreParsers = WowPacketParser.Parsing.Parsers;
1511
using SplineFacingType = WowPacketParserModule.V6_0_2_19033.Enums.SplineFacingType;
1612
using SplineFlag = WowPacketParserModule.V7_0_3_22248.Enums.SplineFlag;

‎WowPacketParserModule.V5_5_0_61735/Parser/MovementHandler.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@
44
using WowPacketParser.Enums;
55
using WowPacketParser.Enums.Version;
66
using WowPacketParser.Misc;
7-
using WowPacketParser.PacketStructures;
87
using WowPacketParser.Parsing;
98
using WowPacketParser.Proto;
109
using WowPacketParserModule.V6_0_2_19033.Enums;
10+
using static WowPacketParserModule.V7_0_3_22248.Enums.ProtoExtensions;
1111
using CoreParsers = WowPacketParser.Parsing.Parsers;
12+
using SplineFlag = WowPacketParserModule.V7_0_3_22248.Enums.SplineFlag;
1213

1314
namespace WowPacketParserModule.V5_5_0_61735.Parsers
1415
{

‎WowPacketParserModule.V5_5_0_61735/Parser/MovementHandler1158.cs‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
1-
using Google.Protobuf.WellKnownTypes;
2-
using System.Linq;
3-
using WowPacketParser.DBC;
4-
using WowPacketParser.Enums;
1+
using WowPacketParser.Enums;
52
using WowPacketParser.Enums.Version;
63
using WowPacketParser.Misc;
7-
using WowPacketParser.PacketStructures;
84
using WowPacketParser.Parsing;
95
using WowPacketParser.Proto;
106
using WowPacketParserModule.V6_0_2_19033.Enums;
11-
using CoreParsers = WowPacketParser.Parsing.Parsers;
7+
using static WowPacketParserModule.V7_0_3_22248.Enums.ProtoExtensions;
8+
using SplineFlag = WowPacketParserModule.V7_0_3_22248.Enums.SplineFlag;
129

1310
namespace WowPacketParserModule.V5_5_0_61735.Parsers
1411
{

‎WowPacketParserModule.V7_0_3_22248/Enums/ProtoExtensions.cs‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
using WowPacketParser.Enums;
2+
using WowPacketParser.Misc;
13
using WowPacketParser.Proto;
24

35
namespace WowPacketParserModule.V7_0_3_22248.Enums
@@ -7,12 +9,15 @@ public static class ProtoExtensions
79
public static UniversalSplineFlag ToUniversal(this SplineFlag flags)
810
{
911
UniversalSplineFlag universal = UniversalSplineFlag.SplineFlagNone;
10-
if (flags.HasFlag(SplineFlag.AnimTierSwim))
11-
universal |= UniversalSplineFlag.AnimTierSwim;
12-
if (flags.HasFlag(SplineFlag.AnimTierHover))
13-
universal |= UniversalSplineFlag.AnimTierHover;
14-
if (flags.HasFlag(SplineFlag.AnimTierSubmerged))
15-
universal |= UniversalSplineFlag.AnimTierSubmerged;
12+
if (ClientVersion.RemovedInVersion(ClientType.Shadowlands))
13+
{
14+
if (flags.HasFlag(SplineFlag.AnimTierSwim))
15+
universal |= UniversalSplineFlag.AnimTierSwim;
16+
if (flags.HasFlag(SplineFlag.AnimTierHover))
17+
universal |= UniversalSplineFlag.AnimTierHover;
18+
if (flags.HasFlag(SplineFlag.AnimTierSubmerged))
19+
universal |= UniversalSplineFlag.AnimTierSubmerged;
20+
}
1621
if (flags.HasFlag(SplineFlag.FallingSlow))
1722
universal |= UniversalSplineFlag.FallingSlow;
1823
if (flags.HasFlag(SplineFlag.Done))
@@ -31,7 +36,7 @@ public static UniversalSplineFlag ToUniversal(this SplineFlag flags)
3136
universal |= UniversalSplineFlag.Cyclic;
3237
if (flags.HasFlag(SplineFlag.EnterCycle))
3338
universal |= UniversalSplineFlag.EnterCycle;
34-
if (flags.HasFlag(SplineFlag.Frozen))
39+
if (flags.HasFlag(SplineFlag.Turning))
3540
universal |= UniversalSplineFlag.Frozen;
3641
if (flags.HasFlag(SplineFlag.TransportEnter))
3742
universal |= UniversalSplineFlag.TransportEnter;

‎WowPacketParserModule.V7_0_3_22248/Enums/SplineFlag.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public enum SplineFlag : uint
1010
AnimTierHover = 0x00000002,
1111
AnimTierFly = 0x00000003,
1212
AnimTierSubmerged = 0x00000004,
13-
Unknown0 = 0x00000008,
13+
JumpOrientationFixed= 0x00000008,
1414
FallingSlow = 0x00000010,
1515
Done = 0x00000020,
1616
Falling = 0x00000040,
@@ -21,7 +21,7 @@ public enum SplineFlag : uint
2121
Catmullrom = 0x00000800,
2222
Cyclic = 0x00001000,
2323
EnterCycle = 0x00002000,
24-
Frozen = 0x00004000,
24+
Turning = 0x00004000, // Frozen before 11.1.7 (never used so just using new name unconditionally)
2525
TransportEnter = 0x00008000,
2626
TransportExit = 0x00010000,
2727
Unknown2 = 0x00020000,
@@ -31,12 +31,12 @@ public enum SplineFlag : uint
3131
CanSwim = 0x00200000,
3232
UncompressedPath = 0x00400000,
3333
Unknown4 = 0x00800000,
34-
Unknown5 = 0x01000000,
34+
FastSteering = 0x01000000,
3535
Animation = 0x02000000,
3636
Parabolic = 0x04000000,
3737
FadeObject = 0x08000000,
3838
Steering = 0x10000000,
39-
Unknown8 = 0x20000000,
39+
UnlimitedSpeed = 0x20000000,
4040
Unknown9 = 0x40000000,
4141
Unknown10 = 0x80000000,
4242
}

‎WowPacketParserModule.V7_0_3_22248/Parsers/MovementHandler.cs‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
1+
using System.Linq;
42
using WowPacketParser.DBC;
53
using WowPacketParser.Enums;
64
using WowPacketParser.Misc;
75
using WowPacketParser.Parsing;
86
using WowPacketParser.Proto;
9-
using WowPacketParserModule.V7_0_3_22248.Enums;
7+
using static WowPacketParserModule.V7_0_3_22248.Enums.ProtoExtensions;
108
using CoreParsers = WowPacketParser.Parsing.Parsers;
11-
using MovementFlag = WowPacketParser.Enums.v4.MovementFlag;
12-
using MovementFlag2 = WowPacketParser.Enums.v7.MovementFlag2;
139
using SplineFacingType = WowPacketParserModule.V6_0_2_19033.Enums.SplineFacingType;
1410
using SplineFlag = WowPacketParserModule.V7_0_3_22248.Enums.SplineFlag;
1511

‎WowPacketParserModule.V8_0_1_27101/Parsers/MovementHandler.cs‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
1-
using System;
2-
using System.Diagnostics.Eventing.Reader;
3-
using System.Linq;
4-
using System.Reflection;
1+
using System.Linq;
52
using WowPacketParser.DBC;
63
using WowPacketParser.Enums;
74
using WowPacketParser.Misc;
85
using WowPacketParser.Parsing;
96
using WowPacketParser.Proto;
10-
using WowPacketParser.Store;
11-
using WowPacketParserModule.V6_0_2_19033.Parsers;
12-
using WowPacketParserModule.V7_0_3_22248.Enums;
7+
using static WowPacketParserModule.V7_0_3_22248.Enums.ProtoExtensions;
138
using CoreParsers = WowPacketParser.Parsing.Parsers;
149
using SplineFacingType = WowPacketParserModule.V6_0_2_19033.Enums.SplineFacingType;
1510
using SplineFlag = WowPacketParserModule.V7_0_3_22248.Enums.SplineFlag;

0 commit comments

Comments
 (0)