diff options
author | Sergeanur <s.anureev@yandex.ua> | 2020-04-16 11:57:58 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-16 11:57:58 +0200 |
commit | 552f8c864fccdb449feef10e24e7a3d3c3d24300 (patch) | |
tree | 273aa6a3d04c8c4f1175f99dec539bec128f7e74 /src/weapons/BulletInfo.h | |
parent | Increase alpha entity list capacity for wide screen (diff) | |
parent | Merge remote-tracking branch 'upstream/master' (diff) | |
download | re3-552f8c864fccdb449feef10e24e7a3d3c3d24300.tar re3-552f8c864fccdb449feef10e24e7a3d3c3d24300.tar.gz re3-552f8c864fccdb449feef10e24e7a3d3c3d24300.tar.bz2 re3-552f8c864fccdb449feef10e24e7a3d3c3d24300.tar.lz re3-552f8c864fccdb449feef10e24e7a3d3c3d24300.tar.xz re3-552f8c864fccdb449feef10e24e7a3d3c3d24300.tar.zst re3-552f8c864fccdb449feef10e24e7a3d3c3d24300.zip |
Diffstat (limited to 'src/weapons/BulletInfo.h')
-rw-r--r-- | src/weapons/BulletInfo.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/weapons/BulletInfo.h b/src/weapons/BulletInfo.h index b10ef0a1..c7d740b2 100644 --- a/src/weapons/BulletInfo.h +++ b/src/weapons/BulletInfo.h @@ -5,10 +5,20 @@ enum eWeaponType; class CBulletInfo { + eWeaponType m_eWeaponType; + CEntity* m_pSource; + float m_fTimer; // big mistake + bool m_bInUse; + CVector m_vecPosition; + CVector m_vecSpeed; + int16 m_nDamage; public: + enum { + NUM_BULLETS = 100 + }; static void Initialise(void); static void Shutdown(void); - static void AddBullet(CEntity *firingEntity, eWeaponType type, CVector pos, CVector velocity); + static bool AddBullet(CEntity* pSource, eWeaponType type, CVector vecPosition, CVector vecSpeed); static void Update(void); static bool TestForSniperBullet(float x1, float x2, float y1, float y2, float z1, float z2); };
\ No newline at end of file |