summaryrefslogtreecommitdiffstats
path: root/src/weapons
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-05-26 11:39:16 +0200
committerGitHub <noreply@github.com>2020-05-26 11:39:16 +0200
commit800d706935a9ef2ccd360584416a4b24d99be718 (patch)
treeea345190077017dc3f5783cbe531f193e11ec5f6 /src/weapons
parenteSurfaceType (diff)
parentPed.h include not needed (diff)
downloadre3-800d706935a9ef2ccd360584416a4b24d99be718.tar
re3-800d706935a9ef2ccd360584416a4b24d99be718.tar.gz
re3-800d706935a9ef2ccd360584416a4b24d99be718.tar.bz2
re3-800d706935a9ef2ccd360584416a4b24d99be718.tar.lz
re3-800d706935a9ef2ccd360584416a4b24d99be718.tar.xz
re3-800d706935a9ef2ccd360584416a4b24d99be718.tar.zst
re3-800d706935a9ef2ccd360584416a4b24d99be718.zip
Diffstat (limited to 'src/weapons')
-rw-r--r--src/weapons/ShotInfo.cpp2
-rw-r--r--src/weapons/Weapon.cpp4
-rw-r--r--src/weapons/WeaponInfo.cpp3
-rw-r--r--src/weapons/WeaponInfo.h1
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 9edb3c51..eaf86bfc 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"