Skip to content

Commit 22f98f7

Browse files
author
G_Moris
committed
adjustments
1 parent 034fbf0 commit 22f98f7

File tree

3 files changed

+1
-9
lines changed

3 files changed

+1
-9
lines changed

Client/game_sa/premake5.lua

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ project "Game SA"
44
targetname "game_sa"
55
targetdir(buildpath("mta"))
66

7-
-- HACK(Jusonex): Temp fix for ebp not being set in naked functions
8-
-- More information on this in multiplayer_sa's premake5.lua
97
cppdialect "C++20"
108

119
pchheader "StdInc.h"

Client/multiplayer_sa/CMultiplayerSA.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7364,7 +7364,7 @@ void PostCWorld_ProcessPedsAfterPreRender()
73647364
const DWORD CWorld_ProcessPedsAfterPreRender = 0x563430;
73657365
void _declspec(naked) HOOK_Idle_CWorld_ProcessPedsAfterPreRender()
73667366
{
7367-
_asm
7367+
__asm
73687368
{
73697369
call CWorld_ProcessPedsAfterPreRender
73707370
call PostCWorld_ProcessPedsAfterPreRender

Client/multiplayer_sa/premake5.lua

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,6 @@ project "Multiplayer SA"
44
targetname "multiplayer_sa"
55
targetdir(buildpath("mta"))
66

7-
-- HACK(Jusonex): Temp fix for ebp not being set in naked functions
8-
-- VS2019 changed the evaluation order as required by the C++17 standard
9-
-- which broke all functions marked with __declspec(naked) that call C++ code
10-
-- Falling back to the old, C++14 implementing fixes this
11-
-- See https://developercommunity.visualstudio.com/content/problem/549628/stack-access-broken-in-naked-function.html
12-
-- We're not aware of any workaround to avoid rewriting multiplayer_sa
137
cppdialect "C++20"
148

159
filter "system:windows"

0 commit comments

Comments
 (0)