ModdingRX/re3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix an original bug about entering boat sometimes takes 2 key press

Browse Source
This commit is contained in:
erorcun 2021-08-21 19:07:26 +03:00
parent f86bdb2cdb
commit c52aebe8e7
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/peds/PedAI.cpp
View File

@ -3531,23 +3531,17 @@ CPed::SetEnterCar_AllClear(CVehicle *car, uint32 doorNode, uint32 doorFlag)
m_vecOffsetSeek = doorOpenPos - GetPosition(); m_vecOffsetSeek = doorOpenPos - GetPosition();
m_nPedStateTimer = CTimer::GetTimeInMilliseconds() + 600; m_nPedStateTimer = CTimer::GetTimeInMilliseconds() + 600;
if (car->IsBoat()) { if (car->IsBoat()) {
#ifdef VC_PED_PORTS
// VC checks for handling flag, but we can't do that
if(car->GetModelIndex() == MI_SPEEDER)
m_pVehicleAnim = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_STD_CAR_SIT, 100.0f);
else
m_pVehicleAnim = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_STD_BOAT_DRIVE, 100.0f);
PedSetInCarCB(nil, this);
bVehExitWillBeInstant = true;
#else
#ifndef FIX_BUGS #ifndef FIX_BUGS
m_pVehicleAnim = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_STD_BOAT_DRIVE, 100.0f); m_pVehicleAnim = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_STD_BOAT_DRIVE, 100.0f);
#else #else
m_pVehicleAnim = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, car->GetDriverAnim(), 100.0f); m_pVehicleAnim = CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, car->GetDriverAnim(), 100.0f);
#endif #endif
// Otherwise boat enter key sometimes processed multiple times, so you enter/exit instantly
#if defined VC_PED_PORTS || defined FIX_BUGS
PedSetInCarCB(nil, this);
bVehExitWillBeInstant = true;
#else
m_pVehicleAnim->SetFinishCallback(PedSetInCarCB, this); m_pVehicleAnim->SetFinishCallback(PedSetInCarCB, this);
#endif #endif
if (IsPlayer()) if (IsPlayer())
@ -5194,8 +5188,10 @@ CPed::SeekBoatPosition(void)
enterOffset = boatModel->GetFrontSeatPosn(); enterOffset = boatModel->GetFrontSeatPosn();
enterOffset.x = 0.0f; enterOffset.x = 0.0f;
CMatrix boatMat(m_carInObjective->GetMatrix()); CMatrix boatMat(m_carInObjective->GetMatrix());
CVector boatEnterPos = Multiply3x3(boatMat, enterOffset);
boatEnterPos += m_carInObjective->GetPosition();
SetMoveState(PEDMOVE_WALK); SetMoveState(PEDMOVE_WALK);
m_vecSeekPos = boatMat * enterOffset; m_vecSeekPos = boatEnterPos;
if (Seek()) { if (Seek()) {
// We arrived to the boat // We arrived to the boat
m_vehDoor = 0; m_vehDoor = 0;