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

Merge branch 'master' into next

Browse Source
This commit is contained in:
ac-stef
2015-02-08 16:17:04 +01:00
parent c31399a36a 87bb20e799
commit 39cbee947d
150 changed files with 2348 additions and 716 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/console.cpp
+10
View File
@@ -94,6 +94,10 @@ COMMANDN(toggleconsole, toggleconsole, "");
void renderconsole() { con.render(); }
stream *clientlogfile = NULL;
vector<char> *bootclientlog = new vector<char>;
int clientloglinesremaining = INT_MAX;
void clientlogf(const char *s, ...)
{
defvformatstring(sp, s, s);
@@ -105,6 +109,12 @@ void clientlogf(const char *s, ...)
{ // break into single lines first
if((p = strchr(l, '\n'))) *p = '\0';
printf("%s%s\n", ts, l);
if(clientlogfile)
{
clientlogfile->printf("%s%s\n", ts, l);
if(--clientloglinesremaining <= 0) DELETEP(clientlogfile);
}
else if(bootclientlog) cvecprintf(*bootclientlog, "%s%s\n", ts, l);
l = p + 1;
}
while(p);