diff --git a/src/Syroot.Worms/Gen2/Armageddon/ProjectX/Actions/BounceAction.cs b/src/Syroot.Worms/Gen2/Armageddon/ProjectX/Actions/BounceAction.cs index 54e5daa..ea73a35 100644 --- a/src/Syroot.Worms/Gen2/Armageddon/ProjectX/Actions/BounceAction.cs +++ b/src/Syroot.Worms/Gen2/Armageddon/ProjectX/Actions/BounceAction.cs @@ -40,7 +40,7 @@ namespace Syroot.Worms.Gen2.Armageddon.ProjectX { using (BinaryDataReader reader = new BinaryDataReader(stream, Encoding.ASCII, true)) { - Collisions = reader.ReadEnum(true); + Collisions = reader.ReadEnum(false); Bounciness = reader.ReadInt32(); Acceleration = reader.ReadInt32(); Sound = reader.ReadInt32(); diff --git a/src/Syroot.Worms/Gen2/Armageddon/ProjectX/Actions/HomeAction.cs b/src/Syroot.Worms/Gen2/Armageddon/ProjectX/Actions/HomeAction.cs index d3539e8..3f3e65e 100644 --- a/src/Syroot.Worms/Gen2/Armageddon/ProjectX/Actions/HomeAction.cs +++ b/src/Syroot.Worms/Gen2/Armageddon/ProjectX/Actions/HomeAction.cs @@ -29,7 +29,7 @@ namespace Syroot.Worms.Gen2.Armageddon.ProjectX { reader.Seek(4); Sprite = reader.ReadStruct(); - HomeStyle = reader.ReadEnum(true); + HomeStyle = reader.ReadEnum(false); Delay = reader.ReadInt32(); Duration = reader.ReadInt32(); } diff --git a/src/Syroot.Worms/Gen2/Armageddon/ProjectX/Actions/RoamAction.cs b/src/Syroot.Worms/Gen2/Armageddon/ProjectX/Actions/RoamAction.cs index eeda7c4..e50659a 100644 --- a/src/Syroot.Worms/Gen2/Armageddon/ProjectX/Actions/RoamAction.cs +++ b/src/Syroot.Worms/Gen2/Armageddon/ProjectX/Actions/RoamAction.cs @@ -54,8 +54,8 @@ namespace Syroot.Worms.Gen2.Armageddon.ProjectX { using (BinaryDataReader reader = new BinaryDataReader(stream, Encoding.ASCII, true)) { - RoamCollisions = reader.ReadEnum(true); - ExplosionCollisions = reader.ReadEnum(true); + RoamCollisions = reader.ReadEnum(false); + ExplosionCollisions = reader.ReadEnum(false); WalkSpeed = reader.ReadInt32(); Unknown = reader.ReadInt32(); JumpAngleEdge = reader.ReadInt32(); diff --git a/src/Syroot.Worms/Gen2/Armageddon/ProjectX/Styles/AirstrikeStyle.cs b/src/Syroot.Worms/Gen2/Armageddon/ProjectX/Styles/AirstrikeStyle.cs index d8688f7..bcb6cfa 100644 --- a/src/Syroot.Worms/Gen2/Armageddon/ProjectX/Styles/AirstrikeStyle.cs +++ b/src/Syroot.Worms/Gen2/Armageddon/ProjectX/Styles/AirstrikeStyle.cs @@ -40,7 +40,7 @@ namespace Syroot.Worms.Gen2.Armageddon.ProjectX HorizontalSpeed = reader.ReadInt32(); Sound = reader.ReadInt32(); - Action = reader.ReadEnum(true); + Action = reader.ReadEnum(false); switch (Action) { case WeaponAirstrikeAction.Launcher: diff --git a/src/Syroot.Worms/Gen2/Armageddon/ProjectX/Styles/GunStyle.cs b/src/Syroot.Worms/Gen2/Armageddon/ProjectX/Styles/GunStyle.cs index 6c6ad99..ee9a305 100644 --- a/src/Syroot.Worms/Gen2/Armageddon/ProjectX/Styles/GunStyle.cs +++ b/src/Syroot.Worms/Gen2/Armageddon/ProjectX/Styles/GunStyle.cs @@ -52,7 +52,7 @@ namespace Syroot.Worms.Gen2.Armageddon.ProjectX BulletSpread = reader.ReadInt32(); Burst = reader.ReadInt32(); BurstSpread = reader.ReadInt32(); - Collisions = reader.ReadEnum(true); + Collisions = reader.ReadEnum(false); ExplosionBias = reader.ReadInt32(); ExplosionPower = reader.ReadInt32(); MaxDamage = reader.ReadInt32(); diff --git a/src/Syroot.Worms/Gen2/Armageddon/ProjectX/Styles/LauncherStyle.cs b/src/Syroot.Worms/Gen2/Armageddon/ProjectX/Styles/LauncherStyle.cs index 706685d..97a3a64 100644 --- a/src/Syroot.Worms/Gen2/Armageddon/ProjectX/Styles/LauncherStyle.cs +++ b/src/Syroot.Worms/Gen2/Armageddon/ProjectX/Styles/LauncherStyle.cs @@ -69,7 +69,7 @@ namespace Syroot.Worms.Gen2.Armageddon.ProjectX SpriteSize = reader.ReadInt32(); FixedSpeed = reader.ReadInt32(); RunAway = reader.ReadBoolean(BinaryBooleanFormat.NonZeroDword); - Collisions = reader.ReadEnum(true); + Collisions = reader.ReadEnum(false); ExplosionBias = reader.ReadInt32(); ExplosionPushPower = reader.ReadInt32(); ExplosionDamage = reader.ReadInt32(); @@ -85,7 +85,7 @@ namespace Syroot.Worms.Gen2.Armageddon.ProjectX Sound = reader.ReadStruct(); ExplodeOnSpace = reader.ReadBoolean(BinaryBooleanFormat.NonZeroDword); - ExplosionAction = reader.ReadEnum(true); + ExplosionAction = reader.ReadEnum(false); switch (ExplosionAction) { case ExplosionAction.Bounce: @@ -103,7 +103,7 @@ namespace Syroot.Worms.Gen2.Armageddon.ProjectX } reader.Position = offset + 180; - ExplosionTarget = reader.ReadEnum(true); + ExplosionTarget = reader.ReadEnum(false); reader.Seek(sizeof(int)); switch (ExplosionTarget) { diff --git a/src/Syroot.Worms/Gen2/Armageddon/ProjectX/Targets/ClusterTarget.cs b/src/Syroot.Worms/Gen2/Armageddon/ProjectX/Targets/ClusterTarget.cs index 101ae5e..8d2215a 100644 --- a/src/Syroot.Worms/Gen2/Armageddon/ProjectX/Targets/ClusterTarget.cs +++ b/src/Syroot.Worms/Gen2/Armageddon/ProjectX/Targets/ClusterTarget.cs @@ -68,7 +68,7 @@ namespace Syroot.Worms.Gen2.Armageddon.ProjectX Speed = reader.ReadInt32(); EjectionAngle = reader.ReadInt32(); DispersionAngle = reader.ReadInt32(); - Collisions = reader.ReadEnum(true); + Collisions = reader.ReadEnum(false); ExplosionBias = reader.ReadInt32(); ExplosionPushPower = reader.ReadInt32(); ExplosionDamage = reader.ReadInt32(); @@ -84,7 +84,7 @@ namespace Syroot.Worms.Gen2.Armageddon.ProjectX Sound = reader.ReadStruct(); ExplodeOnSpace = reader.ReadBoolean(BinaryBooleanFormat.NonZeroDword); - ExplosionAction = reader.ReadEnum(true); + ExplosionAction = reader.ReadEnum(false); switch (ExplosionAction) { case ExplosionAction.Bounce: diff --git a/src/Syroot.Worms/Gen2/Armageddon/ProjectX/Weapon.cs b/src/Syroot.Worms/Gen2/Armageddon/ProjectX/Weapon.cs index 1a4ed4e..8762678 100644 --- a/src/Syroot.Worms/Gen2/Armageddon/ProjectX/Weapon.cs +++ b/src/Syroot.Worms/Gen2/Armageddon/ProjectX/Weapon.cs @@ -131,7 +131,7 @@ namespace Syroot.Worms.Gen2.Armageddon.ProjectX Unknown2 = reader.ReadInt32(); // Read the activation and the corresponding weapon settings. - Activation = reader.ReadEnum(true); + Activation = reader.ReadEnum(false); switch (Activation) { case WeaponActivation.Airstrike: @@ -140,7 +140,7 @@ namespace Syroot.Worms.Gen2.Armageddon.ProjectX break; case WeaponActivation.Crosshair: reader.Seek(sizeof(int)); - CrosshairAction = reader.ReadEnum(true); + CrosshairAction = reader.ReadEnum(false); switch (CrosshairAction) { case WeaponCrosshairAction.Bow: @@ -158,7 +158,7 @@ namespace Syroot.Worms.Gen2.Armageddon.ProjectX } break; case WeaponActivation.Spacebar: - SpacebarAction = reader.ReadEnum(true); + SpacebarAction = reader.ReadEnum(false); switch (SpacebarAction) { case WeaponSpacebarAction.Armageddon: @@ -219,7 +219,7 @@ namespace Syroot.Worms.Gen2.Armageddon.ProjectX break; case WeaponActivation.Throw: ThrowHerdCount = reader.ReadInt32(); - ThrowAction = reader.ReadEnum(true); + ThrowAction = reader.ReadEnum(false); switch (ThrowAction) { case WeaponThrowAction.Canister: diff --git a/src/Syroot.Worms/Gen2/Image.cs b/src/Syroot.Worms/Gen2/Image.cs index 5c001fc..88570a7 100644 --- a/src/Syroot.Worms/Gen2/Image.cs +++ b/src/Syroot.Worms/Gen2/Image.cs @@ -53,7 +53,7 @@ namespace Syroot.Worms.Gen2 /// true to align the data array by 4 bytes. internal Image(Stream stream, bool alignData) { - Load(stream); + Load(stream, alignData); } // ---- PROPERTIES ---------------------------------------------------------------------------------------------