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

Bugfixes for previous commit.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2497 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2008-11-24 08:22:34 +00:00
parent dab73791c3
commit 9f11f50f4f
3 changed files with 2 additions and 20 deletions

2
src/gui/race_gui.cpp

@ -463,7 +463,7 @@ void RaceGUI::drawPowerupIcons ( Kart* player_kart, int offset_x,
void RaceGUI::drawEnergyMeter ( Kart *player_kart, int offset_x, int offset_y,
float ratio_x, float ratio_y )
{
float state = (float)(player_kart->getEnergy()) /
float state = (float)(player_kart->getNumItems()) /
MAX_ITEMS_COLLECTED;
int x = (int)((user_config->m_width-24) * ratio_x) + offset_x;
int y = (int)(250 * ratio_y) + offset_y;

9
src/karts/kart.cpp

@ -565,15 +565,6 @@ void Kart::update(float dt)
// track again)
if (material->isReset() && isOnGround()) forceRescue();
else if(material->isZipper() && isOnGround()) handleZipper();
else if(user_config->m_skidding) // set friction otherwise if it's enabled
{
for(int i=0; i<m_vehicle->getNumWheels(); i++)
{
// terrain dependent friction
m_vehicle->getWheelInfo(i).m_frictionSlip =
getFrictionSlip() * material->getFriction();
} // for i<getNumWheels
} // neither reset nor zipper material
} // if there is material
// Check if any item was hit.

11
src/race_manager.cpp

@ -145,16 +145,7 @@ void RaceManager::setNumPlayers(int num)
*/
void RaceManager::setDifficulty(Difficulty diff)
{
if(diff==RD_SKIDDING)
{
m_difficulty = RD_HARD;
user_config->m_skidding = true;
}
else
{
m_difficulty = diff;
user_config->m_skidding = false;
}
m_difficulty = diff;
} // setDifficulty
//-----------------------------------------------------------------------------