Skip to content
This repository was archived by the owner on Dec 25, 2022. It is now read-only.

Commit b77e8c4

Browse files
committed
Showing proper player server ID and names in debug menus
1 parent ffaf063 commit b77e8c4

File tree

3 files changed

+15
-5
lines changed

3 files changed

+15
-5
lines changed

Client/Common.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ namespace PocceMod.Client
88
{
99
public static class Common
1010
{
11+
public static int PlayerID
12+
{
13+
get { return API.GetPlayerServerId(API.PlayerId()); }
14+
}
15+
1116
public static void Notification(string message, bool blink = false, bool saveToBrief = false)
1217
{
1318
API.SetNotificationTextEntry("CELL_EMAIL_BCON");

Client/Menus/Dev/DebugMenu.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using CitizenFX.Core.Native;
2-
using MenuAPI;
1+
using MenuAPI;
32
using PocceMod.Shared;
43

54
namespace PocceMod.Client.Menus.Dev
@@ -18,7 +17,8 @@ private enum ConfigKind
1817

1918
public DebugMenu() : base("PocceMod", "debug menu")
2019
{
21-
AddMenuItem(new MenuItem("PlayerID") { Label = API.PlayerId().ToString() });
20+
var serverIDItem = new MenuItem("Player server ID");
21+
AddMenuItem(serverIDItem);
2222

2323
var permissionGroupItem = new MenuItem("Permission group") { Enabled = false };
2424
AddMenuItem(permissionGroupItem);
@@ -55,6 +55,8 @@ public DebugMenu() : base("PocceMod", "debug menu")
5555

5656
OnMenuOpen += (_menu) =>
5757
{
58+
serverIDItem.Label = Common.PlayerID.ToString();
59+
5860
if (!permissionGroupItem.Enabled && Permission.GetPlayerGroup(out Permission.Group permissionGroup))
5961
{
6062
permissionGroupItem.Label = permissionGroup.ToString();

Client/Menus/Dev/TelemetryMenu.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using MenuAPI;
1+
using CitizenFX.Core.Native;
2+
using MenuAPI;
23

34
namespace PocceMod.Client.Menus.Dev
45
{
@@ -19,7 +20,9 @@ public TelemetryMenu() : base("PocceMod", "telemetry menu")
1920
{
2021
foreach (var playerTelemetry in Telemetry.Entries)
2122
{
22-
var menuItem = new MenuItem("player#" + playerTelemetry.Key) { ItemData = playerTelemetry.Value };
23+
var player = playerTelemetry.Key;
24+
var playerName = API.GetPlayerName(API.GetPlayerFromServerId(player));
25+
var menuItem = new MenuItem(string.Format("{0} (#{1})", playerName, player)) { ItemData = playerTelemetry.Value };
2326
AddMenuItem(menuItem);
2427
}
2528
};

0 commit comments

Comments
 (0)