Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Update premake and protoc

Browse Source
This commit is contained in:
momo5502
2016-06-07 21:08:23 +02:00
parent db40f3b6c2
commit 2a64c578c7
5 changed files with 16 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/Components/Modules/Logger.cpp
View File

@ -23,32 +23,25 @@ namespace Components
void Logger::MessagePrint(int channel, std::string message)
{
if (Flags::HasFlag("stdout"))
if (Flags::HasFlag("stdout") || Loader::PerformingUnitTests())
{
printf("%s", message.data());
fflush(stdout);
return;
}
else if (Logger::IsConsoleReady())
if (!Logger::IsConsoleReady())
{
if (!Game::Sys_IsMainThread())
{
Logger::EnqueueMessage(message);
}
else
{
Game::Com_PrintMessage(0, message.data(), 0);
}
OutputDebugStringA(message.data());
}
if (!Game::Sys_IsMainThread())
{
Logger::EnqueueMessage(message);
}
else
{
// Only print to stdout, when doing unit tests
if (Loader::PerformingUnitTests())
{
printf("%s", message.data());
fflush(stdout);
}
OutputDebugStringA(message.data());
Game::Com_PrintMessage(0, message.data(), 0);
}
}
@ -90,11 +83,9 @@ namespace Components
for (unsigned int i = 0; i < Logger::MessageQueue.size(); ++i)
{
if (Logger::IsConsoleReady())
{
Game::Com_PrintMessage(0, Logger::MessageQueue[i].data(), 0);
}
else
Game::Com_PrintMessage(0, Logger::MessageQueue[i].data(), 0);
if (!Logger::IsConsoleReady())
{
OutputDebugStringA(Logger::MessageQueue[i].data());
}