Skip to content

Commit ed77b94

Browse files
ccw808ccw808
committed
Applied source formatting
1 parent f205f34 commit ed77b94

21 files changed

+55
-91
lines changed

‎Client/core/CChat.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ void CChat::Draw(bool bUseCacheTexture, bool bAllowOutline)
215215
// If we can't get a rendertarget for some reason, just render the text directly to the screen
216216
if (!m_pCacheTexture)
217217
{
218-
drawList.bOutline = false; // Outline too slow without cache texture
218+
drawList.bOutline = false; // Outline too slow without cache texture
219219
DrawDrawList(drawList, chatTopLeft);
220220
return;
221221
}

‎Client/core/CJoystickManager.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1050,11 +1050,9 @@ void CJoystickManager::ApplyAxes(CControllerState& cs, bool bInVehicle)
10501050

10511051
if (line.SourceAxisDir == eDirPos)
10521052
value = std::max(0.f, value);
1053-
else
1054-
if (line.SourceAxisDir == eDirNeg)
1053+
else if (line.SourceAxisDir == eDirNeg)
10551054
value = -std::min(0.f, value);
1056-
else
1057-
if (line.SourceAxisDir == eDirNegToPos)
1055+
else if (line.SourceAxisDir == eDirNegToPos)
10581056
value = value * 0.5f + 0.5f;
10591057

10601058
if (line.OutputAxisDir == eDirNeg)

‎Client/game_sa/CAudioEngineSA.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -426,8 +426,7 @@ VOID CAudioEngineSA::UpdateAmbientSoundSettings(void)
426426
MemPut<BYTE>(0x507814, 0x33); // No gunfire
427427
}
428428

429-
__declspec(noinline)
430-
bool _cdecl IsAmbientSoundGeneralEnabled(void)
429+
__declspec(noinline) bool _cdecl IsAmbientSoundGeneralEnabled(void)
431430
{
432431
if (pGame)
433432
{
@@ -506,8 +505,7 @@ bool CAudioEngineSA::OnWorldSound(CAESound* pAESound)
506505

507506
////////////////////////////////////////////////////////////////////////////////////////////////
508507
// Return false to skip sound
509-
__declspec(noinline)
510-
bool _cdecl On_CAESoundManager_RequestNewSound(CAESound* pAESound)
508+
__declspec(noinline) bool _cdecl On_CAESoundManager_RequestNewSound(CAESound* pAESound)
511509
{
512510
return g_pAudioSA->OnWorldSound(pAESound);
513511
}

‎Client/game_sa/CCameraSA.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -568,8 +568,7 @@ void CCameraSA::GetCameraClip(bool &bObjects, bool &bVehicles)
568568
bVehicles = bCameraClipVehicles;
569569
}
570570

571-
__declspec(noinline)
572-
void _cdecl DoCameraCollisionDetectionPokes()
571+
__declspec(noinline) void _cdecl DoCameraCollisionDetectionPokes()
573572
{
574573
if (!bCameraClipObjects)
575574
{

‎Client/game_sa/CFxSystemSA.cpp

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,7 @@ bool CFxSystemSA::HasCustomDrawDistance(void)
123123
// Poke new draw distance for the FxSystem
124124
//
125125
//////////////////////////////////////////////////////////////////////////////////////////
126-
__declspec(noinline)
127-
void OnMY_FxSystem_c_Update_MidA_Pre(CFxSystemSAInterface* pFxSystemSAInterface)
126+
__declspec(noinline) void OnMY_FxSystem_c_Update_MidA_Pre(CFxSystemSAInterface* pFxSystemSAInterface)
128127
{
129128
CFxSystemSA* pFxSystemSA = pGame->GetFxManagerSA()->GetFxSystem(pFxSystemSAInterface);
130129
if (pFxSystemSA && pFxSystemSA->HasCustomDrawDistance())
@@ -139,8 +138,7 @@ void OnMY_FxSystem_c_Update_MidA_Pre(CFxSystemSAInterface* pFxSystemSAInterface)
139138
ms_fUsingDrawDistance = 0;
140139
}
141140

142-
__declspec(noinline)
143-
void OnMY_FxSystem_c_Update_MidA_Post(void)
141+
__declspec(noinline) void OnMY_FxSystem_c_Update_MidA_Post(void)
144142
{
145143
if (ms_pUsingFxSystemSAInterface)
146144
{
@@ -191,8 +189,7 @@ void _declspec(naked) HOOK_FxSystem_c_Update_MidA()
191189
// Poke new draw distances for each emitter
192190
//
193191
//////////////////////////////////////////////////////////////////////////////////////////
194-
__declspec(noinline)
195-
void OnMY_FxSystem_c_Update_MidB_Pre(CFxEmitterSAInterface* pFxEmitterSAInterface)
192+
__declspec(noinline) void OnMY_FxSystem_c_Update_MidB_Pre(CFxEmitterSAInterface* pFxEmitterSAInterface)
196193
{
197194
if (ms_fUsingDrawDistance)
198195
{
@@ -209,8 +206,7 @@ void OnMY_FxSystem_c_Update_MidB_Pre(CFxEmitterSAInterface* pFxEmitterSAInterfac
209206
}
210207
}
211208

212-
__declspec(noinline)
213-
void OnMY_FxSystem_c_Update_MidB_Post(void)
209+
__declspec(noinline) void OnMY_FxSystem_c_Update_MidB_Post(void)
214210
{
215211
if (ms_pUsingFxEmitterSAInterface)
216212
{

‎Client/game_sa/CHandlingManagerSA.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ CHandlingEntrySA* CHandlingManagerSA::m_pOriginalEntries[HT_MAX];
2727

2828
DWORD m_dwStore_Calculate = 0;
2929

30-
__declspec(noinline)
31-
void DumpHandlingData(tHandlingDataSA* pData)
30+
__declspec(noinline) void DumpHandlingData(tHandlingDataSA* pData)
3231
{
3332
unsigned int iCounter = pData->iVehicleID;
3433

‎Client/game_sa/CModelInfoSA.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1189,8 +1189,7 @@ void CModelInfoSA::MakePedModel(char* szTexture)
11891189
// Skip loading GTA collision model if we have replaced it
11901190
//
11911191
//////////////////////////////////////////////////////////////////////////////////////////
1192-
__declspec(noinline)
1193-
bool OnMY_CFileLoader_LoadCollisionFile_Mid(int iModelId)
1192+
__declspec(noinline) bool OnMY_CFileLoader_LoadCollisionFile_Mid(int iModelId)
11941193
{
11951194
if (MapContains(CModelInfoSA::ms_ReplacedColModels, iModelId))
11961195
return false;
@@ -1236,8 +1235,7 @@ void _declspec(naked) HOOK_CFileLoader_LoadCollisionFile_Mid()
12361235
// Ignore extra characters in dff frame name
12371236
//
12381237
//////////////////////////////////////////////////////////////////////////////////////////
1239-
__declspec(noinline)
1240-
void OnMY_NodeNameStreamRead(RwStream* stream, char* pDest, uint uiSize)
1238+
__declspec(noinline) void OnMY_NodeNameStreamRead(RwStream* stream, char* pDest, uint uiSize)
12411239
{
12421240
// Calc sizes
12431241
const uint uiMaxBufferSize = 24;

‎Client/game_sa/CPedSA.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1745,8 +1745,7 @@ ePedState CPedSA::GetPedState()
17451745
// Check if they have already been applied.
17461746
//
17471747
////////////////////////////////////////////////////////////////
1748-
__declspec(noinline)
1749-
int _cdecl OnCPed_PreRenderAfterTest(CPedSAInterface* pPedInterface)
1748+
__declspec(noinline) int _cdecl OnCPed_PreRenderAfterTest(CPedSAInterface* pPedInterface)
17501749
{
17511750
if (pPedInterface->pedFlags.bCalledPreRender)
17521751
return 1; // Skip slope and swim rotations

‎Client/game_sa/CPlayerPedSA.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -492,8 +492,7 @@ int GetAnimPose(int iAnim)
492492
// Returns anim to use
493493
//
494494
////////////////////////////////////////////////////////////////
495-
__declspec(noinline)
496-
int _cdecl OnCPlayerPed_ProcessAnimGroups_Mid(CPlayerPedSAInterface *pPlayerPedSAInterface, int iReqMoveAnim)
495+
__declspec(noinline) int _cdecl OnCPlayerPed_ProcessAnimGroups_Mid(CPlayerPedSAInterface *pPlayerPedSAInterface, int iReqMoveAnim)
497496
{
498497
CPed *pPed = pGame->GetPools()->GetPed((DWORD *)pPlayerPedSAInterface);
499498

@@ -554,8 +553,7 @@ void _declspec(naked) HOOK_CPlayerPed_ProcessAnimGroups_Mid()
554553
// Returns MOVE_PLAYER, MOVE_PLAYER_F or MOVE_PLAYER_M
555554
//
556555
////////////////////////////////////////////////////////////////
557-
__declspec(noinline)
558-
int _cdecl OnCClothes_GetDefaultPlayerMotionGroup(int iReqMoveAnim)
556+
__declspec(noinline) int _cdecl OnCClothes_GetDefaultPlayerMotionGroup(int iReqMoveAnim)
559557
{
560558
CPed *pPed = g_pCore->GetMultiplayer()->GetContextSwitchedPed();
561559

‎Client/game_sa/CRenderWareSA.ClothesReplacing.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,7 @@ bool CRenderWareSA::HasClothesReplacementChanged(void)
110110
// then maybe switch to replacement txd file data
111111
//
112112
////////////////////////////////////////////////////////////////
113-
__declspec(noinline)
114-
bool _cdecl OnCStreaming_RequestModel_Mid(int flags, SImgGTAItemInfo* pImgGTAInfo)
113+
__declspec(noinline) bool _cdecl OnCStreaming_RequestModel_Mid(int flags, SImgGTAItemInfo* pImgGTAInfo)
115114
{
116115
// Check is player.img
117116
if (pImgGTAInfo->ucImgId != 5)

0 commit comments

Comments
 (0)