From e785adbd4e21c75a4401438b21b6d32672e35417 Mon Sep 17 00:00:00 2001 From: kervala Date: Thu, 14 Oct 2010 14:01:15 +0200 Subject: [PATCH] Changed: #825 Remove all warning when compiling Ryzom --- code/nel/include/nel/sound/audio_mixer_user.h | 4 ++-- code/nel/include/nel/sound/u_audio_mixer.h | 4 ++-- .../3d/driver/direct3d/driver_direct3d_shader.cpp | 4 ++-- code/nel/src/3d/texture_far.cpp | 4 ++++ code/nel/src/3d/zone.cpp | 12 ++++++------ code/nel/src/sound/audio_mixer_user.cpp | 8 ++++---- 6 files changed, 20 insertions(+), 16 deletions(-) diff --git a/code/nel/include/nel/sound/audio_mixer_user.h b/code/nel/include/nel/sound/audio_mixer_user.h index be5dfb356..7cd0de051 100644 --- a/code/nel/include/nel/sound/audio_mixer_user.h +++ b/code/nel/include/nel/sound/audio_mixer_user.h @@ -148,7 +148,7 @@ public: * for the HighestPri source. * By default, reserve are set for each channel to the number of available tracks. */ - virtual void setPriorityReserve(TSoundPriority priorityChannel, size_t reserve); + virtual void setPriorityReserve(TSoundPriority priorityChannel, uint reserve); /** Set the Low water mark. * This value is use to mute sound source that try to play when there priority * channel is full (see setPriorityReserve). @@ -161,7 +161,7 @@ public: * available tracks (witch is almos alwais the case). But this value will help * the mixer make it's best. */ - virtual void setLowWaterMark(size_t value); + virtual void setLowWaterMark(uint value); virtual void changeMaxTrack(uint maxTrack); diff --git a/code/nel/include/nel/sound/u_audio_mixer.h b/code/nel/include/nel/sound/u_audio_mixer.h index ad3f1ab03..e1c2a274e 100644 --- a/code/nel/include/nel/sound/u_audio_mixer.h +++ b/code/nel/include/nel/sound/u_audio_mixer.h @@ -229,7 +229,7 @@ public: * for the HighestPri source. * By default, reserve are set for each channel to the number of available tracks. */ - virtual void setPriorityReserve(TSoundPriority priorityChannel, size_t reserve) = 0; + virtual void setPriorityReserve(TSoundPriority priorityChannel, uint reserve) = 0; /** Set the Low water mark. * This value is use to mute sound source that try to play when their priority * channel is full (see setPriorityReserve). @@ -242,7 +242,7 @@ public: * available tracks (which is almost always the case). But this value will help * the mixer make its best. */ - virtual void setLowWaterMark(size_t value) = 0; + virtual void setLowWaterMark(uint value) = 0; /** Change the number of tracks in RealTime. If the number is lowered, random tracks are deleted. * Any playing sources of such deleted track will be stopped */ diff --git a/code/nel/src/3d/driver/direct3d/driver_direct3d_shader.cpp b/code/nel/src/3d/driver/direct3d/driver_direct3d_shader.cpp index 4bb65d436..445b52451 100644 --- a/code/nel/src/3d/driver/direct3d/driver_direct3d_shader.cpp +++ b/code/nel/src/3d/driver/direct3d/driver_direct3d_shader.cpp @@ -2964,7 +2964,7 @@ pixelshader water_diffuse_2_0 = asm \n\ //bias result (include scaling) \n\ mad r0.xy, r0, c1.z, c1; \n\ //add envmap coord \n\ - add r0.xy, r0, t2; \n\ + add r0.xy, r0, t2; \n\ // read envmap \n\ texld r0, r0, s2; \n\ // read diffuse \n\ @@ -3073,7 +3073,7 @@ pixelshader water_no_diffuse_2_0 = asm \n\ //bias result (include scaling) \n\ mad r0.xy, r0, c1.z, c1; \n\ //add envmap coord \n\ - add r0.xy, r0, t2; \n\ + add r0.xy, r0, t2; \n\ //read envmap \n\ texld r0, r0, s2; \n\ mov oC0, r0; \n\ diff --git a/code/nel/src/3d/texture_far.cpp b/code/nel/src/3d/texture_far.cpp index bb3773f3f..151c97a8e 100644 --- a/code/nel/src/3d/texture_far.cpp +++ b/code/nel/src/3d/texture_far.cpp @@ -545,6 +545,10 @@ void CTextureFar::rebuildPatch (const CVector2s texturePos, const CPatchIdent &p // ** Fill the struct for the tile fill method for each layers NL3D_CComputeTileFar TileFar; + TileFar.SrcDiffusePixels = NULL; + TileFar.SrcAdditivePixels = NULL; + TileFar.SrcDeltaX = 0; + TileFar.SrcDeltaY = 0; TileFar.AsmMMX= false; #if defined(NL_OS_WINDOWS) && !defined(NL_NO_ASM) TileFar.AsmMMX= NLMISC::CSystemInfo::hasMMX(); diff --git a/code/nel/src/3d/zone.cpp b/code/nel/src/3d/zone.cpp index 38d6584c8..6e5763441 100644 --- a/code/nel/src/3d/zone.cpp +++ b/code/nel/src/3d/zone.cpp @@ -1411,7 +1411,7 @@ void CZone::setTileColor(bool monochrome, float factor) void CZone::debugBinds(FILE *f) { fprintf(f, "*****************************\n"); - fprintf(f, "ZoneId: %d. NPatchs:%zu\n", ZoneId, PatchConnects.size()); + fprintf(f, "ZoneId: %d. NPatchs:%u\n", ZoneId, (uint)PatchConnects.size()); sint i; for(i=0;i<(sint)PatchConnects.size();i++) { @@ -1420,10 +1420,10 @@ void CZone::debugBinds(FILE *f) for(sint j=0;j<4;j++) { CPatchInfo::CBindInfo &bd= pc.BindEdges[j]; - fprintf(f, " edge%d: Zone:%d. NPatchs:%d. ", j, bd.ZoneId, bd.NPatchs); + fprintf(f, " edge%d: Zone:%u. NPatchs:%u. ", j, (uint)bd.ZoneId, (uint)bd.NPatchs); for(sint k=0;k (zone %d) vertex %d\n",BorderVertices[i].CurrentVertex, - BorderVertices[i].NeighborZoneId, - BorderVertices[i].NeighborVertex); + fprintf(f,"current : %u -> (zone %u) vertex %u\n", (uint)BorderVertices[i].CurrentVertex, + (uint)BorderVertices[i].NeighborZoneId, + (uint)BorderVertices[i].NeighborVertex); } } diff --git a/code/nel/src/sound/audio_mixer_user.cpp b/code/nel/src/sound/audio_mixer_user.cpp index e124a09cc..7f17f9d35 100644 --- a/code/nel/src/sound/audio_mixer_user.cpp +++ b/code/nel/src/sound/audio_mixer_user.cpp @@ -177,14 +177,14 @@ void CAudioMixerUser::initClusteredSound(NL3D::CScene *scene, float minGain, flo } -void CAudioMixerUser::setPriorityReserve(TSoundPriority priorityChannel, size_t reserve) +void CAudioMixerUser::setPriorityReserve(TSoundPriority priorityChannel, uint reserve) { - _PriorityReserve[priorityChannel] = (uint32)min(_Tracks.size(), reserve); + _PriorityReserve[priorityChannel] = (uint32)min((uint)_Tracks.size(), reserve); } -void CAudioMixerUser::setLowWaterMark(size_t value) +void CAudioMixerUser::setLowWaterMark(uint value) { - _LowWaterMark = (uint32)min(_Tracks.size(), value); + _LowWaterMark = (uint32)min((uint)_Tracks.size(), value); }