Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: Warnings

Browse source 
--HG--
branch : develop
This commit is contained in:
kervala 2016-12-19 17:47:15 +01:00
parent 798fde40f6
commit 1b1e08b7f6
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/src/3d/water_height_map.cpp
View file

@ -76,7 +76,7 @@ void CWaterHeightMap::updateUserPos()
nlassert(_Size != 0); nlassert(_Size != 0);
if ((uint) x == _X && (uint) y == _Y) return; 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 // compute zone

2
code/nel/src/sound/sample_bank_manager.cpp
View file

@ -81,7 +81,7 @@ void CSampleBankManager::init(NLGEORGES::UFormElm *mixerConfig)
{ {
TFilteredBank fb; TFilteredBank fb;
std::string bankName; std::string bankName;
NLGEORGES::UFormElm *realBank; NLGEORGES::UFormElm *realBank = NULL;
realBank->getArrayNode(&realBank, j); realBank->getArrayNode(&realBank, j);
realBank->getValueByName(bankName, ".SampleBank"); realBank->getValueByName(bankName, ".SampleBank");

4
code/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
View file

@ -2046,7 +2046,7 @@ int CLuaIHMRyzom::addShape(CLuaState &ls)
float x = 0.0f, y = 0.0f, z = 0.0f; float x = 0.0f, y = 0.0f, z = 0.0f;
float scale = 1.0f; float scale = 1.0f;
string context,url,skeleton,texture = ""; string context, url, skeleton, texture;
bool highlight, transparency, collision = false; bool highlight, transparency, collision = false;
if (ls.getTop() >= 2) 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; x = UserEntity->pos().x;
y = UserEntity->pos().y; y = UserEntity->pos().y;