Skip to content

Commit 2e12e98

Browse files
committed
Use double underscore for __declspec(naked)
1 parent 3b2b5be commit 2e12e98

Some content is hidden

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

51 files changed

+408
-408
lines changed

Client/game_sa/CAudioEngineSA.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ __declspec(noinline) bool _cdecl IsAmbientSoundGeneralEnabled()
423423
}
424424

425425
// Hook for manual ambient sound pause
426-
void _declspec(naked) HOOK_CAEAmbienceTrackManager_CheckForPause()
426+
void __declspec(naked) HOOK_CAEAmbienceTrackManager_CheckForPause()
427427
{
428428
_asm
429429
{
@@ -511,7 +511,7 @@ __declspec(noinline) bool _cdecl On_CAESoundManager_RequestNewSound(CAESound* pA
511511
return g_pAudioSA->OnWorldSound(pAESound);
512512
}
513513

514-
void _declspec(naked) HOOK_CAESoundManager_RequestNewSound()
514+
void __declspec(naked) HOOK_CAESoundManager_RequestNewSound()
515515
{
516516
_asm
517517
{

Client/game_sa/CCameraSA.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,7 @@ __declspec(noinline) void _cdecl DoCameraCollisionDetectionPokes()
501501
MemPutFast<char>(VAR_CameraClipVehicles, 0);
502502
}
503503

504-
void _declspec(naked) HOOK_Camera_CollisionDetection()
504+
void __declspec(naked) HOOK_Camera_CollisionDetection()
505505
{
506506
_asm
507507
{

Client/game_sa/CCheckpointSA.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ static void __cdecl RenderTargetArrow(CCheckpointSAInterface* pCheckpoint)
156156
((void(__cdecl*)(float, float, float, float, std::uint8_t, std::uint8_t, std::uint8_t, std::uint8_t, float, float, float))C3dMarkers_DirectionArrowSet)(position->fX, position->fY, position->fZ, checkpoint->GetTargetArrowSize(), color.R, color.G, color.B, color.A, -direction->fX, -direction->fY, -direction->fZ);
157157
}
158158

159-
static void _declspec(naked) HOOK_CCheckpoint__Render()
159+
static void __declspec(naked) HOOK_CCheckpoint__Render()
160160
{
161161
_asm {
162162
pushad

Client/game_sa/CFireSA.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ static void AbortFireTask(CEntitySAInterface* entityOnFire, DWORD returnAddress)
237237
#define HOOKPOS_CFire_Extinguish 0x539429
238238
#define HOOKSIZE_CFire_Extinguish 6
239239
static constexpr std::uintptr_t CONTINUE_CFire_Extinguish = 0x53942F;
240-
static void _declspec(naked) HOOK_CFire_Extinguish()
240+
static void __declspec(naked) HOOK_CFire_Extinguish()
241241
{
242242
_asm
243243
{

Client/game_sa/CFxSystemSA.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ __declspec(noinline) void OnMY_FxSystem_c_Update_MidA_Post()
166166
#define HOOKPOS_FxSystem_c_Update_MidA 0x04AAF70
167167
#define HOOKSIZE_FxSystem_c_Update_MidA 5
168168
DWORD RETURN_FxSystem_c_Update_MidA = 0x04AAF75;
169-
void _declspec(naked) HOOK_FxSystem_c_Update_MidA()
169+
void __declspec(naked) HOOK_FxSystem_c_Update_MidA()
170170
{
171171
_asm
172172
{
@@ -234,7 +234,7 @@ __declspec(noinline) void OnMY_FxSystem_c_Update_MidB_Post()
234234
#define HOOKPOS_FxSystem_c_Update_MidB 0x04AB21D
235235
#define HOOKSIZE_FxSystem_c_Update_MidB 7
236236
DWORD RETURN_FxSystem_c_Update_MidB = 0x04AB224;
237-
void _declspec(naked) HOOK_FxSystem_c_Update_MidB()
237+
void __declspec(naked) HOOK_FxSystem_c_Update_MidB()
238238
{
239239
_asm
240240
{

Client/game_sa/CHudSA.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -897,7 +897,7 @@ void CHudSA::RenderWanted(bool empty, float x, float y, const char* strLevel)
897897
}
898898

899899
static constexpr std::uintptr_t CONTINUE_RenderWanted = 0x58DFD8;
900-
static void _declspec(naked) HOOK_RenderWanted()
900+
static void __declspec(naked) HOOK_RenderWanted()
901901
{
902902
_asm
903903
{

Client/game_sa/CModelInfoSA.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1892,7 +1892,7 @@ __declspec(noinline) void OnMY_NodeNameStreamRead(RwStream* stream, char* pDest,
18921892
#define HOOKPOS_NodeNameStreamRead 0x072FA68
18931893
#define HOOKSIZE_NodeNameStreamRead 15
18941894
DWORD RETURN_NodeNameStreamRead = 0x072FA77;
1895-
void _declspec(naked) HOOK_NodeNameStreamRead()
1895+
void __declspec(naked) HOOK_NodeNameStreamRead()
18961896
{
18971897
_asm
18981898
{

Client/game_sa/CObjectSA.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ static void CObject_PreRender(CObjectSAInterface* objectInterface)
2727
}
2828

2929
const std::uintptr_t RETURN_CCObject_PreRender = 0x59FD56;
30-
static void _declspec(naked) HOOK_CCObject_PreRender()
30+
static void __declspec(naked) HOOK_CCObject_PreRender()
3131
{
3232
__asm
3333
{

Client/game_sa/CPedSA.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,7 @@ void CPedSA::GetAttachedSatchels(std::vector<SSatchelsData>& satchelsList) const
590590
#define HOOKSIZE_CPed_PreRenderAfterTest 15
591591
static constexpr std::uintptr_t RETURN_CPed_PreRenderAfterTest = 0x5E65AF;
592592
static constexpr std::uintptr_t RETURN_CPed_PreRenderAfterTestSkip = 0x5E6658;
593-
static void _declspec(naked) HOOK_CPed_PreRenderAfterTest()
593+
static void __declspec(naked) HOOK_CPed_PreRenderAfterTest()
594594
{
595595
_asm
596596
{
@@ -629,7 +629,7 @@ static void _declspec(naked) HOOK_CPed_PreRenderAfterTest()
629629
#define HOOKSIZE_CPed_PreRenderAfterTest_Mid 5
630630
static constexpr std::uintptr_t RETURN_CPed_PreRenderAfterTest_Mid = 0x5E666E;
631631
static constexpr std::uintptr_t RETURN_CPed_PreRenderAfterTest_MidSkip = 0x5E766F;
632-
static void _declspec(naked) HOOK_CPed_PreRenderAfterTest_Mid()
632+
static void __declspec(naked) HOOK_CPed_PreRenderAfterTest_Mid()
633633
{
634634
_asm
635635
{

Client/game_sa/CPlayerPedSA.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ __declspec(noinline) int _cdecl OnCPlayerPed_ProcessAnimGroups_Mid(CPlayerPedSAI
443443
#define HOOKPOS_CPlayerPed_ProcessAnimGroups_Mid 0x0609A44
444444
#define HOOKSIZE_CPlayerPed_ProcessAnimGroups_Mid 6
445445
DWORD RETURN_CPlayerPed_ProcessAnimGroups_Mid = 0x0609A4A;
446-
void _declspec(naked) HOOK_CPlayerPed_ProcessAnimGroups_Mid()
446+
void __declspec(naked) HOOK_CPlayerPed_ProcessAnimGroups_Mid()
447447
{
448448
_asm
449449
{
@@ -495,7 +495,7 @@ __declspec(noinline) int _cdecl OnCClothes_GetDefaultPlayerMotionGroup(int iReqM
495495
#define HOOKPOS_CClothes_GetDefaultPlayerMotionGroup 0x05A81B0
496496
#define HOOKSIZE_CClothes_GetDefaultPlayerMotionGroup 5
497497
DWORD RETURN_CClothes_GetDefaultPlayerMotionGroup = 0x05A81B5;
498-
void _declspec(naked) HOOK_CClothes_GetDefaultPlayerMotionGroup()
498+
void __declspec(naked) HOOK_CClothes_GetDefaultPlayerMotionGroup()
499499
{
500500
_asm
501501
{

0 commit comments

Comments
 (0)