diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2021-01-01 12:53:20 +0100 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2021-01-01 12:53:20 +0100 |
| commit | 9fd93e8e5792781b1bce0eb5d75aa6eff00d9f69 (patch) | |
| tree | 49f4d64c4ee48b03e9ac032fca6b97259d181935 /src/peds | |
| parent | Merge branch 'miami' of github.com:GTAmodding/re3 into miami (diff) | |
| parent | actual struct name (diff) | |
| download | re3-9fd93e8e5792781b1bce0eb5d75aa6eff00d9f69.tar re3-9fd93e8e5792781b1bce0eb5d75aa6eff00d9f69.tar.gz re3-9fd93e8e5792781b1bce0eb5d75aa6eff00d9f69.tar.bz2 re3-9fd93e8e5792781b1bce0eb5d75aa6eff00d9f69.tar.lz re3-9fd93e8e5792781b1bce0eb5d75aa6eff00d9f69.tar.xz re3-9fd93e8e5792781b1bce0eb5d75aa6eff00d9f69.tar.zst re3-9fd93e8e5792781b1bce0eb5d75aa6eff00d9f69.zip | |
Diffstat (limited to 'src/peds')
| -rw-r--r-- | src/peds/Ped.cpp | 2 | ||||
| -rw-r--r-- | src/peds/PedType.cpp | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp index e408c5bb..b8afaeab 100644 --- a/src/peds/Ped.cpp +++ b/src/peds/Ped.cpp @@ -4105,7 +4105,9 @@ CPed::PedSetOutCarCB(CAnimBlendAssociation *animAssoc, void *arg) if (veh->pDriver == ped) { veh->RemoveDriver(); +#ifndef FIX_BUGS // RemoveDriver does it anyway veh->SetStatus(STATUS_ABANDONED); +#endif if (veh->m_nDoorLock == CARLOCK_LOCKED_INITIALLY) veh->m_nDoorLock = CARLOCK_UNLOCKED; if (ped->m_nPedType == PEDTYPE_COP && veh->IsLawEnforcementVehicle()) diff --git a/src/peds/PedType.cpp b/src/peds/PedType.cpp index 5565b90f..bc6395b0 100644 --- a/src/peds/PedType.cpp +++ b/src/peds/PedType.cpp @@ -254,13 +254,12 @@ CPedStats::LoadPedStats(void) float fleeDist, headingChangeRate, attackStrength, defendWeakness; int fear, temper, lawfullness, sexiness, flags; - type = 0; buf = new char[16 * 1024]; - CFileMgr::SetDir("DATA"); - buflen = CFileMgr::LoadFile("PEDSTATS.DAT", (uint8*)buf, 16 * 1024, "r"); - CFileMgr::SetDir(""); + CFileMgr::SetDir("DATA"); + buflen = CFileMgr::LoadFile("PEDSTATS.DAT", (uint8*)buf, 16 * 1024, "r"); + CFileMgr::SetDir(""); for(bp = 0; bp < buflen; ){ // read file line by line |