diff options
| author | nrb <email.com> | 2020-05-24 17:27:12 +0200 |
|---|---|---|
| committer | nrb <email.com> | 2020-05-24 17:27:12 +0200 |
| commit | d59862eb5e9b56fe5b9fb0b2332e07b5266dcd22 (patch) | |
| tree | cb26faa96123be56fe3bad98a6447ae5f476b11b /src/weapons | |
| parent | how did saving even work in original III? (diff) | |
| download | re3-d59862eb5e9b56fe5b9fb0b2332e07b5266dcd22.tar re3-d59862eb5e9b56fe5b9fb0b2332e07b5266dcd22.tar.gz re3-d59862eb5e9b56fe5b9fb0b2332e07b5266dcd22.tar.bz2 re3-d59862eb5e9b56fe5b9fb0b2332e07b5266dcd22.tar.lz re3-d59862eb5e9b56fe5b9fb0b2332e07b5266dcd22.tar.xz re3-d59862eb5e9b56fe5b9fb0b2332e07b5266dcd22.tar.zst re3-d59862eb5e9b56fe5b9fb0b2332e07b5266dcd22.zip | |
Diffstat (limited to 'src/weapons')
| -rw-r--r-- | src/weapons/ShotInfo.cpp | 2 | ||||
| -rw-r--r-- | src/weapons/Weapon.cpp | 4 | ||||
| -rw-r--r-- | src/weapons/WeaponInfo.cpp | 3 | ||||
| -rw-r--r-- | src/weapons/WeaponInfo.h | 1 |
4 files changed, 6 insertions, 4 deletions
diff --git a/src/weapons/ShotInfo.cpp b/src/weapons/ShotInfo.cpp index f09ae052..6fc6341d 100644 --- a/src/weapons/ShotInfo.cpp +++ b/src/weapons/ShotInfo.cpp @@ -128,4 +128,4 @@ CShotInfo::Update() if (!((CTimer::GetFrameCounter() + slot) & 3)) CWorld::SetCarsOnFire(shot.m_startPos.x, shot.m_startPos.y, shot.m_startPos.z, 4.0f, shot.m_sourceEntity); } -}
\ No newline at end of file +} diff --git a/src/weapons/Weapon.cpp b/src/weapons/Weapon.cpp index ebdeb38b..6908abab 100644 --- a/src/weapons/Weapon.cpp +++ b/src/weapons/Weapon.cpp @@ -817,7 +817,7 @@ CWeapon::FireInstantHit(CEntity *shooter, CVector *fireSource) CPed *threatAttack = (CPed*)shooterPed->m_pPointGunAt; if ( threatAttack->IsPed() ) { - threatAttack->m_pedIK.GetComponentPosition((RwV3d)target, PED_MID); + threatAttack->m_pedIK.GetComponentPosition(*(RwV3d *)&target, PED_MID); threatAttack->ReactToPointGun(shooter); } else @@ -1483,7 +1483,7 @@ CWeapon::FireShotgun(CEntity *shooter, CVector *fireSource) { CVector pos; if (shooterPed->m_pPointGunAt->IsPed()) { - ((CPed*)shooterPed->m_pPointGunAt)->m_pedIK.GetComponentPosition((RwV3d)pos, PED_MID); + ((CPed*)shooterPed->m_pPointGunAt)->m_pedIK.GetComponentPosition(*(RwV3d *)&pos, PED_MID); } else { pos = ((CPed*)shooterPed->m_pPointGunAt)->GetPosition(); } diff --git a/src/weapons/WeaponInfo.cpp b/src/weapons/WeaponInfo.cpp index 104fa2ec..bd53d8c5 100644 --- a/src/weapons/WeaponInfo.cpp +++ b/src/weapons/WeaponInfo.cpp @@ -59,7 +59,8 @@ static char ms_aWeaponNames[][32] = { }; CWeaponInfo* -CWeaponInfo::GetWeaponInfo(eWeaponType weaponType) { +CWeaponInfo::GetWeaponInfo(eWeaponType weaponType) +{ return &CWeaponInfo::ms_apWeaponInfos[weaponType]; } diff --git a/src/weapons/WeaponInfo.h b/src/weapons/WeaponInfo.h index 41450047..e7013004 100644 --- a/src/weapons/WeaponInfo.h +++ b/src/weapons/WeaponInfo.h @@ -1,5 +1,6 @@ #pragma once +#include "AnimManager.h" #include "AnimationId.h" #include "WeaponType.h" |