mirror of
https://github.com/halpz/re3.git
synced 2025-07-15 23:28:15 +00:00
Cleanup
This commit is contained in:
Filip Gawin
@ -49,8 +49,8 @@ public:
|
||||
uint8 field_89;
|
||||
uint8 field_90;
|
||||
uint8 field_91;
|
||||
|
||||
// no methods
|
||||
|
||||
// no methods
|
||||
};
|
||||
|
||||
static_assert(sizeof(tActiveSample) == 92, "tActiveSample: error");
|
||||
@ -88,8 +88,8 @@ public:
|
||||
float m_afVolume[4];
|
||||
uint8 m_Loops;
|
||||
uint8 field_25[3];
|
||||
|
||||
// no methods
|
||||
|
||||
// no methods
|
||||
};
|
||||
|
||||
static_assert(sizeof(tAudioEntity) == 40, "tAudioEntity: error");
|
||||
@ -104,8 +104,8 @@ public:
|
||||
uint8 m_bVolume;
|
||||
int8 field_25; // allocated time?
|
||||
uint8 gap_26[2];
|
||||
|
||||
// no methods
|
||||
|
||||
// no methods
|
||||
};
|
||||
|
||||
static_assert(sizeof(tPedComment) == 28, "tPedComment: error");
|
||||
@ -119,7 +119,7 @@ public:
|
||||
uint8 activeBank;
|
||||
uint8 gap_1163[1];
|
||||
|
||||
// reversed all methods
|
||||
// reversed all methods
|
||||
void Add(tPedComment *com); /// ok
|
||||
void Process(); /// ok
|
||||
};
|
||||
@ -142,8 +142,8 @@ public:
|
||||
CVector m_vecPosition;
|
||||
float m_fDistance;
|
||||
int32 m_nBaseVolume;
|
||||
|
||||
// no methods
|
||||
|
||||
// no methods
|
||||
};
|
||||
|
||||
static_assert(sizeof(cAudioCollision) == 40, "cAudioCollision: error");
|
||||
@ -157,6 +157,8 @@ public:
|
||||
uint8 m_bCollisionsInQueue;
|
||||
uint8 gap_811;
|
||||
cAudioCollision m_sQueue;
|
||||
|
||||
void AddCollisionToRequestedQueue(); // todo
|
||||
};
|
||||
|
||||
static_assert(sizeof(cAudioCollisionManager) == 852, "cAudioCollisionManager: error");
|
||||
@ -177,6 +179,7 @@ public:
|
||||
uint8 field_29;
|
||||
uint8 field_30;
|
||||
uint8 field_31;
|
||||
// no methods
|
||||
};
|
||||
|
||||
static_assert(sizeof(cMissionAudio) == 32, "cMissionAudio: error");
|
||||
@ -188,7 +191,8 @@ class CPed;
|
||||
class cPedParams;
|
||||
class cTransmission;
|
||||
|
||||
class cAudioScriptObject {
|
||||
class cAudioScriptObject
|
||||
{
|
||||
public:
|
||||
int16 AudioId;
|
||||
char _pad0[2];
|
||||
@ -220,22 +224,14 @@ enum {
|
||||
MAX_REFLECTIONS,
|
||||
};
|
||||
|
||||
<<<<<<< HEAD
|
||||
enum AudioEntityHandle
|
||||
{
|
||||
AEHANDLE_NONE = -5,
|
||||
AEHANDLE_ERROR_NOAUDIOSYS = -4,
|
||||
AEHANDLE_ERROR_NOFREESLOT = -3,
|
||||
AEHANDLE_ERROR_NOENTITY = -2,
|
||||
enum AudioEntityHandle {
|
||||
AEHANDLE_NONE = -5,
|
||||
AEHANDLE_ERROR_NOAUDIOSYS = -4,
|
||||
AEHANDLE_ERROR_NOFREESLOT = -3,
|
||||
AEHANDLE_ERROR_NOENTITY = -2,
|
||||
AEHANDLE_ERROR_BADAUDIOTYPE = -1,
|
||||
};
|
||||
|
||||
#define AEHANDLE_IS_FAILED(h) ((h)<0)
|
||||
#define AEHANDLE_IS_OK(h) ((h)>=0)
|
||||
|
||||
|
||||
=======
|
||||
>>>>>>> Cleanup
|
||||
class cAudioManager
|
||||
{
|
||||
public:
|
||||
@ -285,22 +281,10 @@ public:
|
||||
uint8 field_19195; // time?
|
||||
uint32 m_FrameCounter;
|
||||
|
||||
<<<<<<< HEAD
|
||||
inline uint32 GetFrameCounter(void) { return m_FrameCounter; }
|
||||
float GetReflectionsDistance(int32 idx) { return m_afReflectionsDistances[idx]; }
|
||||
<<<<<<< HEAD
|
||||
int32 GetRandomNumber(int32 idx) { return m_anRandomTable[idx]; }
|
||||
=======
|
||||
int32 GetRandomTabe(int32 idx) { return m_anRandomTable[idx]; }
|
||||
|
||||
>>>>>>> Cleanup
|
||||
//
|
||||
=======
|
||||
// getters
|
||||
uint32 GetFrameCounter() const { return m_FrameCounter; }
|
||||
float GetReflectionsDistance(int32 idx) const { return m_afReflectionsDistances[idx]; }
|
||||
int32 GetRandomTabe(int32 idx) const { return m_anRandomTable[idx]; }
|
||||
>>>>>>> More more more audio
|
||||
int32 GetRandomNumber(int32 idx) const { return m_anRandomTable[idx]; }
|
||||
|
||||
// "Should" be in alphabetic order, except "getXTalkSfx"
|
||||
void AddDetailsToRequestedOrderList(uint8 sample); /// ok
|
||||
@ -312,80 +296,22 @@ public:
|
||||
void AgeCrimes(); // todo
|
||||
|
||||
void CalculateDistance(bool *ptr, float dist); /// ok
|
||||
bool CheckForAnAudioFileOnCD() const; /// ok
|
||||
bool CheckForAnAudioFileOnCD() const; /// ok
|
||||
void ClearMissionAudio(); /// ok
|
||||
void ClearRequestedQueue(); /// ok
|
||||
int32 ComputeDopplerEffectedFrequency(uint32 oldFreq, float position1, float position2,
|
||||
float speedMultiplier) const; /// ok
|
||||
int32 ComputePan(float, CVector *); // todo
|
||||
<<<<<<< HEAD
|
||||
uint32 ComputeVolume(int emittingVolume, float soundIntensity, float distance); /// ok
|
||||
int32 CreateEntity(int32 type, void *entity); /// ok
|
||||
=======
|
||||
float speedMultiplier) const; /// ok
|
||||
int32 ComputePan(float, CVector *); // todo
|
||||
uint32 ComputeVolume(int emittingVolume, float soundIntensity, float distance) const; /// ok
|
||||
int32 CreateEntity(int32 type, CPhysical *entity); /// ok
|
||||
>>>>>>> More more more audio
|
||||
int32 CreateEntity(int32 type, CPhysical *entity); /// ok
|
||||
|
||||
void DestroyAllGameCreatedEntities(); /// ok
|
||||
void DestroyEntity(int32 id); /// ok
|
||||
void DoJumboVolOffset() const; /// ok
|
||||
void DoPoliceRadioCrackle(); /// ok
|
||||
|
||||
void GenerateIntegerRandomNumberTable(); /// ok
|
||||
|
||||
void TranslateEntity(CVector *v1, CVector *v2) const ; /// ok
|
||||
|
||||
void ResetAudioLogicTimers(int32 timer); /// ok
|
||||
|
||||
void Terminate();
|
||||
uint8 GetNum3DProvidersAvailable() const;
|
||||
bool IsMP3RadioChannelAvailable() const;
|
||||
uint8 GetCDAudioDriveLetter() const;
|
||||
|
||||
void SetEffectsMasterVolume(uint8 volume) const;
|
||||
void SetMusicMasterVolume(uint8 volume) const;
|
||||
void SetEffectsFadeVolume(uint8 volume) const;
|
||||
void SetMusicFadeVolume(uint8 volume) const;
|
||||
|
||||
void SetSpeakerConfig(int32 conf) const;
|
||||
|
||||
bool SetupJumboEngineSound(uint8, int32); // todo
|
||||
void PreInitialiseGameSpecificSetup() const;
|
||||
void SetMissionScriptPoliceAudio(int32 sfx) const;
|
||||
|
||||
bool UsesSiren(int32 model) const;
|
||||
bool UsesSirenSwitching(int32 model) const;
|
||||
|
||||
char *Get3DProviderName(uint8 id) const;
|
||||
|
||||
bool SetupJumboFlySound(uint8 emittingVol); /// ok
|
||||
bool SetupJumboRumbleSound(uint8 emittingVol); /// ok
|
||||
bool SetupJumboTaxiSound(uint8 vol); /// ok
|
||||
bool SetupJumboWhineSound(uint8 emittingVol, int32 freq); /// ok
|
||||
|
||||
void SetMissionAudioLocation(float x, float y, float z);
|
||||
|
||||
void ResetPoliceRadio();
|
||||
|
||||
bool UsesReverseWarning(int32 model) const;
|
||||
|
||||
int32 RandomDisplacement(uint32 seed) const;
|
||||
|
||||
void ReleaseDigitalHandle() const;
|
||||
void ReacquireDigitalHandle() const;
|
||||
void SetDynamicAcousticModelingStatus(bool status);
|
||||
|
||||
bool IsAudioInitialised() const;
|
||||
|
||||
void SetEntityStatus(int32 id, bool status);
|
||||
|
||||
void Service();
|
||||
void GetPhrase(uint32 *phrase, uint32 *prevPhrase, uint32 sample, uint32 maxOffset) const;
|
||||
|
||||
void DoJumboVolOffset() const;
|
||||
|
||||
int32 GetPedCommentSfx(CPed *ped, int32 sound);
|
||||
|
||||
// order from GetPedCommentSfx
|
||||
// functions returning talk sfx,
|
||||
// order from GetPedCommentSfx
|
||||
uint32 GetPlayerTalkSfx(int16 sound);
|
||||
uint32 GetCopTalkSfx(int16 sound);
|
||||
uint32 GetSwatTalkSfx(int16 sound);
|
||||
@ -462,15 +388,22 @@ public:
|
||||
|
||||
uint32 GetGenericMaleTalkSfx(int16 sound);
|
||||
uint32 GetGenericFemaleTalkSfx(int16 sound);
|
||||
// end of functions returning talk sfx
|
||||
|
||||
void GenerateIntegerRandomNumberTable(); /// ok
|
||||
char *Get3DProviderName(uint8 id) const;
|
||||
uint8 GetCDAudioDriveLetter() const;
|
||||
int8 GetCurrent3DProviderIndex() const; /// ok
|
||||
float GetCollisionLoopingRatio(uint32 a, uint32 b, float c) const; // todo hook
|
||||
float GetCollisionOneShotRatio(uint32 a, float b) const; // todo hook
|
||||
float GetCollisionRatio(float a, float b, float c, float d) const; // todo hook
|
||||
float GetCollisionLoopingRatio(uint32 a, uint32 b, float c) const; // not used
|
||||
float GetCollisionOneShotRatio(uint32 a, float b) const; /// ok
|
||||
float GetCollisionRatio(float a, float b, float c, float d) const; /// ok
|
||||
float GetDistanceSquared(CVector *v) const; /// ok
|
||||
int32 GetJumboTaxiFreq() const; /// ok
|
||||
bool GetMissionAudioLoadingStatus() const; /// ok
|
||||
char GetMissionScriptPoliceAudioPlayingStatus() const; /// ok
|
||||
uint8 GetNum3DProvidersAvailable() const;
|
||||
int32 GetPedCommentSfx(CPed *ped, int32 sound);
|
||||
void GetPhrase(uint32 *phrase, uint32 *prevPhrase, uint32 sample, uint32 maxOffset) const;
|
||||
float GetVehicleDriveWheelSkidValue(uint8 a1, CAutomobile *a2, cTransmission *a3,
|
||||
float a4); // todo
|
||||
int32 GetVehicleNonDriveWheelSkidValue(float a1, int a2, int a3, int a4, float a5); // todo
|
||||
@ -481,19 +414,22 @@ public:
|
||||
void InitialisePoliceRadio(); // todo
|
||||
void InitialisePoliceRadioZones(); // todo
|
||||
void InterrogateAudioEntities(); /// ok
|
||||
bool IsAudioInitialised() const; /// ok
|
||||
bool IsMissionAudioSampleFinished(); /// ok
|
||||
bool IsMP3RadioChannelAvailable() const;
|
||||
|
||||
bool MissionScriptAudioUsesPoliceChannel(int32 soundMission) const; /// ok
|
||||
|
||||
void PlayLoadedMissionAudio(); /// ok
|
||||
void PlayOneShot(int32 index, int16 sound, float vol); // todo
|
||||
uint32 PlaySuspectLastSeen(float x, float y, float z); // todo
|
||||
void PlayerJustGotInCar() const; /// ok
|
||||
void PlayerJustLeftCar() const; /// ok
|
||||
uint32 PlaySuspectLastSeen(float x, float y, float z); // todo
|
||||
void PlayerJustGotInCar() const; /// ok
|
||||
void PlayerJustLeftCar() const; /// ok
|
||||
void PostInitialiseGameSpecificSetup(); /// ok
|
||||
void PostTerminateGameSpecificShutdown(); /// ok
|
||||
void PreTerminateGameSpecificShutdown(); /// ok
|
||||
void PreloadMissionAudio(char *); // todo
|
||||
void PreInitialiseGameSpecificSetup() const;
|
||||
void PreloadMissionAudio(char *); // todo
|
||||
void PreTerminateGameSpecificShutdown(); /// ok
|
||||
/// processX - main logic of adding new sounds
|
||||
void ProcessActiveQueues(); // todo
|
||||
bool ProcessAirBrakes(cVehicleParams *params); /// ok
|
||||
@ -541,7 +477,7 @@ public:
|
||||
void ProcessPornCinema(uint8 sound); /// ok
|
||||
void ProcessProjectiles(); // todo requires CProjectileInfo
|
||||
void ProcessRainOnVehicle(cVehicleParams *params); /// ok
|
||||
void ProcessReverb() const; /// ok
|
||||
void ProcessReverb() const; /// ok
|
||||
bool ProcessReverseGear(cVehicleParams *a2); /// ok
|
||||
void ProcessSawMillScriptObject(uint8 sound); /// ok
|
||||
void ProcessScriptObject(int32 id); /// ok
|
||||
@ -558,11 +494,55 @@ public:
|
||||
// void ProcessVehicleSirenOrAlarm(void *);
|
||||
// void ProcessVehicleSkidding(void *);
|
||||
void ProcessWaterCannon(int32); // todo
|
||||
void ProcessWeather(int32 id); // todo
|
||||
bool ProcessWetRoadNoise(cVehicleParams *params); // todo hook
|
||||
void ProcessWeather(int32 id); /// ok
|
||||
bool ProcessWetRoadNoise(cVehicleParams *params); /// ok
|
||||
void ProcessWorkShopScriptObject(uint8 sound); /// ok
|
||||
|
||||
void SetupPedComments(cPedParams *params, uint32 sound); /// ok
|
||||
int32 RandomDisplacement(uint32 seed) const;
|
||||
void ReacquireDigitalHandle() const;
|
||||
void ReleaseDigitalHandle() const;
|
||||
int32 ReportCollision(CEntity *a2, CEntity *a3, uint8 a4, uint8 a5, float a6,
|
||||
float a7); // todo
|
||||
int32 ReportCrime(int a2, int *a3); // todo
|
||||
void ResetAudioLogicTimers(int32 timer); /// ok
|
||||
void ResetPoliceRadio();
|
||||
void ResetTimers(unsigned int a2); // todo
|
||||
|
||||
void Service(); // todo
|
||||
void ServiceCollisions(); // todo
|
||||
void ServicePoliceRadio(); // todo
|
||||
void ServicePoliceRadioChannel(int a2); // todo
|
||||
void ServiceSoundEffects(); // todo
|
||||
void SetCurrent3DProvider(uint8);
|
||||
void SetDynamicAcousticModelingStatus(bool status);
|
||||
void SetEffectsFadeVolume(uint8 volume) const;
|
||||
void SetEffectsMasterVolume(uint8 volume) const;
|
||||
void SetEntityStatus(int32 id, bool status);
|
||||
uint32 SetLoopingCollisionRequestedSfxFreqAndGetVol(int32); // todo
|
||||
void SetMissionAudioLocation(float x, float y, float z);
|
||||
void SetMissionScriptPoliceAudio(int32 sfx) const;
|
||||
void SetMonoMode(uint8); // todo
|
||||
void SetMusicFadeVolume(uint8 volume) const;
|
||||
void SetMusicMasterVolume(uint8 volume) const;
|
||||
void SetSpeakerConfig(int32 conf) const;
|
||||
void SetUpLoopingCollisionSound(int a2, int a3); // todo
|
||||
void SetUpOneShotCollisionSound(int a2); // todo
|
||||
void SetupCrimeReport(); // todo
|
||||
bool SetupJumboEngineSound(uint8, int32); // todo
|
||||
bool SetupJumboFlySound(uint8 emittingVol); /// ok
|
||||
bool SetupJumboRumbleSound(uint8 emittingVol); /// ok
|
||||
bool SetupJumboTaxiSound(uint8 vol); /// ok
|
||||
bool SetupJumboWhineSound(uint8 emittingVol, int32 freq); /// ok
|
||||
void SetupPedComments(cPedParams *params, uint32 sound); /// ok
|
||||
void SetupSuspectLastSeenReport(); // todo
|
||||
|
||||
void Terminate();
|
||||
void TranslateEntity(CVector *v1, CVector *v2) const; /// ok
|
||||
|
||||
void UpdateGasPedalAudio(CAutomobile *automobile); // todo hook
|
||||
bool UsesReverseWarning(int32 model) const;
|
||||
bool UsesSiren(int32 model) const;
|
||||
bool UsesSirenSwitching(int32 model) const;
|
||||
};
|
||||
|
||||
static_assert(sizeof(cAudioManager) == 19220, "cAudioManager: error");
|
||||
|
||||
Reference in New Issue
Block a user