From 0df5ef996c9d08c05922ae2d4d4c83b3b53b30f5 Mon Sep 17 00:00:00 2001 From: Indev Date: Fri, 4 Jul 2025 23:15:31 +0300 Subject: [PATCH] (kinda) unify LookupPlayer and nametonum, rename first into D_LookupPlayer --- src/d_clisrv.c | 27 ++++----------------------- src/d_netcmd.c | 7 +++---- src/d_netcmd.h | 1 + src/hu_stuff.c | 2 +- 4 files changed, 9 insertions(+), 28 deletions(-) diff --git a/src/d_clisrv.c b/src/d_clisrv.c index da864f151..d85f824ba 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -3508,31 +3508,12 @@ static void Command_GetPlayerNum(void) SINT8 nametonum(const char *name) { - INT32 playernum, i; + INT32 playernum = D_LookupPlayer(name); - if (!strcmp(name, "0")) - return 0; + if (playernum == -1) + CONS_Printf(M_GetText("There is no player named \"%s\"\n"), name); - playernum = (SINT8)atoi(name); - - if (playernum < 0 || playernum >= MAXPLAYERS) - return -1; - - if (playernum) - { - if (playeringame[playernum]) - return (SINT8)playernum; - else - return -1; - } - - for (i = 0; i < MAXPLAYERS; i++) - if (playeringame[i] && !stricmp(player_names[i], name)) - return (SINT8)i; - - CONS_Printf(M_GetText("There is no player named \"%s\"\n"), name); - - return -1; + return playernum; } /** Lists all players and their player numbers. diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 8a4e12ebf..52ad2ca1a 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -2082,7 +2082,7 @@ static void Command_ResetCamera_f(void) } /* Consider replacing nametonum with this */ -static INT32 LookupPlayer(const char *s) +INT32 D_LookupPlayer(const char *s) { INT32 playernum; @@ -2098,8 +2098,7 @@ static INT32 LookupPlayer(const char *s) for (playernum = 0; playernum < MAXPLAYERS; ++playernum) { /* Match name case-insensitively: fully, or partially the start. */ - if (playeringame[playernum]) - if (strnicmp(player_names[playernum], s, strlen(s)) == 0) + if (playeringame[playernum] && (strnicmp(player_names[playernum], s, strlen(s)) == 0)) { return playernum; } @@ -2210,7 +2209,7 @@ static void Command_View_f(void) } else { - if (( playernum = LookupPlayer(COM_Argv(1)) ) == -1) + if (( playernum = D_LookupPlayer(COM_Argv(1)) ) == -1) { CONS_Alert(CONS_WARNING, "There is no player by that name!\n"); return; diff --git a/src/d_netcmd.h b/src/d_netcmd.h index 657686af4..1078de5d2 100644 --- a/src/d_netcmd.h +++ b/src/d_netcmd.h @@ -323,6 +323,7 @@ void ClearAdminPlayers(void); void RemoveAdminPlayer(INT32 playernum); void ItemFinder_OnChange(void); void D_SetPassword(const char *pw); +INT32 D_LookupPlayer(const char *s); // used for the player setup menu UINT8 CanChangeSkin(INT32 playernum); diff --git a/src/hu_stuff.c b/src/hu_stuff.c index cd4c60dd8..1ea07a9cf 100644 --- a/src/hu_stuff.c +++ b/src/hu_stuff.c @@ -701,7 +701,7 @@ static void Command_Sayto_f(void) return; } - target = nametonum(COM_Argv(1)); + target = D_LookupPlayer(COM_Argv(1)); if (target == -1) { CONS_Alert(CONS_NOTICE, M_GetText("No player with that name!\n"));