From a6d1a2766567071fdd260315a5f8ace069402a89 Mon Sep 17 00:00:00 2001
From: Paweł Redman <pawel.redman@gmail.com>
Date: Sat, 24 Feb 2018 17:49:17 +0100
Subject: Revert "Remove GUID stub from listplayers and namelog"

This reverts commit fb80ecb2433424313064c13a8896ff1fbf361ceb.
---
 src/game/g_admin.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'src/game/g_admin.c')

diff --git a/src/game/g_admin.c b/src/game/g_admin.c
index ff211aa..dfd131e 100644
--- a/src/game/g_admin.c
+++ b/src/game/g_admin.c
@@ -5627,6 +5627,7 @@ qboolean G_admin_listplayers( gentity_t *ent, int skiparg )
   char n3[ MAX_NAME_LENGTH ] = {""};
   char lname[ MAX_NAME_LENGTH ];
   char lname2[ MAX_NAME_LENGTH ];
+  char guid_stub[ 9 ];
   char muted[ 2 ], denied[ 2 ], dbuilder[ 2 ], immune[ 2 ];
   int l;
   char lname_fmt[ 5 ];
@@ -5673,6 +5674,10 @@ qboolean G_admin_listplayers( gentity_t *ent, int skiparg )
       continue;
     }
 
+    for( j = 0; j < 8; j++ )
+      guid_stub[ j ] = p->pers.guid[ j + 24 ];
+    guid_stub[ j ] = '\0';
+
     muted[ 0 ] = '\0';
     if( G_admin_permission( &g_entities[ i ], ADMF_NO_VOTE ) )
     {
@@ -5766,13 +5771,14 @@ qboolean G_admin_listplayers( gentity_t *ent, int skiparg )
       karma[ 0 ] = '\0';
 
     if ( G_admin_permission(ent, ADMF_SEESFULLLISTPLAYERS ) ) {
-      ADMBP( va( "%2i %s%s^7%s %-2i %s^7 ^1%1s%1s%1s%1s^7 %s^7 %s%s^7%s\n",
+      ADMBP( va( "%2i %s%s^7%s %-2i %s^7 (*%s) ^1%1s%1s%1s%1s^7 %s^7 %s%s^7%s\n",
                i,
                c,
                t,
                karma,
                l,
                ( *lname ) ? lname2 : "", 
+               guid_stub,
                immune,
                muted,
                dbuilder,
@@ -7016,6 +7022,7 @@ qboolean G_admin_namelog( gentity_t *ent, int skiparg )
   char search[ MAX_NAME_LENGTH ] = {""};
   char s2[ MAX_NAME_LENGTH ] = {""};
   char n2[ MAX_NAME_LENGTH ] = {""};
+  char guid_stub[ 9 ];
   qboolean found = qfalse;
   int printed = 0;
 
@@ -7045,12 +7052,14 @@ qboolean G_admin_namelog( gentity_t *ent, int skiparg )
     }
     printed++;
     for( j = 0; j < 8; j++ )
+      guid_stub[ j ] = g_admin_namelog[ i ]->guid[ j + 24 ];
+    guid_stub[ j ] = '\0';
     if( g_admin_namelog[ i ]->slot > -1 )
        ADMBP( "^3" );
-    ADMBP( va( "%-2s %15s %s^7", 
+    ADMBP( va( "%-2s (*%s) %15s %s^7", 
       (g_admin_namelog[ i ]->slot > -1 ) ?
         va( "%d", g_admin_namelog[ i ]->slot ) : "-",
-      g_admin_namelog[ i ]->ip,
+      guid_stub, g_admin_namelog[ i ]->ip,
       displaySchachtmeisterJudgement( &g_admin_namelog[ i ]->smj, g_admin_namelog[ i ] ) ) );
     for( j = 0; j < MAX_ADMIN_NAMELOG_NAMES && 
       g_admin_namelog[ i ]->name[ j ][ 0 ]; j++ )
-- 
cgit