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

Fixed warnings and unnecessary divisions.

Browse Source
This commit is contained in:
hiker 2014-07-04 08:45:12 +10:00
parent 736c7264b9
commit 26fd76b904
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/config/stk_config.cpp
View File

@ -389,7 +389,7 @@ void STKConfig::getAllData(const XMLNode * root)
m_default_kart_properties->getAllData(node); m_default_kart_properties->getAllData(node);
const XMLNode *types = node->getNode("kart-type"); const XMLNode *types = node->getNode("kart-type");
for (int i = 0; i < types->getNumNodes(); ++i) for (unsigned int i = 0; i < types->getNumNodes(); ++i)
{ {
const XMLNode* type = types->getNode(i); const XMLNode* type = types->getNode(i);
m_kart_properties[type->getName()] = new KartProperties(); m_kart_properties[type->getName()] = new KartProperties();

9
src/karts/kart_properties.cpp
View File

@ -781,14 +781,15 @@ float KartProperties::getStartupBoost() const
return 0; return 0;
} // getStartupBoost } // getStartupBoost
// ----------------------------------------------------------------------------
const float KartProperties::getAvgPower() const const float KartProperties::getAvgPower() const
{ {
float avg = 0.0; float sum = 0.0;
for (int i = 0; i < m_gear_power_increase.size(); ++i) for (unsigned int i = 0; i < m_gear_power_increase.size(); ++i)
{ {
avg += (m_gear_power_increase[i]*m_max_speed[0])/m_gear_power_increase.size(); sum += m_gear_power_increase[i]*m_max_speed[0];
} }
return avg; return sum/m_gear_power_increase.size();
} // getAvgPower } // getAvgPower
/* EOF */ /* EOF */

16
src/karts/kart_properties.hpp
View File

@ -546,7 +546,10 @@ public:
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
/** Returns parameters for the speed-weighted objects */ /** Returns parameters for the speed-weighted objects */
const SpeedWeightedObject::Properties& getSpeedWeightedObjectProperties() const {return m_speed_weighted_object_properties;} const SpeedWeightedObject::Properties& getSpeedWeightedObjectProperties() const
{
return m_speed_weighted_object_properties;
}
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
/** Returns the wheel base (distance front to rear axis). */ /** Returns the wheel base (distance front to rear axis). */
@ -571,13 +574,16 @@ public:
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
/** Returns the maximum speed dependent on the difficult level. */ /** Returns the maximum speed dependent on the difficult level. */
float getMaxSpeed () const {return float getMaxSpeed () const
m_max_speed[race_manager->getDifficulty()];} {
return m_max_speed[race_manager->getDifficulty()];
}
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
/** Return the absolute maximum speed, independent on the difficulty. */ /** Return the absolute maximum speed, independent on the difficulty. */
float getAbsMaxSpeed () const {return float getAbsMaxSpeed () const
m_max_speed[m_max_speed.size()-1]; {
return m_max_speed[m_max_speed.size()-1];
} }
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------