Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 40 additions & 0 deletions src/client/parse.c
Original file line number Diff line number Diff line change
Expand Up @@ -910,10 +910,50 @@ static void CL_CheckForIP(const char *s)
}
}

/*
* Replace ##P<n> tokens with player names from cl.clientinfo.
* Per server game.c: "the client is supposed to translate ##P<n> to
* player names".
*/
static void CL_TranslatePlayerNameTokens(char *s, size_t size)
{
char out[MAX_STRING_CHARS];
const char *src = s;
char *dst = out;

while (*src) {
size_t space = sizeof(out) - (size_t)(dst - out) - 1;
if (!space)
break;

if (!strncmp(src, "##P", 3) && Q_isdigit(src[3])) {
src += 3;
int playernum = 0;
while (Q_isdigit(*src))
playernum = playernum * 10 + (*src++ - '0');

if (playernum < MAX_CLIENTS) {
const char *name = cl.clientinfo[playernum].name;
size_t len = min(strlen(name), space);
memcpy(dst, name, len);
dst += len;
}
continue;
}
*dst++ = *src++;
}
*dst = '\0';
Q_strlcpy(s, out, size);
}

static void CL_HandlePrint(int level, char *s)
Comment thread
res2k marked this conversation as resolved.
{
const char *fmt;

/* Called here rather than CL_ParseLocPrint() because ##P tokens
* arrive via svc_print broadcast messages, not localized prints. */
CL_TranslatePlayerNameTokens(s, MAX_STRING_CHARS);

if (level != PRINT_CHAT) {
if (cl.csr.extended) {
if (level == PRINT_TYPEWRITER || level == PRINT_CENTER) {
Expand Down
Loading