Skip to content

Commit c0f8d3a

Browse files
G-MorisG-Moris
authored
Merge branch 'master' into new-format-mtasa
2 parents 808b61c + 92c1947 commit c0f8d3a

File tree

124 files changed

+3945
-1880
lines changed

Some content is hidden

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

124 files changed

+3945
-1880
lines changed

‎Client/game_sa/C3DMarkersSA.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ C3DMarker* C3DMarkersSA::CreateMarker(DWORD Identifier, T3DMarkerType dwType, CV
4343

4444
DWORD dwFunc = FUNC_PlaceMarker;
4545
DWORD dwReturn = 0;
46-
_asm
46+
__asm
4747
{
4848
push bZCheck // zCheck ##SA##
4949
push 0 // normalZ ##SA##

‎Client/game_sa/CAEAudioHardwareSA.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ bool CAEAudioHardwareSA::IsSoundBankLoaded(short wSoundBankID, short wSoundBankS
2424
DWORD dwThis = (DWORD)m_pInterface;
2525
DWORD dwFunc = FUNC_CAEAudioHardware__IsSoundBankLoaded;
2626
bool bReturn = false;
27-
_asm
27+
__asm
2828
{
2929
push dwSoundBankSlotID
3030
push dwSoundBankID
@@ -41,7 +41,7 @@ void CAEAudioHardwareSA::LoadSoundBank(short wSoundBankID, short wSoundBankSlotI
4141
DWORD dwSoundBankSlotID = wSoundBankSlotID;
4242
DWORD dwThis = (DWORD)m_pInterface;
4343
DWORD dwFunc = FUNC_CAEAudioHardware__LoadSoundBank;
44-
_asm
44+
__asm
4545
{
4646
push dwSoundBankSlotID
4747
push dwSoundBankID

‎Client/game_sa/CAERadioTrackManagerSA.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ BYTE CAERadioTrackManagerSA::GetCurrentRadioStationID()
1616
{
1717
DWORD dwFunc = FUNC_GetCurrentRadioStationID;
1818
BYTE bReturn = 0;
19-
_asm
19+
__asm
2020
{
2121
mov ecx, CLASS_CAERadioTrackManager
2222
call dwFunc
@@ -30,7 +30,7 @@ BYTE CAERadioTrackManagerSA::IsVehicleRadioActive()
3030
{
3131
DWORD dwFunc = FUNC_IsVehicleRadioActive;
3232
BYTE bReturn = 0;
33-
_asm
33+
__asm
3434
{
3535
mov ecx, CLASS_CAERadioTrackManager
3636
call dwFunc
@@ -45,7 +45,7 @@ char* CAERadioTrackManagerSA::GetRadioStationName(BYTE bStationID)
4545
DWORD dwFunc = FUNC_GetRadioStationName;
4646
char* cReturn = 0;
4747
DWORD dwStationID = bStationID;
48-
_asm
48+
__asm
4949
{
5050
mov ecx, CLASS_CAERadioTrackManager
5151
push dwStationID
@@ -60,7 +60,7 @@ bool CAERadioTrackManagerSA::IsRadioOn()
6060
{
6161
DWORD dwFunc = FUNC_IsRadioOn;
6262
bool bReturn = false;
63-
_asm
63+
__asm
6464
{
6565
mov ecx, CLASS_CAERadioTrackManager
6666
call dwFunc
@@ -73,7 +73,7 @@ bool CAERadioTrackManagerSA::IsRadioOn()
7373
void CAERadioTrackManagerSA::SetBassSetting(DWORD dwBass)
7474
{
7575
DWORD dwFunc = FUNC_SetBassSetting;
76-
_asm
76+
__asm
7777
{
7878
mov ecx, CLASS_CAERadioTrackManager
7979
push 0x3F800000 // 1.0f
@@ -85,7 +85,7 @@ void CAERadioTrackManagerSA::SetBassSetting(DWORD dwBass)
8585
void CAERadioTrackManagerSA::Reset()
8686
{
8787
DWORD dwFunc = FUNC_Reset;
88-
_asm
88+
__asm
8989
{
9090
mov ecx, CLASS_CAERadioTrackManager
9191
call dwFunc
@@ -97,7 +97,7 @@ void CAERadioTrackManagerSA::StartRadio(BYTE bStationID, BYTE bUnknown)
9797
DWORD dwFunc = FUNC_StartRadio;
9898
DWORD dwStationID = bStationID;
9999
DWORD dwUnknown = bUnknown;
100-
_asm
100+
__asm
101101
{
102102
mov ecx, CLASS_CAERadioTrackManager
103103
push 0

‎Client/game_sa/CAEVehicleAudioEntitySA.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ void CAEVehicleAudioEntitySA::JustGotInVehicleAsDriver()
2222
m_pInterface->m_bPlayerDriver = true;
2323
DWORD dwFunc = FUNC_CAEVehicleAudioEntity__JustGotInVehicleAsDriver;
2424
DWORD dwThis = (DWORD)m_pInterface;
25-
_asm
25+
__asm
2626
{
2727
mov ecx, dwThis
2828
call dwFunc
@@ -34,7 +34,7 @@ void CAEVehicleAudioEntitySA::JustGotOutOfVehicleAsDriver()
3434
m_pInterface->m_bPlayerDriver = false;
3535
DWORD dwFunc = FUNC_CAEVehicleAudioEntity__JustGotOutOfVehicleAsDriver;
3636
DWORD dwThis = (DWORD)m_pInterface;
37-
_asm
37+
__asm
3838
{
3939
mov ecx, dwThis
4040
call dwFunc
@@ -45,7 +45,7 @@ void CAEVehicleAudioEntitySA::TurnOnRadioForVehicle()
4545
{
4646
DWORD dwFunc = FUNC_CAEVehicleAudioEntity__TurnOnRadioForVehicle;
4747
DWORD dwThis = (DWORD)m_pInterface;
48-
_asm
48+
__asm
4949
{
5050
mov ecx, dwThis
5151
call dwFunc
@@ -59,7 +59,7 @@ void CAEVehicleAudioEntitySA::StopVehicleEngineSound(unsigned char ucSlot)
5959
if (pVehicleSound->m_pSound)
6060
{
6161
DWORD dwThis = (DWORD)pVehicleSound->m_pSound;
62-
_asm
62+
__asm
6363
{
6464
mov ecx, dwThis
6565
call dwFunc

‎Client/game_sa/CAnimBlendAssocGroupSA.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ CAnimBlendAssociationSAInterface* CAnimBlendAssocGroupSA::CopyAnimation(unsigned
2929

3030
DWORD dwThis = (DWORD)m_pInterface;
3131
DWORD dwFunc = FUNC_CAnimBlendAssocGroup_CopyAnimation;
32-
_asm
32+
__asm
3333
{
3434
mov ecx, dwThis
3535
push AnimID
@@ -43,7 +43,7 @@ void CAnimBlendAssocGroupSA::InitEmptyAssociations(RpClump* pClump)
4343
{
4444
DWORD dwThis = (DWORD)m_pInterface;
4545
DWORD dwFunc = FUNC_CAnimBlendAssocGroup_InitEmptyAssociations;
46-
_asm
46+
__asm
4747
{
4848
mov ecx, dwThis
4949
push pClump
@@ -56,7 +56,7 @@ bool CAnimBlendAssocGroupSA::IsCreated()
5656
bool bReturn;
5757
DWORD dwThis = (DWORD)m_pInterface;
5858
DWORD dwFunc = FUNC_CAnimBlendAssocGroup_IsCreated;
59-
_asm
59+
__asm
6060
{
6161
mov ecx, dwThis
6262
call dwFunc
@@ -70,7 +70,7 @@ int CAnimBlendAssocGroupSA::GetNumAnimations()
7070
int iReturn;
7171
DWORD dwThis = (DWORD)m_pInterface;
7272
DWORD dwFunc = FUNC_CAnimBlendAssocGroup_GetNumAnimations;
73-
_asm
73+
__asm
7474
{
7575
mov ecx, dwThis
7676
call dwFunc
@@ -92,7 +92,7 @@ CAnimBlendStaticAssociation* CAnimBlendAssocGroupSA::GetAnimation(unsigned int I
9292
CAnimBlendStaticAssociation* pReturn;
9393
DWORD dwThis = (DWORD)m_pInterface;
9494
DWORD dwFunc = FUNC_CAnimBlendAssocGroup_GetAnimation;
95-
_asm
95+
__asm
9696
{
9797
mov ecx, dwThis
9898
push ID
@@ -124,7 +124,7 @@ void CAnimBlendAssocGroupSA::CreateAssociations(const char* szBlockName)
124124
{
125125
DWORD dwThis = (DWORD)m_pInterface;
126126
DWORD dwFunc = FUNC_CAnimBlendAssocGroup_CreateAssociations;
127-
_asm
127+
__asm
128128
{
129129
mov ecx, dwThis
130130
push szBlockName

‎Client/game_sa/CAnimBlendAssociationSA.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ CAnimBlendAssociationSAInterface* CAnimBlendAssociationSA::Constructor(CAnimBlen
3232
{
3333
DWORD DwFunc = 0x4CF080;
3434
DWORD DwThisInterface = reinterpret_cast<DWORD>(m_pInterface);
35-
_asm
35+
__asm
3636
{
3737
mov ecx, DwThisInterface
3838
push staticAssociationByReference
@@ -44,7 +44,7 @@ CAnimBlendAssociationSAInterface* CAnimBlendAssociationSA::Constructor(RpClump*
4444
{
4545
DWORD DwFunc = 0x4CEFC0;
4646
DWORD DwThisInterface = reinterpret_cast<DWORD>(m_pInterface);
47-
_asm
47+
__asm
4848
{
4949
mov ecx, DwThisInterface
5050
push pAnimHierarchy
@@ -76,7 +76,7 @@ void CAnimBlendAssociationSA::Init(RpClump* pClump, CAnimBlendHierarchySAInterfa
7676
{
7777
DWORD DwFunc = 0x4CED50;
7878
DWORD DwThisInterface = reinterpret_cast<DWORD>(m_pInterface);
79-
_asm
79+
__asm
8080
{
8181
mov ecx, DwThisInterface
8282
push pAnimHierarchy
@@ -89,7 +89,7 @@ void CAnimBlendAssociationSA::AllocateAnimBlendNodeArray(int iCount)
8989
{
9090
DWORD DwFunc = 0x4CE9F0;
9191
DWORD DwThisInterface = reinterpret_cast<DWORD>(m_pInterface);
92-
_asm
92+
__asm
9393
{
9494
mov ecx, DwThisInterface
9595
push iCount
@@ -101,7 +101,7 @@ void CAnimBlendAssociationSA::FreeAnimBlendNodeArray()
101101
{
102102
DWORD DwFunc = 0x4CEA40;
103103
DWORD DwThisInterface = reinterpret_cast<DWORD>(m_pInterface);
104-
_asm
104+
__asm
105105
{
106106
mov ecx, DwThisInterface
107107
call DwFunc
@@ -124,7 +124,7 @@ void CAnimBlendAssociationSA::SetCurrentProgress(float fProgress)
124124

125125
DWORD DwFunc = 0x4CEA80;
126126
DWORD DwThisInterface = reinterpret_cast<DWORD>(m_pInterface);
127-
_asm
127+
__asm
128128
{
129129
mov ecx, DwThisInterface
130130
push fTime

‎Client/game_sa/CAnimBlendHierarchySA.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ void CAnimBlendHierarchySA::SetName(const char* szName)
3535
{
3636
DWORD dwThis = (DWORD)m_pInterface;
3737
DWORD dwFunc = FUNC_CAnimBlendHierarchy_SetName;
38-
_asm
38+
__asm
3939
{
4040
push szName
4141
mov ecx, dwThis
@@ -47,7 +47,7 @@ void CAnimBlendHierarchySA::RemoveAnimSequences()
4747
{
4848
DWORD dwThis = (DWORD)m_pInterface;
4949
DWORD dwFunc = FUNC_CAnimBlendHierarchy_RemoveAnimSequences;
50-
_asm
50+
__asm
5151
{
5252
mov ecx, dwThis
5353
call dwFunc
@@ -58,7 +58,7 @@ void CAnimBlendHierarchySA::RemoveFromUncompressedCache()
5858
{
5959
DWORD dwThis = (DWORD)m_pInterface;
6060
DWORD dwFunc = FUNC_CAnimBlendHierarchy_RemoveFromUncompressedCache;
61-
_asm
61+
__asm
6262
{
6363
mov ecx, dwThis
6464
call dwFunc
@@ -69,7 +69,7 @@ void CAnimBlendHierarchySA::RemoveQuaternionFlips()
6969
{
7070
DWORD dwThis = (DWORD)m_pInterface;
7171
DWORD dwFunc = FUNC_CAnimBlendHierarchy_RemoveQuaternionFlips;
72-
_asm
72+
__asm
7373
{
7474
mov ecx, dwThis
7575
call dwFunc
@@ -80,7 +80,7 @@ void CAnimBlendHierarchySA::CalculateTotalTime()
8080
{
8181
DWORD dwThis = (DWORD)m_pInterface;
8282
DWORD dwFunc = FUNC_CAnimBlendHierarchy_CalculateTotalTime;
83-
_asm
83+
__asm
8484
{
8585
mov ecx, dwThis
8686
call dwFunc

‎Client/game_sa/CAnimBlendSequenceSA.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ void CAnimBlendSequenceSA::SetName(const char* szName)
2424
{
2525
DWORD dwThis = (DWORD)m_pInterface;
2626
DWORD dwFunc = FUNC_CAnimBlendSequence_SetName;
27-
_asm
27+
__asm
2828
{
2929
push szName
3030
mov ecx, dwThis
@@ -36,7 +36,7 @@ void CAnimBlendSequenceSA::SetBoneTag(int32_t i32BoneID)
3636
{
3737
DWORD dwThis = (DWORD)m_pInterface;
3838
DWORD dwFunc = FUNC_CAnimBlendSequence_SetBoneTag;
39-
_asm
39+
__asm
4040
{
4141
push i32BoneID
4242
mov ecx, dwThis
@@ -48,7 +48,7 @@ void CAnimBlendSequenceSA::SetKeyFrames(size_t cKeyFrames, bool bRoot, bool bCom
4848
{
4949
DWORD dwThis = (DWORD)m_pInterface;
5050
DWORD dwFunc = FUNC_CAnimBlendSequence_SetKeyFrames;
51-
_asm
51+
__asm
5252
{
5353
push pKeyFrames
5454
push bCompressed

‎Client/game_sa/CAnimBlendStaticAssociationSA.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ void CAnimBlendStaticAssociationSA::Initialize(RpClump* pClump, CAnimBlendHierar
1616
{
1717
DWORD dwThis = (DWORD)m_pInterface;
1818
DWORD dwFunc = FUNC_CAnimBlendStaticAssociation_Initialize;
19-
_asm
19+
__asm
2020
{
2121
push pAnimBlendHierarchyInterface
2222
push pClump

0 commit comments

Comments
 (0)