Some fixes

Author: TheNormalnij

Client/game_sa/CVehicleAudioSettingsEntrySA.h

@@ -17,23 +17,19 @@
 struct tVehicleAudioSettings
 {
     eVehicleSoundType m_eVehicleSoundType;
-    char  unk1;
-    short m_wEngineOnSoundBankId;
-    short m_wEngineOffSoundBankId;
-    char  m_nStereo; // 0 or 1 or 2
-    char  unk2;
-    float unk3;
-    float unk4;
-    char  m_bHornTon;
-    char  unk5[3];
-    float m_fHornHigh;
-    char  m_nDoorSound;
-    char  unk6;
-    char  m_nRadioNum;
-    char  m_nRadioType;
-    char  m_nVehTypeForAudio;
-    char  unk8[3];
-    float m_fHornVolumeDelta;
+    int16             m_nEngineOnSoundBankId;
+    int16             m_nEngineOffSoundBankId;
+    int8              m_nBassSetting;            // 0 or 1 or 2
+    float             m_fBassEq;
+    float             field_C;
+    int8              m_nHornToneSoundInBank;
+    float             m_fHornHigh;
+    char              m_nDoorSound;
+    char              m_EngineUpgrade;
+    char              m_nRadioID;
+    char              m_nRadioType;
+    char              m_nVehTypeForAudio;
+    float             m_fHornVolumeDelta;
 };
 static_assert(sizeof(tVehicleAudioSettings) == 0x24, "Invalid size for tVehicleAudioSettings");
 
@@ -48,35 +44,35 @@ class CVehicleAudioSettingsEntrySA : public CVehicleAudioSettingsEntry
 
     void Assign(const CVehicleAudioSettingsEntry* pData);
 
-    eVehicleSoundType GetSoundType() { return m_Settings.m_eVehicleSoundType; };
-    short             GetEngineOnSoundBankID() { return m_Settings.m_wEngineOnSoundBankId; };
-    short             GetEngineOffSoundBankID() { return m_Settings.m_wEngineOffSoundBankId; };
-    char              GetStereo() { return m_Settings.m_nStereo; };
-    float             GetUnk3() { return m_Settings.unk3; };
-    float             GetUnk4() { return m_Settings.unk4; };
-    char              GetHornTon() { return m_Settings.m_bHornTon; };
-    float             GetHornHign() { return m_Settings.m_fHornHigh; };
-    char              GetUnk6() { return m_Settings.unk6; };
-    char              GetDoorSound() { return m_Settings.m_nDoorSound; };
-    char              GetRadioNum() { return m_Settings.m_nRadioNum; };
-    char              GetRadioType() { return m_Settings.m_nRadioType; };
-    char              GetVehicleTypeForAudio() { return m_Settings.m_nVehTypeForAudio; };
-    float             GetHornVolumeDelta() { return m_Settings.m_fHornVolumeDelta; };
+    eVehicleSoundType GetSoundType() const noexcept override { return m_Settings.m_eVehicleSoundType; };
+    short             GetEngineOnSoundBankID() const noexcept override { return m_Settings.m_nEngineOnSoundBankId; };
+    short             GetEngineOffSoundBankID() const noexcept override { return m_Settings.m_nEngineOffSoundBankId; };
+    char              GetBassSetting() const noexcept override { return m_Settings.m_nBassSetting; };
+    float             GetBassEq() const noexcept override { return m_Settings.m_fBassEq; };
+    float             GetFieldC() const noexcept override { return m_Settings.field_C; };
+    char              GetHornTon() const noexcept override { return m_Settings.m_nHornToneSoundInBank; };
+    float             GetHornHign() const noexcept override { return m_Settings.m_fHornHigh; };
+    char              GetEngineUpgrade() const noexcept override { return m_Settings.m_EngineUpgrade; };
+    char              GetDoorSound() const noexcept override { return m_Settings.m_nDoorSound; };
+    char              GetRadioNum() const noexcept override { return m_Settings.m_nRadioID; };
+    char              GetRadioType() const noexcept override { return m_Settings.m_nRadioType; };
+    char              GetVehicleTypeForAudio() const noexcept override { return m_Settings.m_nVehTypeForAudio; };
+    float             GetHornVolumeDelta() const noexcept override { return m_Settings.m_fHornVolumeDelta; };
 
-    void SetSoundType(eVehicleSoundType value) { m_Settings.m_eVehicleSoundType = value; };
-    void SetEngineOnSoundBankID(short value) { m_Settings.m_wEngineOnSoundBankId = value; };
-    void SetEngineOffSoundBankID(short value) { m_Settings.m_wEngineOffSoundBankId = value; };
-    void SetStereo(char value) { m_Settings.m_nStereo = value; };
-    void SetUnk3(float value) { m_Settings.unk3= value; };
-    void SetUnk4(float value) { m_Settings.unk4= value; };
-    void SetHornTon(char value) { m_Settings.m_bHornTon = value; };
-    void SetHornHign(float value) { m_Settings.m_fHornHigh = value; };
-    void SetUnk6(char value) { m_Settings.unk6= value; };
-    void SetDoorSound(char value) { m_Settings.m_nDoorSound = value; };
-    void SetRadioNum(char value) { m_Settings.m_nRadioNum = value; };
-    void SetRadioType(char value) { m_Settings.m_nRadioType = value; };
-    void SetVehicleTypeForAudio(char value) { m_Settings.m_nVehTypeForAudio = value; };
-    void SetHornVolumeDelta(float value) { m_Settings.m_fHornVolumeDelta = value; };
+    void SetSoundType(eVehicleSoundType value) noexcept override { m_Settings.m_eVehicleSoundType = value; };
+    void SetEngineOnSoundBankID(short value) noexcept override { m_Settings.m_nEngineOnSoundBankId = value; };
+    void SetEngineOffSoundBankID(short value) noexcept override { m_Settings.m_nEngineOffSoundBankId = value; };
+    void SetBassSetting(char value) noexcept override { m_Settings.m_nBassSetting = value; };
+    void SetBassEq(float value) noexcept override { m_Settings.m_fBassEq = value; };
+    void SetFieldC(float value) noexcept override { m_Settings.field_C = value; };
+    void SetHornTon(char value) noexcept override { m_Settings.m_nHornToneSoundInBank = value; };
+    void SetHornHign(float value) noexcept override { m_Settings.m_fHornHigh = value; };
+    void SetEngineUpgrade(char value) noexcept override { m_Settings.m_EngineUpgrade = value; };
+    void SetDoorSound(char value) noexcept override { m_Settings.m_nDoorSound = value; };
+    void SetRadioNum(char value) noexcept override { m_Settings.m_nRadioID = value; };
+    void SetRadioType(char value) noexcept override { m_Settings.m_nRadioType = value; };
+    void SetVehicleTypeForAudio(char value) noexcept override { m_Settings.m_nVehTypeForAudio = value; };
+    void SetHornVolumeDelta(float value) noexcept override { m_Settings.m_fHornVolumeDelta = value; };
 
 private:
     tVehicleAudioSettings m_Settings;