summaryrefslogtreecommitdiffstats
path: root/src/weapons
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2019-07-23 16:39:30 +0200
committeraap <aap@papnet.eu>2019-07-23 16:39:30 +0200
commite9cafe340a16c489c5f6874066b9836d70bd0091 (patch)
treed4dd7107784bd7cdf6ef055287bc6deffd35f925 /src/weapons
parentMerge pull request #161 from ShFil119/audio5 (diff)
downloadre3-e9cafe340a16c489c5f6874066b9836d70bd0091.tar
re3-e9cafe340a16c489c5f6874066b9836d70bd0091.tar.gz
re3-e9cafe340a16c489c5f6874066b9836d70bd0091.tar.bz2
re3-e9cafe340a16c489c5f6874066b9836d70bd0091.tar.lz
re3-e9cafe340a16c489c5f6874066b9836d70bd0091.tar.xz
re3-e9cafe340a16c489c5f6874066b9836d70bd0091.tar.zst
re3-e9cafe340a16c489c5f6874066b9836d70bd0091.zip
Diffstat (limited to 'src/weapons')
-rw-r--r--src/weapons/Weapon.cpp2
-rw-r--r--src/weapons/Weapon.h6
2 files changed, 7 insertions, 1 deletions
diff --git a/src/weapons/Weapon.cpp b/src/weapons/Weapon.cpp
index cd63544f..0fc89637 100644
--- a/src/weapons/Weapon.cpp
+++ b/src/weapons/Weapon.cpp
@@ -5,7 +5,9 @@
#include "WeaponInfo.h"
WRAPPER bool CWeapon::Fire(CEntity*, CVector*) { EAXJMP(0x55C380); }
+WRAPPER void CWeapon::FireFromCar(CAutomobile *car, bool left) { EAXJMP(0x55C940); }
WRAPPER void CWeapon::AddGunshell(CEntity*, CVector const&, CVector2D const&, float) { EAXJMP(0x55F770); }
+WRAPPER void CWeapon::Update(int32 audioEntity) { EAXJMP(0x563A10); }
void
CWeapon::Initialise(eWeaponType type, int ammo)
diff --git a/src/weapons/Weapon.h b/src/weapons/Weapon.h
index fc1d9988..71fe1f45 100644
--- a/src/weapons/Weapon.h
+++ b/src/weapons/Weapon.h
@@ -1,5 +1,4 @@
#pragma once
-#include "Entity.h"
enum eWeaponType
{
@@ -46,6 +45,9 @@ enum eWeaponState
WEAPONSTATE_MELEE_MADECONTACT
};
+class CEntity;
+class CAutomobile;
+
class CWeapon
{
public:
@@ -61,8 +63,10 @@ public:
}
void Initialise(eWeaponType type, int ammo);
+ void Update(int32 audioEntity);
void Reload(void);
bool Fire(CEntity*, CVector*);
+ void FireFromCar(CAutomobile *car, bool left);
void AddGunshell(CEntity*, CVector const&, CVector2D const&, float);
bool IsTypeMelee(void);
bool IsType2Handed(void);