Skip to content

Commit f24e5c4

Browse files
committed
strcut size validity and weapons in npc playback
1 parent 034dd78 commit f24e5c4

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

Server/Components/NPCs/Playback/record_manager.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ bool NPCRecordManager::parseRecordFile(StringView filePath, NPCRecord& record)
146146
syncData.Health = legacyData.health;
147147
syncData.PlayerHealthArmour.x = legacyData.playerHealth;
148148
syncData.PlayerHealthArmour.y = legacyData.playerArmour;
149-
syncData.WeaponID = legacyData.playerWeaponAndAdditionalKey;
149+
syncData.AdditionalKeyWeapon = legacyData.playerWeaponAndAdditionalKey;
150150
syncData.Siren = legacyData.sirenState;
151151
syncData.LandingGear = legacyData.gearState;
152152
syncData.HydraThrustAngle = legacyData.hydraThrusterAngle;
@@ -179,7 +179,7 @@ bool NPCRecordManager::parseRecordFile(StringView filePath, NPCRecord& record)
179179
legacyData.quaternion[2], legacyData.quaternion[3]);
180180
syncData.HealthArmour.x = legacyData.health;
181181
syncData.HealthArmour.y = legacyData.armour;
182-
syncData.Weapon = legacyData.weaponAndAdditionalKey;
182+
syncData.WeaponAdditionalKey = legacyData.weaponAndAdditionalKey;
183183
syncData.SpecialAction = legacyData.specialAction;
184184
syncData.Velocity = legacyData.velocity;
185185
syncData.SurfingData.offset = legacyData.surfingOffsets;

Server/Components/NPCs/Playback/record_manager.hpp

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,11 @@ struct LegacyVehicleSyncData
5353
uint16_t trailerId;
5454
union
5555
{
56-
uint32_t hydraThrustAngleAndTrainSpeed;
57-
struct
58-
{
59-
uint32_t hydraThrusterAngle;
60-
float trainSpeed;
61-
};
56+
uint32_t hydraThrusterAngle;
57+
float trainSpeed;
6258
};
6359
};
60+
static_assert(sizeof(LegacyVehicleSyncData) == 63, "Invalid LegacyVehicleSyncData size");
6461

6562
struct LegacyOnFootSyncData
6663
{
@@ -86,5 +83,6 @@ struct LegacyOnFootSyncData
8683
};
8784
};
8885
};
86+
static_assert(sizeof(LegacyOnFootSyncData) == 68, "Invalid LegacyOnFootSyncData size");
8987

9088
#pragma pack(pop)

0 commit comments

Comments
 (0)