summaryrefslogtreecommitdiffstats
path: root/src/vehicles
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2019-07-20 14:39:38 +0200
committeraap <aap@papnet.eu>2019-07-20 14:39:38 +0200
commit60045ec6cd5fe5bd650cf62442283e50d4a4c233 (patch)
tree40844313ea09daa35f96c8b7da7c1ba3a6d302e6 /src/vehicles
parentMerge pull request #149 from ShFil119/audio4 (diff)
downloadre3-60045ec6cd5fe5bd650cf62442283e50d4a4c233.tar
re3-60045ec6cd5fe5bd650cf62442283e50d4a4c233.tar.gz
re3-60045ec6cd5fe5bd650cf62442283e50d4a4c233.tar.bz2
re3-60045ec6cd5fe5bd650cf62442283e50d4a4c233.tar.lz
re3-60045ec6cd5fe5bd650cf62442283e50d4a4c233.tar.xz
re3-60045ec6cd5fe5bd650cf62442283e50d4a4c233.tar.zst
re3-60045ec6cd5fe5bd650cf62442283e50d4a4c233.zip
Diffstat (limited to 'src/vehicles')
-rw-r--r--src/vehicles/Automobile.cpp13
-rw-r--r--src/vehicles/HandlingMgr.cpp2
2 files changed, 8 insertions, 7 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)
diff --git a/src/vehicles/HandlingMgr.cpp b/src/vehicles/HandlingMgr.cpp
index 4d3a94a8..be96ab08 100644
--- a/src/vehicles/HandlingMgr.cpp
+++ b/src/vehicles/HandlingMgr.cpp
@@ -70,7 +70,7 @@ char VehicleNames[NUMHANDLINGS][14] = {
cHandlingDataMgr::cHandlingDataMgr(void)
{
- memset(this, 0, sizeof(this));
+ memset(this, 0, sizeof(*this));
}
void