Skip to content
Snippets Groups Projects
Commit 97adde25 authored by Rob Swindell's avatar Rob Swindell :speech_balloon:
Browse files

Allow @-codes in text.dat strings: NodeLoggedOnAtNbps and NodeLoggedOff

Note: format specifiers (e.g. %s) cannot be combined with @-codes (use one or
the other, not both).

Fixes issue #696

If you need additional text strings to support @-codes, you'll have to specify
them explicitly in feature request issues.
parent 63d0772d
No related branches found
No related tags found
No related merge requests found
......@@ -554,10 +554,15 @@ bool sbbs_t::logon()
if(thisnode.status!=NODE_QUIET
&& (node.status==NODE_INUSE || node.status==NODE_QUIET)
&& !(node.misc&NODE_AOFF) && node.useron!=useron.number) {
safe_snprintf(str, sizeof(str), text[NodeLoggedOnAtNbps]
,cfg.node_num
,thisnode.misc&NODE_ANON ? text[UNKNOWN_USER] : useron.alias
,connection);
char fmt[256];
expand_atcodes(text[NodeLoggedOnAtNbps], fmt, sizeof fmt);
if(strcmp(text[NodeLoggedOnAtNbps], fmt) != 0)
SAFECOPY(str, fmt);
else
safe_snprintf(str, sizeof str, fmt
,cfg.node_num
,thisnode.misc&NODE_ANON ? text[UNKNOWN_USER] : useron.alias
,connection);
putnmsg(i, str);
}
}
......
......@@ -66,9 +66,15 @@ void sbbs_t::logout()
getnodedat(i,&node,0);
if((node.status==NODE_INUSE || node.status==NODE_QUIET)
&& !(node.misc&NODE_AOFF) && node.useron!=useron.number) {
SAFEPRINTF2(str,text[NodeLoggedOff],cfg.node_num
,thisnode.misc&NODE_ANON
? text[UNKNOWN_USER] : useron.alias);
char fmt[256];
expand_atcodes(text[NodeLoggedOff], fmt, sizeof fmt);
if(strcmp(text[NodeLoggedOff], fmt) != 0)
SAFECOPY(str, fmt);
else
snprintf(str, sizeof str, fmt
,cfg.node_num
,thisnode.misc&NODE_ANON
? text[UNKNOWN_USER] : useron.alias);
putnmsg(i, str);
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment