Unify log output
This commit is contained in:
parent
53fd34f7b8
commit
55090a0566
@ -19,6 +19,7 @@
|
|||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|
||||||
#include "config/device_config.hpp"
|
#include "config/device_config.hpp"
|
||||||
|
#include "utils/log.hpp"
|
||||||
#include <SKeyMap.h>
|
#include <SKeyMap.h>
|
||||||
using namespace irr;
|
using namespace irr;
|
||||||
|
|
||||||
@ -226,7 +227,7 @@ bool DeviceConfig::deserializeAction(irr::io::IrrXMLReader* xml)
|
|||||||
// Never hurts to check ;)
|
// Never hurts to check ;)
|
||||||
if (xml == NULL)
|
if (xml == NULL)
|
||||||
{
|
{
|
||||||
fprintf(stderr, "Error: null pointer (DeviceConfig::deserializeAction)\n");
|
Log::error("DeviceConfig", "Null pointer (DeviceConfig::deserializeAction)");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -243,8 +244,8 @@ bool DeviceConfig::deserializeAction(irr::io::IrrXMLReader* xml)
|
|||||||
}
|
}
|
||||||
if(binding_id==-1)
|
if(binding_id==-1)
|
||||||
{
|
{
|
||||||
printf("WARNING: DeviceConfig::deserializeAction : action '%s' is unknown\n",
|
Log::warn("DeviceConfig", "DeviceConfig::deserializeAction : action '%s' is unknown.",
|
||||||
name_string);
|
name_string);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -349,23 +350,15 @@ GamepadConfig::GamepadConfig(irr::io::IrrXMLReader* xml) : DeviceConfig( DEVICE_
|
|||||||
{
|
{
|
||||||
const char* name_string = xml->getAttributeValue("name");
|
const char* name_string = xml->getAttributeValue("name");
|
||||||
if(name_string == NULL)
|
if(name_string == NULL)
|
||||||
{
|
Log::error("DeviceConfig", "Unnamed joystick in config file.");
|
||||||
printf("ERROR: Unnamed joystick in config file\n");
|
|
||||||
}
|
|
||||||
else
|
else
|
||||||
{
|
|
||||||
m_name = name_string;
|
m_name = name_string;
|
||||||
}
|
|
||||||
|
|
||||||
const char* enabled_string = xml->getAttributeValue("enabled");
|
const char* enabled_string = xml->getAttributeValue("enabled");
|
||||||
if (enabled_string != NULL)
|
if (enabled_string != NULL)
|
||||||
{
|
|
||||||
m_enabled = (strcmp(enabled_string, "true") == 0);
|
m_enabled = (strcmp(enabled_string, "true") == 0);
|
||||||
}
|
|
||||||
else
|
else
|
||||||
{
|
|
||||||
m_enabled = true;
|
m_enabled = true;
|
||||||
}
|
|
||||||
|
|
||||||
m_plugged = 0;
|
m_plugged = 0;
|
||||||
setDefaultBinds();
|
setDefaultBinds();
|
||||||
|
@ -713,8 +713,8 @@ bool UserConfig::loadConfig()
|
|||||||
// add back the code previously there that upgraded the config file to the new
|
// add back the code previously there that upgraded the config file to the new
|
||||||
// format instead of overwriting it.
|
// format instead of overwriting it.
|
||||||
|
|
||||||
GUIEngine::showMessage( _("Your config file was too old, so it was deleted and a new one will be created."), 10.0f);
|
GUIEngine::showMessage(_("Your config file was too old, so it was deleted and a new one will be created."), 10.0f);
|
||||||
printf("Your config file was too old, so it was deleted and a new one will be created.");
|
Log::info("UserConfig", "Your config file was too old, so it was deleted and a new one will be created.");
|
||||||
delete root;
|
delete root;
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
@ -205,8 +205,8 @@ void Camera::setupCamera()
|
|||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
if(UserConfigParams::logMisc())
|
if(UserConfigParams::logMisc())
|
||||||
fprintf(stderr, "Incorrect number of players: '%d' - assuming 1.\n",
|
Log::warn("Camera", "Incorrect number of players: '%d' - assuming 1.",
|
||||||
race_manager->getNumLocalPlayers());
|
race_manager->getNumLocalPlayers());
|
||||||
m_viewport = core::recti(0, 0,
|
m_viewport = core::recti(0, 0,
|
||||||
UserConfigParams::m_width,
|
UserConfigParams::m_width,
|
||||||
UserConfigParams::m_height);
|
UserConfigParams::m_height);
|
||||||
|
@ -155,10 +155,9 @@ private:
|
|||||||
m_type = EC_AHEAD_OF_KART;
|
m_type = EC_AHEAD_OF_KART;
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
fprintf(stderr,
|
Log::warn("Camera", "Invalid camera type '%s' - camera is ignored.",
|
||||||
"Invalid camera type '%s' - camera is ignored.\n",
|
s.c_str());
|
||||||
s.c_str());
|
return false;
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
node.get("xyz", &m_position);
|
node.get("xyz", &m_position);
|
||||||
node.get("distance", &m_distance2);
|
node.get("distance", &m_distance2);
|
||||||
|
@ -239,7 +239,7 @@ bool MaterialManager::pushTempMaterial(const XMLNode *root,
|
|||||||
if(!node)
|
if(!node)
|
||||||
{
|
{
|
||||||
// We don't have access to the filename at this stage anymore :(
|
// We don't have access to the filename at this stage anymore :(
|
||||||
fprintf(stderr, "Unknown node in material.xml file\n");
|
Log::warn("MaterialManager", "Unknown node in material.xml file.");
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
try
|
try
|
||||||
@ -249,7 +249,7 @@ bool MaterialManager::pushTempMaterial(const XMLNode *root,
|
|||||||
catch(std::exception& e)
|
catch(std::exception& e)
|
||||||
{
|
{
|
||||||
// The message contains a '%s' for the filename
|
// The message contains a '%s' for the filename
|
||||||
fprintf(stderr, e.what(), filename.c_str());
|
Log::warn("MaterialManager", e.what(), filename.c_str());
|
||||||
}
|
}
|
||||||
} // for i<xml->getNumNodes)(
|
} // for i<xml->getNumNodes)(
|
||||||
return true;
|
return true;
|
||||||
|
@ -581,7 +581,7 @@ void ParticleEmitter::setParticleType(const ParticleKind* type)
|
|||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
{
|
{
|
||||||
fprintf(stderr, "[ParticleEmitter] Unknown shape\n");
|
Log::error("ParticleEmitter", "Unknown shape");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -100,7 +100,7 @@ ParticleKind::ParticleKind(const std::string file) : m_min_start_color(255,255,2
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
fprintf(stderr, "[ParticleKind] <particles> main node has unknown value for attribute 'emitter'\n");
|
Log::warn("ParticleKind", "<particles> main node has unknown value for attribute 'emitter'.");
|
||||||
m_shape = EMITTER_POINT;
|
m_shape = EMITTER_POINT;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -254,8 +254,8 @@ Material* ParticleKind::getMaterial() const
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
fprintf(stderr, "[ParticleKind] WARNING: particle image '%s' does not appear in the list of "
|
Log::warn("ParticleKind", "Particle image '%s' does not appear in the list of "
|
||||||
"currently known materials\n", m_material_file.c_str());
|
"currently known materials.", m_material_file.c_str());
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -87,12 +87,9 @@ namespace GUIEngine
|
|||||||
Widget* out = getWidget(name);
|
Widget* out = getWidget(name);
|
||||||
T* outCasted = dynamic_cast<T*>( out );
|
T* outCasted = dynamic_cast<T*>( out );
|
||||||
if (out != NULL && outCasted == NULL)
|
if (out != NULL && outCasted == NULL)
|
||||||
{
|
Log::fatal("Screen::getWidget", "Widget '%s' of type '%s'"
|
||||||
fprintf(stderr, "Screen::getWidget : Widget '%s' of type '%s'"
|
"cannot be casted to requested type '%s'!\n", name,
|
||||||
"cannot be casted to requested type '%s'!\n", name,
|
typeid(*out).name(), typeid(T).name());
|
||||||
typeid(*out).name(), typeid(T).name());
|
|
||||||
abort();
|
|
||||||
}
|
|
||||||
return outCasted;
|
return outCasted;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -47,7 +47,7 @@ int atoi_p(const char* val)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
fprintf(stderr, "[LayoutManager] WARNING: Invalid value '%s' found in XML file where integer was expected\n", val);
|
Log::warn("LayoutManager", "Invalid value '%s' found in XML file where integer was expected.", val);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -461,7 +461,7 @@ void LayoutManager::doCalculateLayout(PtrVector<Widget>& widgets, AbstractTopLev
|
|||||||
|
|
||||||
if (left_space < 0)
|
if (left_space < 0)
|
||||||
{
|
{
|
||||||
fprintf(stderr, "[LayoutManager] WARNING: statically sized widgets took all the place!!\n");
|
Log::warn("LayoutManager", "Statically sized widgets took all the place!!");
|
||||||
left_space = 0;
|
left_space = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -536,9 +536,9 @@ void LayoutManager::doCalculateLayout(PtrVector<Widget>& widgets, AbstractTopLev
|
|||||||
|
|
||||||
if (widgets[n].m_w <= 0)
|
if (widgets[n].m_w <= 0)
|
||||||
{
|
{
|
||||||
fprintf(stderr, "WARNING: widget '%s' has a width of %i (left_space = %i, "
|
Log::warn("LayoutManager", "Widget '%s' has a width of %i (left_space = %i, "
|
||||||
"fraction = %f, max_width = %s)\n", widgets[n].m_properties[PROP_ID].c_str(),
|
"fraction = %f, max_width = %s)", widgets[n].m_properties[PROP_ID].c_str(),
|
||||||
widgets[n].m_w, left_space, fraction, widgets[n].m_properties[PROP_MAX_WIDTH].c_str());
|
widgets[n].m_w, left_space, fraction, widgets[n].m_properties[PROP_MAX_WIDTH].c_str());
|
||||||
widgets[n].m_w = 1;
|
widgets[n].m_w = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -556,9 +556,9 @@ void LayoutManager::doCalculateLayout(PtrVector<Widget>& widgets, AbstractTopLev
|
|||||||
|
|
||||||
if (widgets[n].m_h <= 0)
|
if (widgets[n].m_h <= 0)
|
||||||
{
|
{
|
||||||
fprintf(stderr, "WARNING: widget '%s' has a height of %i (left_space = %i, "
|
Log::warn("LayoutManager", "Widget '%s' has a height of %i (left_space = %i, "
|
||||||
"fraction = %f, max_width = %s)\n", widgets[n].m_properties[PROP_ID].c_str(),
|
"fraction = %f, max_width = %s)\n", widgets[n].m_properties[PROP_ID].c_str(),
|
||||||
widgets[n].m_h, left_space, fraction, widgets[n].m_properties[PROP_MAX_WIDTH].c_str());
|
widgets[n].m_h, left_space, fraction, widgets[n].m_properties[PROP_MAX_WIDTH].c_str());
|
||||||
widgets[n].m_h = 1;
|
widgets[n].m_h = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -57,8 +57,7 @@ ScalableFont::ScalableFont(IGUIEnvironment *env, const std::string &filename)
|
|||||||
io::IXMLReader* reader = file_manager->createXMLReader(filename.c_str());
|
io::IXMLReader* reader = file_manager->createXMLReader(filename.c_str());
|
||||||
if (!load( reader ))
|
if (!load( reader ))
|
||||||
{
|
{
|
||||||
fprintf(stderr, "[ScalableFont] Loading font failed\n");
|
Log::fatal("ScalableFont", "Loading font failed");
|
||||||
assert(false);
|
|
||||||
}
|
}
|
||||||
reader->drop();
|
reader->drop();
|
||||||
|
|
||||||
@ -157,7 +156,7 @@ void ScalableFont::doReadXmlFile(io::IXMLReader* xml)
|
|||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
if (m_texture_files.find(i) != m_texture_files.end())
|
if (m_texture_files.find(i) != m_texture_files.end())
|
||||||
{
|
{
|
||||||
fprintf(stderr, "[ScalableFont] WARNING: Font conflict, two images have texture %i\n", i);
|
Log::warn("ScalableFont", "Font conflict, two images have texture %i.", i);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -258,7 +257,7 @@ bool ScalableFont::load(io::IXMLReader* xml)
|
|||||||
{
|
{
|
||||||
if (!SpriteBank)
|
if (!SpriteBank)
|
||||||
{
|
{
|
||||||
fprintf(stderr, "[ScalableFont::load] SpriteBank is NULL!!\n");
|
Log::error("ScalableFont::load", "SpriteBank is NULL!!");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -633,7 +632,7 @@ void ScalableFont::draw(const core::stringw& text,
|
|||||||
|
|
||||||
if (texture == NULL)
|
if (texture == NULL)
|
||||||
{
|
{
|
||||||
fprintf(stderr, "WARNING: character not found in current font\n");
|
Log::warn("ScalableFont", "Character not found in current font");
|
||||||
continue; // no such character
|
continue; // no such character
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -709,7 +708,7 @@ void ScalableFont::lazyLoadTexture(int texID)
|
|||||||
// couldn't load texture, abort.
|
// couldn't load texture, abort.
|
||||||
if (!SpriteBank->getTexture(texID))
|
if (!SpriteBank->getTexture(texID))
|
||||||
{
|
{
|
||||||
fprintf(stderr, "!!!!! Unable to load all textures in the font\n");
|
Log::error("ScalableFont::lazyLoadTexture", "Unable to load all textures in the font");
|
||||||
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
|
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -184,7 +184,7 @@ void Screen::addWidgets()
|
|||||||
Widget* w = getFirstWidget();
|
Widget* w = getFirstWidget();
|
||||||
//std::cout << "First widget is " << (w == NULL ? "null" : w->m_properties[PROP_ID].c_str()) << std::endl;
|
//std::cout << "First widget is " << (w == NULL ? "null" : w->m_properties[PROP_ID].c_str()) << std::endl;
|
||||||
if (w != NULL) w->setFocusForPlayer( PLAYER_ID_GAME_MASTER );
|
if (w != NULL) w->setFocusForPlayer( PLAYER_ID_GAME_MASTER );
|
||||||
else fprintf(stderr, "Couldn't select first widget, NULL was returned\n");
|
else Log::warn("Screen::AddWidgets", "Couldn't select first widget, NULL was returned");
|
||||||
} // addWidgets
|
} // addWidgets
|
||||||
|
|
||||||
// -----------------------------------------------------------------------------
|
// -----------------------------------------------------------------------------
|
||||||
@ -206,9 +206,9 @@ void Screen::manualRemoveWidget(Widget* w)
|
|||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
if(!m_widgets.contains(w))
|
if(!m_widgets.contains(w))
|
||||||
{
|
{
|
||||||
fprintf(stderr, "Widget '%d' not found in screen when removing.\n",
|
Log::info("Screen", "Widget '%d' not found in screen when removing.",
|
||||||
w->m_id);
|
w->m_id);
|
||||||
fprintf(stderr, "This can be ignored, but is probably wrong.\n");
|
Log::info("Screen", "This can be ignored, but is probably wrong.");
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
m_widgets.remove(w);
|
m_widgets.remove(w);
|
||||||
|
@ -189,7 +189,7 @@ void DynamicRibbonWidget::add()
|
|||||||
|
|
||||||
if (m_child_width <= 0 || m_child_height <= 0)
|
if (m_child_width <= 0 || m_child_height <= 0)
|
||||||
{
|
{
|
||||||
std::cerr << "/!\\ Warning /!\\ : ribbon grid widgets require 'child_width' and 'child_height' arguments" << std::endl;
|
Log::warn("DynamicRibbonWidget", "Ribbon grid widgets require 'child_width' and 'child_height' arguments");
|
||||||
m_child_width = 256;
|
m_child_width = 256;
|
||||||
m_child_height = 256;
|
m_child_height = 256;
|
||||||
}
|
}
|
||||||
@ -206,7 +206,7 @@ void DynamicRibbonWidget::add()
|
|||||||
|
|
||||||
if (m_h - m_label_height < 0)
|
if (m_h - m_label_height < 0)
|
||||||
{
|
{
|
||||||
fprintf(stderr, "[DynamicRibbonWidget] WARNING: the widget is too small for anything to fit in it!!\n");
|
Log::warn("DynamicRibbonWidget", "The widget is too small for anything to fit in it!!");
|
||||||
m_row_amount = 1;
|
m_row_amount = 1;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -66,13 +66,9 @@ KartStatsWidget::KartStatsWidget(core::recti area, const int player_id,
|
|||||||
}
|
}
|
||||||
|
|
||||||
if(!props)
|
if(!props)
|
||||||
{
|
Log::fatal("KartSelectionScreen", "Can't find default "
|
||||||
fprintf(stderr,
|
"kart '%s' nor any other kart.",
|
||||||
"[KartSelectionScreen] WARNING: Can't find default "
|
default_kart.c_str());
|
||||||
"kart '%s' nor any other kart.\n",
|
|
||||||
default_kart.c_str());
|
|
||||||
exit(-1);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -115,8 +115,8 @@ void RibbonWidget::add()
|
|||||||
if (m_active_children[i].m_type != WTYPE_ICON_BUTTON &&
|
if (m_active_children[i].m_type != WTYPE_ICON_BUTTON &&
|
||||||
m_active_children[i].m_type != WTYPE_BUTTON)
|
m_active_children[i].m_type != WTYPE_BUTTON)
|
||||||
{
|
{
|
||||||
fprintf(stderr, "/!\\ Warning /!\\ : ribbon widgets can only have "
|
Log::warn("RiggonWidget", "Ribbon widgets can only have "
|
||||||
"(icon)button widgets as children\n");
|
"(icon)button widgets as children");
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -275,7 +275,7 @@ void RibbonWidget::add()
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
fprintf(stderr, "Invalid tab bar contents\n");
|
Log::error("RibbonWidget", "Invalid tab bar contents");
|
||||||
}
|
}
|
||||||
|
|
||||||
m_active_children[i].m_element = subbtn;
|
m_active_children[i].m_element = subbtn;
|
||||||
@ -375,8 +375,7 @@ void RibbonWidget::add()
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
fprintf(stderr,
|
Log::warn("RiggonWidget", "Invalid contents type in ribbon");
|
||||||
"/!\\ Warning /!\\ : Invalid contents type in ribbon\n");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -51,7 +51,7 @@ bool Binding::deserialize(irr::io::IrrXMLReader* xml)
|
|||||||
// Proceed only if neccesary tags were found
|
// Proceed only if neccesary tags were found
|
||||||
if ((id_string == NULL) || (event_string == NULL))
|
if ((id_string == NULL) || (event_string == NULL))
|
||||||
{
|
{
|
||||||
printf("No id-string or event-string given - ignored.\n");
|
Log::warn("Binding", "No id-string or event-string given - ignored.");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -66,7 +66,7 @@ bool Binding::deserialize(irr::io::IrrXMLReader* xml)
|
|||||||
// If the action is a stick motion & a direction is defined
|
// If the action is a stick motion & a direction is defined
|
||||||
if (dir_string == NULL)
|
if (dir_string == NULL)
|
||||||
{
|
{
|
||||||
printf("WARNING: IT_STICKMOTION without direction, ignoring.\n");
|
Log::warn("Binding", "IT_STICKMOTION without direction, ignoring.");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -156,7 +156,7 @@ void GamePadDevice::resetAxisDirection(const int axis,
|
|||||||
AbstractKart* pk = player->getKart();
|
AbstractKart* pk = player->getKart();
|
||||||
if (pk == NULL)
|
if (pk == NULL)
|
||||||
{
|
{
|
||||||
fprintf(stderr, "Error, trying to reset axis for an unknown player\n");
|
Log::error("Binding", "Trying to reset axis for an unknown player.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -118,7 +118,7 @@ void GetPublicAddress::asynchronousUpdate()
|
|||||||
hints.ai_socktype = SOCK_STREAM;
|
hints.ai_socktype = SOCK_STREAM;
|
||||||
|
|
||||||
if ((status = getaddrinfo(stun_servers[rand_result].c_str(), NULL, &hints, &res)) != 0) {
|
if ((status = getaddrinfo(stun_servers[rand_result].c_str(), NULL, &hints, &res)) != 0) {
|
||||||
fprintf(stderr, "getaddrinfo: %s\n", gai_strerror(status));
|
Log::error("getaddrinfo", gai_strerror(status));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
for(p = res;p != NULL; p = p->ai_next)
|
for(p = res;p != NULL; p = p->ai_next)
|
||||||
|
@ -238,10 +238,7 @@ void PhysicalObject::init()
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
fprintf(stderr, "[PhysicalObject] Unknown node type\n");
|
Log::fatal("PhysicalObject", "Unknown node type");
|
||||||
max = 1.0f;
|
|
||||||
min = 0.0f;
|
|
||||||
assert(false);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (dynamic_cast<TrackObjectPresentationInstancing*>(presentation) != NULL)
|
else if (dynamic_cast<TrackObjectPresentationInstancing*>(presentation) != NULL)
|
||||||
@ -256,10 +253,7 @@ void PhysicalObject::init()
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
fprintf(stderr, "[PhysicalObject] Unknown node type\n");
|
Log::fatal("PhysicalObject", "Unknown node type");
|
||||||
max = 1.0f;
|
|
||||||
min = 0.0f;
|
|
||||||
assert(false);
|
|
||||||
}
|
}
|
||||||
Vec3 extend = max-min;
|
Vec3 extend = max-min;
|
||||||
// Adjust the mesth of the graphical object so that its center is where it
|
// Adjust the mesth of the graphical object so that its center is where it
|
||||||
@ -453,7 +447,7 @@ void PhysicalObject::init()
|
|||||||
}
|
}
|
||||||
case MP_NONE:
|
case MP_NONE:
|
||||||
default:
|
default:
|
||||||
fprintf(stderr, "WARNING: Uninitialised moving shape\n");
|
Log::warn("PhysicalObject", "Uninitialised moving shape");
|
||||||
// intended fall-through
|
// intended fall-through
|
||||||
case MP_BOX:
|
case MP_BOX:
|
||||||
{
|
{
|
||||||
|
@ -112,7 +112,7 @@ void TriangleMesh::createCollisionShape(bool create_collision_object, const char
|
|||||||
btOptimizedBvh* bhv = btOptimizedBvh::deSerializeInPlace(bytes, pos, !IS_LITTLE_ENDIAN);
|
btOptimizedBvh* bhv = btOptimizedBvh::deSerializeInPlace(bytes, pos, !IS_LITTLE_ENDIAN);
|
||||||
if (bhv == NULL)
|
if (bhv == NULL)
|
||||||
{
|
{
|
||||||
fprintf(stderr, "[TriangleMesh] WARNING, failed to load serialized BHV\n");
|
Log::warn("TriangleMesh", "Failed to load serialized BHV");
|
||||||
bhv_triangle_mesh = new btBvhTriangleMeshShape(&m_mesh, false /* useQuantizedAabbCompression */);
|
bhv_triangle_mesh = new btBvhTriangleMeshShape(&m_mesh, false /* useQuantizedAabbCompression */);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -212,10 +212,10 @@ void Highscores::getEntry(int number, std::string &kart_name,
|
|||||||
{
|
{
|
||||||
if(number<0 || number>getNumberEntries())
|
if(number<0 || number>getNumberEntries())
|
||||||
{
|
{
|
||||||
fprintf(stderr, "Error, accessing undefined highscore entry:\n");
|
Log::warn("Highscores", "Accessing undefined highscore entry:");
|
||||||
fprintf(stderr,"number %d, but %d entries are defined\n",number,
|
Log::warn("Highscores", "Number %d, but %d entries are defined.", number,
|
||||||
getNumberEntries());
|
getNumberEntries());
|
||||||
fprintf(stderr, "This error can be ignored, but no highscores are available\n");
|
Log::warn("Highscores", "This error can be ignored, but no highscores are available.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
kart_name = m_kart_name[number];
|
kart_name = m_kart_name[number];
|
||||||
|
@ -127,7 +127,7 @@ void History::updateReplay(float dt)
|
|||||||
World *world = World::getWorld();
|
World *world = World::getWorld();
|
||||||
if(m_current>=(int)m_all_deltas.size())
|
if(m_current>=(int)m_all_deltas.size())
|
||||||
{
|
{
|
||||||
printf("Replay finished.\n");
|
Log::info("History", "Replay finished");
|
||||||
m_current = 0;
|
m_current = 0;
|
||||||
// Note that for physics replay all physics parameters
|
// Note that for physics replay all physics parameters
|
||||||
// need to be reset, e.g. velocity, ...
|
// need to be reset, e.g. velocity, ...
|
||||||
@ -158,20 +158,19 @@ void History::Save()
|
|||||||
{
|
{
|
||||||
FILE *fd = fopen("history.dat","w");
|
FILE *fd = fopen("history.dat","w");
|
||||||
if(fd)
|
if(fd)
|
||||||
printf("History saved in ./history.dat.\n");
|
Log::info("History", "Saved in ./history.dat.");
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
std::string fn = file_manager->getUserConfigFile("history.dat");
|
std::string fn = file_manager->getUserConfigFile("history.dat");
|
||||||
fd = fopen(fn.c_str(), "w");
|
fd = fopen(fn.c_str(), "w");
|
||||||
if(fd)
|
if(fd)
|
||||||
printf("History saved in '%s'.\n",fn.c_str());
|
Log::info("History", "Saved in '%s'.", fn.c_str());
|
||||||
|
|
||||||
}
|
}
|
||||||
if(!fd)
|
if(!fd)
|
||||||
{
|
{
|
||||||
printf("Can't open history.dat file for writing - can't save history.\n");
|
Log::info("History", "Can't open history.dat file for writing - can't save history.");
|
||||||
printf("Make sure history.dat in the current directory or the config\n");
|
Log::info("History", "Make sure history.dat in the current directory "
|
||||||
printf("directory is writable.\n");
|
"or the config directory is writable.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -231,75 +230,46 @@ void History::Load()
|
|||||||
|
|
||||||
FILE *fd = fopen("history.dat","r");
|
FILE *fd = fopen("history.dat","r");
|
||||||
if(fd)
|
if(fd)
|
||||||
printf("Reading ./history.dat\n");
|
Log::info("History", "Reading ./history.dat");
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
std::string fn = file_manager->getUserConfigFile("history.dat");
|
std::string fn = file_manager->getUserConfigFile("history.dat");
|
||||||
fd = fopen(fn.c_str(), "r");
|
fd = fopen(fn.c_str(), "r");
|
||||||
if(fd)
|
if(fd)
|
||||||
printf("Reading '%s'.\n", fn.c_str());
|
Log::info("History", "Reading '%s'.", fn.c_str());
|
||||||
}
|
}
|
||||||
if(!fd)
|
if(!fd)
|
||||||
{
|
Log::fatal("History", "Could not open history.dat");
|
||||||
fprintf(stderr, "ERROR: could not open history.dat\n");
|
|
||||||
exit(-2);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (fgets(s, 1023, fd) == NULL)
|
if (fgets(s, 1023, fd) == NULL)
|
||||||
{
|
Log::fatal("History", "Could not read history.dat.");
|
||||||
fprintf(stderr, "ERROR: could not read history.dat\n");
|
|
||||||
exit(-2);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (sscanf(s,"Version: %1023s",s1)!=1)
|
if (sscanf(s,"Version: %1023s",s1)!=1)
|
||||||
{
|
Log::fatal("History", "No Version information found in history file (bogus history file).");
|
||||||
fprintf(stderr, "ERROR: no Version information found in history file (bogus history file)\n");
|
else if (strcmp(s1,STK_VERSION))
|
||||||
exit(-2);
|
Log::warn("History", "History is version '%s', STK version is '%s'.", s1, STK_VERSION);
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (strcmp(s1,STK_VERSION))
|
|
||||||
{
|
|
||||||
fprintf(stderr, "WARNING: history is version '%s'\n",s1);
|
|
||||||
fprintf(stderr, " STK version is '%s'\n",STK_VERSION);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (fgets(s, 1023, fd) == NULL)
|
if (fgets(s, 1023, fd) == NULL)
|
||||||
{
|
Log::fatal("History", "Could not read history.dat.");
|
||||||
fprintf(stderr, "ERROR: could not read history.dat\n");
|
|
||||||
exit(-2);
|
|
||||||
}
|
|
||||||
|
|
||||||
unsigned int num_karts;
|
unsigned int num_karts;
|
||||||
if(sscanf(s, "numkarts: %d",&num_karts)!=1)
|
if(sscanf(s, "numkarts: %d",&num_karts)!=1)
|
||||||
{
|
Log::fatal("History", "No number of karts found in history file.");
|
||||||
fprintf(stderr,"WARNING: No number of karts found in history file.\n");
|
|
||||||
exit(-2);
|
|
||||||
}
|
|
||||||
race_manager->setNumKarts(num_karts);
|
race_manager->setNumKarts(num_karts);
|
||||||
|
|
||||||
fgets(s, 1023, fd);
|
fgets(s, 1023, fd);
|
||||||
if(sscanf(s, "numplayers: %d",&n)!=1)
|
if(sscanf(s, "numplayers: %d",&n)!=1)
|
||||||
{
|
Log::fatal("History", "No number of players found in history file.");
|
||||||
fprintf(stderr,"WARNING: No number of players found in history file.\n");
|
|
||||||
exit(-2);
|
|
||||||
}
|
|
||||||
race_manager->setNumLocalPlayers(n);
|
race_manager->setNumLocalPlayers(n);
|
||||||
|
|
||||||
fgets(s, 1023, fd);
|
fgets(s, 1023, fd);
|
||||||
if(sscanf(s, "difficulty: %d",&n)!=1)
|
if(sscanf(s, "difficulty: %d",&n)!=1)
|
||||||
{
|
Log::fatal("History", "No difficulty found in history file.");
|
||||||
fprintf(stderr,"WARNING: No difficulty found in history file.\n");
|
|
||||||
exit(-2);
|
|
||||||
}
|
|
||||||
race_manager->setDifficulty((RaceManager::Difficulty)n);
|
race_manager->setDifficulty((RaceManager::Difficulty)n);
|
||||||
|
|
||||||
fgets(s, 1023, fd);
|
fgets(s, 1023, fd);
|
||||||
if(sscanf(s, "track: %1023s",s1)!=1)
|
if(sscanf(s, "track: %1023s",s1)!=1)
|
||||||
{
|
Log::warn("History", "Track not found in history file.");
|
||||||
fprintf(stderr,"WARNING: Track not found in history file.\n");
|
|
||||||
}
|
|
||||||
race_manager->setTrack(s1);
|
race_manager->setTrack(s1);
|
||||||
// This value doesn't really matter, but should be defined, otherwise
|
// This value doesn't really matter, but should be defined, otherwise
|
||||||
// the racing phase can switch to 'ending'
|
// the racing phase can switch to 'ending'
|
||||||
@ -308,12 +278,8 @@ void History::Load()
|
|||||||
for(unsigned int i=0; i<num_karts; i++)
|
for(unsigned int i=0; i<num_karts; i++)
|
||||||
{
|
{
|
||||||
fgets(s, 1023, fd);
|
fgets(s, 1023, fd);
|
||||||
if(sscanf(s, "model %d: %1023s",&n, s1)!=2)
|
if(sscanf(s, "model %d: %1023s",&n, s1) != 2)
|
||||||
{
|
Log::fatal("History", "No model information for kart %d found.", i);
|
||||||
fprintf(stderr,"WARNING: No model information for kart %d found.\n",
|
|
||||||
i);
|
|
||||||
exit(-2);
|
|
||||||
}
|
|
||||||
m_kart_ident.push_back(s1);
|
m_kart_ident.push_back(s1);
|
||||||
if(i<race_manager->getNumPlayers())
|
if(i<race_manager->getNumPlayers())
|
||||||
{
|
{
|
||||||
@ -323,10 +289,8 @@ void History::Load()
|
|||||||
// FIXME: The model information is currently ignored
|
// FIXME: The model information is currently ignored
|
||||||
fgets(s, 1023, fd);
|
fgets(s, 1023, fd);
|
||||||
if(sscanf(s,"size: %d",&m_size)!=1)
|
if(sscanf(s,"size: %d",&m_size)!=1)
|
||||||
{
|
Log::fatal("History", "Number of records not found in history file.");
|
||||||
fprintf(stderr,"WARNING: Number of records not found in history file.\n");
|
|
||||||
exit(-2);
|
|
||||||
}
|
|
||||||
allocateMemory(m_size);
|
allocateMemory(m_size);
|
||||||
m_current = -1;
|
m_current = -1;
|
||||||
|
|
||||||
|
@ -88,70 +88,51 @@ void ReplayPlay::Load()
|
|||||||
FILE *fd = openReplayFile(/*writeable*/false);
|
FILE *fd = openReplayFile(/*writeable*/false);
|
||||||
if(!fd)
|
if(!fd)
|
||||||
{
|
{
|
||||||
printf("Can't read '%s', ghost replay disabled.\n",
|
Log::error("Replay", "Can't read '%s', ghost replay disabled.",
|
||||||
getReplayFilename().c_str());
|
getReplayFilename().c_str());
|
||||||
destroy();
|
destroy();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
printf("Reading replay file '%s'.\n", getReplayFilename().c_str());
|
Log::info("Replay", "Reading replay file '%s'.", getReplayFilename().c_str());
|
||||||
|
|
||||||
if (fgets(s, 1023, fd) == NULL)
|
if (fgets(s, 1023, fd) == NULL)
|
||||||
{
|
Log::fatal("Replay", "Could not read '%s'.", getReplayFilename().c_str());
|
||||||
fprintf(stderr, "ERROR: could not read '%s'.\n",
|
|
||||||
getReplayFilename().c_str());
|
|
||||||
exit(-2);
|
|
||||||
}
|
|
||||||
|
|
||||||
unsigned int version;
|
unsigned int version;
|
||||||
if (sscanf(s,"Version: %d", &version)!=1)
|
if (sscanf(s,"Version: %d", &version) != 1)
|
||||||
{
|
Log::fatal("Replay", "No Version information found in replay file (bogus replay file).");
|
||||||
fprintf(stderr, "ERROR: no Version information found in replay file"
|
|
||||||
" (bogus replay file)\n");
|
|
||||||
exit(-2);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (version!=getReplayVersion())
|
if (version != getReplayVersion())
|
||||||
{
|
{
|
||||||
fprintf(stderr, "WARNING: replay is version '%d'\n",version);
|
Log::warn("Replay", "Replay is version '%d'",version);
|
||||||
fprintf(stderr, " STK version is '%d'\n",getReplayVersion());
|
Log::warn("Replay", "STK version is '%d'",getReplayVersion());
|
||||||
fprintf(stderr, " We try to proceed, but it may fail.\n");
|
Log::warn("Replay", "We try to proceed, but it may fail.");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (fgets(s, 1023, fd) == NULL)
|
if (fgets(s, 1023, fd) == NULL)
|
||||||
{
|
Log::fatal("Replay", "Could not read '%s'.", getReplayFilename().c_str());
|
||||||
fprintf(stderr, "ERROR: could not read '%s'.\n",
|
|
||||||
getReplayFilename().c_str());
|
|
||||||
exit(-2);
|
|
||||||
}
|
|
||||||
|
|
||||||
int n;
|
int n;
|
||||||
if(sscanf(s, "difficulty: %d",&n)!=1)
|
if(sscanf(s, "difficulty: %d", &n) != 1)
|
||||||
{
|
Log::fatal("Replay", " No difficulty found in replay file.");
|
||||||
fprintf(stderr,"WARNING: No difficulty found in replay file.\n");
|
|
||||||
exit(-2);
|
|
||||||
}
|
|
||||||
|
|
||||||
if(race_manager->getDifficulty()!=(RaceManager::Difficulty)n)
|
if(race_manager->getDifficulty()!=(RaceManager::Difficulty)n)
|
||||||
printf("Warning, difficulty of replay is '%d', "
|
Log::warn("Replay", "Difficulty of replay is '%d', "
|
||||||
"while '%d' is selected.\n",
|
"while '%d' is selected.",
|
||||||
race_manager->getDifficulty(), n);
|
race_manager->getDifficulty(), n);
|
||||||
|
|
||||||
fgets(s, 1023, fd);
|
fgets(s, 1023, fd);
|
||||||
if(sscanf(s, "track: %s",s1)!=1)
|
if(sscanf(s, "track: %s", s1) != 1)
|
||||||
{
|
Log::warn("Replay", "Track not found in replay file.");
|
||||||
fprintf(stderr,"WARNING: Track not found in replay file.\n");
|
|
||||||
}
|
|
||||||
assert(std::string(s1)==race_manager->getTrackName());
|
assert(std::string(s1)==race_manager->getTrackName());
|
||||||
race_manager->setTrack(s1);
|
race_manager->setTrack(s1);
|
||||||
|
|
||||||
unsigned int num_laps;
|
unsigned int num_laps;
|
||||||
fgets(s, 1023, fd);
|
fgets(s, 1023, fd);
|
||||||
if(sscanf(s, "Laps: %d",&num_laps)!=1)
|
if(sscanf(s, "Laps: %d", &num_laps) != 1)
|
||||||
{
|
Log::fatal("Replay", "No number of laps found in replay file.");
|
||||||
fprintf(stderr,"WARNING: No number of laps found in replay file.\n");
|
|
||||||
exit(-2);
|
|
||||||
}
|
|
||||||
race_manager->setNumLaps(num_laps);
|
race_manager->setNumLaps(num_laps);
|
||||||
|
|
||||||
// eof actually doesn't trigger here, since it requires first to try
|
// eof actually doesn't trigger here, since it requires first to try
|
||||||
@ -175,25 +156,18 @@ void ReplayPlay::readKartData(FILE *fd, char *next_line)
|
|||||||
{
|
{
|
||||||
char s[1024];
|
char s[1024];
|
||||||
if(sscanf(next_line, "model: %s", s)!=1)
|
if(sscanf(next_line, "model: %s", s)!=1)
|
||||||
{
|
Log::fatal("Replay", "No model information for kart %d found.",
|
||||||
fprintf(stderr,
|
|
||||||
"WARNING: No model information for kart %d found.\n",
|
|
||||||
m_ghost_karts.size());
|
m_ghost_karts.size());
|
||||||
exit(-2);
|
|
||||||
}
|
|
||||||
m_ghost_karts.push_back(new GhostKart(std::string(s)));
|
m_ghost_karts.push_back(new GhostKart(std::string(s)));
|
||||||
m_ghost_karts[m_ghost_karts.size()-1].init(RaceManager::KT_GHOST);
|
m_ghost_karts[m_ghost_karts.size()-1].init(RaceManager::KT_GHOST);
|
||||||
|
|
||||||
fgets(s, 1023, fd);
|
fgets(s, 1023, fd);
|
||||||
unsigned int size;
|
unsigned int size;
|
||||||
if(sscanf(s,"size: %d",&size)!=1)
|
if(sscanf(s,"size: %d",&size)!=1)
|
||||||
{
|
Log::fatal("Replay", "Number of records not found in replay file "
|
||||||
fprintf(stderr,
|
"for kart %d.",
|
||||||
"WARNING: Number of records not found in replay file "
|
|
||||||
"for kart %d.\n",
|
|
||||||
m_ghost_karts.size()-1);
|
m_ghost_karts.size()-1);
|
||||||
exit(-2);
|
|
||||||
}
|
|
||||||
|
|
||||||
for(unsigned int i=0; i<size; i++)
|
for(unsigned int i=0; i<size; i++)
|
||||||
{
|
{
|
||||||
@ -217,20 +191,17 @@ void ReplayPlay::readKartData(FILE *fd, char *next_line)
|
|||||||
{
|
{
|
||||||
// Invalid record found
|
// Invalid record found
|
||||||
// ---------------------
|
// ---------------------
|
||||||
fprintf(stderr, "Can't read replay data line %d:\n", i);
|
Log::warn("Replay", "Can't read replay data line %d:", i);
|
||||||
fprintf(stderr, "%s", s);
|
Log::warn("Replay", "%s", s);
|
||||||
fprintf(stderr, "Ignored.\n");
|
Log::warn("Replay", "Ignored.");
|
||||||
}
|
}
|
||||||
} // for i
|
} // for i
|
||||||
fgets(s, 1023, fd);
|
fgets(s, 1023, fd);
|
||||||
unsigned int num_events;
|
unsigned int num_events;
|
||||||
if(sscanf(s,"events: %d",&num_events)!=1)
|
if(sscanf(s,"events: %d",&num_events)!=1)
|
||||||
{
|
Log::warn("Replay", "Number of events not found in replay file "
|
||||||
fprintf(stderr,
|
"for kart %d.", m_ghost_karts.size()-1);
|
||||||
"WARNING: Number of events not found in replay file "
|
|
||||||
"for kart %d.\n",
|
|
||||||
m_ghost_karts.size()-1);
|
|
||||||
}
|
|
||||||
for(unsigned int i=0; i<num_events; i++)
|
for(unsigned int i=0; i<num_events; i++)
|
||||||
{
|
{
|
||||||
fgets(s, 1023, fd);
|
fgets(s, 1023, fd);
|
||||||
@ -245,9 +216,9 @@ void ReplayPlay::readKartData(FILE *fd, char *next_line)
|
|||||||
{
|
{
|
||||||
// Invalid record found
|
// Invalid record found
|
||||||
// ---------------------
|
// ---------------------
|
||||||
fprintf(stderr, "Can't read replay event line %d:\n", i);
|
Log::warn("Replay", "Can't read replay event line %d:", i);
|
||||||
fprintf(stderr, "%s", s);
|
Log::warn("Replay", "%s", s);
|
||||||
fprintf(stderr, "Ignored.\n");
|
Log::warn("Replay", "Ignored.");
|
||||||
}
|
}
|
||||||
|
|
||||||
} // for i < events
|
} // for i < events
|
||||||
|
@ -130,8 +130,12 @@ void ReplayRecorder::update(float dt)
|
|||||||
{
|
{
|
||||||
// Only print this message once.
|
// Only print this message once.
|
||||||
if(m_count_transforms[i]==m_transform_events[i].size())
|
if(m_count_transforms[i]==m_transform_events[i].size())
|
||||||
printf("Can't store more events for kart %s.\n",
|
{
|
||||||
|
char buffer[100];
|
||||||
|
sprintf(buffer, "Can't store more events for kart %s.",
|
||||||
kart->getIdent().c_str());
|
kart->getIdent().c_str());
|
||||||
|
Log::warn("ReplayRecorder", buffer);
|
||||||
|
}
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
TransformEvent *p = &(m_transform_events[i][m_count_transforms[i]-1]);
|
TransformEvent *p = &(m_transform_events[i][m_count_transforms[i]-1]);
|
||||||
@ -153,12 +157,12 @@ void ReplayRecorder::Save()
|
|||||||
FILE *fd = openReplayFile(/*writeable*/true);
|
FILE *fd = openReplayFile(/*writeable*/true);
|
||||||
if(!fd)
|
if(!fd)
|
||||||
{
|
{
|
||||||
printf("Can't open '%s' for writing - can't save replay data.\n",
|
Log::error("ReplayRecorder", "Can't open '%s' for writing - can't save replay data.",
|
||||||
getReplayFilename().c_str());
|
getReplayFilename().c_str());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
printf("Replay saved in '%s'.\n", getReplayFilename().c_str());
|
Log::info("ReplayRecorder", "Replay saved in '%s'.\n", getReplayFilename().c_str());
|
||||||
|
|
||||||
World *world = World::getWorld();
|
World *world = World::getWorld();
|
||||||
unsigned int num_karts = world->getNumKarts();
|
unsigned int num_karts = world->getNumKarts();
|
||||||
|
@ -85,7 +85,7 @@ bool CreditsScreen::getWideLine(std::ifstream& file, core::stringw* out)
|
|||||||
{
|
{
|
||||||
if (!file.good())
|
if (!file.good())
|
||||||
{
|
{
|
||||||
fprintf(stderr, "getWideLine : File is not good!\n");
|
Log::error("CreditsScreen", "getWideLine: File is not good!");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
wchar_t wide_char;
|
wchar_t wide_char;
|
||||||
@ -147,8 +147,8 @@ void CreditsScreen::loadedFromFile()
|
|||||||
|
|
||||||
if (file.fail() || !file.is_open() || file.eof())
|
if (file.fail() || !file.is_open() || file.eof())
|
||||||
{
|
{
|
||||||
fprintf(stderr, "\n/!\\ Failed to open file at '%s'\n\n",
|
Log::error("CreditsScreen", "Failed to open file at '%s'.",
|
||||||
creditsfile.c_str());
|
creditsfile.c_str());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -160,10 +160,8 @@ void CreditsScreen::loadedFromFile()
|
|||||||
|
|
||||||
if (file.fail() || !file.is_open() || file.eof())
|
if (file.fail() || !file.is_open() || file.eof())
|
||||||
{
|
{
|
||||||
fprintf(stderr,
|
Log::error("CreditsScreen", "Failed to read file at '%s', unexpected EOF.",
|
||||||
"\n/!\\ Failed to read file at '%s', unexpected EOF\n\n",
|
creditsfile.c_str());
|
||||||
creditsfile.c_str());
|
|
||||||
assert(false);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -203,9 +201,7 @@ void CreditsScreen::loadedFromFile()
|
|||||||
|
|
||||||
if (lineCount == 0)
|
if (lineCount == 0)
|
||||||
{
|
{
|
||||||
fprintf(stderr,
|
Log::error("CreditsScreen", "Could not read anything from CREDITS file!");
|
||||||
"\n/!\\ Could not read anything from CREDITS file!\n\n");
|
|
||||||
assert(false);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -384,11 +384,10 @@ void AddonsLoading::doUninstall()
|
|||||||
error = !addons_manager->uninstall(m_addon);
|
error = !addons_manager->uninstall(m_addon);
|
||||||
if(error)
|
if(error)
|
||||||
{
|
{
|
||||||
printf("[addons]Directory '%s' can not be removed.\n",
|
Log::warn("Addons", "Directory '%s' can not be removed.",
|
||||||
m_addon.getDataDir().c_str());
|
m_addon.getDataDir().c_str());
|
||||||
printf("[addons]Please remove this directory manually.\n");
|
Log::warn("Addons", "Please remove this directory manually.");
|
||||||
core::stringw msg = StringUtils::insertValues(
|
core::stringw msg = StringUtils::insertValues(_("Problems removing the addon '%s'."),
|
||||||
_("Problems removing the addon '%s'."),
|
|
||||||
core::stringw(m_addon.getName().c_str()));
|
core::stringw(m_addon.getName().c_str()));
|
||||||
getWidget<BubbleWidget>("description")->setText(msg.c_str());
|
getWidget<BubbleWidget>("description")->setText(msg.c_str());
|
||||||
}
|
}
|
||||||
|
@ -252,9 +252,9 @@ void GrandPrixLose::setKarts(std::vector<std::string> ident_arg)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
fprintf(stderr, "[GrandPrixLose] WARNING: could not find a kart named '%s'\n", ident_arg[n].c_str());
|
Log::warn("GrandPrixLose", "Could not find a kart named '%s'.", ident_arg[n].c_str());
|
||||||
m_kart_node[n] = NULL;
|
m_kart_node[n] = NULL;
|
||||||
}// if kart !=NULL
|
} // if kart != NULL
|
||||||
}
|
}
|
||||||
} // setKarts
|
} // setKarts
|
||||||
|
|
||||||
|
@ -71,8 +71,8 @@ void HelpScreen1::eventCallback(Widget* widget, const std::string& name, const i
|
|||||||
|
|
||||||
if (kart_properties_manager->getKart(UserConfigParams::m_default_kart) == NULL)
|
if (kart_properties_manager->getKart(UserConfigParams::m_default_kart) == NULL)
|
||||||
{
|
{
|
||||||
fprintf(stderr, "[MainMenuScreen] WARNING: cannot find kart '%s', will revert to default\n",
|
Log::warn("HelpScreen1", "Cannot find kart '%s', will revert to default",
|
||||||
UserConfigParams::m_default_kart.c_str());
|
UserConfigParams::m_default_kart.c_str());
|
||||||
UserConfigParams::m_default_kart.revertToDefaults();
|
UserConfigParams::m_default_kart.revertToDefaults();
|
||||||
}
|
}
|
||||||
race_manager->setLocalKartInfo(0, UserConfigParams::m_default_kart);
|
race_manager->setLocalKartInfo(0, UserConfigParams::m_default_kart);
|
||||||
|
@ -331,13 +331,9 @@ PlayerKartWidget::PlayerKartWidget(KartSelectionScreen* parent,
|
|||||||
}
|
}
|
||||||
|
|
||||||
if(!props)
|
if(!props)
|
||||||
{
|
Log::fatal("KartSelectionScreen", "Can't find default "
|
||||||
fprintf(stderr,
|
"kart '%s' nor any other kart.",
|
||||||
"[KartSelectionScreen] WARNING: Can't find default "
|
default_kart.c_str());
|
||||||
"kart '%s' nor any other kart.\n",
|
|
||||||
default_kart.c_str());
|
|
||||||
exit(-1);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
m_kartInternalName = props->getIdent();
|
m_kartInternalName = props->getIdent();
|
||||||
|
|
||||||
@ -423,14 +419,12 @@ void PlayerKartWidget::setPlayerID(const int newPlayerID)
|
|||||||
if (StateManager::get()->getActivePlayer(newPlayerID)
|
if (StateManager::get()->getActivePlayer(newPlayerID)
|
||||||
!= m_associated_player)
|
!= m_associated_player)
|
||||||
{
|
{
|
||||||
Log::warn("[KartSelectionScreen]", "Internal "
|
Log::error("KartSelectionScreen", "Internal "
|
||||||
"inconsistency, PlayerKartWidget has IDs and "
|
"inconsistency, PlayerKartWidget has IDs and "
|
||||||
"pointers that do not correspond to one player");
|
"pointers that do not correspond to one player");
|
||||||
fprintf(stderr,
|
Log::fatal("KartSelectionScreen", " Player: %p - Index: %d - m_associated_player: %p",
|
||||||
" Player: %p - Index: %d - m_associated_player: %p\n",
|
StateManager::get()->getActivePlayer(newPlayerID),
|
||||||
StateManager::get()->getActivePlayer(newPlayerID),
|
newPlayerID, m_associated_player);
|
||||||
newPlayerID, m_associated_player);
|
|
||||||
assert(false);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Remove current focus, but rembmer it
|
// Remove current focus, but rembmer it
|
||||||
@ -1612,11 +1606,9 @@ void KartSelectionScreen::updateKartWidgetModel(uint8_t widget_id,
|
|||||||
->setText( selectionText.c_str(), false );
|
->setText( selectionText.c_str(), false );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
Log::warn("KartSelectionScreen", "could not "
|
||||||
fprintf(stderr, "[KartSelectionScreen] WARNING: could not "
|
"find a kart named '%s'",
|
||||||
"find a kart named '%s'\n",
|
selection.c_str());
|
||||||
selection.c_str());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -380,8 +380,8 @@ void MainMenuScreen::eventCallback(Widget* widget, const std::string& name,
|
|||||||
|
|
||||||
if (kart_properties_manager->getKart(UserConfigParams::m_default_kart) == NULL)
|
if (kart_properties_manager->getKart(UserConfigParams::m_default_kart) == NULL)
|
||||||
{
|
{
|
||||||
fprintf(stderr, "[MainMenuScreen] WARNING: cannot find kart '%s', will revert to default\n",
|
Log::warn("MainMenuScreen", "Cannot find kart '%s', will revert to default",
|
||||||
UserConfigParams::m_default_kart.c_str());
|
UserConfigParams::m_default_kart.c_str());
|
||||||
UserConfigParams::m_default_kart.revertToDefaults();
|
UserConfigParams::m_default_kart.revertToDefaults();
|
||||||
}
|
}
|
||||||
race_manager->setLocalKartInfo(0, UserConfigParams::m_default_kart);
|
race_manager->setLocalKartInfo(0, UserConfigParams::m_default_kart);
|
||||||
|
@ -567,7 +567,8 @@ void OptionsScreenInput2::onConfirm()
|
|||||||
const bool success =
|
const bool success =
|
||||||
input_manager->getDeviceList()->deleteConfig(m_config);
|
input_manager->getDeviceList()->deleteConfig(m_config);
|
||||||
assert(success);
|
assert(success);
|
||||||
if (!success) fprintf(stderr, "Failed to delete config!\n");
|
if (!success)
|
||||||
|
Log::error("OptionsScreenInput2", "Failed to delete config!");
|
||||||
|
|
||||||
m_config = NULL;
|
m_config = NULL;
|
||||||
input_manager->getDeviceList()->serialize();
|
input_manager->getDeviceList()->serialize();
|
||||||
|
@ -471,8 +471,8 @@ void RaceGUIOverworld::drawGlobalMiniMap()
|
|||||||
|
|
||||||
if (challenge == NULL)
|
if (challenge == NULL)
|
||||||
{
|
{
|
||||||
fprintf(stderr, "[RaceGUIOverworld] ERROR: Cannot find challenge <%s>\n",
|
Log::error("RaceGUIOverworld", "Cannot find challenge <%s>.",
|
||||||
challenges[n].m_challenge_id.c_str());
|
challenges[n].m_challenge_id.c_str());
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -483,10 +483,10 @@ void RaceGUIOverworld::drawGlobalMiniMap()
|
|||||||
|
|
||||||
if (gp == NULL)
|
if (gp == NULL)
|
||||||
{
|
{
|
||||||
fprintf(stderr, "[RaceGUIOverworld] ERROR: Cannot find GP <%s>, "
|
Log::error("RaceGUIOverworld", "Cannot find GP <%s>, "
|
||||||
"referenced from challenge <%s>\n",
|
"referenced from challenge <%s>",
|
||||||
challenge->getGPId().c_str(),
|
challenge->getGPId().c_str(),
|
||||||
challenges[n].m_challenge_id.c_str());
|
challenges[n].m_challenge_id.c_str());
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -508,10 +508,10 @@ void RaceGUIOverworld::drawGlobalMiniMap()
|
|||||||
Track* track = track_manager->getTrack(challenge->getTrackId());
|
Track* track = track_manager->getTrack(challenge->getTrackId());
|
||||||
if (track == NULL)
|
if (track == NULL)
|
||||||
{
|
{
|
||||||
fprintf(stderr, "[RaceGUIOverworld] ERROR: Cannot find track <%s>, "
|
Log::error("RaceGUIOverworld", "Cannot find track <%s>, "
|
||||||
"referenced from challenge <%s>\n",
|
"referenced from challenge <%s>",
|
||||||
challenge->getTrackId().c_str(),
|
challenge->getTrackId().c_str(),
|
||||||
challenges[n].m_challenge_id.c_str());
|
challenges[n].m_challenge_id.c_str());
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -297,9 +297,8 @@ void RaceResultGUI::eventCallback(GUIEngine::Widget* widget,
|
|||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
fprintf(stderr, "Incorrect event '%s' when things are unlocked.\n",
|
Log::fatal("RaceResultGUI", "Incorrect event '%s' when things are unlocked.",
|
||||||
name.c_str());
|
name.c_str());
|
||||||
assert(false);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// If we're playing online :
|
// If we're playing online :
|
||||||
@ -342,11 +341,8 @@ void RaceResultGUI::eventCallback(GUIEngine::Widget* widget,
|
|||||||
MessageDialog::MESSAGE_DIALOG_CONFIRM, this, false);
|
MessageDialog::MESSAGE_DIALOG_CONFIRM, this, false);
|
||||||
}
|
}
|
||||||
else if (!getWidget(name.c_str())->isVisible())
|
else if (!getWidget(name.c_str())->isVisible())
|
||||||
{
|
Log::fatal("RaceResultGUI", "Incorrect event '%s' when things are unlocked.",
|
||||||
fprintf(stderr, "Incorrect event '%s' when things are unlocked.\n",
|
name.c_str());
|
||||||
name.c_str());
|
|
||||||
assert(false);
|
|
||||||
}
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -387,10 +383,8 @@ void RaceResultGUI::eventCallback(GUIEngine::Widget* widget,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
Log::fatal("RaceResultGUI", "Incorrect event '%s' for normal race.",
|
||||||
fprintf(stderr, "Incorrect event '%s' for normal race.\n",
|
name.c_str());
|
||||||
name.c_str());
|
|
||||||
}
|
|
||||||
return;
|
return;
|
||||||
} // eventCallback
|
} // eventCallback
|
||||||
|
|
||||||
@ -615,8 +609,8 @@ void RaceResultGUI::onUpdate(float dt)
|
|||||||
}
|
}
|
||||||
catch (std::exception& e)
|
catch (std::exception& e)
|
||||||
{
|
{
|
||||||
fprintf(stderr, "[RaceResultGUI] WARNING: exception caught when "
|
Log::error("RaceResultGUI", "Exception caught when "
|
||||||
"trying to load music: %s\n", e.what());
|
"trying to load music: %s", e.what());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} // onUpdate
|
} // onUpdate
|
||||||
|
@ -36,12 +36,8 @@ CheckCannon::CheckCannon(const XMLNode &node, unsigned int index)
|
|||||||
: CheckLine(node, index)
|
: CheckLine(node, index)
|
||||||
{
|
{
|
||||||
core::vector3df p1, p2;
|
core::vector3df p1, p2;
|
||||||
if(!node.get("target-p1", &p1) ||
|
if(!node.get("target-p1", &p1) || !node.get("target-p2", &p2))
|
||||||
!node.get("target-p2", &p2) )
|
Log::fatal("CheckCannon", "No target line specified.");
|
||||||
{
|
|
||||||
printf("CheckCannon has no target line specified.\n");
|
|
||||||
exit(-1);
|
|
||||||
}
|
|
||||||
m_target.setLine(p1, p2);
|
m_target.setLine(p1, p2);
|
||||||
m_curve = new Ipo(*(node.getNode("curve")),
|
m_curve = new Ipo(*(node.getNode("curve")),
|
||||||
/*fps*/25,
|
/*fps*/25,
|
||||||
|
@ -72,8 +72,8 @@ void CheckGoal::update(float dt)
|
|||||||
if(isTriggered(m_previous_position[ball_index], xyz, ball_index))
|
if(isTriggered(m_previous_position[ball_index], xyz, ball_index))
|
||||||
{
|
{
|
||||||
if(UserConfigParams::m_check_debug)
|
if(UserConfigParams::m_check_debug)
|
||||||
printf("CHECK: Goal check structure %d triggered for object %s.\n",
|
Log::info("CheckGoal", "Goal check structure %d triggered for object %s.",
|
||||||
m_index, obj->getPresentation<TrackObjectPresentationMesh>()->getNode()->getDebugName());
|
m_index, obj->getPresentation<TrackObjectPresentationMesh>()->getNode()->getDebugName());
|
||||||
trigger(ball_index);
|
trigger(ball_index);
|
||||||
}
|
}
|
||||||
m_previous_position[ball_index] = xyz;
|
m_previous_position[ball_index] = xyz;
|
||||||
|
@ -71,11 +71,10 @@ bool CheckLap::isTriggered(const Vec3 &old_pos, const Vec3 &new_pos,
|
|||||||
bool result =(m_previous_distance[indx]>0.95f*track_length &&
|
bool result =(m_previous_distance[indx]>0.95f*track_length &&
|
||||||
current_distance<7.0f);
|
current_distance<7.0f);
|
||||||
if(UserConfigParams::m_check_debug && result)
|
if(UserConfigParams::m_check_debug && result)
|
||||||
{
|
Log::info("CheckLap", "Kart %s crossed start line from %f to %f.",
|
||||||
printf("CHECK: Kart %s crossed start line from %f to %f.\n",
|
World::getWorld()->getKart(indx)->getIdent().c_str(),
|
||||||
World::getWorld()->getKart(indx)->getIdent().c_str(),
|
m_previous_distance[indx], current_distance);
|
||||||
m_previous_distance[indx], current_distance);
|
|
||||||
}
|
|
||||||
m_previous_distance[indx] = current_distance;
|
m_previous_distance[indx] = current_distance;
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
|
@ -173,14 +173,14 @@ bool CheckLine::isTriggered(const Vec3 &old_pos, const Vec3 &new_pos,
|
|||||||
if(UserConfigParams::m_check_debug && !result)
|
if(UserConfigParams::m_check_debug && !result)
|
||||||
{
|
{
|
||||||
if(World::getWorld()->getNumKarts()>0)
|
if(World::getWorld()->getNumKarts()>0)
|
||||||
printf("CHECK: Kart %s crosses line, but wrong height "
|
Log::info("CheckLine", "Kart %s crosses line, but wrong height "
|
||||||
"(%f vs %f).\n",
|
"(%f vs %f).",
|
||||||
World::getWorld()->getKart(indx)->getIdent().c_str(),
|
World::getWorld()->getKart(indx)->getIdent().c_str(),
|
||||||
new_pos.getY(), m_min_height);
|
new_pos.getY(), m_min_height);
|
||||||
else
|
else
|
||||||
printf("CHECK: Kart %d crosses line, but wrong height "
|
Log::info("CheckLine", "Kart %d crosses line, but wrong height "
|
||||||
"(%f vs %f).\n",
|
"(%f vs %f).",
|
||||||
indx, new_pos.getY(), m_min_height);
|
indx, new_pos.getY(), m_min_height);
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -64,7 +64,7 @@ void CheckManager::load(const XMLNode &node)
|
|||||||
m_all_checks.push_back(cs);
|
m_all_checks.push_back(cs);
|
||||||
} // checksphere
|
} // checksphere
|
||||||
else
|
else
|
||||||
printf("Unknown check structure '%s' - ignored.\n", type.c_str());
|
Log::warn("CheckManager", "Unknown check structure '%s' - ignored.", type.c_str());
|
||||||
} // for i<node.getNumNodes
|
} // for i<node.getNumNodes
|
||||||
|
|
||||||
// Now set all 'successors', i.e. check structures that need to get a
|
// Now set all 'successors', i.e. check structures that need to get a
|
||||||
@ -141,18 +141,15 @@ unsigned int CheckManager::getLapLineIndex() const
|
|||||||
|
|
||||||
if (dynamic_cast<CheckLap*>(c) != NULL) return i;
|
if (dynamic_cast<CheckLap*>(c) != NULL) return i;
|
||||||
}
|
}
|
||||||
fprintf(stderr,
|
Log::warn("CheckManager", "No check-lap structure found! This can cause incorrect kart");
|
||||||
"No check-lap structure found! This can cause incorrect kart\n");
|
Log::warn("CheckManager", "ranking when crossing the line, but can otherwise be ignored.");
|
||||||
fprintf(stderr,
|
|
||||||
"ranking when crossing the line, but can otherwise be ignored.\n");
|
|
||||||
for (unsigned int i=0; i<getCheckStructureCount(); i++)
|
for (unsigned int i=0; i<getCheckStructureCount(); i++)
|
||||||
{
|
{
|
||||||
if(getCheckStructure(i)->getType()==CheckStructure::CT_NEW_LAP)
|
if(getCheckStructure(i)->getType()==CheckStructure::CT_NEW_LAP)
|
||||||
return i;
|
return i;
|
||||||
}
|
}
|
||||||
|
|
||||||
fprintf(stderr, "Error, no kind of lap line for track found, aborting.\n");
|
Log::fatal("CheckManager", "Error, no kind of lap line for track found, aborting.");
|
||||||
exit(-1);
|
|
||||||
} // getLapLineIndex
|
} // getLapLineIndex
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
@ -54,9 +54,7 @@ CheckStructure::CheckStructure(const XMLNode &node, unsigned int index)
|
|||||||
else if(node.getName()=="cannon")
|
else if(node.getName()=="cannon")
|
||||||
m_check_type = CT_CANNON;
|
m_check_type = CT_CANNON;
|
||||||
else
|
else
|
||||||
{
|
Log::warn("CheckStructure", "Unknown check structure '%s' - ignored.", kind.c_str());
|
||||||
printf("Unknown check structure '%s' - ignored.\n", kind.c_str());
|
|
||||||
}
|
|
||||||
|
|
||||||
node.get("same-group", &m_same_group);
|
node.get("same-group", &m_same_group);
|
||||||
// Make sure that the index of this check structure is included in
|
// Make sure that the index of this check structure is included in
|
||||||
@ -108,8 +106,8 @@ void CheckStructure::update(float dt)
|
|||||||
if(m_is_active[i] && isTriggered(m_previous_position[i], xyz, i))
|
if(m_is_active[i] && isTriggered(m_previous_position[i], xyz, i))
|
||||||
{
|
{
|
||||||
if(UserConfigParams::m_check_debug)
|
if(UserConfigParams::m_check_debug)
|
||||||
printf("CHECK: Check structure %d triggered for kart %s.\n",
|
Log::info("CheckStructure", "Check structure %d triggered for kart %s.",
|
||||||
m_index, world->getKart(i)->getIdent().c_str());
|
m_index, world->getKart(i)->getIdent().c_str());
|
||||||
trigger(i);
|
trigger(i);
|
||||||
}
|
}
|
||||||
m_previous_position[i] = xyz;
|
m_previous_position[i] = xyz;
|
||||||
@ -144,18 +142,18 @@ void CheckStructure::changeStatus(const std::vector<int> indices,
|
|||||||
cs->m_is_active[kart_index] = false;
|
cs->m_is_active[kart_index] = false;
|
||||||
if(UserConfigParams::m_check_debug)
|
if(UserConfigParams::m_check_debug)
|
||||||
{
|
{
|
||||||
printf("CHECK: Deactivating %d for %s.\n",
|
Log::info("CheckStructure", "Deactivating %d for %s.",
|
||||||
indices[i],
|
indices[i],
|
||||||
World::getWorld()->getKart(kart_index)->getIdent().c_str());
|
World::getWorld()->getKart(kart_index)->getIdent().c_str());
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case CS_ACTIVATE:
|
case CS_ACTIVATE:
|
||||||
cs->m_is_active[kart_index] = true;
|
cs->m_is_active[kart_index] = true;
|
||||||
if(UserConfigParams::m_check_debug)
|
if(UserConfigParams::m_check_debug)
|
||||||
{
|
{
|
||||||
printf("CHECK: Activating %d for %s.\n",
|
Log::info("CheckStructure", "Activating %d for %s.",
|
||||||
indices[i],
|
indices[i],
|
||||||
World::getWorld()->getKart(kart_index)->getIdent().c_str());
|
World::getWorld()->getKart(kart_index)->getIdent().c_str());
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case CS_TOGGLE:
|
case CS_TOGGLE:
|
||||||
@ -166,10 +164,10 @@ void CheckStructure::changeStatus(const std::vector<int> indices,
|
|||||||
// non-POD type 'struct std::_Bit_reference' through '...';
|
// non-POD type 'struct std::_Bit_reference' through '...';
|
||||||
// call will abort at runtime"). So we use this somewhat
|
// call will abort at runtime"). So we use this somewhat
|
||||||
// unusual but portable construct.
|
// unusual but portable construct.
|
||||||
printf("CHECK: Toggling %d for %s from %d.\n",
|
Log::info("CheckStructure", "Toggling %d for %s from %d.",
|
||||||
indices[i],
|
indices[i],
|
||||||
World::getWorld()->getKart(kart_index)->getIdent().c_str(),
|
World::getWorld()->getKart(kart_index)->getIdent().c_str(),
|
||||||
cs->m_is_active[kart_index]==true);
|
cs->m_is_active[kart_index]==true);
|
||||||
}
|
}
|
||||||
cs->m_is_active[kart_index] = !cs->m_is_active[kart_index];
|
cs->m_is_active[kart_index] = !cs->m_is_active[kart_index];
|
||||||
} // switch
|
} // switch
|
||||||
@ -213,9 +211,9 @@ void CheckStructure::trigger(unsigned int kart_index)
|
|||||||
World::getWorld()->newLap(kart_index);
|
World::getWorld()->newLap(kart_index);
|
||||||
if(UserConfigParams::m_check_debug)
|
if(UserConfigParams::m_check_debug)
|
||||||
{
|
{
|
||||||
printf("CHECK: %s new lap %d triggered\n",
|
Log::info("CheckStructure", "%s new lap %d triggered",
|
||||||
World::getWorld()->getKart(kart_index)->getIdent().c_str(),
|
World::getWorld()->getKart(kart_index)->getIdent().c_str(),
|
||||||
m_index);
|
m_index);
|
||||||
}
|
}
|
||||||
changeStatus(m_check_structures_to_change_state,
|
changeStatus(m_check_structures_to_change_state,
|
||||||
kart_index, CS_ACTIVATE);
|
kart_index, CS_ACTIVATE);
|
||||||
|
@ -30,10 +30,8 @@
|
|||||||
GraphNode::GraphNode(unsigned int quad_index, unsigned int node_index)
|
GraphNode::GraphNode(unsigned int quad_index, unsigned int node_index)
|
||||||
{
|
{
|
||||||
if (quad_index >= QuadSet::get()->getNumberOfQuads())
|
if (quad_index >= QuadSet::get()->getNumberOfQuads())
|
||||||
{
|
Log::fatal("GraphNode", "No driveline found, or empty driveline.");
|
||||||
fprintf(stderr, "[GraphNode] ERROR: No driveline found, or empty driveline");
|
|
||||||
abort();
|
|
||||||
}
|
|
||||||
m_quad_index = quad_index;
|
m_quad_index = quad_index;
|
||||||
m_node_index = node_index;
|
m_node_index = node_index;
|
||||||
m_distance_from_start = -1.0f;
|
m_distance_from_start = -1.0f;
|
||||||
@ -130,10 +128,10 @@ void GraphNode::setupPathsToNode()
|
|||||||
gn.markAllSuccessorsToUse(i, &m_path_to_node);
|
gn.markAllSuccessorsToUse(i, &m_path_to_node);
|
||||||
}
|
}
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
for(unsigned int i=0; i<m_path_to_node.size(); i++)
|
for(unsigned int i = 0; i < m_path_to_node.size(); ++i)
|
||||||
{
|
{
|
||||||
if(m_path_to_node[i]==-1)
|
if(m_path_to_node[i] == -1)
|
||||||
printf("[WARNING] No path to node %d found on graph node %d.\n",
|
Log::warn("GraphNode", "No path to node %d found on graph node %d.",
|
||||||
i, m_node_index);
|
i, m_node_index);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
@ -17,6 +17,7 @@
|
|||||||
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
|
||||||
#include "tracks/quad.hpp"
|
#include "tracks/quad.hpp"
|
||||||
|
#include "utils/log.hpp"
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <S3DVertex.h>
|
#include <S3DVertex.h>
|
||||||
@ -31,10 +32,10 @@ Quad::Quad(const Vec3 &p0, const Vec3 &p1, const Vec3 &p2, const Vec3 &p3,
|
|||||||
if(p1.sideOfLine2D(p0, p2)>0 ||
|
if(p1.sideOfLine2D(p0, p2)>0 ||
|
||||||
p3.sideOfLine2D(p0, p2)<0)
|
p3.sideOfLine2D(p0, p2)<0)
|
||||||
{
|
{
|
||||||
printf("Warning: quad has wrong orientation: p0=%f %f %f p1=%f %f %f\n",
|
Log::warn("Quad", "Quad has wrong orientation: p0=%f %f %f p1=%f %f %f",
|
||||||
p0.getX(), p0.getY(), p0.getZ(),p1.getX(), p1.getY(), p1.getZ());
|
p0.getX(), p0.getY(), p0.getZ(),p1.getX(), p1.getY(), p1.getZ());
|
||||||
printf("The quad will be swapped, nevertheless test for correctness -\n");
|
Log::warn("Quad", "The quad will be swapped, nevertheless test for correctness -");
|
||||||
printf("quads must be counter-clockwise oriented.\n");
|
Log::warn("Quad", "quads must be counter-clockwise oriented.");
|
||||||
m_p[0]=p1; m_p[1]=p0; m_p[2]=p3; m_p[3]=p2;
|
m_p[0]=p1; m_p[1]=p0; m_p[2]=p3; m_p[3]=p2;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -498,10 +498,7 @@ public:
|
|||||||
btTransform getStartTransform (unsigned int index) const
|
btTransform getStartTransform (unsigned int index) const
|
||||||
{
|
{
|
||||||
if (index >= m_start_transforms.size())
|
if (index >= m_start_transforms.size())
|
||||||
{
|
Log::fatal("Tracj", "No start position for kart %i.", index);
|
||||||
fprintf(stderr, "No start position for kart %i\n", index);
|
|
||||||
abort();
|
|
||||||
}
|
|
||||||
return m_start_transforms[index];
|
return m_start_transforms[index];
|
||||||
}
|
}
|
||||||
// ------------------------------------------------------------------------
|
// ------------------------------------------------------------------------
|
||||||
|
@ -98,9 +98,8 @@ void TrackManager::setUnavailableTracks(const std::vector<std::string> &tracks)
|
|||||||
if (std::find(tracks.begin(), tracks.end(), id)==tracks.end())
|
if (std::find(tracks.begin(), tracks.end(), id)==tracks.end())
|
||||||
{
|
{
|
||||||
m_track_avail[i-m_tracks.begin()] = false;
|
m_track_avail[i-m_tracks.begin()] = false;
|
||||||
fprintf(stderr,
|
Log::warn("TrackManager", "Track '%s' not available on all clients, disabled.",
|
||||||
"Track '%s' not available on all clients, disabled.\n",
|
id.c_str());
|
||||||
id.c_str());
|
|
||||||
} // if id not in tracks
|
} // if id not in tracks
|
||||||
} // for all available tracks in track manager
|
} // for all available tracks in track manager
|
||||||
|
|
||||||
@ -174,7 +173,7 @@ bool TrackManager::loadTrack(const std::string& dirname)
|
|||||||
}
|
}
|
||||||
catch (std::exception& e)
|
catch (std::exception& e)
|
||||||
{
|
{
|
||||||
fprintf(stderr, "[TrackManager] ERROR: Cannot load track <%s> : %s\n",
|
Log::error("TrackManager", "Cannot load track <%s> : %s\n",
|
||||||
dirname.c_str(), e.what());
|
dirname.c_str(), e.what());
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -182,12 +181,12 @@ bool TrackManager::loadTrack(const std::string& dirname)
|
|||||||
if (track->getVersion()<stk_config->m_min_track_version ||
|
if (track->getVersion()<stk_config->m_min_track_version ||
|
||||||
track->getVersion()>stk_config->m_max_track_version)
|
track->getVersion()>stk_config->m_max_track_version)
|
||||||
{
|
{
|
||||||
fprintf(stderr, "[TrackManager] Warning: track '%s' is not supported "
|
Log::warn("TrackManager", "Track '%s' is not supported "
|
||||||
"by this binary, ignored. (Track is version %i, this "
|
"by this binary, ignored. (Track is version %i, this "
|
||||||
"executable supports from %i to %i)\n",
|
"executable supports from %i to %i).",
|
||||||
track->getIdent().c_str(), track->getVersion(),
|
track->getIdent().c_str(), track->getVersion(),
|
||||||
stk_config->m_min_track_version,
|
stk_config->m_min_track_version,
|
||||||
stk_config->m_max_track_version);
|
stk_config->m_max_track_version);
|
||||||
delete track;
|
delete track;
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -206,22 +205,15 @@ void TrackManager::removeTrack(const std::string &ident)
|
|||||||
{
|
{
|
||||||
Track *track = getTrack(ident);
|
Track *track = getTrack(ident);
|
||||||
if (track == NULL)
|
if (track == NULL)
|
||||||
{
|
Log::fatal("TrackManager", "There is no track named '%s'!!", ident.c_str());
|
||||||
fprintf(stderr, "[TrackManager] ERROR: There is no track named '%s'!!\n", ident.c_str());
|
|
||||||
assert(false);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (track->isInternal()) return;
|
if (track->isInternal()) return;
|
||||||
|
|
||||||
std::vector<Track*>::iterator it = std::find(m_tracks.begin(),
|
std::vector<Track*>::iterator it = std::find(m_tracks.begin(),
|
||||||
m_tracks.end(), track);
|
m_tracks.end(), track);
|
||||||
if (it == m_tracks.end())
|
if (it == m_tracks.end())
|
||||||
{
|
Log::fatal("TrackManager", "Cannot find track '%s' in map!!", ident.c_str());
|
||||||
fprintf(stderr, "[TrackManager] INTERNAL ERROR: Cannot find track '%s' in map!!\n", ident.c_str());
|
|
||||||
assert(false);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
int index = it - m_tracks.begin();
|
int index = it - m_tracks.begin();
|
||||||
|
|
||||||
// Remove the track from all groups it belongs to
|
// Remove the track from all groups it belongs to
|
||||||
|
@ -496,10 +496,7 @@ TrackObjectPresentationSound::TrackObjectPresentationSound(const XMLNode& xml_no
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
Log::error("TrackObject", "Sound emitter object could not be created.");
|
||||||
fprintf(stderr,
|
|
||||||
"[TrackObject] Sound emitter object could not be created\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (trigger_when_near)
|
if (trigger_when_near)
|
||||||
{
|
{
|
||||||
@ -753,9 +750,7 @@ TrackObjectPresentationActionTrigger::TrackObjectPresentationActionTrigger(const
|
|||||||
m_action_active = true;
|
m_action_active = true;
|
||||||
|
|
||||||
if (m_action.size() == 0)
|
if (m_action.size() == 0)
|
||||||
{
|
Log::warn("TrackObject", "Action-trigger has no action defined.");
|
||||||
fprintf(stderr, "[TrackObject] WARNING: action-trigger has no action defined\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
ItemManager::get()->newItem(m_init_xyz, trigger_distance, this);
|
ItemManager::get()->newItem(m_init_xyz, trigger_distance, this);
|
||||||
}
|
}
|
||||||
@ -891,10 +886,7 @@ void TrackObjectPresentationActionTrigger::onTriggerItemApproached(Item* who)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
Log::warn("TrackObject", "Unknown action '%s'", m_action.c_str());
|
||||||
fprintf(stderr, "[TrackObject] WARNING: unknown action <%s>\n",
|
|
||||||
m_action.c_str());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -520,7 +520,7 @@ namespace StringUtils
|
|||||||
// which admittedly only works for min < 100000 - which is about 68
|
// which admittedly only works for min < 100000 - which is about 68
|
||||||
// days - good enough.
|
// days - good enough.
|
||||||
char s[12];
|
char s[12];
|
||||||
sprintf ( s, "%02d:%02d:%02d", min, sec, hundredths) ;
|
sprintf(s, "%02d:%02d:%02d", min, sec, hundredths);
|
||||||
return std::string(s);
|
return std::string(s);
|
||||||
} // timeToString
|
} // timeToString
|
||||||
|
|
||||||
@ -738,8 +738,8 @@ namespace StringUtils
|
|||||||
+ 10*very_minor
|
+ 10*very_minor
|
||||||
+ release_candidate;
|
+ release_candidate;
|
||||||
|
|
||||||
if(version<=0)
|
if(version <= 0)
|
||||||
printf("Invalid version string '%s'.\n", s.c_str());
|
Log::error("StringUtils", "Invalid version string '%s'.", s.c_str());
|
||||||
return version;
|
return version;
|
||||||
} // versionToInt
|
} // versionToInt
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user