From 8b57634c78e6366bfcfb3aac5d84664056004dee Mon Sep 17 00:00:00 2001 From: Sergeanur Date: Mon, 13 Jan 2020 16:36:42 +0200 Subject: Fix projectile crash --- src/weapons/ProjectileInfo.cpp | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'src') 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 } } } -- cgit v1.2.3