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

Remove compiler warning

Browse Source
This commit is contained in:
Benau 2018-09-15 22:43:35 +08:00
parent 211def77a6
commit 28511c597e
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/karts/kart.cpp
View File

@ -1830,7 +1830,8 @@ void Kart::setSquash(float time, float slowdown)
*/ */
bool Kart::isSquashed() const bool Kart::isSquashed() const
{ {
return m_max_speed->isSpeedDecreaseActive(MaxSpeed::MS_DECREASE_SQUASH); return
m_max_speed->isSpeedDecreaseActive(MaxSpeed::MS_DECREASE_SQUASH) == 1;
} // setSquash } // setSquash
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

3
src/states_screens/tracks_screen.cpp
View File

@ -484,7 +484,8 @@ void TracksScreen::onUpdate(float dt)
} }
m_votes->setVisible(true); m_votes->setVisible(true);
int remaining_time = (m_vote_timeout - StkTime::getRealTimeMs()) / 1000; int remaining_time = (int)
((int64_t)m_vote_timeout - (int64_t)StkTime::getRealTimeMs()) / 1000;
if (remaining_time < 0) if (remaining_time < 0)
remaining_time = 0; remaining_time = 0;
//I18N: In tracks screen, about voting of tracks in network //I18N: In tracks screen, about voting of tracks in network