From e44704dc8290918a22e8126b44d3037a1e857d7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?eray=20or=C3=A7unus?= Date: Wed, 17 Jun 2020 21:24:59 +0300 Subject: Ped, Weapon and fixes --- src/control/Replay.cpp | 9 +++++++-- src/control/Script.cpp | 1 - 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'src/control') diff --git a/src/control/Replay.cpp b/src/control/Replay.cpp index 6f9ad156..4407254c 100644 --- a/src/control/Replay.cpp +++ b/src/control/Replay.cpp @@ -111,9 +111,14 @@ static void(*CBArray[])(CAnimBlendAssociation*, void*) = nil, &CPed::PedGetupCB, &CPed::PedStaggerCB, &CPed::PedEvadeCB, &CPed::FinishDieAnimCB, &CPed::FinishedWaitCB, &CPed::FinishLaunchCB, &CPed::FinishHitHeadCB, &CPed::PedAnimGetInCB, &CPed::PedAnimDoorOpenCB, &CPed::PedAnimPullPedOutCB, &CPed::PedAnimDoorCloseCB, &CPed::PedSetInCarCB, &CPed::PedSetOutCarCB, &CPed::PedAnimAlignCB, - &CPed::PedSetDraggedOutCarCB, &CPed::PedAnimStepOutCarCB, &CPed::PedSetInTrainCB, &CPed::PedSetOutTrainCB, &CPed::FinishedAttackCB, + &CPed::PedSetDraggedOutCarCB, &CPed::PedAnimStepOutCarCB, &CPed::PedSetInTrainCB, +#ifdef GTA_TRAIN + &CPed::PedSetOutTrainCB, +#endif + &CPed::FinishedAttackCB, &CPed::FinishFightMoveCB, &PhonePutDownCB, &PhonePickUpCB, &CPed::PedAnimDoorCloseRollingCB, &CPed::FinishJumpCB, - &CPed::PedLandCB, &FinishFuckUCB, &CPed::RestoreHeadingRateCB, &CPed::PedSetQuickDraggedOutCarPositionCB, &CPed::PedSetDraggedOutCarPositionCB + &CPed::PedLandCB, &CPed::RestoreHeadingRateCB, &CPed::PedSetQuickDraggedOutCarPositionCB, &CPed::PedSetDraggedOutCarPositionCB, + &CPed::FinishedReloadCB, &StartTalkingOnMobileCB, &FinishTalkingOnMobileCB }; static uint8 FindCBFunctionID(void(*f)(CAnimBlendAssociation*, void*)) diff --git a/src/control/Script.cpp b/src/control/Script.cpp index b1cf44c6..f90e7fb5 100644 --- a/src/control/Script.cpp +++ b/src/control/Script.cpp @@ -10876,7 +10876,6 @@ int8 CRunningScript::ProcessCommands1200To1299(int32 command) } case COMMAND_POP_CAR_BOOT: { - CollectParameters(&m_nIp, 1); CollectParameters(&m_nIp, 1); CAutomobile* pCar = (CAutomobile*)CPools::GetVehiclePool()->GetAt(ScriptParams[0]); assert(pCar&& pCar->IsCar()); -- cgit v1.2.3