diff options
| author | _AG <gennariarmando@outlook.com> | 2019-07-04 22:31:21 +0200 |
|---|---|---|
| committer | _AG <gennariarmando@outlook.com> | 2019-07-04 22:33:19 +0200 |
| commit | 9fed0c040c482bac8cba688e7564c8e8dfe23b30 (patch) | |
| tree | 6098d16b702a3a057cd0bbd39bf3ece217c832c8 /src/entities/Ped.cpp | |
| parent | Merge pull request #110 from erorcun/erorcun (diff) | |
| download | re3-9fed0c040c482bac8cba688e7564c8e8dfe23b30.tar re3-9fed0c040c482bac8cba688e7564c8e8dfe23b30.tar.gz re3-9fed0c040c482bac8cba688e7564c8e8dfe23b30.tar.bz2 re3-9fed0c040c482bac8cba688e7564c8e8dfe23b30.tar.lz re3-9fed0c040c482bac8cba688e7564c8e8dfe23b30.tar.xz re3-9fed0c040c482bac8cba688e7564c8e8dfe23b30.tar.zst re3-9fed0c040c482bac8cba688e7564c8e8dfe23b30.zip | |
Diffstat (limited to 'src/entities/Ped.cpp')
| -rw-r--r-- | src/entities/Ped.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/entities/Ped.cpp b/src/entities/Ped.cpp index 9e1836c2..2e51a5c1 100644 --- a/src/entities/Ped.cpp +++ b/src/entities/Ped.cpp @@ -39,6 +39,7 @@ WRAPPER void CPed::PreRender(void) { EAXJMP(0x4CFDD0); } WRAPPER void CPed::Render(void) { EAXJMP(0x4D03F0); } WRAPPER int32 CPed::ProcessEntityCollision(CEntity*, CColPoint*) { EAXJMP(0x4CBB30); } WRAPPER void CPed::SetMoveAnim(void) { EAXJMP(0x4C5A40); } +WRAPPER void CPed::MakeChangesForNewWeapon(int8) { EAXJMP(0x4F2560); } bool &CPed::bNastyLimbsCheat = *(bool*)0x95CD44; bool &CPed::bPedCheat2 = *(bool*)0x95CD5A; @@ -461,9 +462,9 @@ CPed::CPed(uint32 pedType) : m_pedIK(this) } m_maxWeaponTypeAllowed = 0; m_currentWeapon = 0; - m_storedWeapon = NO_STORED_WEAPON; + m_storedWeapon = WEAPONTYPE_UNIDENTIFIED; - for(int i = 0; i < NUM_PED_WEAPONTYPES; i++) + for(int i = 0; i < WEAPONTYPE_TOTAL_INVENTORY_WEAPONS; i++) { CWeapon &weapon = GetWeapon(i); weapon.m_eWeaponType = WEAPONTYPE_UNARMED; @@ -1445,9 +1446,9 @@ CPed::PedSetDraggedOutCarCB(CAnimBlendAssociation *dragAssoc, void *arg) // Only uzi can be used on cars, so previous weapon was stored if (ped->IsPlayer() && weaponType == WEAPONTYPE_UZI) { - if (ped->m_storedWeapon != NO_STORED_WEAPON) { + if (ped->m_storedWeapon != WEAPONTYPE_UNIDENTIFIED) { ped->SetCurrentWeapon(ped->m_storedWeapon); - ped->m_storedWeapon = NO_STORED_WEAPON; + ped->m_storedWeapon = WEAPONTYPE_UNIDENTIFIED; } } else { ped->AddWeaponModel(CWeaponInfo::GetWeaponInfo(weaponType)->m_nModelId); |