From 4cc28eb99679ac3ec0dce7a1de2b689afb28f601 Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 10 Jul 2010 13:27:40 +0200 Subject: [PATCH] Changed: #825 Remove all warning when compiling Ryzom --- code/nel/include/nel/3d/mesh_multi_lod.h | 3 ++- code/nel/src/3d/instance_lighter.cpp | 1 + code/nel/src/3d/lod_character_manager.cpp | 3 ++- code/nel/src/3d/packed_world.cpp | 2 +- code/nel/src/3d/patch_lightmap.cpp | 1 + code/nel/src/3d/texture_far.cpp | 2 ++ code/nel/src/misc/dynloadlib.cpp | 6 +++--- 7 files changed, 12 insertions(+), 6 deletions(-) diff --git a/code/nel/include/nel/3d/mesh_multi_lod.h b/code/nel/include/nel/3d/mesh_multi_lod.h index d56383f26..d057b40b6 100644 --- a/code/nel/include/nel/3d/mesh_multi_lod.h +++ b/code/nel/include/nel/3d/mesh_multi_lod.h @@ -56,12 +56,13 @@ public: class CMeshMultiLodBuild { public: + CMeshMultiLodBuild() : StaticLod(false) { } /// A slot of mesh for the build class CBuildSlot { public: - CBuildSlot() : MeshGeom(NULL) { } + CBuildSlot() : MeshGeom(NULL), DistMax(0.0f), BlendLength(0.0f), Flags(0) { } /** * Flags for the build of a slot * diff --git a/code/nel/src/3d/instance_lighter.cpp b/code/nel/src/3d/instance_lighter.cpp index 47c5dddf1..5fb2e2017 100644 --- a/code/nel/src/3d/instance_lighter.cpp +++ b/code/nel/src/3d/instance_lighter.cpp @@ -349,6 +349,7 @@ void CInstanceLighter::light (const CInstanceGroup &igIn, CInstanceGroup &igOut, CSurfaceLightGrid::CCellCorner defaultCellCorner; defaultCellCorner.SunContribution= 0; defaultCellCorner.Light[0]= 0xFF; + defaultCellCorner.Light[1]= 0xFF; defaultCellCorner.LocalAmbientId= 0xFF; // Init the grid. diff --git a/code/nel/src/3d/lod_character_manager.cpp b/code/nel/src/3d/lod_character_manager.cpp index b60b6e4ec..3a538afcf 100644 --- a/code/nel/src/3d/lod_character_manager.cpp +++ b/code/nel/src/3d/lod_character_manager.cpp @@ -373,7 +373,6 @@ bool CLodCharacterManager::addRenderCharacterKey(CLodCharacterInstance &instan float a00, a01, a02; float a10, a11, a12; float a20, a21, a22; - sint f8; uint64 blank= 0; CRGBA ambient= paramAmbient; CRGBA diffuse= paramDiffuse; @@ -502,6 +501,8 @@ bool CLodCharacterManager::addRenderCharacterKey(CLodCharacterInstance &instan if(numVertices) { + sint f8; + /* NB: order is important for AGP filling optimisation in dstPtr Pentium2+ optimisation notes: diff --git a/code/nel/src/3d/packed_world.cpp b/code/nel/src/3d/packed_world.cpp index 1f23b65c5..b989e2cf9 100644 --- a/code/nel/src/3d/packed_world.cpp +++ b/code/nel/src/3d/packed_world.cpp @@ -83,7 +83,7 @@ bool CPackedWorld::raytrace(const NLMISC::CVector &start, const NLMISC::CVector if (_ZoneGrid.empty()) return false; ++_RaytraceCounter; float bestDist = FLT_MAX; - NLMISC::CVector bestNormal; + CVector bestNormal(CVector::Null); CVector currEnd = end; CVector currInter; if (_RaytraceCounter == (uint32) ~0) diff --git a/code/nel/src/3d/patch_lightmap.cpp b/code/nel/src/3d/patch_lightmap.cpp index 01134793a..b5a6c8f8d 100644 --- a/code/nel/src/3d/patch_lightmap.cpp +++ b/code/nel/src/3d/patch_lightmap.cpp @@ -1525,6 +1525,7 @@ void CPatch::resetTileLightInfluences() { // Disable all light influence on this point. TileLightInfluences[i].Light[0]= 0xFF; + TileLightInfluences[i].Light[1]= 0xFF; } } diff --git a/code/nel/src/3d/texture_far.cpp b/code/nel/src/3d/texture_far.cpp index 632d2ac1d..bb3773f3f 100644 --- a/code/nel/src/3d/texture_far.cpp +++ b/code/nel/src/3d/texture_far.cpp @@ -1421,7 +1421,9 @@ extern "C" void NL3D_expandLightmap (const NL3D_CExpandLightmap* pLightmap) // Compute current color CRGBA color0; CRGBA color1; + color0.A = 255; color0.set565 (colorTilePtr[srcIndex].Color565); + color1.A = 255; color1.set565 (colorTilePtr[srcIndex+1].Color565); expandedUserColorLinePtr[u].blendFromui (color0, color1, srcIndexPixel&0xff); // Compute current TLI color diff --git a/code/nel/src/misc/dynloadlib.cpp b/code/nel/src/misc/dynloadlib.cpp index 705f4b4b3..fe46fa6f4 100644 --- a/code/nel/src/misc/dynloadlib.cpp +++ b/code/nel/src/misc/dynloadlib.cpp @@ -67,9 +67,9 @@ void *nlGetSymbolAddress(NL_LIB_HANDLE libHandle, const std::string &procName) #ifdef NL_OS_WINDOWS const string nlLibPrefix; // empty const string nlLibExt(".dll"); -#elif defined(NL_OS_MAC) - const string nlLibPrefix("lib"); - const string nlLibExt(".dylib"); +#elif defined(NL_OS_MAC) + const string nlLibPrefix("lib"); + const string nlLibExt(".dylib"); #elif defined(NL_OS_UNIX) const string nlLibPrefix("lib"); const string nlLibExt(".so");