summaryrefslogtreecommitdiffstats
path: root/src/vehicles/Automobile.cpp
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2019-07-20 15:19:33 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2019-07-20 15:19:33 +0200
commitbe8e29e4e2dede741516be156dc370376acb13a9 (patch)
tree8e68c4e5c40b69511dd2c151aa35c917c3062dea /src/vehicles/Automobile.cpp
parentfixed replay (diff)
parentone more fix (diff)
downloadre3-be8e29e4e2dede741516be156dc370376acb13a9.tar
re3-be8e29e4e2dede741516be156dc370376acb13a9.tar.gz
re3-be8e29e4e2dede741516be156dc370376acb13a9.tar.bz2
re3-be8e29e4e2dede741516be156dc370376acb13a9.tar.lz
re3-be8e29e4e2dede741516be156dc370376acb13a9.tar.xz
re3-be8e29e4e2dede741516be156dc370376acb13a9.tar.zst
re3-be8e29e4e2dede741516be156dc370376acb13a9.zip
Diffstat (limited to 'src/vehicles/Automobile.cpp')
-rw-r--r--src/vehicles/Automobile.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/vehicles/Automobile.cpp b/src/vehicles/Automobile.cpp
index 93590b2e..46116536 100644
--- a/src/vehicles/Automobile.cpp
+++ b/src/vehicles/Automobile.cpp
@@ -180,8 +180,6 @@ CAutomobile::CAutomobile(int32 id, uint8 CreatedBy)
bExplosionProof = true;
bBulletProof = true;
}
-
- *(void**)this = (void*)0x600C1C;
}
@@ -1443,9 +1441,11 @@ CAutomobile::RcbanditCheckHitWheels(void)
{ EAXJMP(0x53C990);
}
-//WRAPPER void
-//CAutomobile::VehicleDamage(float impulse, uint16 damagedPiece)
-//{ EAXJMP(0x52F390);
+#if 0
+WRAPPER void
+CAutomobile::VehicleDamage(float impulse, uint16 damagedPiece)
+{ EAXJMP(0x52F390); }
+#else
void
CAutomobile::VehicleDamage(float impulse, uint16 damagedPiece)
{
@@ -1494,7 +1494,7 @@ CAutomobile::VehicleDamage(float impulse, uint16 damagedPiece)
return;
if(m_pDamageEntity){
- if(m_pDamageEntity->m_status == STATUS_PLAYER_PLAYBACKFROMBUFFER &&
+ if(m_pDamageEntity->IsBuilding() &&
DotProduct(m_vecDamageNormal, GetUp()) > 0.6f)
return;
}
@@ -1686,6 +1686,7 @@ CAutomobile::VehicleDamage(float impulse, uint16 damagedPiece)
}
}
}
+#endif
void
CAutomobile::dmgDrawCarCollidingParticles(const CVector &pos, float amount)