From 54b7d57d635d969446b3efac9673f36b51e009f2 Mon Sep 17 00:00:00 2001 From: hikerstk Date: Tue, 4 Jan 2011 04:35:35 +0000 Subject: [PATCH] Fixed compiler warnings. git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7246 178a84e3-b1eb-0310-8ba1-8eac791a3b58 --- src/addons/network_http.cpp | 2 +- src/guiengine/layout_manager.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/addons/network_http.cpp b/src/addons/network_http.cpp index ff37c7e45..eeb4b5f48 100644 --- a/src/addons/network_http.cpp +++ b/src/addons/network_http.cpp @@ -314,7 +314,7 @@ int NetworkHttp::progressDownload(void *clientp, float f; if(download_now < download_total) { - f = download_now / download_total; + f = (float)download_now / (float)download_total; // In case of floating point rouding errors make sure that // 1.0 is only reached when downloadFileInternal is finished if (f>=1.0f) f=0.99f; diff --git a/src/guiengine/layout_manager.cpp b/src/guiengine/layout_manager.cpp index 9419b4bbf..cbb5ff80c 100644 --- a/src/guiengine/layout_manager.cpp +++ b/src/guiengine/layout_manager.cpp @@ -307,7 +307,7 @@ void LayoutManager::calculateLayout(ptr_vector& widgets, AbstractTopLeve if (prop_y[ prop_y.size()-1 ] == '%') { prop_y = prop_y.substr(0, prop_y.size() - 1); - widgets[n].m_y = y + atoi(prop_y.c_str())/100.0f * h; + widgets[n].m_y = (int)(y + atoi(prop_y.c_str())/100.0f * h); } else { @@ -366,7 +366,7 @@ void LayoutManager::calculateLayout(ptr_vector& widgets, AbstractTopLeve if (prop_x[ prop_x.size()-1 ] == '%') { prop_x = prop_x.substr(0, prop_x.size() - 1); - widgets[n].m_x = x + atoi(prop_x.c_str())/100.0f * w; + widgets[n].m_x = (int)(x + atoi(prop_x.c_str())/100.0f * w); } else { @@ -420,7 +420,7 @@ void LayoutManager::calculateLayout(ptr_vector& widgets, AbstractTopLeve if (prop_y[ prop_y.size()-1 ] == '%') { prop_y = prop_y.substr(0, prop_y.size() - 1); - widgets[n].m_y = y + atoi(prop_y.c_str())/100.0f * h; + widgets[n].m_y = (int)(y + atoi(prop_y.c_str())/100.0f * h); } else { @@ -466,7 +466,7 @@ void LayoutManager::calculateLayout(ptr_vector& widgets, AbstractTopLeve if (prop_x[ prop_x.size()-1 ] == '%') { prop_x = prop_x.substr(0, prop_x.size() - 1); - widgets[n].m_x = x + atoi(prop_x.c_str())/100.0f * w; + widgets[n].m_x = (int)(x + atoi(prop_x.c_str())/100.0f * w); } else {