expvintl/RAGECOOP-V
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Vehicle seat fix

Browse Source
This commit is contained in:
Sardelka
2022-08-15 20:04:08 +08:00
parent d4ffb0c929
commit 3289c03fd2
3 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
RageCoop.Client/Networking/Send.cs
View File

@ -59,6 +59,7 @@ namespace RageCoop.Client
{
var veh = ped.CurrentVehicle?.GetSyncEntity() ?? ped.VehicleTryingToEnter?.GetSyncEntity() ?? ped.LastVehicle?.GetSyncEntity();
p.VehicleID = veh?.ID ?? 0;
if (p.VehicleID==0) { Main.Logger.Error("Invalid vehicle"); }
if (p.Speed==5)
{
p.Seat=ped.GetSeatTryingToEnter();

4
RageCoop.Client/Sync/Entities/Ped/SyncedPed.cs
View File

@ -692,7 +692,7 @@ namespace RageCoop.Client
}
if (!(localRagdoll || MainPed.IsDead))
{
if (!IsAiming)
if (!IsAiming && !MainPed.IsGettingUp)
{
MainPed.Heading=Heading;
}
@ -741,7 +741,7 @@ namespace RageCoop.Client
#endregion
private void DisplayInVehicle()
{
if (CurrentVehicle==null || CurrentVehicle.MainVehicle==null) { return; }
if (CurrentVehicle==null || CurrentVehicle.MainVehicle==null) { Main.Logger.Error("Veh not found"); return; }
switch (Speed)
{
case 4:

24
RageCoop.Client/Util/PedExtensions.cs
View File

@ -45,6 +45,18 @@ namespace RageCoop.Client
public static byte GetPedSpeed(this Ped ped)
{
if (ped.IsSittingInVehicle())
{
return 4;
}
if (ped.IsTaskActive(TaskType.CTaskEnterVehicle))
{
return 5;
}
if (ped.IsTaskActive(TaskType.CTaskExitVehicle))
{
return 6;
}
if (ped.IsWalking)
{
return 1;
@ -58,18 +70,6 @@ namespace RageCoop.Client
return 3;
}
if (ped.IsSittingInVehicle())
{
return 4;
}
if (ped.IsTaskActive(TaskType.CTaskEnterVehicle))
{
return 5;
}
if (ped.IsTaskActive(TaskType.CTaskExitVehicle))
{
return 6;
}
return 0;
}