From 321786c28783a6371e13f9c3b080ce4cdca76ce5 Mon Sep 17 00:00:00 2001 From: hiker Date: Tue, 17 Mar 2015 10:47:49 +1100 Subject: [PATCH] Removed warning in case of missing wheels (that warning is now part of the exporter, and e.g. Sara's kart has always one wheel missing). --- src/karts/kart_model.cpp | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/src/karts/kart_model.cpp b/src/karts/kart_model.cpp index 7637c1b92..c047376d9 100644 --- a/src/karts/kart_model.cpp +++ b/src/karts/kart_model.cpp @@ -629,19 +629,9 @@ void KartModel::loadWheelInfo(const XMLNode &node, const std::string &wheel_name, int index) { const XMLNode *wheel_node = node.getNode(wheel_name); - if(!wheel_node) - { - // Only print the warning if a model filename is given. Otherwise the - // stk_config file is read (which has no model information). - if(m_model_filename!="") - { - Log::error("Kart_Model", "Missing wheel information '%s' for model " - "'%s'.", wheel_name.c_str(), m_model_filename.c_str()); - Log::error("Kart_Model", "This can be ignored, but the wheels will " - "not rotate."); - } - return; - } + // Ignore in case of karts with missing wheels (e.g. Sara) + if(!wheel_node) return; + wheel_node->get("model", &m_wheel_filename[index] ); wheel_node->get("position", &m_wheel_graphics_position[index]); wheel_node->get("min-suspension", &m_min_suspension[index] );