From 47c85dce3bd686c1c27065b36d0a1b68e6d77b1e Mon Sep 17 00:00:00 2001 From: IronClawTrem Date: Tue, 2 Jun 2020 18:55:14 +0100 Subject: fix segfault running !namelog through console console has no guid :P --- src/game/g_admin.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/game/g_admin.c b/src/game/g_admin.c index e22639a..c446764 100644 --- a/src/game/g_admin.c +++ b/src/game/g_admin.c @@ -6554,14 +6554,12 @@ qboolean G_admin_namelog( gentity_t *ent, int skiparg ) for( j = 0; j < 8; j++ ) { - if( G_admin_permission_guid( g_admin_namelog[ i ]->guid, ADMF_INCOGNITO ) + if( ent && G_admin_permission_guid( g_admin_namelog[ i ]->guid, ADMF_INCOGNITO ) && !admin_higher_guid( ent->client->pers.guid, g_admin_namelog[ i ]->guid ) && !G_admin_permission( ent, ADMF_SEESINCOGNITO ) ) - { guid_stub[ j ] = 'X'; - } else { + else guid_stub[ j ] = g_admin_namelog[ i ]->guid[ j + 24 ]; - } } guid_stub[ j ] = '\0'; -- cgit