diff options
| author | Fire_Head <Fire-Head@users.noreply.github.com> | 2019-08-15 04:06:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-15 04:06:52 +0200 |
| commit | 6909fa283a25410a6d5f2fc93259b71770512ca2 (patch) | |
| tree | cc187ba965eb71352fae028d3eb7f9f8db463153 /src/vehicles/Vehicle.cpp | |
| parent | CParticleObject done, cDMAudio done (diff) | |
| parent | Merge pull request #189 from Nick007J/master (diff) | |
| download | re3-6909fa283a25410a6d5f2fc93259b71770512ca2.tar re3-6909fa283a25410a6d5f2fc93259b71770512ca2.tar.gz re3-6909fa283a25410a6d5f2fc93259b71770512ca2.tar.bz2 re3-6909fa283a25410a6d5f2fc93259b71770512ca2.tar.lz re3-6909fa283a25410a6d5f2fc93259b71770512ca2.tar.xz re3-6909fa283a25410a6d5f2fc93259b71770512ca2.tar.zst re3-6909fa283a25410a6d5f2fc93259b71770512ca2.zip | |
Diffstat (limited to 'src/vehicles/Vehicle.cpp')
| -rw-r--r-- | src/vehicles/Vehicle.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/vehicles/Vehicle.cpp b/src/vehicles/Vehicle.cpp index 6f7dd7d5..775689f7 100644 --- a/src/vehicles/Vehicle.cpp +++ b/src/vehicles/Vehicle.cpp @@ -30,6 +30,10 @@ void *CVehicle::operator new(size_t sz, int handle) { return CPools::GetVehicleP void CVehicle::operator delete(void *p, size_t sz) { CPools::GetVehiclePool()->Delete((CVehicle*)p); } void CVehicle::operator delete(void *p, int handle) { CPools::GetVehiclePool()->Delete((CVehicle*)p); } +WRAPPER bool CVehicle::ShufflePassengersToMakeSpace(void) { EAXJMP(0x5528A0); } +// or Weapon.cpp? +WRAPPER void FireOneInstantHitRound(CVector *shotSource, CVector *shotTarget, int32 damage) { EAXJMP(0x563B00); } + CVehicle::CVehicle(uint8 CreatedBy) { int i; @@ -57,7 +61,7 @@ CVehicle::CVehicle(uint8 CreatedBy) pPassengers[i] = nil; m_nBombTimer = 0; m_pBlowUpEntity = nil; - field_1FB = 0; + m_nPacManPickupsCarried = 0; bComedyControls = false; bCraneMessageDone = false; bExtendedRange = false; @@ -68,7 +72,7 @@ CVehicle::CVehicle(uint8 CreatedBy) m_nTimeOfDeath = 0; m_pCarFire = nil; bHasBeenOwnedByPlayer = false; - m_veh_flagC20 = false; + bCreateRoadBlockPeds = false; bCanBeDamaged = true; bUsingSpecialColModel = false; m_veh_flagD1 = false; @@ -99,7 +103,7 @@ CVehicle::CVehicle(uint8 CreatedBy) m_aCollPolys[0].valid = false; m_aCollPolys[1].valid = false; AutoPilot.m_nCarMission = MISSION_NONE; - AutoPilot.m_nAnimationId = TEMPACT_NONE; + AutoPilot.m_nTempAction = TEMPACT_NONE; AutoPilot.m_nTimeToStartMission = CTimer::GetTimeInMilliseconds(); AutoPilot.m_flag4 = false; AutoPilot.m_flag10 = false; |