kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

better identification and clean up

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@5132 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Rafael Barreto
2010-06-01 21:11:08 +00:00
parent fd226ed857
commit af4bfa975b
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/clientgame.cpp
+1 -1
View File
@@ -162,7 +162,7 @@ void newname(const char *name)
{
if(name[0])
{
filtertext(player1->name, name, 0, MAXNAMELEN);//12345678901234//
filtertext(player1->name, name, 0, MAXNAMELEN);//12345678901234//
if(!player1->name[0]) copystring(player1->name, "unarmed");
updateclientname(player1);
addmsg(SV_SWITCHNAME, "rs", player1->name);
source/src/protocol.cpp
+3 -2
View File
@@ -197,7 +197,7 @@ int pututf8char(uchar *&d, int s)
}
void filtertext(char *dst, const char *src, int whitespace, int len)
{ // whitespace: no whitespace at all (0), blanks only (1), blanks & newline (2)
{ // whitespace: no whitespace at all (0), blanks only (1), blanks & newline (2), spaces for underlines (-1)
for(int c = *src; c; c = *++src)
{
c &= 0x7F; // 7-bit ascii
@@ -205,8 +205,9 @@ void filtertext(char *dst, const char *src, int whitespace, int len)
{
case '\f': ++src; continue;
}
if(isspace(c) ? whitespace && (whitespace>1 || c == ' ') : isprint(c))
if(isspace(c) ? whitespace && (whitespace>1 || c == ' '): isprint(c))
{
if ( whitespace < 0 && c == ' ' ) c = '_';
*dst++ = c;
if(!--len) break;
}
source/src/serverms.cpp
+2 -2
View File
@@ -162,8 +162,8 @@ static inline void updatemasterserver(int millis, int port)
{
if(!lastupdatemaster || millis-lastupdatemaster>60*60*1000)
{
string servername; sprintf(servername,"%s",global_name);
if(mastername[0]) requestmasterf("regserv %d %s\n", port, servername);
string servername; filtertext(servername,global_name,-1,20);
if(mastername[0]) requestmasterf("regserv %d %s\n", port, servername[0] ? servername : "noname" );
lastupdatemaster = millis ? millis : 1;
}
}