diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2019-09-02 18:04:09 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2019-09-02 18:04:09 +0200 |
| commit | b2236d8951562e8b780e979fd473fc7b0f7120ec (patch) | |
| tree | f8c7198e6124f85be46f0b40b27c50fc4bd53c0b /src/control/CarCtrl.h | |
| parent | CCarCtrl Weave stuff done (diff) | |
| download | re3-b2236d8951562e8b780e979fd473fc7b0f7120ec.tar re3-b2236d8951562e8b780e979fd473fc7b0f7120ec.tar.gz re3-b2236d8951562e8b780e979fd473fc7b0f7120ec.tar.bz2 re3-b2236d8951562e8b780e979fd473fc7b0f7120ec.tar.lz re3-b2236d8951562e8b780e979fd473fc7b0f7120ec.tar.xz re3-b2236d8951562e8b780e979fd473fc7b0f7120ec.tar.zst re3-b2236d8951562e8b780e979fd473fc7b0f7120ec.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/control/CarCtrl.h | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/src/control/CarCtrl.h b/src/control/CarCtrl.h index 77982ba6..d5405137 100644 --- a/src/control/CarCtrl.h +++ b/src/control/CarCtrl.h @@ -11,6 +11,12 @@ enum{ #define LANE_WIDTH 5.0f +#ifdef FIX_BUGS +#define FIX_PATHFIND_BUG +#endif + +#undef FIX_PATHFIND_BUG + class CCarCtrl { enum eCarClass { @@ -56,7 +62,7 @@ public: static bool IsThisVehicleInteresting(CVehicle*); static int32 CountCarsOfType(int32 mi); static void SlowCarOnRailsDownForTrafficAndLights(CVehicle*); - static void PickNextNodeAccordingStrategy(CVehicle*); + static bool PickNextNodeAccordingStrategy(CVehicle*); static void DragCarToPoint(CVehicle*, CVector*); static float FindMaximumSpeedForThisCarInTraffic(CVehicle*); static void SlowCarDownForCarsSectorList(CPtrList&, CVehicle*, float, float, float, float, float*, float); @@ -71,6 +77,14 @@ public: static void WeaveForPed(CEntity*, CVehicle*, float*, float*); static void WeaveThroughObjectsSectorList(CPtrList&, CVehicle*, float, float, float, float, float*, float*); static void WeaveForObject(CEntity*, CVehicle*, float*, float*); +#ifdef FIX_PATHFIND_BUG + static void PickNextNodeToChaseCar(CVehicle*, float, float, float, CVehicle*); +#else + static void PickNextNodeToChaseCar(CVehicle*, float, float, CVehicle*); +#endif + static bool PickNextNodeToFollowPath(CVehicle*); + static void PickNextNodeRandomly(CVehicle*); + static uint8 FindPathDirection(int32, int32, int32); static float GetOffsetOfLaneFromCenterOfRoad(int8 lane, CCarPathLink* pLink) { |