archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-06-28 15:26:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adding getters and setters for type and status

Browse Source
This commit is contained in:
Sergeanur
2020-04-30 16:45:45 +03:00
parent cf5a404f6b
commit 7d758f3a9f
41 changed files with 256 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/weapons/BulletInfo.cpp
View File

@ -171,7 +171,7 @@ void CBulletInfo::Update(void)
}
if (pBullet->m_eWeaponType == WEAPONTYPE_SNIPERRIFLE && bAddSound) {
cAudioScriptObject* pAudio;
switch (pHitEntity->m_type) {
switch (pHitEntity->GetType()) {
case ENTITY_TYPE_BUILDING:
pAudio = new cAudioScriptObject();
pAudio->Posn = pHitEntity->GetPosition();

2
src/weapons/ProjectileInfo.cpp
View File

@ -193,7 +193,7 @@ CProjectileInfo::Update()
if (!gaProjectileInfo[i].m_bInUse) continue;
CPed *ped = (CPed*)gaProjectileInfo[i].m_pSource;
if (ped != nil && ped->m_type == ENTITY_TYPE_PED && !ped->IsPointerValid())
if (ped != nil && ped->IsPed() && !ped->IsPointerValid())
gaProjectileInfo[i].m_pSource = nil;
if (ms_apProjectile[i] == nil) {

28
src/weapons/Weapon.cpp
View File

@ -990,7 +990,7 @@ CWeapon::DoBulletImpact(CEntity *shooter, CEntity *victim,
}
else
{
switch ( victim->m_type )
switch ( victim->GetType() )
{
case ENTITY_TYPE_BUILDING:
{
@ -1065,7 +1065,7 @@ CWeapon::DoBulletImpact(CEntity *shooter, CEntity *victim,
}
}
switch ( victim->m_type )
switch ( victim->GetType() )
{
case ENTITY_TYPE_BUILDING:
{
@ -1256,7 +1256,7 @@ CWeapon::FireShotgun(CEntity *shooter, CVector *fireSource)
}
else
{
switch ( victim->m_type )
switch ( victim->GetType() )
{
case ENTITY_TYPE_VEHICLE:
{
@ -1315,7 +1315,7 @@ CWeapon::FireShotgun(CEntity *shooter, CVector *fireSource)
}
}
switch ( victim->m_type )
switch ( victim->GetType() )
{
case ENTITY_TYPE_BUILDING:
{
@ -1724,7 +1724,7 @@ CWeapon::FireInstantHitFromCar(CAutomobile *shooter, bool left)
else
CGlass::WasGlassHitByBullet(victim, point.point);
switch ( victim->m_type )
switch ( victim->GetType() )
{
case ENTITY_TYPE_BUILDING:
{
@ -1796,10 +1796,10 @@ CWeapon::DoDoomAiming(CEntity *shooter, CVector *source, CVector *target)
if ( (CEntity*)shooterPed != victim && shooterPed->CanSeeEntity(victim, DEGTORAD(22.5f)) )
{
if ( !(victim->m_status == STATUS_TRAIN_MOVING
|| victim->m_status == STATUS_TRAIN_NOT_MOVING
|| victim->m_status == STATUS_HELI
|| victim->m_status == STATUS_PLANE) )
if ( !(victim->GetStatus() == STATUS_TRAIN_MOVING
|| victim->GetStatus() == STATUS_TRAIN_NOT_MOVING
|| victim->GetStatus() == STATUS_HELI
|| victim->GetStatus() == STATUS_PLANE) )
{
float distToVictim = (shooterPed->GetPosition()-victim->GetPosition()).Magnitude2D();
float distToVictimZ = Abs(shooterPed->GetPosition().z-victim->GetPosition().z);
@ -1866,10 +1866,10 @@ CWeapon::DoTankDoomAiming(CEntity *shooter, CEntity *driver, CVector *source, CV
if ( shooter != victim && driver != victim )
{
if ( !(victim->m_status == STATUS_TRAIN_MOVING
|| victim->m_status == STATUS_TRAIN_NOT_MOVING
|| victim->m_status == STATUS_HELI
|| victim->m_status == STATUS_PLANE) )
if ( !(victim->GetStatus() == STATUS_TRAIN_MOVING
|| victim->GetStatus() == STATUS_TRAIN_NOT_MOVING
|| victim->GetStatus() == STATUS_HELI
|| victim->GetStatus() == STATUS_PLANE) )
{
if ( !(victim->IsVehicle() && victim->bRenderScorched) )
{
@ -2086,7 +2086,7 @@ FireOneInstantHitRound(CVector *source, CVector *target, int32 damage)
((CVehicle *)victim)->InflictDamage(nil, WEAPONTYPE_UZI, damage);
//BUG ? no CGlass::WasGlassHitByBullet
switch ( victim->m_type )
switch ( victim->GetType() )
{
case ENTITY_TYPE_BUILDING:
{