diff --git a/media/goal.xcf b/media/goal.xcf deleted file mode 100644 index 4f48e626d..000000000 Binary files a/media/goal.xcf and /dev/null differ diff --git a/media/mode_soccer.xcf b/media/mode_soccer.xcf deleted file mode 100644 index 9881ba7d1..000000000 Binary files a/media/mode_soccer.xcf and /dev/null differ diff --git a/src/karts/kart_model.cpp b/src/karts/kart_model.cpp index f8f200b93..26bd4b108 100644 --- a/src/karts/kart_model.cpp +++ b/src/karts/kart_model.cpp @@ -97,13 +97,9 @@ KartModel::KartModel(bool is_master) * does not actually load the models (see load()). * \param node XML object of configuration file. */ -void KartModel::loadInfo(const XMLNode &node, bool xmas_mode, bool halloween_mode) +void KartModel::loadInfo(const XMLNode &node) { node.get("model-file", &m_model_filename); - if(xmas_mode) - node.get("xmas-model-file", &m_model_filename); - if(halloween_mode) - node.get("halloween-model-file", &m_model_filename); if(const XMLNode *animation_node=node.getNode("animations")) { animation_node->get("left", &m_animation_frame[AF_LEFT] ); diff --git a/src/karts/kart_model.hpp b/src/karts/kart_model.hpp index bd8127e3f..ef090032e 100644 --- a/src/karts/kart_model.hpp +++ b/src/karts/kart_model.hpp @@ -142,7 +142,7 @@ public: ~KartModel(); KartModel* makeCopy(); void reset(); - void loadInfo(const XMLNode &node, bool xmas_mode, bool halloween_mode); + void loadInfo(const XMLNode &node); bool loadModels(const KartProperties &kart_properties); void update(float rotation_dt, float steer, const float suspension[4]); diff --git a/src/karts/kart_properties.cpp b/src/karts/kart_properties.cpp index 7644a9345..5d8883f2a 100644 --- a/src/karts/kart_properties.cpp +++ b/src/karts/kart_properties.cpp @@ -21,7 +21,6 @@ #include #include #include -#include #include "config/stk_config.hpp" #include "config/user_config.hpp" @@ -56,13 +55,6 @@ KartProperties::KartProperties(const std::string &filename) m_shadow_x_offset = 0.0f; m_shadow_y_offset = 0.0f; - time_t rawtime; - struct tm* timeinfo; - std::time(&rawtime); - timeinfo = std::localtime(&rawtime); - m_xmas_mode = (timeinfo->tm_mon == 12-1); // Xmas mode happens in December - m_halloween_mode = (timeinfo->tm_mon == 10-1); // Halloween mode appears in October - m_groups.clear(); m_custom_sfx_id.resize(SFXManager::NUM_CUSTOMS); @@ -282,22 +274,6 @@ void KartProperties::getAllData(const XMLNode * root) root->get("minimap-icon-file", &m_minimap_icon_file); - // Override file paths on Christmas - root->get("force-xmas-mode", &m_xmas_mode); - if(m_xmas_mode) - { - root->get("xmas-icon-file", &m_icon_file); - root->get("xmas-minimap-icon-file", &m_minimap_icon_file); - } - - // Override file paths on Halloween - root->get("force-halloween-mode", &m_halloween_mode); - if(m_halloween_mode) - { - root->get("halloween-icon-file", &m_icon_file); - root->get("halloween-minimap-icon-file", &m_minimap_icon_file); - } - root->get("shadow-file", &m_shadow_file ); Vec3 c; root->get("rgb", &c ); @@ -584,7 +560,7 @@ void KartProperties::getAllData(const XMLNode * root) } // if sounds-node exist if(m_kart_model) - m_kart_model->loadInfo(*root, m_xmas_mode, m_halloween_mode); + m_kart_model->loadInfo(*root); } // getAllData // ---------------------------------------------------------------------------- diff --git a/src/karts/kart_properties.hpp b/src/karts/kart_properties.hpp index 63bef3fd5..9f37588af 100644 --- a/src/karts/kart_properties.hpp +++ b/src/karts/kart_properties.hpp @@ -84,9 +84,6 @@ private: * the kart_properties object is const. */ mutable KartModel *m_kart_model; - bool m_xmas_mode; - bool m_halloween_mode; - /** List of all groups the kart belongs to. */ std::vector m_groups; static float UNDEFINED;