diff --git a/src/homing.cpp b/src/homing.cpp index 7515afce4..c1e21c1f6 100644 --- a/src/homing.cpp +++ b/src/homing.cpp @@ -140,8 +140,8 @@ void Homing::update(float dt) ideal_direction.setInterpolate3(actual_direction.normalized(), ideal_direction, dt); - const int current_xy_speed = sqrt( actual_direction.getX()*actual_direction.getX() + - actual_direction.getY()*actual_direction.getY()); + const int current_xy_speed = (int)sqrt( actual_direction.getX()*actual_direction.getX() + + actual_direction.getY()*actual_direction.getY()); m_body->setLinearVelocity( btVector3(ideal_direction.getX()*current_xy_speed, ideal_direction.getY()*current_xy_speed, diff --git a/src/modes/three_strikes_battle.cpp b/src/modes/three_strikes_battle.cpp index 4e885b994..c0dacdf72 100644 --- a/src/modes/three_strikes_battle.cpp +++ b/src/modes/three_strikes_battle.cpp @@ -288,7 +288,7 @@ void ThreeStrikesBattle::raceResultOrder( int* order ) { const int pos = m_kart[kart_id]->getPosition() - 1; assert(pos >= 0); - assert(pos < num_karts); + assert(pos < (int)num_karts); order[pos] = kart_id; } }