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

Changed: #825 Remove all warning when compiling Ryzom on Linux (patch provided by ThibG)

Browse source
This commit is contained in:
kervala 2010-05-14 11:41:28 +02:00
parent b9e8bd0d00
commit fc76a5abdd
7 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/include/nel/sound/mixing_track.h
View file

@ -38,7 +38,7 @@ class CTrack
{ {
public: public:
/// Constructor /// Constructor
CTrack() : m_PhysicalSource(NULL), m_LogicalSource(NULL) { } CTrack() : m_LogicalSource(NULL), m_PhysicalSource(NULL) { }
/// Init /// Init
inline void init(ISoundDriver *soundDriver) { m_PhysicalSource = soundDriver->createSource(); } inline void init(ISoundDriver *soundDriver) { m_PhysicalSource = soundDriver->createSource(); }
/// Destructor /// Destructor

2
code/nel/src/misc/eval_num_expr.cpp
View file

@ -270,7 +270,7 @@ CEvalNumExpr::TReturnState CEvalNumExpr::getNextToken (TToken &token)
return NoError; return NoError;
} }
// Is a number ? // Is a number ?
else if ((currentChar >= '0') && (currentChar <= '9') || (currentChar == '.')) else if (((currentChar >= '0') && (currentChar <= '9')) || (currentChar == '.'))
{ {
// This is a number // This is a number
token = Number; token = Number;

2
code/nel/src/net/naming_client.cpp
View file

@ -231,7 +231,7 @@ static TCallbackItem NamingClientCallbackArray[] =
void CNamingClient::connect( const CInetAddress &addr, CCallbackNetBase::TRecordingState rec, const vector<CInetAddress> &/* addresses */ ) void CNamingClient::connect( const CInetAddress &addr, CCallbackNetBase::TRecordingState rec, const vector<CInetAddress> &/* addresses */ )
{ {
nlassert (_Connection == NULL || _Connection != NULL && !_Connection->connected ()); nlassert (_Connection == NULL || (_Connection != NULL && !_Connection->connected ()));
if (_Connection == NULL) if (_Connection == NULL)
{ {

2
code/nel/src/pacs/build_indoor.cpp
View file

@ -185,7 +185,7 @@ void followBorder(CInteriorSurface &surface, uint first, uint edge, uint sens, v
loop = false; loop = false;
// -1 means no neighbor at all, -2 means a neighbor that is not available yet // -1 means no neighbor at all, -2 means a neighbor that is not available yet
sint32 thisOpposite = (next != NULL) ? next->InternalSurface : (current->Visibility[nextEdge] ? -1 : -2); sint32 thisOpposite = (next != NULL) ? next->InternalSurface : (current->Visibility[nextEdge] ? -1 : -2);
if (thisOpposite != currentSurfId && thisOpposite != oppositeSurfId || if ((thisOpposite != currentSurfId && thisOpposite != oppositeSurfId) ||
(loop = (current->EdgeFlags[nextEdge] && !allowThis))) (loop = (current->EdgeFlags[nextEdge] && !allowThis)))
{ {
// if reaches the end of the border, then quits. // if reaches the end of the border, then quits.

4
code/nel/src/pacs/collision_mesh_build.h
View file

@ -182,8 +182,8 @@ public:
// check each edge of each face // check each edge of each face
for (i=0; i<Faces.size(); ++i) for (i=0; i<Faces.size(); ++i)
{ {
if (Faces[i].Surface == CCollisionFace::ExteriorSurface && linkInterior || if ((Faces[i].Surface == CCollisionFace::ExteriorSurface && linkInterior) ||
Faces[i].Surface >= CCollisionFace::InteriorSurfaceFirst && !linkInterior) (Faces[i].Surface >= CCollisionFace::InteriorSurfaceFirst && !linkInterior))
continue; continue;
for (j=0; j<3; ++j) for (j=0; j<3; ++j)

16
code/nel/src/pacs/local_retriever.cpp
View file

@ -95,7 +95,7 @@ const CVector &NLPACS::CLocalRetriever::getStartVector(uint32 chain, sint32 surf
const COrderedChain3f &ochain = onLeft ? _FullOrderedChains[_Chains[chain].getSubChains().front()] : const COrderedChain3f &ochain = onLeft ? _FullOrderedChains[_Chains[chain].getSubChains().front()] :
_FullOrderedChains[_Chains[chain].getSubChains().back()]; _FullOrderedChains[_Chains[chain].getSubChains().back()];
if (ochain.isForward() && onLeft || !ochain.isForward() && !onLeft) if (ochain.isForward() == onLeft)
return ochain.getVertices().front(); return ochain.getVertices().front();
else else
return ochain.getVertices().back(); return ochain.getVertices().back();
@ -107,7 +107,7 @@ const CVector &NLPACS::CLocalRetriever::getStopVector(uint32 chain, sint32 surfa
const COrderedChain3f &ochain = onLeft ? _FullOrderedChains[_Chains[chain].getSubChains().back()] : const COrderedChain3f &ochain = onLeft ? _FullOrderedChains[_Chains[chain].getSubChains().back()] :
_FullOrderedChains[_Chains[chain].getSubChains().front()]; _FullOrderedChains[_Chains[chain].getSubChains().front()];
if (ochain.isForward() && onLeft || !ochain.isForward() && !onLeft) if (ochain.isForward() == onLeft)
return ochain.getVertices().back(); return ochain.getVertices().back();
else else
return ochain.getVertices().front(); return ochain.getVertices().front();
@ -525,7 +525,7 @@ void NLPACS::CLocalRetriever::computeLoopsAndTips()
nlwarning("loopCloseDistance=%f", loopCloseDistance); nlwarning("loopCloseDistance=%f", loopCloseDistance);
nlerror("Couldn't close loop on surface=%d", i); nlerror("Couldn't close loop on surface=%d", i);
} }
else if (best > 1.0e0f && loopCloseDistance < 3.0e-2f || else if ((best > 1.0e0f && loopCloseDistance < 3.0e-2f) ||
loopCloseDistance < 1.0e-3f) loopCloseDistance < 1.0e-3f)
{ {
break; break;
@ -1132,8 +1132,8 @@ void NLPACS::CLocalRetriever::retrievePosition(CVector estimated, CCollisionSurf
++stop; ++stop;
// if upper or lower the bounds, do nothing // if upper or lower the bounds, do nothing
if (estim.y > vertices[start].y && estim.y > vertices[stop].y || if ((estim.y > vertices[start].y && estim.y > vertices[stop].y) ||
estim.y < vertices[start].y && estim.y < vertices[stop].y) (estim.y < vertices[start].y && estim.y < vertices[stop].y))
continue; continue;
isOnBorder = true; isOnBorder = true;
@ -1306,8 +1306,8 @@ void NLPACS::CLocalRetriever::retrieveAccuratePosition(CVector2s estim, CCollisi
++stop; ++stop;
// if upper or lower the bounds, do nothing // if upper or lower the bounds, do nothing
if (estim.y > vertices[start].y && estim.y > vertices[stop].y || if ((estim.y > vertices[start].y && estim.y > vertices[stop].y) ||
estim.y < vertices[start].y && estim.y < vertices[stop].y) (estim.y < vertices[start].y && estim.y < vertices[stop].y))
continue; continue;
onBorder = true; onBorder = true;
@ -1839,7 +1839,7 @@ void NLPACS::CLocalRetriever::findPath(const NLPACS::CLocalRetriever::CLocalPosi
thisChainId = surface._Chains[loop[loopIndex]].Chain; thisChainId = surface._Chains[loop[loopIndex]].Chain;
thisChainForward = (_Chains[thisChainId].getLeft() == surfaceId); thisChainForward = (_Chains[thisChainId].getLeft() == surfaceId);
thisOChainIndex = (thisChainForward && forward || !thisChainForward && !forward) ? thisOChainIndex = (thisChainForward == forward) ?
0 : (sint)_Chains[thisChainId]._SubChains.size()-1; 0 : (sint)_Chains[thisChainId]._SubChains.size()-1;
} }

4
code/nel/src/sound/simple_source.cpp
View file

@ -30,9 +30,9 @@ namespace NLSOUND {
CSimpleSource::CSimpleSource(CSimpleSound *simpleSound, bool spawn, TSpawnEndCallback cb, void *cbUserParam, NL3D::CCluster *cluster) CSimpleSource::CSimpleSource(CSimpleSound *simpleSound, bool spawn, TSpawnEndCallback cb, void *cbUserParam, NL3D::CCluster *cluster)
: CSourceCommon(simpleSound, spawn, cb, cbUserParam, cluster), : CSourceCommon(simpleSound, spawn, cb, cbUserParam, cluster),
_SimpleSound(simpleSound),
_Track(NULL), _Track(NULL),
_PlayMuted(false), _PlayMuted(false)
_SimpleSound(simpleSound)
{ {
nlassert(_SimpleSound != 0); nlassert(_SimpleSound != 0);