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

Replaced more printfs with Log::.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12364 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2013-01-16 01:23:22 +00:00
parent e0725de73b
commit 12b10a80a6
1 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/karts/kart_properties.cpp
View File

@ -33,6 +33,7 @@
#include "modes/world.hpp" #include "modes/world.hpp"
#include "io/xml_node.hpp" #include "io/xml_node.hpp"
#include "utils/constants.hpp" #include "utils/constants.hpp"
#include "utils/log.hpp"
#include "utils/string_utils.hpp" #include "utils/string_utils.hpp"
#include "utils/translation.hpp" #include "utils/translation.hpp"
@ -189,9 +190,9 @@ void KartProperties::load(const std::string &filename, const std::string &node)
} }
catch(std::exception& err) catch(std::exception& err)
{ {
fprintf(stderr, "Error while parsing KartProperties '%s':\n", Log::error("KartProperties", "Error while parsing KartProperties '%s':\n",
filename.c_str()); filename.c_str());
fprintf(stderr, "%s\n", err.what()); Log::error("KartProperties", "%s\n", err.what());
} }
if(root) delete root; if(root) delete root;
@ -363,7 +364,8 @@ void KartProperties::getAllData(const XMLNode * root)
if( engine_node->get("power", &v)) if( engine_node->get("power", &v))
{ {
if(v.size()!=3) if(v.size()!=3)
printf("Incorrect engine-power specifications for kart '%s'\n", Log::warn("KartProperties",
"Incorrect engine-power specifications for kart '%s'\n",
getIdent().c_str()); getIdent().c_str());
else else
{ {
@ -376,7 +378,8 @@ void KartProperties::getAllData(const XMLNode * root)
if( engine_node->get("max-speed", &v)) if( engine_node->get("max-speed", &v))
{ {
if(v.size()!=3) if(v.size()!=3)
printf("Incorrect max-speed specifications for kart '%s'\n", Log::error("KartProperties",
"Incorrect max-speed specifications for kart '%s'\n",
getIdent().c_str()); getIdent().c_str());
else else
{ {
@ -454,7 +457,8 @@ void KartProperties::getAllData(const XMLNode * root)
m_terrain_impulse_type = IMPULSE_TO_DRIVELINE; m_terrain_impulse_type = IMPULSE_TO_DRIVELINE;
else else
{ {
fprintf(stderr, "Missing or incorrect value for impulse-type: '%s'.\n", Log::fatal("KartProperties",
"Missing or incorrect value for impulse-type: '%s'.\n",
s.c_str()); s.c_str());
exit(-1); exit(-1);
} }
@ -475,7 +479,8 @@ void KartProperties::getAllData(const XMLNode * root)
plunger_node->get("in-face-time", &v); plunger_node->get("in-face-time", &v);
if(v.size()!=3) if(v.size()!=3)
{ {
fprintf(stderr, "[KartProperties] ERROR: Invalid plunger in-face-time specification."); Log::error("KartProperties",
"Invalid plunger in-face-time specification.");
} }
else else
{ {
@ -530,8 +535,8 @@ void KartProperties::getAllData(const XMLNode * root)
else if (s == "small") m_engine_sfx_type = "engine_small"; else if (s == "small") m_engine_sfx_type = "engine_small";
else else
{ {
std::cerr << "[KartProperties::getAllData()] WARNING : Kart " << m_name.c_str() Log::warn("KartProperties", "Kart '%s' has invalid engine '%s'.",
<< " has invalid engine : " << s << "\n"; m_name.c_str(), s.c_str());
m_engine_sfx_type = "engine_small"; m_engine_sfx_type = "engine_small";
} }
@ -573,29 +578,36 @@ void KartProperties::checkAllSet(const std::string &filename)
{ {
if(m_gear_switch_ratio.size()==0) if(m_gear_switch_ratio.size()==0)
{ {
fprintf(stderr,"Missing default value for 'gear-switch-ratio' in '%s'.\n", Log::fatal("KartProperties",
"Missing default value for 'gear-switch-ratio' in '%s'.\n",
filename.c_str()); filename.c_str());
exit(-1); exit(-1);
} }
if(m_gear_power_increase.size()==0) if(m_gear_power_increase.size()==0)
{ {
fprintf(stderr,"Missing default value for 'gear-power-increase' in '%s'.\n", Log::error("KartProperties",
"Missing default value for 'gear-power-increase' in '%s'.\n",
filename.c_str()); filename.c_str());
exit(-1); exit(-1);
} }
if(m_gear_switch_ratio.size()!=m_gear_power_increase.size()) { if(m_gear_switch_ratio.size()!=m_gear_power_increase.size()) {
fprintf(stderr,"Number of entries for 'gear-switch-ratio' and 'gear-power-increase\n"); Log::error("KartProperties",
fprintf(stderr,"in '%s' must be equal.\n", filename.c_str()); "Number of entries for 'gear-switch-ratio' and "
"'gear-power-increase\n");
Log::fatal("KartProperties", "in '%s' must be equal.\n",
filename.c_str());
exit(-1); exit(-1);
} }
if(m_startup_boost.size()!=m_startup_times.size()) if(m_startup_boost.size()!=m_startup_times.size())
{ {
fprintf(stderr, "Number of entried for 'startup times' and 'startup-boost\n"); Log::error("KartProperties",
fprintf(stderr, "must be identical.\n"); "Number of entried for 'startup times' and 'startup-boost\n");
Log::fatal("KartProperties", "must be identical.\n");
exit(-1); exit(-1);
} }
#define CHECK_NEG( a,strA) if(a<=UNDEFINED) { \ #define CHECK_NEG( a,strA) if(a<=UNDEFINED) { \
fprintf(stderr,"Missing default value for '%s' in '%s'.\n", \ Log::fatal("KartProperties", \
"Missing default value for '%s' in '%s'.\n", \
strA,filename.c_str());exit(-1); \ strA,filename.c_str());exit(-1); \
} }