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

Apply patch by marius1309 to update printfs into log, thanks\! Accidentally got merged into some changes of mine to make the battle againt Nolok a little harder. Those changes are incomplete, but good to go for now, more tweaks may be done later

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12665 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria
2013-04-17 00:40:05 +00:00
parent 9860f5f576
commit 816a7e9bbe
4 changed files with 48 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/input/binding.cpp
View File

@@ -20,6 +20,7 @@
#include "input/binding.hpp"
#include "utils/string_utils.hpp"
#include "utils/translation.hpp"
#include "utils/log.hpp"
/** Convert thjis binding to XML attributes. The full XML node is actually
* written by device_config, so we only have to add the attributes here.

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

@@ -81,8 +81,9 @@ void AIProperties::load(const XMLNode *ai_node)
m_nitro_usage = NITRO_ALL;
else
{
printf("Incorrect nitro-usage '%s' in AI '%s'.\n",s.c_str(),
m_ident.c_str());
Log::error("AIProperties",
"Incorrect nitro-usage '%s' in AI '%s'.\n",s.c_str(),
m_ident.c_str());
exit(-1);
}
// We actually need the square of the distance later
@@ -97,11 +98,11 @@ void AIProperties::load(const XMLNode *ai_node)
*/
void AIProperties::checkAllSet(const std::string &filename) const
{
#define CHECK_NEG( a,str_a) if(a<=UNDEFINED) { \
fprintf(stderr,"Missing default value for '%s' in '%s' " \
"'for AI '%s'.\n", \
str_a,filename.c_str(), \
m_ident.c_str());exit(-1); \
#define CHECK_NEG( a,str_a) if(a<=UNDEFINED) { \
Log::error("AIProperties","Missing default value for" \
" '%s' in '%s' 'for AI '%s'.\n", \
str_a, filename.c_str(), m_ident.c_str()); \
exit(-1); \
}
CHECK_NEG(m_max_item_angle, "max-item-angle" );
CHECK_NEG(m_max_item_angle_high_speed, "max-item-angle-high-speed" );
@@ -115,19 +116,19 @@ void AIProperties::checkAllSet(const std::string &filename) const
if(m_skid_probability.size()==0)
{
printf("No skid probability defined.\n");
Log::error("AIProperties", "No skid probability defined.\n");
exit(-1);
}
if(m_speed_cap.size()==0)
{
printf("No speed cap defined.\n");
Log::error("AIProperties", "No speed cap defined.\n");
exit(-1);
}
if(m_collect_item_probability.size()==0)
{
printf("No collect-item-probability defined.\n");
Log::error("AIProperties", "No collect-item-probability defined.\n");
exit(-1);
}

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

@@ -234,7 +234,7 @@ void PlayerController::steer(float dt, int steer_val)
{
if(UserConfigParams::m_gamepad_debug)
{
printf("steering: steer_val %d ", steer_val);
Log::debug("PlayerController", "steering: steer_val %d ", steer_val);
RaceGUIBase* gui_base = World::getWorld()->getRaceGUI();
gui_base->clearAllMessages();
gui_base->addMessage(StringUtils::insertValues(L"steer_val %i", steer_val), m_kart, 1.0f,
@@ -287,7 +287,7 @@ void PlayerController::steer(float dt, int steer_val)
} // no key is pressed
if(UserConfigParams::m_gamepad_debug)
{
printf(" set to: %f\n", m_controls->m_steer);
Log::debug("PlayerController", " set to: %f\n", m_controls->m_steer);
}
m_controls->m_steer = std::min(1.0f, std::max(-1.0f, m_controls->m_steer));
@@ -312,7 +312,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("irr_driver", "-------------------------------------\n");
Log::debug("PlayerController", "irr_driver", "-------------------------------------\n");
}
// Don't do steering if it's replay. In position only replay it doesn't

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

@@ -199,7 +199,7 @@ void SkiddingAI::reset()
QuadGraph::get()->findRoadSector(m_kart->getXYZ(), &m_track_node);
if(m_track_node==QuadGraph::UNKNOWN_SECTOR)
{
fprintf(stderr,
Log::error("SkiddingAI",
"Invalid starting position for '%s' - not on track"
" - can be ignored.\n",
m_kart->getIdent().c_str());
@@ -405,7 +405,7 @@ void SkiddingAI::handleBraking()
{
#ifdef DEBUG
if(m_ai_debug)
printf("[AI] braking: %s ahead of leader.\n",
Log::debug("SkiddingAI", "braking: %s ahead of leader.\n",
m_kart->getIdent().c_str());
#endif
@@ -425,7 +425,7 @@ void SkiddingAI::handleBraking()
{
#ifdef DEBUG
if(m_ai_debug)
printf("[AI] braking: %s not aligned with track.\n",
Log::debug("SkiddingAI", "%s not aligned with track.\n",
m_kart->getIdent().c_str());
#endif
m_controls->m_brake = true;
@@ -445,10 +445,11 @@ void SkiddingAI::handleBraking()
m_controls->m_brake = true;
#ifdef DEBUG
if(m_ai_debug)
printf("[AI] braking: %s too tight curve: radius %f "
"speed %f.\n",
Log::debug("SkiddingAI",
"speed %f too tight curve: radius %f ",
m_kart->getSpeed(),
m_kart->getIdent().c_str(),
m_current_curve_radius, m_kart->getSpeed() );
m_current_curve_radius);
#endif
}
return;
@@ -705,7 +706,8 @@ void SkiddingAI::handleItemCollectionAndAvoidance(Vec3 *aim_point,
}
if(m_ai_debug)
printf("[AI] %s unselects item.\n", m_kart->getIdent().c_str());
Log::debug("SkiddingAI", "%s unselects item.\n",
m_kart->getIdent().c_str());
// Otherwise remove the pre-selected item (and start
// looking for a new item).
m_item_to_collect = NULL;
@@ -774,7 +776,7 @@ void SkiddingAI::handleItemCollectionAndAvoidance(Vec3 *aim_point,
.toIrrVector());
#endif
if(m_ai_debug)
printf("[AI] %s selects item type '%d'.\n",
Log::debug("SkiddingAI", "%s selects item type '%d'.\n",
m_kart->getIdent().c_str(),
item_to_collect->getType());
m_item_to_collect = item_to_collect;
@@ -797,14 +799,16 @@ void SkiddingAI::handleItemCollectionAndAvoidance(Vec3 *aim_point,
.toIrrVector());
#endif
if(m_ai_debug)
printf("[AI] %s adjusts to hit type %d angle %f.\n",
Log::debug("SkiddingAI",
"%s adjusts to hit type %d angle %f.\n",
m_kart->getIdent().c_str(),
item_to_collect->getType(), angle);
}
else
{
if(m_ai_debug)
printf("[AI] %s won't hit '%d', angle %f.\n",
Log::debug("SkiddingAI",
"%s won't hit '%d', angle %f.\n",
m_kart->getIdent().c_str(),
item_to_collect->getType(), angle);
}
@@ -1153,13 +1157,13 @@ void SkiddingAI::handleItems(const float dt)
{
m_controls->m_look_back = (m_kart->getPowerup()->getType() == PowerupManager::POWERUP_BOWLING);
if( m_time_since_last_shot > 3.5f )
if( m_time_since_last_shot > 3.0f )
{
m_controls->m_fire = true;
if (m_kart->getPowerup()->getType() == PowerupManager::POWERUP_SWATTER)
m_time_since_last_shot = 3.5f;
m_time_since_last_shot = 3.0f;
else
m_time_since_last_shot = (rand() % 1000) / 1000.0f * 3.0f - 1.50f; // to make things less predictable :)
m_time_since_last_shot = (rand() % 1000) / 1000.0f * 3.0f - 2.0f; // to make things less predictable :)
}
else
{
@@ -1321,7 +1325,8 @@ void SkiddingAI::handleItems(const float dt)
m_controls->m_fire = m_kart_ahead != NULL;
break;
default:
printf("Invalid or unhandled powerup '%d' in default AI.\n",
Log::error("SkiddingAI",
"Invalid or unhandled powerup '%d' in default AI.\n",
m_kart->getPowerup()->getType());
assert(false);
}
@@ -1640,7 +1645,8 @@ void SkiddingAI::checkCrashes(const Vec3& pos )
int current_node = m_track_node;
if(steps<1 || steps>1000)
{
printf("Warning, incorrect STEPS=%d. kart_length %f velocity %f\n",
Log::warn("SkiddingAI",
"Incorrect STEPS=%d. kart_length %f velocity %f\n",
steps, m_kart_length, m_kart->getVelocityLC().getZ());
steps=1000;
}
@@ -2122,7 +2128,7 @@ bool SkiddingAI::doSkid(float steer_fraction)
if(m_ai_debug)
{
if(fabsf(steer_fraction)>=2.5f)
printf("[AI] skid: %s stops skidding (%f).\n",
Log::debug("SkiddingAI", "%s stops skidding (%f).\n",
m_kart->getIdent().c_str(), steer_fraction);
}
#endif
@@ -2142,7 +2148,7 @@ bool SkiddingAI::doSkid(float steer_fraction)
#ifdef DEBUG
if(m_controls->m_skid && m_ai_debug)
{
printf("[AI] skid: %s stops skidding on straight.\n",
Log::debug("SkiddingAI", "%s stops skidding on straight.\n",
m_kart->getIdent().c_str());
}
#endif
@@ -2179,8 +2185,8 @@ bool SkiddingAI::doSkid(float steer_fraction)
if(m_controls->m_skid && duration < 1.0f)
{
if(m_ai_debug)
printf("[AI] skid : '%s' too short, stop skid.\n",
m_kart->getIdent().c_str());
Log::debug("SkiddingAI", "'%s' too short, stop skid.\n",
m_kart->getIdent().c_str());
return false;
}
// Test if the AI is trying to skid against track direction. This
@@ -2194,7 +2200,8 @@ bool SkiddingAI::doSkid(float steer_fraction)
{
#ifdef DEBUG
if(m_controls->m_skid && m_ai_debug)
printf("[AI] skid: %s skidding against track direction.\n",
Log::debug("SkiddingAI",
"%s skidding against track direction.\n",
m_kart->getIdent().c_str());
#endif
return false;
@@ -2205,8 +2212,8 @@ bool SkiddingAI::doSkid(float steer_fraction)
{
#ifdef DEBUG
if(!m_controls->m_skid && m_ai_debug)
printf("[AI] skid: %s start skid, duration %f.\n",
m_kart->getIdent().c_str(), duration);
Log::debug("SkiddingAI", "%s start skid, duration %f.\n",
m_kart->getIdent().c_str(), duration);
#endif
return true;
@@ -2214,7 +2221,7 @@ bool SkiddingAI::doSkid(float steer_fraction)
#ifdef DEBUG
if(m_controls->m_skid && m_ai_debug)
printf("[AI] skid: %s has no reasons to skid anymore.\n",
Log::debug("SkiddingAI", "%s has no reasons to skid anymore.\n",
m_kart->getIdent().c_str());
#endif
return false;
@@ -2260,7 +2267,7 @@ void SkiddingAI::setSteering(float angle, float dt)
: SKID_PROBAB_NO_SKID;
#undef PRINT_SKID_STATS
#ifdef PRINT_SKID_STATS
printf("%s distance %f prob %d skidding %s\n",
Log::info("SkiddingAI", "%s distance %f prob %d skidding %s\n",
m_kart->getIdent().c_str(), distance, prob,
sc= ? "no" : sc==KartControl::SC_LEFT ? "left" : "right");
#endif
@@ -2293,7 +2300,7 @@ void SkiddingAI::setSteering(float angle, float dt)
m_controls->m_skid = KartControl::SC_NONE;
#ifdef DEBUG
if(m_ai_debug)
printf("[AI] skid : '%s' wrong steering, stop skid.\n",
Log::info("SkiddingAI", "'%s' wrong steering, stop skid.\n",
m_kart->getIdent().c_str());
#endif
}
@@ -2308,7 +2315,7 @@ void SkiddingAI::setSteering(float angle, float dt)
{
#ifdef DEBUG
if(m_ai_debug)
printf("[AI] skid: %s steering too much (%f).\n",
Log::info("SkiddingAI", "%s steering too much (%f).\n",
m_kart->getIdent().c_str(), steer_fraction);
#endif
m_controls->m_skid = KartControl::SC_NONE;