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

clean src/karts from cout, printf and cerr

Browse Source
This commit is contained in:
KroArtem
2014-02-06 01:26:30 +04:00
parent ca4bfa525e
commit a61ee58a39
10 changed files with 38 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/karts/abstract_kart.cpp
View File

@@ -111,7 +111,7 @@ void AbstractKart::setKartAnimation(AbstractKartAnimation *ka)
ka->getName().c_str());
else Log::debug("Abstract_Kart", "Setting kart animation to NULL.");
if(m_kart_animation) Log::info("Abstract_Kart", "Current kart"
"animation is '%s'.\n",
"animation is '%s'.",
m_kart_animation->getName().c_str());
else Log::debug("Abstract_Kart", "Current kart animation is NULL.");
}

10
src/karts/controller/ai_properties.cpp
View File

@@ -85,7 +85,7 @@ void AIProperties::load(const XMLNode *ai_node)
else
{
Log::fatal("AIProperties",
"Incorrect nitro-usage '%s' in AI '%s'.\n",s.c_str(),
"Incorrect nitro-usage '%s' in AI '%s'.",s.c_str(),
m_ident.c_str());
}
// We actually need the square of the distance later
@@ -102,7 +102,7 @@ void AIProperties::checkAllSet(const std::string &filename) const
{
#define CHECK_NEG( a,str_a) if(a<=UNDEFINED) { \
Log::fatal("AIProperties","Missing default value for" \
" '%s' in '%s' 'for AI '%s'.\n", \
" '%s' in '%s' 'for AI '%s'.", \
str_a, filename.c_str(), m_ident.c_str()); \
}
CHECK_NEG(m_max_item_angle, "max-item-angle" );
@@ -118,17 +118,17 @@ void AIProperties::checkAllSet(const std::string &filename) const
if(m_skid_probability.size()==0)
{
Log::fatal("AIProperties", "No skid probability defined.\n");
Log::fatal("AIProperties", "No skid probability defined.");
}
if(m_speed_cap.size()==0)
{
Log::fatal("AIProperties", "No speed cap defined.\n");
Log::fatal("AIProperties", "No speed cap defined.");
}
if(m_collect_item_probability.size()==0)
{
Log::fatal("AIProperties", "No collect-item-probability defined.\n");
Log::fatal("AIProperties", "No collect-item-probability defined.");
}
} // checkAllSet

2
src/karts/controller/end_controller.cpp
View File

@@ -218,7 +218,7 @@ void EndController::handleSteering(float dt)
const int next = m_next_node_index[m_track_node];
target_point = QuadGraph::get()->getQuadOfNode(next).getCenter();
#ifdef AI_DEBUG
Log::debug("end_controller.cpp", "- Outside of road: steer to center point.\n");
Log::debug("end_controller.cpp", "- Outside of road: steer to center point.");
#endif
}
else

2
src/karts/controller/network_player_controller.cpp
View File

@@ -255,7 +255,7 @@ void NetworkPlayerController::update(float dt)
{
// Print a dividing line so that it's easier to see which events
// get received in which order in the one frame.
Log::debug("PlayerController", "irr_driver", "-------------------------------------\n");
Log::debug("PlayerController", "irr_driver", "-------------------------------------");
}
// Don't do steering if it's replay. In position only replay it doesn't

2
src/karts/controller/player_controller.cpp
View File

@@ -311,7 +311,7 @@ void PlayerController::update(float dt)
{
// Print a dividing line so that it's easier to see which events
// get received in which order in the one frame.
Log::debug("PlayerController", "irr_driver", "-------------------------------------\n");
Log::debug("PlayerController", "irr_driver", "-------------------------------------");
}
// Don't do steering if it's replay. In position only replay it doesn't

34
src/karts/controller/skidding_ai.cpp
View File

@@ -198,7 +198,7 @@ void SkiddingAI::reset()
{
Log::error("SkiddingAI",
"Invalid starting position for '%s' - not on track"
" - can be ignored.\n",
" - can be ignored.",
m_kart->getIdent().c_str());
m_track_node = QuadGraph::get()->findOutOfRoadSector(m_kart->getXYZ());
}
@@ -401,7 +401,7 @@ void SkiddingAI::handleBraking()
{
#ifdef DEBUG
if(m_ai_debug)
Log::debug("SkiddingAI", "braking: %s ahead of leader.\n",
Log::debug("SkiddingAI", "braking: %s ahead of leader.",
m_kart->getIdent().c_str());
#endif
@@ -421,7 +421,7 @@ void SkiddingAI::handleBraking()
{
#ifdef DEBUG
if(m_ai_debug)
Log::debug("SkiddingAI", "%s not aligned with track.\n",
Log::debug("SkiddingAI", "%s not aligned with track.",
m_kart->getIdent().c_str());
#endif
m_controls->m_brake = true;
@@ -486,7 +486,7 @@ void SkiddingAI::handleSteering(float dt)
#ifdef AI_DEBUG
m_debug_sphere[0]->setPosition(QuadGraph::get()->getQuadOfNode(next)
.getCenter().toIrrVector());
Log::debug("skidding_ai","-Outside of road: steer to center point.\n");
Log::debug("skidding_ai","-Outside of road: steer to center point.");
#endif
}
//If we are going to crash against a kart, avoid it if it doesn't
@@ -522,7 +522,7 @@ void SkiddingAI::handleSteering(float dt)
#ifdef AI_DEBUG
Log::debug("skidding_ai", "- Velocity vector crashes with kart "
"and doesn't crashes with road : steer 90 "
"degrees away from kart.\n");
"degrees away from kart.");
#endif
}
@@ -701,7 +701,7 @@ void SkiddingAI::handleItemCollectionAndAvoidance(Vec3 *aim_point,
}
if(m_ai_debug)
Log::debug("SkiddingAI", "%s unselects item.\n",
Log::debug("SkiddingAI", "%s unselects item.",
m_kart->getIdent().c_str());
// Otherwise remove the pre-selected item (and start
// looking for a new item).
@@ -771,7 +771,7 @@ void SkiddingAI::handleItemCollectionAndAvoidance(Vec3 *aim_point,
.toIrrVector());
#endif
if(m_ai_debug)
Log::debug("SkiddingAI", "%s selects item type '%d'.\n",
Log::debug("SkiddingAI", "%s selects item type '%d'.",
m_kart->getIdent().c_str(),
item_to_collect->getType());
m_item_to_collect = item_to_collect;
@@ -795,7 +795,7 @@ void SkiddingAI::handleItemCollectionAndAvoidance(Vec3 *aim_point,
#endif
if(m_ai_debug)
Log::debug("SkiddingAI",
"%s adjusts to hit type %d angle %f.\n",
"%s adjusts to hit type %d angle %f.",
m_kart->getIdent().c_str(),
item_to_collect->getType(), angle);
}
@@ -803,7 +803,7 @@ void SkiddingAI::handleItemCollectionAndAvoidance(Vec3 *aim_point,
{
if(m_ai_debug)
Log::debug("SkiddingAI",
"%s won't hit '%d', angle %f.\n",
"%s won't hit '%d', angle %f.",
m_kart->getIdent().c_str(),
item_to_collect->getType(), angle);
}
@@ -1378,7 +1378,7 @@ void SkiddingAI::handleItems(const float dt)
break;
default:
Log::error("SkiddingAI",
"Invalid or unhandled powerup '%d' in default AI.\n",
"Invalid or unhandled powerup '%d' in default AI.",
m_kart->getPowerup()->getType());
assert(false);
}
@@ -1699,7 +1699,7 @@ void SkiddingAI::checkCrashes(const Vec3& pos )
if(steps<1 || steps>1000)
{
Log::warn("SkiddingAI",
"Incorrect STEPS=%d. kart_length %f velocity %f\n",
"Incorrect STEPS=%d. kart_length %f velocity %f",
steps, m_kart_length, m_kart->getVelocityLC().getZ());
steps=1000;
}
@@ -2181,7 +2181,7 @@ bool SkiddingAI::doSkid(float steer_fraction)
if(m_ai_debug)
{
if(fabsf(steer_fraction)>=2.5f)
Log::debug("SkiddingAI", "%s stops skidding (%f).\n",
Log::debug("SkiddingAI", "%s stops skidding (%f).",
m_kart->getIdent().c_str(), steer_fraction);
}
#endif
@@ -2201,7 +2201,7 @@ bool SkiddingAI::doSkid(float steer_fraction)
#ifdef DEBUG
if(m_controls->m_skid && m_ai_debug)
{
Log::debug("SkiddingAI", "%s stops skidding on straight.\n",
Log::debug("SkiddingAI", "%s stops skidding on straight.",
m_kart->getIdent().c_str());
}
#endif
@@ -2238,7 +2238,7 @@ bool SkiddingAI::doSkid(float steer_fraction)
if(m_controls->m_skid && duration < 1.0f)
{
if(m_ai_debug)
Log::debug("SkiddingAI", "'%s' too short, stop skid.\n",
Log::debug("SkiddingAI", "'%s' too short, stop skid.",
m_kart->getIdent().c_str());
return false;
}
@@ -2254,7 +2254,7 @@ bool SkiddingAI::doSkid(float steer_fraction)
#ifdef DEBUG
if(m_controls->m_skid && m_ai_debug)
Log::debug("SkiddingAI",
"%s skidding against track direction.\n",
"%s skidding against track direction.",
m_kart->getIdent().c_str());
#endif
return false;
@@ -2265,7 +2265,7 @@ bool SkiddingAI::doSkid(float steer_fraction)
{
#ifdef DEBUG
if(!m_controls->m_skid && m_ai_debug)
Log::debug("SkiddingAI", "%s start skid, duration %f.\n",
Log::debug("SkiddingAI", "%s start skid, duration %f.",
m_kart->getIdent().c_str(), duration);
#endif
return true;
@@ -2274,7 +2274,7 @@ bool SkiddingAI::doSkid(float steer_fraction)
#ifdef DEBUG
if(m_controls->m_skid && m_ai_debug)
Log::debug("SkiddingAI", "%s has no reasons to skid anymore.\n",
Log::debug("SkiddingAI", "%s has no reasons to skid anymore.",
m_kart->getIdent().c_str());
#endif
return false;

1
src/karts/explosion_animation.cpp
View File

@@ -26,7 +26,6 @@
#include "karts/kart_properties.hpp"
#include "modes/world.hpp"
#include "tracks/track.hpp"
#include "utils/log.hpp" //TODO: remove after debugging is done
/** A static create function that does only create an explosion if
* the explosion happens to be close enough to affect the kart.

4
src/karts/kart.cpp
View File

@@ -198,7 +198,7 @@ void Kart::init(RaceManager::KartType type)
if(!m_engine_sound)
{
Log::error("Kart","Could not allocate a sfx object for the kart. Further errors may ensue!\n");
Log::error("Kart","Could not allocate a sfx object for the kart. Further errors may ensue!");
}
@@ -256,7 +256,7 @@ Kart::~Kart()
if(m_slipstream) delete m_slipstream;
if(m_sky_particles_emitter) delete m_sky_particles_emitter;
if(m_attachment) delete m_attachment;
if (m_stars_effect) delete m_stars_effect;
if(m_stars_effect) delete m_stars_effect;
delete m_shadow;

3
src/karts/kart_gfx.cpp
View File

@@ -27,6 +27,7 @@
#include "karts/kart_properties.hpp"
#include "karts/skidding.hpp"
#include "physics/btKart.hpp"
#include "utils/log.hpp"
#include <iostream>
@@ -122,7 +123,7 @@ void KartGFX::addEffect(KartGFXType type, const std::string &file_name,
// by adding a NULL to the list (which is tested for in all
// cases). C++ guarantees that all memory allocated in the
// constructor is properly freed.
std::cerr << e.what() << std::endl;
Log::error("[KartGFX]", "%s",e.what());
kind = NULL;
emitter = NULL;
}

20
src/karts/kart_properties_manager.cpp
View File

@@ -189,8 +189,8 @@ bool KartPropertiesManager::loadKart(const std::string &dir)
}
catch (std::runtime_error& err)
{
std::cerr << "Giving up loading '" << config_filename.c_str()
<< "' : " << err.what() << std::endl;
Log::error("[Kart_Properties_Manager]","Giving up loading '%s': %s",
config_filename.c_str(), err.what());
return false;
}
@@ -199,7 +199,7 @@ bool KartPropertiesManager::loadKart(const std::string &dir)
if (kart_properties->getVersion() < stk_config->m_min_kart_version ||
kart_properties->getVersion() > stk_config->m_max_kart_version)
{
Log::warn("Kart_Properties_Manager", "Warning: kart '%s' is not "
Log::warn("[Kart_Properties_Manager]", "Warning: kart '%s' is not "
"supported by this binary, ignored.",
kart_properties->getIdent().c_str());
delete kart_properties;
@@ -304,7 +304,7 @@ void KartPropertiesManager::setUnavailableKarts(std::vector<std::string> karts)
{
m_kart_available[i] = false;
Log::error("Kart_Properties_Manager",
Log::error("[Kart_Properties_Manager]",
"Kart '%s' not available on all clients, disabled.",
m_karts_properties[i].getIdent().c_str());
} // kart not in list
@@ -425,10 +425,8 @@ void KartPropertiesManager::getRandomKartList(int count,
catch (std::runtime_error& ex)
{
(void)ex;
std::cerr <<
"[KartPropertiesManager] getRandomKartList : WARNING, "
"can't find kart '"
<< existing_karts[i].getKartName() << "'\n";
Log::error("[KartPropertiesManager]", "getRandomKartList : WARNING, "
"can't find kart '%s'", existing_karts[i].getKartName().c_str());
}
}
for(unsigned int i=0; i<ai_list->size(); i++)
@@ -441,10 +439,8 @@ void KartPropertiesManager::getRandomKartList(int count,
catch (std::runtime_error &ex)
{
(void)ex;
std::cerr <<
"[KartPropertiesManager] getRandomKartList : WARNING, "
"can't find kart '"
<< (*ai_list)[i] << "'\n";
Log::error("[KartPropertiesManager]", "getRandomKartList : WARNING, "
"can't find kart '%s'",(*ai_list)[i].c_str());
}
}