From ea95ffe424496109f2e1e0f67496db81012bcfda Mon Sep 17 00:00:00 2001
From: Benau <Benau@users.noreply.github.com>
Date: Fri, 10 Feb 2017 18:21:27 +0800
Subject: [PATCH] Remove compiler warning
---
src/config/stk_config.cpp | 9 ++-------
src/graphics/camera_normal.cpp | 1 -
src/karts/kart_model.cpp | 4 ++--
3 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/src/config/stk_config.cpp b/src/config/stk_config.cpp
index 42cc40d4a..0f52a462a 100644
--- a/src/config/stk_config.cpp
+++ b/src/config/stk_config.cpp
@@ -224,15 +224,10 @@ void STKConfig::getAllData(const XMLNode * root)
}
m_score_increase.push_back(points);
}
- if(m_max_karts>(gp_node->getNumNodes()))
+ if (m_max_karts > int(gp_node->getNumNodes()))
{
Log::error("StkConfig", "Not enough grand-prix ranking nodes:");
-
- for(unsigned int i=0; i<(m_max_karts-(gp_node->getNumNodes())); i++)
- {
- int points=0;
- m_score_increase.push_back(points);
- }
+ m_score_increase.resize(m_max_karts, 0);
}
}
diff --git a/src/graphics/camera_normal.cpp b/src/graphics/camera_normal.cpp
index 26518b799..0c0e1aa65 100644
--- a/src/graphics/camera_normal.cpp
+++ b/src/graphics/camera_normal.cpp
@@ -90,7 +90,6 @@ void CameraNormal::smoothMoveCamera(float dt)
core::vector3df current_position = m_camera->getPosition();
// Smoothly interpolate towards the position and target
const KartProperties *kp = m_kart->getKartProperties();
- float max_increase_with_zipper = kp->getZipperMaxSpeedIncrease();
float max_speed_without_zipper = kp->getEngineMaxSpeed();
float current_speed = m_kart->getSmoothedSpeed();
diff --git a/src/karts/kart_model.cpp b/src/karts/kart_model.cpp
index 92906ddef..5a5ff9dc1 100644
--- a/src/karts/kart_model.cpp
+++ b/src/karts/kart_model.cpp
@@ -530,7 +530,7 @@ scene::ISceneNode* KartModel::attachModel(bool animated_models, bool always_anim
}
}
- for (int i = 0; i < m_headlight_objects.size(); i++)
+ for (unsigned i = 0; i < m_headlight_objects.size(); i++)
{
HeadlightObject& obj = m_headlight_objects[i];
@@ -642,7 +642,7 @@ bool KartModel::loadModels(const KartProperties &kart_properties)
kart_max.max(obj_max);
}
- for (int i = 0; i < m_headlight_objects.size(); i++)
+ for (unsigned i = 0; i < m_headlight_objects.size(); i++)
{
HeadlightObject& obj = m_headlight_objects[i];
std::string full_name = kart_properties.getKartDir() + obj.getFilename();