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

Set wheel radius from kart properties, removed compiler warnings.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2282 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2008-09-19 14:41:23 +00:00
parent 8931601f53
commit 66b3f127f6
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/kart.cpp
View File

@ -500,11 +500,14 @@ void Kart::collectedHerring(const Herring &herring, int add_info)
switch (type) switch (type)
{ {
case HE_GREEN : m_attachment.hitGreenHerring(herring, add_info); break; case HE_GREEN : m_attachment.hitGreenHerring(herring, add_info); break;
case HE_SILVER : m_num_herrings_gobbled++ ; break; case HE_SILVER : m_num_herrings_gobbled++ ; break;
case HE_GOLD : m_num_herrings_gobbled += 3 ; break; case HE_GOLD : m_num_herrings_gobbled += 3 ; break;
case HE_RED : int n=1 + 4*getNumHerring() / MAX_HERRING_EATEN; case HE_RED : {
m_collectable.hitRedHerring(n, herring, add_info); break; int n=1 + 4*getNumHerring() / MAX_HERRING_EATEN;
m_collectable.hitRedHerring(n, herring,add_info);break;
}
default : break;
} // switch TYPE } // switch TYPE
// Attachments and collectables are stored in the corresponding // Attachments and collectables are stored in the corresponding
@ -949,7 +952,7 @@ void Kart::updatePhysics (float dt)
// tire_diameter // tire_diameter
//the magic number 1.7 is used to bring the computed gear ratio into a sensible range //the magic number 1.7 is used to bring the computed gear ratio into a sensible range
float gear_ratio = 1.7f + (1 - m_current_gear_ratio); float gear_ratio = 1.7f + (1 - m_current_gear_ratio);
float tire_diameter = 2;//can this be determined for each kart? Smaller tires make for higher rpm's. float tire_diameter = m_kart_properties->getWheelRadius();
m_max_gear_rpm = m_current_gear_ratio * max_speed; m_max_gear_rpm = m_current_gear_ratio * max_speed;
m_rpm = ((m_speed * gear_ratio) / tire_diameter); m_rpm = ((m_speed * gear_ratio) / tire_diameter);