summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-01-13 15:36:42 +0100
committerSergeanur <s.anureev@yandex.ua>2020-01-13 15:36:42 +0100
commit8b57634c78e6366bfcfb3aac5d84664056004dee (patch)
treeee7f666f0de84150634a5c4b14d8ab77b6881a41
parentMerge pull request #290 from Sergeanur/ProjectileInfo (diff)
downloadre3-8b57634c78e6366bfcfb3aac5d84664056004dee.tar
re3-8b57634c78e6366bfcfb3aac5d84664056004dee.tar.gz
re3-8b57634c78e6366bfcfb3aac5d84664056004dee.tar.bz2
re3-8b57634c78e6366bfcfb3aac5d84664056004dee.tar.lz
re3-8b57634c78e6366bfcfb3aac5d84664056004dee.tar.xz
re3-8b57634c78e6366bfcfb3aac5d84664056004dee.tar.zst
re3-8b57634c78e6366bfcfb3aac5d84664056004dee.zip
-rw-r--r--src/weapons/ProjectileInfo.cpp15
1 files changed, 0 insertions, 15 deletions
diff --git a/src/weapons/ProjectileInfo.cpp b/src/weapons/ProjectileInfo.cpp
index 5e58907a..64d8b632 100644
--- a/src/weapons/ProjectileInfo.cpp
+++ b/src/weapons/ProjectileInfo.cpp
@@ -213,9 +213,6 @@ CProjectileInfo::Update()
|| !CWorld::GetIsLineOfSightClear(gaProjectileInfo[i].m_vecPos, pos, true, true, true, true, false, false)
|| gaProjectileInfo[i].m_eWeaponType == WEAPONTYPE_ROCKETLAUNCHER && (CHeli::TestRocketCollision(&pos) || CPlane::TestRocketCollision(&pos))) {
RemoveProjectile(&gaProjectileInfo[i], ms_apProjectile[i]);
-#ifdef FIX_BUGS
- ms_apProjectile[i] = nil;
-#endif
}
CWorld::pIgnoreEntity = nil;
} else if (gaProjectileInfo[i].m_eWeaponType == WEAPONTYPE_MOLOTOV) {
@@ -229,18 +226,12 @@ CProjectileInfo::Update()
|| !CWorld::GetIsLineOfSightClear(gaProjectileInfo[i].m_vecPos, pos, true, true, true, true, false, false)
|| gaProjectileInfo[i].m_eWeaponType == WEAPONTYPE_ROCKETLAUNCHER && (CHeli::TestRocketCollision(&pos) || CPlane::TestRocketCollision(&pos))) {
RemoveProjectile(&gaProjectileInfo[i], ms_apProjectile[i]);
-#ifdef FIX_BUGS
- ms_apProjectile[i] = nil;
-#endif
}
}
CWorld::pIgnoreEntity = nil;
}
} else {
RemoveProjectile(&gaProjectileInfo[i], ms_apProjectile[i]);
-#ifdef FIX_BUGS
- ms_apProjectile[i] = nil;
-#endif
}
gaProjectileInfo[i].m_vecPos = ms_apProjectile[i]->GetPosition();
@@ -261,9 +252,6 @@ CProjectileInfo::IsProjectileInRange(float x1, float x2, float y1, float y2, flo
gaProjectileInfo[i].m_bInUse = false;
CWorld::Remove(ms_apProjectile[i]);
delete ms_apProjectile[i];
-#ifdef FIX_BUGS
- ms_apProjectile[i] = nil;
-#endif
}
}
}
@@ -280,9 +268,6 @@ CProjectileInfo::RemoveAllProjectiles()
gaProjectileInfo[i].m_bInUse = false;
CWorld::Remove(ms_apProjectile[i]);
delete ms_apProjectile[i];
-#ifdef FIX_BUGS
- ms_apProjectile[i] = nil;
-#endif
}
}
}