diff --git a/src/graphics/material.cpp b/src/graphics/material.cpp index 1655be961..e0ac0d1bf 100644 --- a/src/graphics/material.cpp +++ b/src/graphics/material.cpp @@ -56,8 +56,7 @@ Material::Material(const XMLNode *node, int index) node->get("ignore", &m_ignore ); node->get("zipper", &m_zipper ); node->get("reset", &m_resetter ); - node->get("collide", &m_collideable ); - node->get("maxSpeed", &m_max_speed_fraction); + node->get("max-speed", &m_max_speed_fraction); node->get("slowdown", &m_slowdown ); std::string s(""); node->get("graphical-effect", &s ); @@ -105,7 +104,6 @@ void Material::init(unsigned int index) m_ignore = false; m_zipper = false; m_resetter = false; - m_collideable = true; m_max_speed_fraction = 1.0f; m_slowdown = 1.0f; m_graphical_effect = GE_NONE; diff --git a/src/graphics/material.hpp b/src/graphics/material.hpp index 7159d39ec..c0900fb0b 100644 --- a/src/graphics/material.hpp +++ b/src/graphics/material.hpp @@ -37,7 +37,6 @@ private: unsigned int m_index; std::string m_texname; GraphicalEffect m_graphical_effect; - bool m_collideable; bool m_zipper; bool m_resetter; bool m_ignore; @@ -66,7 +65,6 @@ public: bool isIgnore () const { return m_ignore; } bool isZipper () const { return m_zipper; } bool isSphereMap () const { return m_sphere_map; } - bool isCrashable () const { return m_collideable; } bool isReset () const { return m_resetter; } float getFriction () const { return m_friction; } const std::string&