games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-19 00:17:56 +02:00
Code Issues Releases Activity

Remove console global

Browse Source
This commit is contained in:
Ivan Savenko
2025-02-27 23:10:11 +00:00
parent e5a095a237
commit 782362e5ce
12 changed files with 105 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
clientapp/EntryPoint.cpp
View File

@ -210,8 +210,13 @@ int main(int argc, char * argv[])
CStopWatch total;
CStopWatch pomtime;
std::cout.flags(std::ios::unitbuf);
setThreadNameLoggingOnly("MainGUI");
boost::filesystem::path logPath = VCMIDirs::get().userLogsPath() / "VCMI_Client_log.txt";
if(vm.count("logLocation"))
logPath = vm["logLocation"].as<std::string>() + "/VCMI_Client_log.txt";
#ifndef VCMI_IOS
console = new CConsoleHandler();
auto callbackFunction = [](std::string buffer, bool calledFromIngameConsole)
{
@ -219,15 +224,14 @@ int main(int argc, char * argv[])
commandController.processCommand(buffer, calledFromIngameConsole);
};
*console->cb = callbackFunction;
console->start();
CConsoleHandler console(callbackFunction);
console.start();
logConfig = new CBasicLogConfigurator(logPath, &console);
#else
logConfig = new CBasicLogConfigurator(logPath, nullptr);
#endif
setThreadNameLoggingOnly("MainGUI");
boost::filesystem::path logPath = VCMIDirs::get().userLogsPath() / "VCMI_Client_log.txt";
if(vm.count("logLocation"))
logPath = vm["logLocation"].as<std::string>() + "/VCMI_Client_log.txt";
logConfig = new CBasicLogConfigurator(logPath, console);
logConfig->configureDefault();
logGlobal->info("Starting client of '%s'", GameConstants::VCMI_VERSION);
logGlobal->info("Creating console and configuring logger: %d ms", pomtime.getDiff());
@ -236,7 +240,7 @@ int main(int argc, char * argv[])
// Init filesystem and settings
try
{
preinitDLL(::console, false);
preinitDLL(false);
}
catch (const DataLoadingException & e)
{