summaryrefslogtreecommitdiffstats
path: root/src/vehicles/Vehicle.cpp
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-04-23 18:12:20 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2020-04-23 18:12:20 +0200
commit05ddc80ea22cee3c97f274b1d5c3d3d1d5cafdbd (patch)
treed1b9a842f2d767a0d05b1a23c3a0a4746d2b5e70 /src/vehicles/Vehicle.cpp
parentMerge remote-tracking branch 'upstream/master' (diff)
parentremoved fix that made no sense (diff)
downloadre3-05ddc80ea22cee3c97f274b1d5c3d3d1d5cafdbd.tar
re3-05ddc80ea22cee3c97f274b1d5c3d3d1d5cafdbd.tar.gz
re3-05ddc80ea22cee3c97f274b1d5c3d3d1d5cafdbd.tar.bz2
re3-05ddc80ea22cee3c97f274b1d5c3d3d1d5cafdbd.tar.lz
re3-05ddc80ea22cee3c97f274b1d5c3d3d1d5cafdbd.tar.xz
re3-05ddc80ea22cee3c97f274b1d5c3d3d1d5cafdbd.tar.zst
re3-05ddc80ea22cee3c97f274b1d5c3d3d1d5cafdbd.zip
Diffstat (limited to 'src/vehicles/Vehicle.cpp')
-rw-r--r--src/vehicles/Vehicle.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/vehicles/Vehicle.cpp b/src/vehicles/Vehicle.cpp
index c09375cc..57c5f3af 100644
--- a/src/vehicles/Vehicle.cpp
+++ b/src/vehicles/Vehicle.cpp
@@ -1002,21 +1002,15 @@ void
DestroyVehicleAndDriverAndPassengers(CVehicle* pVehicle)
{
if (pVehicle->pDriver) {
-#ifndef FIX_BUGS
- // this just isn't fair
CDarkel::RegisterKillByPlayer(pVehicle->pDriver, WEAPONTYPE_UNIDENTIFIED);
-#endif
pVehicle->pDriver->FlagToDestroyWhenNextProcessed();
}
for (int i = 0; i < pVehicle->m_nNumMaxPassengers; i++) {
if (pVehicle->pPassengers[i]) {
-#ifndef FIX_BUGS
- // this just isn't fair
CDarkel::RegisterKillByPlayer(pVehicle->pPassengers[i], WEAPONTYPE_UNIDENTIFIED);
-#endif
pVehicle->pPassengers[i]->FlagToDestroyWhenNextProcessed();
}
}
CWorld::Remove(pVehicle);
delete pVehicle;
-} \ No newline at end of file
+}