Norse_Harold/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

fix init order bug that was rendering CLogger inoperable

Browse Source 
This was SVN commit r2496.
This commit is contained in:
janwas 2005-07-20 04:52:05 +00:00
parent 5f15ff3b2d
commit 0b193342e7
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
source/main.cpp
View File

@ -1154,8 +1154,6 @@ debug_printf("INIT &argc=%p &argv=%p\n", &argc, &argv);
// If you ever want to catch a particular allocation:
//_CrtSetBreakAlloc(187);
new CLogger;
// no longer set 24 bit (float) precision by default: for
// very long game uptimes (> 1 day; e.g. dedicated server),
// we need full precision when calculating the time.
@ -1168,15 +1166,6 @@ debug_printf("INIT &argc=%p &argv=%p\n", &argc, &argv);
// do this before lengthy init so we can time those accurately.
get_cpu_info();
// Call LoadLanguage(NULL) to initialise the I18n system, but
// without loading an actual language file - translate() will
// just show the English key text, which is better than crashing
// from a null pointer when attempting to translate e.g. error messages.
// Real languages can only be loaded when the scripting system has
// been initialised.
MICROLOG(L"init i18n");
I18n::LoadLanguage(NULL);
// Do this as soon as possible, because it chdirs
// and will mess up the error reporting if anything
// crashes before the working directory is set.
@ -1187,6 +1176,22 @@ debug_printf("INIT &argc=%p &argv=%p\n", &argc, &argv);
// directory for itself.
InitVfs(argv0);
// This must come after VFS init, which sets the current directory
// (required for finding our output log files).
new CLogger;
// Call LoadLanguage(NULL) to initialise the I18n system, but
// without loading an actual language file - translate() will
// just show the English key text, which is better than crashing
// from a null pointer when attempting to translate e.g. error messages.
// Real languages can only be loaded when the scripting system has
// been initialised.
//
// this uses LOG and must therefore come after CLogger init.
MICROLOG(L"init i18n");
I18n::LoadLanguage(NULL);
// Set up the console early, so that debugging
// messages can be logged to it. (The console's size
// and fonts are set later in InitPs())