Skip to content

Commit

Permalink
Clean up game_sa project (Round 5, PR #2773)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Merlin
Merlin committed Oct 2, 2022
1 parent 8a68561 commit d7082ed
Show file tree
Hide file tree
Showing 80 changed files with 608 additions and 764 deletions.
30 changes: 15 additions & 15 deletions Client/game_sa/C3DMarkerSA.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ void C3DMarkerSA::SetMatrix(CMatrix* pMatrix)
MemCpyFast(&mat->vUp, &pMatrix->vUp, sizeof(CVector));
}

VOID C3DMarkerSA::SetPosition(CVector* vecPosition)
void C3DMarkerSA::SetPosition(CVector* vecPosition)
{
DEBUG_TRACE("VOID C3DMarkerSA::SetPosition(CVector * vecPosition)");
this->GetInterface()->m_mat.vPos = *vecPosition;
Expand All @@ -47,7 +47,7 @@ DWORD C3DMarkerSA::GetType()
return this->GetInterface()->m_nType;
}

VOID C3DMarkerSA::SetType(DWORD dwType)
void C3DMarkerSA::SetType(DWORD dwType)
{
DEBUG_TRACE("VOID C3DMarkerSA::SetType(DWORD dwType)");
this->GetInterface()->m_nType = (unsigned short)(dwType);
Expand Down Expand Up @@ -78,73 +78,73 @@ SColor C3DMarkerSA::GetColor()
return color;
}

VOID C3DMarkerSA::SetColor(const SColor color)
void C3DMarkerSA::SetColor(const SColor color)
{
// To ABGR
this->GetInterface()->rwColour = (color.A << 24) | (color.B << 16) | (color.G << 8) | color.R;
}

VOID C3DMarkerSA::SetPulsePeriod(WORD wPulsePeriod)
void C3DMarkerSA::SetPulsePeriod(WORD wPulsePeriod)
{
DEBUG_TRACE("VOID C3DMarkerSA::SetPulsePeriod(WORD wPulsePeriod)");
this->GetInterface()->m_nPulsePeriod = wPulsePeriod;
}

VOID C3DMarkerSA::SetRotateRate(short RotateRate)
void C3DMarkerSA::SetRotateRate(short RotateRate)
{
DEBUG_TRACE("VOID C3DMarkerSA::SetRotateRate(short RotateRate)");
this->GetInterface()->m_nRotateRate = RotateRate;
}

FLOAT C3DMarkerSA::GetSize()
float C3DMarkerSA::GetSize()
{
DEBUG_TRACE("FLOAT C3DMarkerSA::GetSize()");
return this->GetInterface()->m_fSize;
}

VOID C3DMarkerSA::SetSize(FLOAT fSize)
void C3DMarkerSA::SetSize(float fSize)
{
DEBUG_TRACE("VOID C3DMarkerSA::SetSize(FLOAT fSize)");
this->GetInterface()->m_fSize = fSize;
}

FLOAT C3DMarkerSA::GetBrightness()
float C3DMarkerSA::GetBrightness()
{
DEBUG_TRACE("FLOAT C3DMarkerSA::GetBrightness()");
return this->GetInterface()->m_fBrightness;
}

VOID C3DMarkerSA::SetBrightness(FLOAT fBrightness)
void C3DMarkerSA::SetBrightness(float fBrightness)
{
DEBUG_TRACE("VOID C3DMarkerSA::SetBrightness(FLOAT fBrightness)");
this->GetInterface()->m_fBrightness = fBrightness;
}

VOID C3DMarkerSA::SetCameraRange(FLOAT fCameraRange)
void C3DMarkerSA::SetCameraRange(float fCameraRange)
{
DEBUG_TRACE("VOID C3DMarkerSA::SetCameraRange(FLOAT fCameraRange)");
this->GetInterface()->m_fCameraRange = fCameraRange;
}

VOID C3DMarkerSA::SetPulseFraction(FLOAT fPulseFraction)
void C3DMarkerSA::SetPulseFraction(float fPulseFraction)
{
DEBUG_TRACE("VOID C3DMarkerSA::SetPulseFraction(FLOAT fPulseFraction)");
this->GetInterface()->m_fPulseFraction = fPulseFraction;
}

FLOAT C3DMarkerSA::GetPulseFraction()
float C3DMarkerSA::GetPulseFraction()
{
DEBUG_TRACE("FLOAT C3DMarkerSA::GetPulseFraction()");
return this->GetInterface()->m_fPulseFraction;
}

VOID C3DMarkerSA::Disable()
void C3DMarkerSA::Disable()
{
DEBUG_TRACE("VOID C3DMarkerSA::Disable ()");
this->GetInterface()->m_nIdentifier = 0;
}

VOID C3DMarkerSA::DeleteMarkerObject()
void C3DMarkerSA::DeleteMarkerObject()
{
if (this->GetInterface()->m_pRwObject)
{
Expand All @@ -164,7 +164,7 @@ VOID C3DMarkerSA::DeleteMarkerObject()
}
}

VOID C3DMarkerSA::Reset()
void C3DMarkerSA::Reset()
{
this->internalInterface->m_lastPosition = this->internalInterface->m_mat.vPos;
}
28 changes: 14 additions & 14 deletions Client/game_sa/C3DMarkerSA.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,18 @@ class C3DMarkerSAInterface
WORD m_nPulsePeriod; // 92
short m_nRotateRate; // deg per frame (in either direction) // 94
DWORD m_nStartTime; // 96
FLOAT m_fPulseFraction; // 100
FLOAT m_fStdSize; // 104
FLOAT m_fSize; // 108
FLOAT m_fBrightness; // 112
FLOAT m_fCameraRange; // 116
float m_fPulseFraction; // 100
float m_fStdSize; // 104
float m_fSize; // 108
float m_fBrightness; // 112
float m_fCameraRange; // 116

CVector m_normal; // Normal of the object point at // 120
// the following variables remember the last time we read the heigh of the
// map. Using this we don't have to do this every frame and we can still have moving markers.
WORD m_LastMapReadX, m_LastMapReadY; // 132 / 134
FLOAT m_LastMapReadResultZ; // 136
FLOAT m_roofHeight; // 140
float m_LastMapReadResultZ; // 136
float m_roofHeight; // 140
CVector m_lastPosition; // 144
DWORD m_OnScreenTestTime; // time last screen check was done // 156
};
Expand Down Expand Up @@ -72,13 +72,13 @@ class C3DMarkerSA : public C3DMarker
void SetColor(const SColor color); // actually BGRA
void SetPulsePeriod(WORD wPulsePeriod);
void SetRotateRate(short RotateRate);
FLOAT GetSize();
void SetSize(FLOAT fSize);
FLOAT GetBrightness();
void SetBrightness(FLOAT fBrightness);
void SetCameraRange(FLOAT fCameraRange);
void SetPulseFraction(FLOAT fPulseFraction); // doesn't work propperly (not virtualed)
FLOAT GetPulseFraction();
float GetSize();
void SetSize(float fSize);
float GetBrightness();
void SetBrightness(float fBrightness);
void SetCameraRange(float fCameraRange);
void SetPulseFraction(float fPulseFraction); // doesn't work propperly (not virtualed)
float GetPulseFraction();
void Disable();
void DeleteMarkerObject();
void Reset();
Expand Down
2 changes: 1 addition & 1 deletion Client/game_sa/C3DMarkersSA.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ C3DMarkersSA::~C3DMarkersSA()
}
}

C3DMarker* C3DMarkersSA::CreateMarker(DWORD Identifier, e3DMarkerType dwType, CVector* vecPosition, FLOAT fSize, FLOAT fPulseFraction, BYTE r, BYTE g, BYTE b,
C3DMarker* C3DMarkersSA::CreateMarker(DWORD Identifier, e3DMarkerType dwType, CVector* vecPosition, float fSize, float fPulseFraction, BYTE r, BYTE g, BYTE b,
BYTE a)
{
DEBUG_TRACE("C3DMarkersSA::CreateMarker(DWORD Identifier, e3DMarkerType dwType, CVector * vecPosition, FLOAT fSize, FLOAT fPulseFraction)");
Expand Down
2 changes: 1 addition & 1 deletion Client/game_sa/C3DMarkersSA.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class C3DMarkersSA : public C3DMarkers
C3DMarkersSA();
~C3DMarkersSA();

C3DMarker* CreateMarker(DWORD Identifier, e3DMarkerType dwType, CVector* vecPosition, FLOAT fSize, FLOAT fPulseFraction, BYTE r, BYTE g, BYTE b, BYTE a);
C3DMarker* CreateMarker(DWORD Identifier, e3DMarkerType dwType, CVector* vecPosition, float fSize, float fPulseFraction, BYTE r, BYTE g, BYTE b, BYTE a);
C3DMarker* FindFreeMarker();
C3DMarker* FindMarker(DWORD Identifier);
};
6 changes: 3 additions & 3 deletions Client/game_sa/CAERadioTrackManagerSA.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ BOOL CAERadioTrackManagerSA::IsRadioOn()
return bReturn;
}

VOID CAERadioTrackManagerSA::SetBassSetting(DWORD dwBass)
void CAERadioTrackManagerSA::SetBassSetting(DWORD dwBass)
{
DEBUG_TRACE("VOID CAERadioTrackManagerSA::SetBassSetting(DWORD dwBass)");
DWORD dwFunc = FUNC_SetBassSetting;
Expand All @@ -86,7 +86,7 @@ VOID CAERadioTrackManagerSA::SetBassSetting(DWORD dwBass)
}
}

VOID CAERadioTrackManagerSA::Reset()
void CAERadioTrackManagerSA::Reset()
{
DEBUG_TRACE("VOID CAERadioTrackManagerSA::Reset()");
DWORD dwFunc = FUNC_Reset;
Expand All @@ -97,7 +97,7 @@ VOID CAERadioTrackManagerSA::Reset()
}
}

VOID CAERadioTrackManagerSA::StartRadio(BYTE bStationID, BYTE bUnknown)
void CAERadioTrackManagerSA::StartRadio(BYTE bStationID, BYTE bUnknown)
{
DEBUG_TRACE("VOID CAERadioTrackManagerSA::StartRadio(BYTE bStationID, BYTE bUnknown)");
DWORD dwFunc = FUNC_StartRadio;
Expand Down
6 changes: 3 additions & 3 deletions Client/game_sa/CAERadioTrackManagerSA.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class CAERadioTrackManagerSA : public CAERadioTrackManager
BYTE IsVehicleRadioActive();
char* GetRadioStationName(BYTE bStationID);
BOOL IsRadioOn();
VOID SetBassSetting(DWORD dwBass);
VOID Reset();
VOID StartRadio(BYTE bStationID, BYTE bUnknown);
void SetBassSetting(DWORD dwBass);
void Reset();
void StartRadio(BYTE bStationID, BYTE bUnknown);
};
34 changes: 17 additions & 17 deletions Client/game_sa/CAudioEngineSA.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ CAudioEngineSA::CAudioEngineSA(CAudioEngineSAInterface* pInterface)
HookInstall(HOOKPOS_CAESoundManager_RequestNewSound, (DWORD)HOOK_CAESoundManager_RequestNewSound, 5);
}

VOID CAudioEngineSA::StopRadio()
void CAudioEngineSA::StopRadio()
{
m_bRadioOn = false;

Expand Down Expand Up @@ -86,7 +86,7 @@ VOID CAudioEngineSA::StopRadio()
}
}

VOID CAudioEngineSA::StartRadio(unsigned int station)
void CAudioEngineSA::StartRadio(unsigned int station)
{
m_ucRadioChannel = station;
m_bRadioOn = true;
Expand Down Expand Up @@ -149,14 +149,14 @@ VOID CAudioEngineSA::StartRadio(unsigned int station)
// 43 = race one
// 32 = help
// 13 = camera take picture
VOID CAudioEngineSA::PlayFrontEndSound(DWORD dwEventID)
void CAudioEngineSA::PlayFrontEndSound(DWORD dwEventID)
{
if (*(DWORD*)VAR_AudioEventVolumes != 0 && dwEventID <= 101) // may prevent a crash
{
DEBUG_TRACE("VOID CAudioEngineSA::PlayFrontEndSound(DWORD dwSound)");
DWORD dwFunc = FUNC_ReportFrontendAudioEvent;
FLOAT fSpeed = 1.0f;
FLOAT fVolumeChange = 0.0f;
float fSpeed = 1.0f;
float fVolumeChange = 0.0f;
_asm
{
push fSpeed
Expand All @@ -168,7 +168,7 @@ VOID CAudioEngineSA::PlayFrontEndSound(DWORD dwEventID)
}
}

VOID CAudioEngineSA::SetEffectsMasterVolume(BYTE bVolume)
void CAudioEngineSA::SetEffectsMasterVolume(BYTE bVolume)
{
DWORD dwFunc = FUNC_SetEffectsMasterVolume;
DWORD dwVolume = bVolume;
Expand All @@ -180,7 +180,7 @@ VOID CAudioEngineSA::SetEffectsMasterVolume(BYTE bVolume)
}
}

VOID CAudioEngineSA::SetMusicMasterVolume(BYTE bVolume)
void CAudioEngineSA::SetMusicMasterVolume(BYTE bVolume)
{
DWORD dwFunc = FUNC_SetMusicMasterVolume;
DWORD dwVolume = bVolume;
Expand Down Expand Up @@ -216,7 +216,7 @@ VOID CAudioEngineSA::SetMusicMasterVolume(BYTE bVolume)
}
}

VOID CAudioEngineSA::PlayBeatTrack(short iTrack)
void CAudioEngineSA::PlayBeatTrack(short iTrack)
{
if (*(DWORD*)VAR_AudioEventVolumes != 0) // may prevent a crash
{
Expand All @@ -240,7 +240,7 @@ VOID CAudioEngineSA::PlayBeatTrack(short iTrack)
}
}

VOID CAudioEngineSA::ClearMissionAudio(int slot)
void CAudioEngineSA::ClearMissionAudio(int slot)
{
DWORD dwFunc = 0x5072F0; // CAudioEngine::ClearMissionAudio(unsigned char)
_asm
Expand All @@ -265,7 +265,7 @@ bool CAudioEngineSA::IsMissionAudioSampleFinished(int slot)
return cret;
}

VOID CAudioEngineSA::PreloadMissionAudio(unsigned short usAudioEvent, int slot)
void CAudioEngineSA::PreloadMissionAudio(unsigned short usAudioEvent, int slot)
{
DWORD dwFunc = 0x507290; // CAudioEngine__PreloadMissionAudio
DWORD AudioEvent = usAudioEvent;
Expand All @@ -292,7 +292,7 @@ unsigned char CAudioEngineSA::GetMissionAudioLoadingStatus(int slot)
return cret;
}

VOID CAudioEngineSA::AttachMissionAudioToPhysical(CPhysical* physical, int slot)
void CAudioEngineSA::AttachMissionAudioToPhysical(CPhysical* physical, int slot)
{
CEntitySAInterface* entity = NULL;
if (physical)
Expand All @@ -312,7 +312,7 @@ VOID CAudioEngineSA::AttachMissionAudioToPhysical(CPhysical* physical, int slot)
}
}

VOID CAudioEngineSA::SetMissionAudioPosition(CVector* position, int slot)
void CAudioEngineSA::SetMissionAudioPosition(CVector* position, int slot)
{
DWORD dwFunc = 0x507300; // CAudioEngine__SetMissionAudioPosition
_asm
Expand Down Expand Up @@ -340,7 +340,7 @@ bool CAudioEngineSA::PlayLoadedMissionAudio(int slot)
return false;
}

VOID CAudioEngineSA::PauseAllSound(bool bPaused)
void CAudioEngineSA::PauseAllSound(bool bPaused)
{
if (bPaused)
{
Expand All @@ -362,13 +362,13 @@ VOID CAudioEngineSA::PauseAllSound(bool bPaused)
}
}

VOID CAudioEngineSA::PauseAmbientSounds(bool bPaused)
void CAudioEngineSA::PauseAmbientSounds(bool bPaused)
{
m_bAmbientSoundsPaused = bPaused;
UpdateAmbientSoundSettings();
}

VOID CAudioEngineSA::SetAmbientSoundEnabled(eAmbientSoundType eType, bool bEnabled)
void CAudioEngineSA::SetAmbientSoundEnabled(eAmbientSoundType eType, bool bEnabled)
{
if (eType == AMBIENT_SOUND_GENERAL)
{
Expand All @@ -393,13 +393,13 @@ bool CAudioEngineSA::IsAmbientSoundEnabled(eAmbientSoundType eType)
return false;
}

VOID CAudioEngineSA::ResetAmbientSounds()
void CAudioEngineSA::ResetAmbientSounds()
{
SetAmbientSoundEnabled(AMBIENT_SOUND_GENERAL, true);
SetAmbientSoundEnabled(AMBIENT_SOUND_GUNFIRE, true);
}

VOID CAudioEngineSA::UpdateAmbientSoundSettings()
void CAudioEngineSA::UpdateAmbientSoundSettings()
{
// Update gunfire setting
if (IsAmbientSoundEnabled(AMBIENT_SOUND_GUNFIRE))
Expand Down
26 changes: 13 additions & 13 deletions Client/game_sa/CAudioEngineSA.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,25 +118,25 @@ class CAudioEngineSA : public CAudioEngine
public:
CAudioEngineSA(CAudioEngineSAInterface* pInterface);

VOID PlayFrontEndSound(DWORD dwSound);
VOID PlayBeatTrack(short iTrack);
VOID SetEffectsMasterVolume(BYTE bVolume); // 64 = max volume
VOID SetMusicMasterVolume(BYTE bVolume);
VOID ClearMissionAudio(int slot = 1);
VOID PreloadMissionAudio(unsigned short usAudioEvent, int slot = 1);
void PlayFrontEndSound(DWORD dwSound);
void PlayBeatTrack(short iTrack);
void SetEffectsMasterVolume(BYTE bVolume); // 64 = max volume
void SetMusicMasterVolume(BYTE bVolume);
void ClearMissionAudio(int slot = 1);
void PreloadMissionAudio(unsigned short usAudioEvent, int slot = 1);
unsigned char GetMissionAudioLoadingStatus(int slot = 1);
bool IsMissionAudioSampleFinished(int slot = 1);
VOID AttachMissionAudioToPhysical(CPhysical* physical, int slot = 1);
VOID SetMissionAudioPosition(CVector* position, int slot = 1);
void AttachMissionAudioToPhysical(CPhysical* physical, int slot = 1);
void SetMissionAudioPosition(CVector* position, int slot = 1);
bool PlayLoadedMissionAudio(int slot = 1);
VOID PauseAllSound(bool bPaused);
VOID StopRadio();
VOID StartRadio(unsigned int station);
void PauseAllSound(bool bPaused);
void StopRadio();
void StartRadio(unsigned int station);
void PauseAmbientSounds(bool bPaused);
VOID SetAmbientSoundEnabled(eAmbientSoundType eType, bool bEnabled);
void SetAmbientSoundEnabled(eAmbientSoundType eType, bool bEnabled);
bool IsAmbientSoundEnabled(eAmbientSoundType eType);
void ResetAmbientSounds();
VOID SetWorldSoundEnabled(uint uiGroup, uint uiIndex, bool bEnabled, bool bImmediate);
void SetWorldSoundEnabled(uint uiGroup, uint uiIndex, bool bEnabled, bool bImmediate);
bool IsWorldSoundEnabled(uint uiGroup, uint uiIndex);
void ResetWorldSounds();
void SetWorldSoundHandler(WorldSoundHandler* pHandler);
Expand Down
Loading

0 comments on commit d7082ed

Please sign in to comment.