ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More Log:: improvements.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12407 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2013-01-22 21:12:42 +00:00
parent b9ef630f8e
commit 08c3c7487a
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/graphics/referee.cpp
View File

@ -24,6 +24,7 @@
#include "io/file_manager.hpp"
#include "io/xml_node.hpp"
#include "utils/constants.hpp"
#include "utils/log.hpp"
#include "utils/string_utils.hpp"
int Referee::m_st_first_start_frame = 1;
@ -46,19 +47,19 @@ void Referee::init()
const std::string filename=file_manager->getModelFile("referee.xml");
if(filename=="")
{
printf("Can't find referee.xml, aborting.\n");
Log::fatal("referee", "Can't find referee.xml, aborting.");
exit(-1);
}
XMLNode *node = file_manager->createXMLTree(filename);
if(!node)
{
printf("Can't read XML file referee.xml, aborting.\n");
Log::fatal("referee", "Can't read XML file referee.xml, aborting.");
exit(-1);
}
if(node->getName()!="referee")
{
printf("The file referee.xml does not contain a referee"
"node, aborting.\n");
Log::fatal("referee", "The file referee.xml does not contain a referee"
"node, aborting.");
exit(-1);
}
std::string model_filename;
@ -68,7 +69,7 @@ void Referee::init()
file_manager->getModelFile(model_filename) );
if(!m_st_referee_mesh)
{
printf("Can't find referee model '%s', aborting.\n",
Log::fatal("referee", "Can't find referee model '%s', aborting.",
model_filename.c_str());
exit(-1);
}
@ -102,12 +103,12 @@ void Referee::init()
node->get("colors", &colors);
if(colors.size()>3)
printf("Too many colors for referee defined, "
"only first three will be used.\n");
Log::warn("referee", "Too many colors for referee defined, "
"only first three will be used.");
if(colors.size()<3)
{
printf("Not enough colors for referee defined, "
"only first three will be used, aborting.\n");
Log::fatal("referee",
"Not enough colors for referee defined, aborting.");
exit(-1);
}
for(unsigned int i=0; i<3; i++)
@ -115,8 +116,9 @@ void Referee::init()
std::string full_path = file_manager->getTextureFile(colors[i]);
if(full_path.size()==0)
{
printf("Can't find texture '%s' for referee, aborting.\n",
colors[i].c_str());
Log::fatal("referee",
"Can't find texture '%s' for referee, aborting.",
colors[i].c_str());
exit(-1);
}
m_st_traffic_lights[i] = irr_driver->getTexture(full_path);

11
src/utils/translation.cpp
View File

@ -187,14 +187,15 @@ Translations::Translations() //: m_dictionary_manager("UTF-16")
char c[1024];
GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_SISO639LANGNAME,
c, 1024);
Log::verbose("translation", "GetLocaleInfo langname returns '%s'.\n",
Log::verbose("translation", "GetLocaleInfo langname returns '%s'.",
c);
if(c[0])
{
language = c;
GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_SISO3166CTRYNAME,
c, 1024);
Log::verbose("translation", "GetLocaleInfo tryname returns '%s'.\n", c);
Log::verbose("translation",
"GetLocaleInfo tryname returns '%s'.", c);
if(c[0]) language += std::string("_")+c;
} // if c[0]
#endif
@ -204,7 +205,7 @@ Translations::Translations() //: m_dictionary_manager("UTF-16")
if (language != "")
{
Log::verbose("translation", "Env var LANGUAGE = '%s'.\n",
Log::verbose("translation", "Env var LANGUAGE = '%s'.",
language.c_str());
if (language.find(":") != std::string::npos)
@ -217,7 +218,7 @@ Translations::Translations() //: m_dictionary_manager("UTF-16")
l = Language::from_env(langs[curr]);
if (l)
{
Log::verbose("translation", "Language '%s'.\n",
Log::verbose("translation", "Language '%s'.",
l.get_name().c_str());
m_dictionary = m_dictionary_manager.get_dictionary(l);
break;
@ -233,7 +234,7 @@ Translations::Translations() //: m_dictionary_manager("UTF-16")
}
else
{
Log::verbose("translation", "Language '%s'.\n",
Log::verbose("translation", "Language '%s'.",
Language::from_env(language).get_name().c_str());
m_current_language_name = Language::from_env(language).get_name() ;