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

Fixed compiler warnings.

Browse Source
This commit is contained in:
hiker
2018-11-16 09:36:26 +11:00
parent b215bf4d22
commit cf52ff16b7
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/karts/kart.cpp
View File

@@ -882,9 +882,9 @@ float Kart::getSpeedForTurnRadius(float radius) const
InterpolationArray turn_angle_at_speed = m_kart_properties->getTurnRadius();
// Convert the turn radius into turn angle
for(int i = 0; i < (int)turn_angle_at_speed.size(); i++)
turn_angle_at_speed.setY(i, sin( 1.0 / turn_angle_at_speed.getY(i)));
turn_angle_at_speed.setY(i, sin( 1.0f / turn_angle_at_speed.getY(i)));
float angle = sin(1.0 / radius);
float angle = sin(1.0f / radius);
return turn_angle_at_speed.getReverse(angle);
} // getSpeedForTurnRadius
@@ -901,7 +901,7 @@ float Kart::getMaxSteerAngle(float speed) const
// across karts of different lengths sharing the same
// turn radius properties
for(int i = 0; i < (int)turn_angle_at_speed.size(); i++)
turn_angle_at_speed.setY(i, sin( 1.0 / turn_angle_at_speed.getY(i))
turn_angle_at_speed.setY(i, sin( 1.0f / turn_angle_at_speed.getY(i))
* m_kart_properties->getWheelBase());
return turn_angle_at_speed.get(speed);

2
src/states_screens/online/server_selection.cpp
View File

@@ -140,7 +140,7 @@ void ServerSelection::init()
m_searcher->clearListeners();
m_searcher->addListener(this);
m_icon_bank->setScale((float)getHeight() / 15.0f / 128.0f);
m_server_list_widget->setIcons(m_icon_bank, (float)getHeight() / 12.0f);
m_server_list_widget->setIcons(m_icon_bank, int(getHeight() / 12.0f));
m_sort_desc = false;
/** Triggers the loading of the server list in the servers manager. */
refresh(true);