Skip to content

Commit

Permalink
Clean up game_sa project (Round 8, PR #2779)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Merlin
Merlin committed Oct 7, 2022
1 parent 8e8e63f commit d085fb9
Show file tree
Hide file tree
Showing 99 changed files with 176 additions and 1,006 deletions.
27 changes: 2 additions & 25 deletions Client/game_sa/C3DMarkerSA.cpp
View file
Expand Up @@ -32,43 +32,36 @@ void C3DMarkerSA::SetMatrix(CMatrix* pMatrix)

void C3DMarkerSA::SetPosition(CVector* vecPosition)
{
DEBUG_TRACE("VOID C3DMarkerSA::SetPosition(CVector * vecPosition)");
this->GetInterface()->m_mat.vPos = *vecPosition;
}

CVector* C3DMarkerSA::GetPosition()
{
DEBUG_TRACE("CVector * C3DMarkerSA::GetPosition()");
return &this->GetInterface()->m_mat.vPos;
}

DWORD C3DMarkerSA::GetType()
{
DEBUG_TRACE("DWORD C3DMarkerSA::GetType()");
return this->GetInterface()->m_nType;
}

void C3DMarkerSA::SetType(DWORD dwType)
{
DEBUG_TRACE("VOID C3DMarkerSA::SetType(DWORD dwType)");
this->GetInterface()->m_nType = (unsigned short)(dwType);
}

BOOL C3DMarkerSA::IsActive()
bool C3DMarkerSA::IsActive()
{
DEBUG_TRACE("BOOL C3DMarkerSA::IsActive()");
return (BOOL)this->GetInterface()->m_bIsUsed;
return this->GetInterface()->m_bIsUsed;
}

DWORD C3DMarkerSA::GetIdentifier()
{
DEBUG_TRACE("DWORD C3DMarkerSA::GetIdentifier()");
return this->GetInterface()->m_nIdentifier;
}

SharedUtil::SColor C3DMarkerSA::GetColor()
{
DEBUG_TRACE("RGBA C3DMarkerSA::GetColor()");
// From ABGR
unsigned long ulABGR = this->GetInterface()->rwColour;
SharedUtil::SColor color;
Expand All @@ -87,61 +80,51 @@ void C3DMarkerSA::SetColor(const SharedUtil::SColor color)

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

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

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

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

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

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

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

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

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

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

Expand All @@ -156,12 +139,6 @@ void C3DMarkerSA::DeleteMarkerObject()
mov ecx, dwThis
call dwFunc
}

// OutputDebugString ( "Object destroyed!" );
}
else
{
// OutputDebugString ( "No object to destroy!" );
}
}

Expand Down
4 changes: 1 addition & 3 deletions Client/game_sa/C3DMarkerSA.h
View file
Expand Up @@ -13,7 +13,6 @@

#include <game/C3DMarker.h>
#include <CMatrix_Pad.h>
#include "Common.h"

#define FUNC_DeleteMarkerObject 0x722390

Expand Down Expand Up @@ -55,7 +54,6 @@ class C3DMarkerSA : public C3DMarker
C3DMarkerSAInterface* internalInterface;

public:
// constructor
C3DMarkerSA(C3DMarkerSAInterface* markerInterface) { internalInterface = markerInterface; };

C3DMarkerSAInterface* GetInterface() { return internalInterface; }
Expand All @@ -66,7 +64,7 @@ class C3DMarkerSA : public C3DMarker
CVector* GetPosition();
DWORD GetType(); // need enum?
void SetType(DWORD dwType); // doesn't work propperly (not virtualed)
BOOL IsActive();
bool IsActive();
DWORD GetIdentifier();
SharedUtil::SColor GetColor();
void SetColor(const SharedUtil::SColor color); // actually BGRA
Expand Down
4 changes: 0 additions & 4 deletions Client/game_sa/C3DMarkersSA.cpp
View file
Expand Up @@ -14,7 +14,6 @@

C3DMarkersSA::C3DMarkersSA()
{
DEBUG_TRACE("C3DMarkersSA::C3DMarkersSA()");
for (int i = 0; i < MAX_3D_MARKERS; i++)
{
this->Markers[i] = new C3DMarkerSA((C3DMarkerSAInterface*)(ARRAY_3D_MARKERS + i * sizeof(C3DMarkerSAInterface)));
Expand All @@ -32,7 +31,6 @@ C3DMarkersSA::~C3DMarkersSA()
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)");
/*
static C3dMarker *PlaceMarker(unsigned int nIdentifier, unsigned short nType,
CVector &vecPosition, float fSize, unsigned char r, unsigned char g, unsigned char b, unsigned char a,
Expand Down Expand Up @@ -84,7 +82,6 @@ C3DMarker* C3DMarkersSA::CreateMarker(DWORD Identifier, e3DMarkerType dwType, CV

C3DMarker* C3DMarkersSA::FindFreeMarker()
{
DEBUG_TRACE("C3DMarker * C3DMarkersSA::FindFreeMarker()");
for (int i = 0; i < MAX_3D_MARKERS; i++)
{
if (!Markers[i]->IsActive())
Expand All @@ -95,7 +92,6 @@ C3DMarker* C3DMarkersSA::FindFreeMarker()

C3DMarker* C3DMarkersSA::FindMarker(DWORD Identifier)
{
DEBUG_TRACE("C3DMarker * C3DMarkersSA::FindMarker( DWORD Identifier )");
for (int i = 0; i < MAX_3D_MARKERS; i++)
{
if (Markers[i]->GetIdentifier() == Identifier)
Expand Down
1 change: 0 additions & 1 deletion Client/game_sa/C3DMarkersSA.h
View file
Expand Up @@ -25,7 +25,6 @@ class C3DMarkersSA : public C3DMarkers
C3DMarkerSA* Markers[MAX_3D_MARKERS];

public:
// constructor
C3DMarkersSA();
~C3DMarkersSA();

Expand Down
11 changes: 2 additions & 9 deletions Client/game_sa/CAERadioTrackManagerSA.cpp
View file
Expand Up @@ -14,7 +14,6 @@

BYTE CAERadioTrackManagerSA::GetCurrentRadioStationID()
{
DEBUG_TRACE("BYTE CAERadioTrackManagerSA::GetCurrentRadioStationID()");
DWORD dwFunc = FUNC_GetCurrentRadioStationID;
BYTE bReturn = 0;
_asm
Expand All @@ -29,7 +28,6 @@ BYTE CAERadioTrackManagerSA::GetCurrentRadioStationID()

BYTE CAERadioTrackManagerSA::IsVehicleRadioActive()
{
DEBUG_TRACE("BYTE CAERadioTrackManagerSA::IsVehicleRadioActive()");
DWORD dwFunc = FUNC_IsVehicleRadioActive;
BYTE bReturn = 0;
_asm
Expand All @@ -44,7 +42,6 @@ BYTE CAERadioTrackManagerSA::IsVehicleRadioActive()

char* CAERadioTrackManagerSA::GetRadioStationName(BYTE bStationID)
{
DEBUG_TRACE("char * CAERadioTrackManagerSA::GetRadioStationName(BYTE bStationID)");
DWORD dwFunc = FUNC_GetRadioStationName;
char* cReturn = 0;
DWORD dwStationID = bStationID;
Expand All @@ -59,11 +56,10 @@ char* CAERadioTrackManagerSA::GetRadioStationName(BYTE bStationID)
return cReturn;
}

BOOL CAERadioTrackManagerSA::IsRadioOn()
bool CAERadioTrackManagerSA::IsRadioOn()
{
DEBUG_TRACE("BOOL CAERadioTrackManagerSA::IsRadioOn()");
DWORD dwFunc = FUNC_IsRadioOn;
BYTE bReturn = 0;
bool bReturn = false;
_asm
{
mov ecx, CLASS_CAERadioTrackManager
Expand All @@ -76,7 +72,6 @@ BOOL CAERadioTrackManagerSA::IsRadioOn()

void CAERadioTrackManagerSA::SetBassSetting(DWORD dwBass)
{
DEBUG_TRACE("VOID CAERadioTrackManagerSA::SetBassSetting(DWORD dwBass)");
DWORD dwFunc = FUNC_SetBassSetting;
_asm
{
Expand All @@ -89,7 +84,6 @@ void CAERadioTrackManagerSA::SetBassSetting(DWORD dwBass)

void CAERadioTrackManagerSA::Reset()
{
DEBUG_TRACE("VOID CAERadioTrackManagerSA::Reset()");
DWORD dwFunc = FUNC_Reset;
_asm
{
Expand All @@ -100,7 +94,6 @@ void CAERadioTrackManagerSA::Reset()

void CAERadioTrackManagerSA::StartRadio(BYTE bStationID, BYTE bUnknown)
{
DEBUG_TRACE("VOID CAERadioTrackManagerSA::StartRadio(BYTE bStationID, BYTE bUnknown)");
DWORD dwFunc = FUNC_StartRadio;
DWORD dwStationID = bStationID;
DWORD dwUnknown = bUnknown;
Expand Down
2 changes: 1 addition & 1 deletion Client/game_sa/CAERadioTrackManagerSA.h
View file
Expand Up @@ -29,7 +29,7 @@ class CAERadioTrackManagerSA : public CAERadioTrackManager
BYTE GetCurrentRadioStationID();
BYTE IsVehicleRadioActive();
char* GetRadioStationName(BYTE bStationID);
BOOL IsRadioOn();
bool IsRadioOn();
void SetBassSetting(DWORD dwBass);
void Reset();
void StartRadio(BYTE bStationID, BYTE bUnknown);
Expand Down
2 changes: 0 additions & 2 deletions Client/game_sa/CAudioEngineSA.cpp
View file
Expand Up @@ -157,7 +157,6 @@ 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;
Expand Down Expand Up @@ -224,7 +223,6 @@ void CAudioEngineSA::PlayBeatTrack(short iTrack)
{
if (*(DWORD*)VAR_AudioEventVolumes != 0) // may prevent a crash
{
DEBUG_TRACE("VOID CAudioEngineSA::PlayBeatTrack ( short iTrack )");
DWORD dwFunc = FUNC_PreloadBeatTrack;
DWORD dwTrack = iTrack;
_asm
Expand Down
10 changes: 0 additions & 10 deletions Client/game_sa/CAutomobileSA.cpp
View file
Expand Up @@ -17,8 +17,6 @@
*/
CAutomobileSA::CAutomobileSA(eVehicleTypes dwModelID, unsigned char ucVariation, unsigned char ucVariation2) : CVehicleSA(dwModelID, ucVariation, ucVariation2)
{
DEBUG_TRACE("CAutomobileSA::CAutomobileSA( eVehicleTypes dwModelID ):CVehicleSA( dwModelID )");

// create our mirror classes
for (int i = 0; i < MAX_DOORS; i++)
this->door[i] = new CDoorSA(&((CAutomobileSAInterface*)this->GetInterface())->m_doors[i]);
Expand All @@ -27,7 +25,6 @@ CAutomobileSA::CAutomobileSA(eVehicleTypes dwModelID, unsigned char ucVariation,

CAutomobileSA::CAutomobileSA(CAutomobileSAInterface* automobile)
{
DEBUG_TRACE("CAutomobileSA::CAutomobileSA( CAutomobileSAInterface * automobile )");
// just so it can be passed on to CVehicle
}

Expand All @@ -42,7 +39,6 @@ CAutomobileSA::~CAutomobileSA()

bool CAutomobileSA::BurstTyre(DWORD dwTyreID)
{
DEBUG_TRACE("bool CAutomobileSA::BurstTyre ( DWORD dwTyreID )");
DWORD dwThis = (DWORD)GetInterface();
DWORD dwFunc = FUNC_CAutomobile_BurstTyre;
bool bReturn;
Expand All @@ -60,7 +56,6 @@ bool CAutomobileSA::BurstTyre(DWORD dwTyreID)

bool CAutomobileSA::BreakTowLink()
{
DEBUG_TRACE("bool CAutomobileSA::BreakTowLink ( void )");
DWORD dwThis = (DWORD)GetInterface();
DWORD dwFunc = FUNC_CAutomobile_BreakTowLink;
bool bReturn;
Expand All @@ -77,7 +72,6 @@ bool CAutomobileSA::BreakTowLink()

bool CAutomobileSA::IsComponentPresent(int iComponentID)
{
DEBUG_TRACE("bool CAutomobileSA::IsComponentPresent ( int iComponentID )");
DWORD dwThis = (DWORD)GetInterface();
DWORD dwFunc = FUNC_CAutomobile_IsComponentPresent;
bool bReturn;
Expand All @@ -95,7 +89,6 @@ bool CAutomobileSA::IsComponentPresent(int iComponentID)

void CAutomobileSA::ResetSuspension()
{
DEBUG_TRACE("void CAutomobileSA::ResetSuspension ( void )");
DWORD dwThis = (DWORD)GetInterface();
DWORD dwFunc = FUNC_CAutomobile_ResetSuspension;

Expand All @@ -108,7 +101,6 @@ void CAutomobileSA::ResetSuspension()

void CAutomobileSA::SetTaxiLight(bool bState)
{
DEBUG_TRACE("void CAutomobileSA::SetTaxiLight ( bool bState )");
DWORD dwThis = (DWORD)GetInterface();
DWORD dwState = (DWORD)bState;
DWORD dwFunc = FUNC_CAutomobile_SetTaxiLight;
Expand All @@ -123,7 +115,6 @@ void CAutomobileSA::SetTaxiLight(bool bState)

CPhysical* CAutomobileSA::SpawnFlyingComponent(int iCarNodeIndex, int iUnknown)
{
DEBUG_TRACE("CPhysical* CAutomobileSA::SpawnFlyingComponent ( int iCarNodeIndex, int iUnknown )");
DWORD dwThis = (DWORD)GetInterface();
DWORD dwFunc = FUNC_CAutomobile_SpawnFlyingComponent;
CPhysical* pReturn;
Expand All @@ -142,6 +133,5 @@ CPhysical* CAutomobileSA::SpawnFlyingComponent(int iCarNodeIndex, int iUnknown)

CDoor* CAutomobileSA::GetDoor(eDoors doorID)
{
DEBUG_TRACE("CDoor * CAutomobileSA::GetDoor(eDoors doorID)");
return this->door[doorID];
}
2 changes: 0 additions & 2 deletions Client/game_sa/CBikeSA.cpp
View file
Expand Up @@ -14,13 +14,11 @@

CBikeSA::CBikeSA(CBikeSAInterface* bike)
{
DEBUG_TRACE("CBikeSA::CBikeSA( CBikeSAInterface * bike )");
this->m_pInterface = bike;
}

CBikeSA::CBikeSA(eVehicleTypes dwModelID, unsigned char ucVariation, unsigned char ucVariation2) : CVehicleSA(dwModelID, ucVariation, ucVariation2)
{
DEBUG_TRACE("CBikeSA::CBikeSA( eVehicleTypes dwModelID ):CVehicleSA( dwModelID )");
/*if(this->internalInterface)
{
// create the actual vehicle
Expand Down
2 changes: 0 additions & 2 deletions Client/game_sa/CBmxSA.cpp
View file
Expand Up @@ -14,11 +14,9 @@

CBmxSA::CBmxSA(CBmxSAInterface* bmx)
{
DEBUG_TRACE("CBmxSA::CBmxSA( CBmxSAInterface * bmx )");
this->m_pInterface = bmx;
}

CBmxSA::CBmxSA(eVehicleTypes dwModelID, unsigned char ucVariation, unsigned char ucVariation2) : CBikeSA(dwModelID, ucVariation, ucVariation2)
{
DEBUG_TRACE("CBmxSA::CBmxSA( eVehicleTypes dwModelID ):CBikeSA( dwModelID )");
}
2 changes: 0 additions & 2 deletions Client/game_sa/CBoatSA.cpp
View file
Expand Up @@ -14,13 +14,11 @@

CBoatSA::CBoatSA(CBoatSAInterface* boat)
{
DEBUG_TRACE("CBoatSA::CBoatSA( CBoatSAInterface * boat )");
this->m_pInterface = boat;
}

CBoatSA::CBoatSA(eVehicleTypes dwModelID, unsigned char ucVariation, unsigned char ucVariation2) : CVehicleSA(dwModelID, ucVariation, ucVariation2)
{
DEBUG_TRACE("CBoatSA::CBoatSA( eVehicleTypes dwModelID ):CVehicleSA( dwModelID )");
/*if(this->internalInterface)
{
// create the actual vehicle
Expand Down

1 comment on commit d085fb9

@botder
Copy link
Member

@botder botder commented on d085fb9 Oct 7, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a note for the future, should a new crash appear: A try-catch has been removed from CPhysicalSA::AttachEntityToEntity.

Please sign in to comment.