Backups/SA-MP
1
0
Fork 0
mirror of https://github.com/dashr9230/SA-MP.git synced 2025-09-19 12:16:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[saco] Implement/match CPlayerPed::IsFighting()

Browse Source
This commit is contained in:
RD42
2024-11-02 22:48:04 +08:00
parent a7ffe33721
commit 975fdd589e
3 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
saco/game/common.h
View File

@ -70,11 +70,19 @@ typedef struct _WEAPON_SLOT_TYPE
} WEAPON_SLOT_TYPE; // MUST BE EXACTLY ALIGNED TO 28 bytes } WEAPON_SLOT_TYPE; // MUST BE EXACTLY ALIGNED TO 28 bytes
//-----------------------------------------------------------
#pragma pack(1)
typedef struct _PED_TASKS_TYPE typedef struct _PED_TASKS_TYPE
{ {
char _gap0[16]; char _gap0[16];
DWORD * pdwJumpJetPack; DWORD * pdwJumpJetPack;
char _gap14[4];
// Extended Tasks
DWORD * pdwFighting;
} PED_TASKS_TYPE; } PED_TASKS_TYPE;
//----------------------------------------------------------- //-----------------------------------------------------------

11
saco/game/playerped.cpp
View File

@ -968,6 +968,17 @@ BOOL CPlayerPed::IsJumping()
//----------------------------------------------------------- //-----------------------------------------------------------
BOOL CPlayerPed::IsFighting()
{
if(m_pPed && !IN_VEHICLE(m_pPed) && m_pPed->Tasks->pdwFighting)
{
return GetTaskTypeFromTask(m_pPed->Tasks->pdwFighting) == 1016;
}
return FALSE;
}
//-----------------------------------------------------------
void CPlayerPed::StartJetpack() void CPlayerPed::StartJetpack()
{ {
if(!m_pPed) return; if(!m_pPed) return;

1
saco/game/playerped.h
View File

@ -109,6 +109,7 @@ public:
void HoldItem(int iObject); void HoldItem(int iObject);
BOOL IsJumping(); BOOL IsJumping();
BOOL IsFighting();
float GetAimZ(); float GetAimZ();
void SetAimZ(float fAimZ); void SetAimZ(float fAimZ);