From 1b1e08b7f6b5fd76a3b2f5d0b870f4f72b41629f Mon Sep 17 00:00:00 2001 From: kervala Date: Mon, 19 Dec 2016 17:47:15 +0100 Subject: [PATCH] Changed: Warnings --HG-- branch : develop --- code/nel/src/3d/water_height_map.cpp | 2 +- code/nel/src/sound/sample_bank_manager.cpp | 2 +- code/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/nel/src/3d/water_height_map.cpp b/code/nel/src/3d/water_height_map.cpp index d608dfc43..3348ffd05 100644 --- a/code/nel/src/3d/water_height_map.cpp +++ b/code/nel/src/3d/water_height_map.cpp @@ -76,7 +76,7 @@ void CWaterHeightMap::updateUserPos() nlassert(_Size != 0); if ((uint) x == _X && (uint) y == _Y) return; - if ((uint) abs((long int)(x - _X)) < _Size && (uint) abs((long int)(y - _Y)) < _Size) // are there common pixels with the previous location? + if ((uint) std::abs((sint)(x - _X)) < _Size && (uint) std::abs((sint)(y - _Y)) < _Size) // are there common pixels with the previous location? { // compute zone diff --git a/code/nel/src/sound/sample_bank_manager.cpp b/code/nel/src/sound/sample_bank_manager.cpp index 9a7b397e5..996c59f1e 100644 --- a/code/nel/src/sound/sample_bank_manager.cpp +++ b/code/nel/src/sound/sample_bank_manager.cpp @@ -81,7 +81,7 @@ void CSampleBankManager::init(NLGEORGES::UFormElm *mixerConfig) { TFilteredBank fb; std::string bankName; - NLGEORGES::UFormElm *realBank; + NLGEORGES::UFormElm *realBank = NULL; realBank->getArrayNode(&realBank, j); realBank->getValueByName(bankName, ".SampleBank"); diff --git a/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp b/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp index 7881df9e1..1e11ae722 100644 --- a/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp +++ b/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp @@ -2046,7 +2046,7 @@ int CLuaIHMRyzom::addShape(CLuaState &ls) float x = 0.0f, y = 0.0f, z = 0.0f; float scale = 1.0f; - string context,url,skeleton,texture = ""; + string context, url, skeleton, texture; bool highlight, transparency, collision = false; if (ls.getTop() >= 2) @@ -2068,7 +2068,7 @@ int CLuaIHMRyzom::addShape(CLuaState &ls) } - if (x == 0 && y == 0) + if (x == 0.f && y == 0.f) { x = UserEntity->pos().x; y = UserEntity->pos().y;