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

Removed unused 'collideable' attribute for materials, renamed 'maxSpeed'

Browse Source 
to 'max-speed' to be consistent with other names in stk.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4499 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2010-01-20 02:34:43 +00:00
parent f3586353f0
commit fe74d19a12
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/graphics/material.cpp
View File

@ -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;

2
src/graphics/material.hpp
View File

@ -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&