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

Fix some control not being ignored on chat

Browse Source
This commit is contained in:
Sardelka
2022-08-16 22:16:18 +08:00
parent efb759b9f9
commit 973f6873e4
2 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
RageCoop.Client/Main.cs
View File

@ -257,14 +257,6 @@ namespace RageCoop.Client
CoopMenu.LastMenu.Visible = true; CoopMenu.LastMenu.Visible = true;
} }
} }
else if (Game.IsControlJustPressed(GTA.Control.MultiplayerInfo))
{
if (Networking.IsOnServer)
{
ulong currentTimestamp = Util.GetTickCount64();
PlayerList.Pressed = (currentTimestamp - PlayerList.Pressed) < 5000 ? (currentTimestamp - 6000) : currentTimestamp;
}
}
else if (Game.IsControlJustPressed(GTA.Control.MpTextChatAll)) else if (Game.IsControlJustPressed(GTA.Control.MpTextChatAll))
{ {
if (Networking.IsOnServer) if (Networking.IsOnServer)
@ -272,7 +264,34 @@ namespace RageCoop.Client
MainChat.Focused = true; MainChat.Focused = true;
} }
} }
else if (e.KeyCode==Settings.PassengerKey) else if (Game.IsEnabledControlJustPressed(GTA.Control.MultiplayerInfo))
{
if (Networking.IsOnServer)
{
ulong currentTimestamp = Util.GetTickCount64();
PlayerList.Pressed = (currentTimestamp - PlayerList.Pressed) < 5000 ? (currentTimestamp - 6000) : currentTimestamp;
}
}
else if (Game.IsEnabledControlJustPressed(GTA.Control.VehicleExit))
{
if (P.IsInVehicle())
{
P.Task.LeaveVehicle();
}
else if (P.IsTaskActive(TaskType.CTaskMoveGoToVehicleDoor))
{
P.Task.ClearAll();
}
else
{
var v = World.GetClosestVehicle(P.Position, 10);
if (v!=null)
{
P.Task.EnterVehicle(v, VehicleSeat.Driver, -1, 5, EnterVehicleFlags.AllowJacking);
}
}
}
else if (e.KeyCode==Settings.PassengerKey && !MainChat.Focused)
{ {
var P = Game.Player.Character; var P = Game.Player.Character;

19
RageCoop.Client/WorldThread.cs
View File

@ -42,25 +42,6 @@ namespace RageCoop.Client
Game.DisableControlThisFrame(Control.FrontendPauseAlternate); Game.DisableControlThisFrame(Control.FrontendPauseAlternate);
} }
var P = Game.Player.Character; var P = Game.Player.Character;
if (Game.IsControlJustPressed(Control.VehicleExit))
{
if (P.IsInVehicle())
{
P.Task.LeaveVehicle();
}
else if (P.IsTaskActive(TaskType.CTaskMoveGoToVehicleDoor))
{
P.Task.ClearAll();
}
else
{
var v = World.GetClosestVehicle(P.Position, 10);
if (v!=null)
{
P.Task.EnterVehicle(v,VehicleSeat.Driver,-1,5, EnterVehicleFlags.AllowJacking);
}
}
}
// Sets a value that determines how aggressive the ocean waves will be. // Sets a value that determines how aggressive the ocean waves will be.
// Values of 2.0 or more make for very aggressive waves like you see during a thunderstorm. // Values of 2.0 or more make for very aggressive waves like you see during a thunderstorm.