archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-07-15 09:18:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

CAutomobile done

Browse Source
This commit is contained in:
aap
2020-05-31 17:05:49 +02:00
parent 00dc86917e
commit 21ce0a4b28
20 changed files with 1365 additions and 437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/weapons/Explosion.cpp
View File

@ -86,7 +86,7 @@ CExplosion::GetExplosionPosition(uint8 id)
}
bool
CExplosion::AddExplosion(CEntity *explodingEntity, CEntity *culprit, eExplosionType type, const CVector &pos, uint32 lifetime)
CExplosion::AddExplosion(CEntity *explodingEntity, CEntity *culprit, eExplosionType type, const CVector &pos, uint32 lifetime, bool unk)
{
CVector pPosn;
CVector posGround;

3
src/weapons/Explosion.h
View File

@ -40,7 +40,8 @@ public:
static void ResetExplosionActiveCounter(uint8 id);
static uint8 GetExplosionType(uint8 id);
static CVector *GetExplosionPosition(uint8 id);
static bool AddExplosion(CEntity *explodingEntity, CEntity *culprit, eExplosionType type, const CVector &pos, uint32 lifetime);
// TODO(MIAMI): that new parameter
static bool AddExplosion(CEntity *explodingEntity, CEntity *culprit, eExplosionType type, const CVector &pos, uint32 lifetime, bool unk = true);
static void Update();
static bool TestForExplosionInArea(eExplosionType type, float x1, float x2, float y1, float y2, float z1, float z2);
static void RemoveAllExplosionsInArea(CVector pos, float radius);

12
src/weapons/Weapon.cpp
View File

@ -113,6 +113,18 @@ CWeapon::UpdateWeapons(void)
CBulletInfo::Update();
}
//--MIAMI: done
CWeapon::CWeapon(eWeaponType type, int32 ammo)
{
m_eWeaponType = type;
m_eWeaponState = WEAPONSTATE_READY;
m_nAmmoTotal = Min(ammo, 99999);
m_nAmmoInClip = 0;
Reload();
m_nTimer = 0;
m_bAddRotOffset = false;
}
// --MIAMI: Done
void
CWeapon::Initialise(eWeaponType type, int32 ammo)

1
src/weapons/Weapon.h
View File

@ -25,6 +25,7 @@ public:
CWeapon() {
m_bAddRotOffset = false;
}
CWeapon(eWeaponType type, int32 ammo);
CWeaponInfo *GetInfo();