diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-03-01 12:19:42 +0100 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-03-01 12:19:42 +0100 |
| commit | ceab73a053d1513c8a40354a3e502bc1c3f01819 (patch) | |
| tree | 80db097ad3fe1e56ab0d72b9dbe6a7d0d3fbb6c1 /src/control | |
| parent | removed debug leftovers (diff) | |
| parent | Merge pull request #339 from erorcun/erorcun (diff) | |
| download | re3-ceab73a053d1513c8a40354a3e502bc1c3f01819.tar re3-ceab73a053d1513c8a40354a3e502bc1c3f01819.tar.gz re3-ceab73a053d1513c8a40354a3e502bc1c3f01819.tar.bz2 re3-ceab73a053d1513c8a40354a3e502bc1c3f01819.tar.lz re3-ceab73a053d1513c8a40354a3e502bc1c3f01819.tar.xz re3-ceab73a053d1513c8a40354a3e502bc1c3f01819.tar.zst re3-ceab73a053d1513c8a40354a3e502bc1c3f01819.zip | |
Diffstat (limited to 'src/control')
| -rw-r--r-- | src/control/Script.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/control/Script.cpp b/src/control/Script.cpp index dab68e5a..acecc863 100644 --- a/src/control/Script.cpp +++ b/src/control/Script.cpp @@ -2769,7 +2769,11 @@ int8 CRunningScript::ProcessCommands200To299(int32 command) pVehicle->AutoPilot.m_nCarMission = MISSION_CRUISE; pVehicle->bEngineOn = true; pPed->bUsesCollision = false; +#ifdef FIX_BUGS + AnimationId anim = pVehicle->GetDriverAnim(); +#else AnimationId anim = pVehicle->bLowVehicle ? ANIM_CAR_LSIT : ANIM_CAR_SIT; +#endif pPed->m_pVehicleAnim = CAnimManager::BlendAnimation(pPed->GetClump(), ASSOCGRP_STD, anim, 100.0f); pPed->StopNonPartialAnims(); pPed->m_nZoneLevel = CTheZones::GetLevelFromPosition(pPed->GetPosition()); @@ -3711,7 +3715,7 @@ int8 CRunningScript::ProcessCommands400To499(int32 command) CollectParameters(&m_nIp, 2); CPlayerInfo* pPlayer = &CWorld::Players[ScriptParams[0]]; if (ScriptParams[1]){ - if (CReplay::IsPlayingBack() || CTheScripts::DelayMakingPlayerUnsafeThisTime){ + if (CGame::playingIntro || CTheScripts::DelayMakingPlayerUnsafeThisTime){ CTheScripts::CountdownToMakePlayerUnsafe = 50; if (CTheScripts::DelayMakingPlayerUnsafeThisTime) CTheScripts::DelayMakingPlayerUnsafeThisTime--; @@ -3963,7 +3967,11 @@ int8 CRunningScript::ProcessCommands400To499(int32 command) pPed->SetPedState(PED_DRIVING); pVehicle->m_status = STATUS_PHYSICS; pPed->bUsesCollision = false; +#ifdef FIX_BUGS + AnimationId anim = pVehicle->GetDriverAnim(); +#else AnimationId anim = pVehicle->bLowVehicle ? ANIM_CAR_LSIT : ANIM_CAR_SIT; +#endif pPed->m_pVehicleAnim = CAnimManager::BlendAnimation(pPed->GetClump(), ASSOCGRP_STD, anim, 100.0f); pPed->StopNonPartialAnims(); pPed->m_nZoneLevel = CTheZones::GetLevelFromPosition(pPed->GetPosition()); |