Skip to content

Commit d085fb9

Browse files
MerlinMerlin
authored
Clean up game_sa project (Round 8, PR #2779)
1 parent 8e8e63f commit d085fb9

File tree

99 files changed

+176
-1006
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+176
-1006
lines changed

‎Client/game_sa/C3DMarkerSA.cpp‎

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -32,43 +32,36 @@ void C3DMarkerSA::SetMatrix(CMatrix* pMatrix)
3232

3333
void C3DMarkerSA::SetPosition(CVector* vecPosition)
3434
{
35-
DEBUG_TRACE("VOID C3DMarkerSA::SetPosition(CVector * vecPosition)");
3635
this->GetInterface()->m_mat.vPos = *vecPosition;
3736
}
3837

3938
CVector* C3DMarkerSA::GetPosition()
4039
{
41-
DEBUG_TRACE("CVector * C3DMarkerSA::GetPosition()");
4240
return &this->GetInterface()->m_mat.vPos;
4341
}
4442

4543
DWORD C3DMarkerSA::GetType()
4644
{
47-
DEBUG_TRACE("DWORD C3DMarkerSA::GetType()");
4845
return this->GetInterface()->m_nType;
4946
}
5047

5148
void C3DMarkerSA::SetType(DWORD dwType)
5249
{
53-
DEBUG_TRACE("VOID C3DMarkerSA::SetType(DWORD dwType)");
5450
this->GetInterface()->m_nType = (unsigned short)(dwType);
5551
}
5652

57-
BOOL C3DMarkerSA::IsActive()
53+
bool C3DMarkerSA::IsActive()
5854
{
59-
DEBUG_TRACE("BOOL C3DMarkerSA::IsActive()");
60-
return (BOOL)this->GetInterface()->m_bIsUsed;
55+
return this->GetInterface()->m_bIsUsed;
6156
}
6257

6358
DWORD C3DMarkerSA::GetIdentifier()
6459
{
65-
DEBUG_TRACE("DWORD C3DMarkerSA::GetIdentifier()");
6660
return this->GetInterface()->m_nIdentifier;
6761
}
6862

6963
SharedUtil::SColor C3DMarkerSA::GetColor()
7064
{
71-
DEBUG_TRACE("RGBA C3DMarkerSA::GetColor()");
7265
// From ABGR
7366
unsigned long ulABGR = this->GetInterface()->rwColour;
7467
SharedUtil::SColor color;
@@ -87,61 +80,51 @@ void C3DMarkerSA::SetColor(const SharedUtil::SColor color)
8780

8881
void C3DMarkerSA::SetPulsePeriod(WORD wPulsePeriod)
8982
{
90-
DEBUG_TRACE("VOID C3DMarkerSA::SetPulsePeriod(WORD wPulsePeriod)");
9183
this->GetInterface()->m_nPulsePeriod = wPulsePeriod;
9284
}
9385

9486
void C3DMarkerSA::SetRotateRate(short RotateRate)
9587
{
96-
DEBUG_TRACE("VOID C3DMarkerSA::SetRotateRate(short RotateRate)");
9788
this->GetInterface()->m_nRotateRate = RotateRate;
9889
}
9990

10091
float C3DMarkerSA::GetSize()
10192
{
102-
DEBUG_TRACE("FLOAT C3DMarkerSA::GetSize()");
10393
return this->GetInterface()->m_fSize;
10494
}
10595

10696
void C3DMarkerSA::SetSize(float fSize)
10797
{
108-
DEBUG_TRACE("VOID C3DMarkerSA::SetSize(FLOAT fSize)");
10998
this->GetInterface()->m_fSize = fSize;
11099
}
111100

112101
float C3DMarkerSA::GetBrightness()
113102
{
114-
DEBUG_TRACE("FLOAT C3DMarkerSA::GetBrightness()");
115103
return this->GetInterface()->m_fBrightness;
116104
}
117105

118106
void C3DMarkerSA::SetBrightness(float fBrightness)
119107
{
120-
DEBUG_TRACE("VOID C3DMarkerSA::SetBrightness(FLOAT fBrightness)");
121108
this->GetInterface()->m_fBrightness = fBrightness;
122109
}
123110

124111
void C3DMarkerSA::SetCameraRange(float fCameraRange)
125112
{
126-
DEBUG_TRACE("VOID C3DMarkerSA::SetCameraRange(FLOAT fCameraRange)");
127113
this->GetInterface()->m_fCameraRange = fCameraRange;
128114
}
129115

130116
void C3DMarkerSA::SetPulseFraction(float fPulseFraction)
131117
{
132-
DEBUG_TRACE("VOID C3DMarkerSA::SetPulseFraction(FLOAT fPulseFraction)");
133118
this->GetInterface()->m_fPulseFraction = fPulseFraction;
134119
}
135120

136121
float C3DMarkerSA::GetPulseFraction()
137122
{
138-
DEBUG_TRACE("FLOAT C3DMarkerSA::GetPulseFraction()");
139123
return this->GetInterface()->m_fPulseFraction;
140124
}
141125

142126
void C3DMarkerSA::Disable()
143127
{
144-
DEBUG_TRACE("VOID C3DMarkerSA::Disable ()");
145128
this->GetInterface()->m_nIdentifier = 0;
146129
}
147130

@@ -156,12 +139,6 @@ void C3DMarkerSA::DeleteMarkerObject()
156139
mov ecx, dwThis
157140
call dwFunc
158141
}
159-
160-
// OutputDebugString ( "Object destroyed!" );
161-
}
162-
else
163-
{
164-
// OutputDebugString ( "No object to destroy!" );
165142
}
166143
}
167144

‎Client/game_sa/C3DMarkerSA.h‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414
#include <game/C3DMarker.h>
1515
#include <CMatrix_Pad.h>
16-
#include "Common.h"
1716

1817
#define FUNC_DeleteMarkerObject 0x722390
1918

@@ -55,7 +54,6 @@ class C3DMarkerSA : public C3DMarker
5554
C3DMarkerSAInterface* internalInterface;
5655

5756
public:
58-
// constructor
5957
C3DMarkerSA(C3DMarkerSAInterface* markerInterface) { internalInterface = markerInterface; };
6058

6159
C3DMarkerSAInterface* GetInterface() { return internalInterface; }
@@ -66,7 +64,7 @@ class C3DMarkerSA : public C3DMarker
6664
CVector* GetPosition();
6765
DWORD GetType(); // need enum?
6866
void SetType(DWORD dwType); // doesn't work propperly (not virtualed)
69-
BOOL IsActive();
67+
bool IsActive();
7068
DWORD GetIdentifier();
7169
SharedUtil::SColor GetColor();
7270
void SetColor(const SharedUtil::SColor color); // actually BGRA

‎Client/game_sa/C3DMarkersSA.cpp‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
C3DMarkersSA::C3DMarkersSA()
1616
{
17-
DEBUG_TRACE("C3DMarkersSA::C3DMarkersSA()");
1817
for (int i = 0; i < MAX_3D_MARKERS; i++)
1918
{
2019
this->Markers[i] = new C3DMarkerSA((C3DMarkerSAInterface*)(ARRAY_3D_MARKERS + i * sizeof(C3DMarkerSAInterface)));
@@ -32,7 +31,6 @@ C3DMarkersSA::~C3DMarkersSA()
3231
C3DMarker* C3DMarkersSA::CreateMarker(DWORD Identifier, e3DMarkerType dwType, CVector* vecPosition, float fSize, float fPulseFraction, BYTE r, BYTE g, BYTE b,
3332
BYTE a)
3433
{
35-
DEBUG_TRACE("C3DMarkersSA::CreateMarker(DWORD Identifier, e3DMarkerType dwType, CVector * vecPosition, FLOAT fSize, FLOAT fPulseFraction)");
3634
/*
3735
static C3dMarker *PlaceMarker(unsigned int nIdentifier, unsigned short nType,
3836
CVector &vecPosition, float fSize, unsigned char r, unsigned char g, unsigned char b, unsigned char a,
@@ -84,7 +82,6 @@ C3DMarker* C3DMarkersSA::CreateMarker(DWORD Identifier, e3DMarkerType dwType, CV
8482

8583
C3DMarker* C3DMarkersSA::FindFreeMarker()
8684
{
87-
DEBUG_TRACE("C3DMarker * C3DMarkersSA::FindFreeMarker()");
8885
for (int i = 0; i < MAX_3D_MARKERS; i++)
8986
{
9087
if (!Markers[i]->IsActive())
@@ -95,7 +92,6 @@ C3DMarker* C3DMarkersSA::FindFreeMarker()
9592

9693
C3DMarker* C3DMarkersSA::FindMarker(DWORD Identifier)
9794
{
98-
DEBUG_TRACE("C3DMarker * C3DMarkersSA::FindMarker( DWORD Identifier )");
9995
for (int i = 0; i < MAX_3D_MARKERS; i++)
10096
{
10197
if (Markers[i]->GetIdentifier() == Identifier)

‎Client/game_sa/C3DMarkersSA.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ class C3DMarkersSA : public C3DMarkers
2525
C3DMarkerSA* Markers[MAX_3D_MARKERS];
2626

2727
public:
28-
// constructor
2928
C3DMarkersSA();
3029
~C3DMarkersSA();
3130

‎Client/game_sa/CAERadioTrackManagerSA.cpp‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
BYTE CAERadioTrackManagerSA::GetCurrentRadioStationID()
1616
{
17-
DEBUG_TRACE("BYTE CAERadioTrackManagerSA::GetCurrentRadioStationID()");
1817
DWORD dwFunc = FUNC_GetCurrentRadioStationID;
1918
BYTE bReturn = 0;
2019
_asm
@@ -29,7 +28,6 @@ BYTE CAERadioTrackManagerSA::GetCurrentRadioStationID()
2928

3029
BYTE CAERadioTrackManagerSA::IsVehicleRadioActive()
3130
{
32-
DEBUG_TRACE("BYTE CAERadioTrackManagerSA::IsVehicleRadioActive()");
3331
DWORD dwFunc = FUNC_IsVehicleRadioActive;
3432
BYTE bReturn = 0;
3533
_asm
@@ -44,7 +42,6 @@ BYTE CAERadioTrackManagerSA::IsVehicleRadioActive()
4442

4543
char* CAERadioTrackManagerSA::GetRadioStationName(BYTE bStationID)
4644
{
47-
DEBUG_TRACE("char * CAERadioTrackManagerSA::GetRadioStationName(BYTE bStationID)");
4845
DWORD dwFunc = FUNC_GetRadioStationName;
4946
char* cReturn = 0;
5047
DWORD dwStationID = bStationID;
@@ -59,11 +56,10 @@ char* CAERadioTrackManagerSA::GetRadioStationName(BYTE bStationID)
5956
return cReturn;
6057
}
6158

62-
BOOL CAERadioTrackManagerSA::IsRadioOn()
59+
bool CAERadioTrackManagerSA::IsRadioOn()
6360
{
64-
DEBUG_TRACE("BOOL CAERadioTrackManagerSA::IsRadioOn()");
6561
DWORD dwFunc = FUNC_IsRadioOn;
66-
BYTE bReturn = 0;
62+
bool bReturn = false;
6763
_asm
6864
{
6965
mov ecx, CLASS_CAERadioTrackManager
@@ -76,7 +72,6 @@ BOOL CAERadioTrackManagerSA::IsRadioOn()
7672

7773
void CAERadioTrackManagerSA::SetBassSetting(DWORD dwBass)
7874
{
79-
DEBUG_TRACE("VOID CAERadioTrackManagerSA::SetBassSetting(DWORD dwBass)");
8075
DWORD dwFunc = FUNC_SetBassSetting;
8176
_asm
8277
{
@@ -89,7 +84,6 @@ void CAERadioTrackManagerSA::SetBassSetting(DWORD dwBass)
8984

9085
void CAERadioTrackManagerSA::Reset()
9186
{
92-
DEBUG_TRACE("VOID CAERadioTrackManagerSA::Reset()");
9387
DWORD dwFunc = FUNC_Reset;
9488
_asm
9589
{
@@ -100,7 +94,6 @@ void CAERadioTrackManagerSA::Reset()
10094

10195
void CAERadioTrackManagerSA::StartRadio(BYTE bStationID, BYTE bUnknown)
10296
{
103-
DEBUG_TRACE("VOID CAERadioTrackManagerSA::StartRadio(BYTE bStationID, BYTE bUnknown)");
10497
DWORD dwFunc = FUNC_StartRadio;
10598
DWORD dwStationID = bStationID;
10699
DWORD dwUnknown = bUnknown;

‎Client/game_sa/CAERadioTrackManagerSA.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class CAERadioTrackManagerSA : public CAERadioTrackManager
2929
BYTE GetCurrentRadioStationID();
3030
BYTE IsVehicleRadioActive();
3131
char* GetRadioStationName(BYTE bStationID);
32-
BOOL IsRadioOn();
32+
bool IsRadioOn();
3333
void SetBassSetting(DWORD dwBass);
3434
void Reset();
3535
void StartRadio(BYTE bStationID, BYTE bUnknown);

‎Client/game_sa/CAudioEngineSA.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ void CAudioEngineSA::PlayFrontEndSound(DWORD dwEventID)
157157
{
158158
if (*(DWORD*)VAR_AudioEventVolumes != 0 && dwEventID <= 101) // may prevent a crash
159159
{
160-
DEBUG_TRACE("VOID CAudioEngineSA::PlayFrontEndSound(DWORD dwSound)");
161160
DWORD dwFunc = FUNC_ReportFrontendAudioEvent;
162161
float fSpeed = 1.0f;
163162
float fVolumeChange = 0.0f;
@@ -224,7 +223,6 @@ void CAudioEngineSA::PlayBeatTrack(short iTrack)
224223
{
225224
if (*(DWORD*)VAR_AudioEventVolumes != 0) // may prevent a crash
226225
{
227-
DEBUG_TRACE("VOID CAudioEngineSA::PlayBeatTrack ( short iTrack )");
228226
DWORD dwFunc = FUNC_PreloadBeatTrack;
229227
DWORD dwTrack = iTrack;
230228
_asm

‎Client/game_sa/CAutomobileSA.cpp‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
*/
1818
CAutomobileSA::CAutomobileSA(eVehicleTypes dwModelID, unsigned char ucVariation, unsigned char ucVariation2) : CVehicleSA(dwModelID, ucVariation, ucVariation2)
1919
{
20-
DEBUG_TRACE("CAutomobileSA::CAutomobileSA( eVehicleTypes dwModelID ):CVehicleSA( dwModelID )");
21-
2220
// create our mirror classes
2321
for (int i = 0; i < MAX_DOORS; i++)
2422
this->door[i] = new CDoorSA(&((CAutomobileSAInterface*)this->GetInterface())->m_doors[i]);
@@ -27,7 +25,6 @@ CAutomobileSA::CAutomobileSA(eVehicleTypes dwModelID, unsigned char ucVariation,
2725

2826
CAutomobileSA::CAutomobileSA(CAutomobileSAInterface* automobile)
2927
{
30-
DEBUG_TRACE("CAutomobileSA::CAutomobileSA( CAutomobileSAInterface * automobile )");
3128
// just so it can be passed on to CVehicle
3229
}
3330

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

4340
bool CAutomobileSA::BurstTyre(DWORD dwTyreID)
4441
{
45-
DEBUG_TRACE("bool CAutomobileSA::BurstTyre ( DWORD dwTyreID )");
4642
DWORD dwThis = (DWORD)GetInterface();
4743
DWORD dwFunc = FUNC_CAutomobile_BurstTyre;
4844
bool bReturn;
@@ -60,7 +56,6 @@ bool CAutomobileSA::BurstTyre(DWORD dwTyreID)
6056

6157
bool CAutomobileSA::BreakTowLink()
6258
{
63-
DEBUG_TRACE("bool CAutomobileSA::BreakTowLink ( void )");
6459
DWORD dwThis = (DWORD)GetInterface();
6560
DWORD dwFunc = FUNC_CAutomobile_BreakTowLink;
6661
bool bReturn;
@@ -77,7 +72,6 @@ bool CAutomobileSA::BreakTowLink()
7772

7873
bool CAutomobileSA::IsComponentPresent(int iComponentID)
7974
{
80-
DEBUG_TRACE("bool CAutomobileSA::IsComponentPresent ( int iComponentID )");
8175
DWORD dwThis = (DWORD)GetInterface();
8276
DWORD dwFunc = FUNC_CAutomobile_IsComponentPresent;
8377
bool bReturn;
@@ -95,7 +89,6 @@ bool CAutomobileSA::IsComponentPresent(int iComponentID)
9589

9690
void CAutomobileSA::ResetSuspension()
9791
{
98-
DEBUG_TRACE("void CAutomobileSA::ResetSuspension ( void )");
9992
DWORD dwThis = (DWORD)GetInterface();
10093
DWORD dwFunc = FUNC_CAutomobile_ResetSuspension;
10194

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

109102
void CAutomobileSA::SetTaxiLight(bool bState)
110103
{
111-
DEBUG_TRACE("void CAutomobileSA::SetTaxiLight ( bool bState )");
112104
DWORD dwThis = (DWORD)GetInterface();
113105
DWORD dwState = (DWORD)bState;
114106
DWORD dwFunc = FUNC_CAutomobile_SetTaxiLight;
@@ -123,7 +115,6 @@ void CAutomobileSA::SetTaxiLight(bool bState)
123115

124116
CPhysical* CAutomobileSA::SpawnFlyingComponent(int iCarNodeIndex, int iUnknown)
125117
{
126-
DEBUG_TRACE("CPhysical* CAutomobileSA::SpawnFlyingComponent ( int iCarNodeIndex, int iUnknown )");
127118
DWORD dwThis = (DWORD)GetInterface();
128119
DWORD dwFunc = FUNC_CAutomobile_SpawnFlyingComponent;
129120
CPhysical* pReturn;
@@ -142,6 +133,5 @@ CPhysical* CAutomobileSA::SpawnFlyingComponent(int iCarNodeIndex, int iUnknown)
142133

143134
CDoor* CAutomobileSA::GetDoor(eDoors doorID)
144135
{
145-
DEBUG_TRACE("CDoor * CAutomobileSA::GetDoor(eDoors doorID)");
146136
return this->door[doorID];
147137
}

‎Client/game_sa/CBikeSA.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,11 @@
1414

1515
CBikeSA::CBikeSA(CBikeSAInterface* bike)
1616
{
17-
DEBUG_TRACE("CBikeSA::CBikeSA( CBikeSAInterface * bike )");
1817
this->m_pInterface = bike;
1918
}
2019

2120
CBikeSA::CBikeSA(eVehicleTypes dwModelID, unsigned char ucVariation, unsigned char ucVariation2) : CVehicleSA(dwModelID, ucVariation, ucVariation2)
2221
{
23-
DEBUG_TRACE("CBikeSA::CBikeSA( eVehicleTypes dwModelID ):CVehicleSA( dwModelID )");
2422
/*if(this->internalInterface)
2523
{
2624
// create the actual vehicle

‎Client/game_sa/CBmxSA.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,9 @@
1414

1515
CBmxSA::CBmxSA(CBmxSAInterface* bmx)
1616
{
17-
DEBUG_TRACE("CBmxSA::CBmxSA( CBmxSAInterface * bmx )");
1817
this->m_pInterface = bmx;
1918
}
2019

2120
CBmxSA::CBmxSA(eVehicleTypes dwModelID, unsigned char ucVariation, unsigned char ucVariation2) : CBikeSA(dwModelID, ucVariation, ucVariation2)
2221
{
23-
DEBUG_TRACE("CBmxSA::CBmxSA( eVehicleTypes dwModelID ):CBikeSA( dwModelID )");
2422
}

0 commit comments

Comments
 (0)