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

Browse source
This commit is contained in:
kervala 2010-07-10 13:27:40 +02:00
parent fbc00082ce
commit f20b894851
7 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
code/nel/include/nel/3d/mesh_multi_lod.h
View file

@ -56,12 +56,13 @@ public:
class CMeshMultiLodBuild class CMeshMultiLodBuild
{ {
public: public:
CMeshMultiLodBuild() : StaticLod(false) { }
/// A slot of mesh for the build /// A slot of mesh for the build
class CBuildSlot class CBuildSlot
{ {
public: public:
CBuildSlot() : MeshGeom(NULL) { } CBuildSlot() : MeshGeom(NULL), DistMax(0.0f), BlendLength(0.0f), Flags(0) { }
/** /**
* Flags for the build of a slot * Flags for the build of a slot
* *

1
code/nel/src/3d/instance_lighter.cpp
View file

@ -349,6 +349,7 @@ void CInstanceLighter::light (const CInstanceGroup &igIn, CInstanceGroup &igOut,
CSurfaceLightGrid::CCellCorner defaultCellCorner; CSurfaceLightGrid::CCellCorner defaultCellCorner;
defaultCellCorner.SunContribution= 0; defaultCellCorner.SunContribution= 0;
defaultCellCorner.Light[0]= 0xFF; defaultCellCorner.Light[0]= 0xFF;
defaultCellCorner.Light[1]= 0xFF;
defaultCellCorner.LocalAmbientId= 0xFF; defaultCellCorner.LocalAmbientId= 0xFF;
// Init the grid. // Init the grid.

3
code/nel/src/3d/lod_character_manager.cpp
View file

@ -373,7 +373,6 @@ bool CLodCharacterManager::addRenderCharacterKey(CLodCharacterInstance &instan
float a00, a01, a02; float a00, a01, a02;
float a10, a11, a12; float a10, a11, a12;
float a20, a21, a22; float a20, a21, a22;
sint f8;
uint64 blank= 0; uint64 blank= 0;
CRGBA ambient= paramAmbient; CRGBA ambient= paramAmbient;
CRGBA diffuse= paramDiffuse; CRGBA diffuse= paramDiffuse;
@ -502,6 +501,8 @@ bool CLodCharacterManager::addRenderCharacterKey(CLodCharacterInstance &instan
if(numVertices) if(numVertices)
{ {
sint f8;
/* NB: order is important for AGP filling optimisation in dstPtr /* NB: order is important for AGP filling optimisation in dstPtr
Pentium2+ optimisation notes: Pentium2+ optimisation notes:

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

@ -83,7 +83,7 @@ bool CPackedWorld::raytrace(const NLMISC::CVector &start, const NLMISC::CVector
if (_ZoneGrid.empty()) return false; if (_ZoneGrid.empty()) return false;
++_RaytraceCounter; ++_RaytraceCounter;
float bestDist = FLT_MAX; float bestDist = FLT_MAX;
NLMISC::CVector bestNormal; CVector bestNormal(CVector::Null);
CVector currEnd = end; CVector currEnd = end;
CVector currInter; CVector currInter;
if (_RaytraceCounter == (uint32) ~0) if (_RaytraceCounter == (uint32) ~0)

1
code/nel/src/3d/patch_lightmap.cpp
View file

@ -1525,6 +1525,7 @@ void CPatch::resetTileLightInfluences()
{ {
// Disable all light influence on this point. // Disable all light influence on this point.
TileLightInfluences[i].Light[0]= 0xFF; TileLightInfluences[i].Light[0]= 0xFF;
TileLightInfluences[i].Light[1]= 0xFF;
} }
} }

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

@ -1421,7 +1421,9 @@ extern "C" void NL3D_expandLightmap (const NL3D_CExpandLightmap* pLightmap)
// Compute current color // Compute current color
CRGBA color0; CRGBA color0;
CRGBA color1; CRGBA color1;
color0.A = 255;
color0.set565 (colorTilePtr[srcIndex].Color565); color0.set565 (colorTilePtr[srcIndex].Color565);
color1.A = 255;
color1.set565 (colorTilePtr[srcIndex+1].Color565); color1.set565 (colorTilePtr[srcIndex+1].Color565);
expandedUserColorLinePtr[u].blendFromui (color0, color1, srcIndexPixel&0xff); expandedUserColorLinePtr[u].blendFromui (color0, color1, srcIndexPixel&0xff);
// Compute current TLI color // Compute current TLI color

6
code/nel/src/misc/dynloadlib.cpp
View file

@ -67,9 +67,9 @@ void *nlGetSymbolAddress(NL_LIB_HANDLE libHandle, const std::string &procName)
#ifdef NL_OS_WINDOWS #ifdef NL_OS_WINDOWS
const string nlLibPrefix; // empty const string nlLibPrefix; // empty
const string nlLibExt(".dll"); const string nlLibExt(".dll");
#elif defined(NL_OS_MAC) #elif defined(NL_OS_MAC)
const string nlLibPrefix("lib"); const string nlLibPrefix("lib");
const string nlLibExt(".dylib"); const string nlLibExt(".dylib");
#elif defined(NL_OS_UNIX) #elif defined(NL_OS_UNIX)
const string nlLibPrefix("lib"); const string nlLibPrefix("lib");
const string nlLibExt(".so"); const string nlLibExt(".so");