(kinda) unify LookupPlayer and nametonum, rename first into D_LookupPlayer

This commit is contained in:
indev committed 2025-07-04 23:15:31 +03:00
1 parent 4c0ea2695e
commit 0df5ef996c
4 files changed
+9 -28

No files matched your search

+4 -23
View File
@@ -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.
+3 -4
View File
@@ -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;
+1
View File
@@ -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);
+1 -1
View File
@@ -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"));