Merge pull request supertuxkart#2380 from nado/clang-fix

deveee · deveee · commit a69eb99094a1 · 2015-11-17T15:23:55.000+01:00
Fixes few warnings at compilation
diff --git a/lib/irrlicht/CMakeLists.txt b/lib/irrlicht/CMakeLists.txt
@@ -25,8 +25,14 @@ elseif(MINGW)
   add_definitions(-D_IRR_STATIC_LIB_)
   add_definitions(-D_CRT_SECURE_NO_WARNINGS) # Shut up about unsafe stuff
 else()
-  set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -Wall -pipe -O3  -fno-exceptions  -fstrict-aliasing -fexpensive-optimizations -I/usr/X11R6/include")
-  set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -Wall -pipe -O3  -fno-exceptions  -fstrict-aliasing -fexpensive-optimizations -I/usr/X11R6/include")
+  set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -Wall -pipe -O3  -fno-exceptions  -fstrict-aliasing -I/usr/X11R6/include")
+  set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -Wall -pipe -O3  -fno-exceptions  -fstrict-aliasing -I/usr/X11R6/include")
+  if(CMAKE_COMPILER_IS_GNUCC)
+	  set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -fexpensive-optimizations")
+  endif()
+  if(CMAKE_COMPILER_IS_GNUCXX)
+	  set(CMAKE_CXX_FLAGS   "${CMAKE_CXX_FLAGS} -fexpensive-optimizations")
+  endif()
 endif()
 
 # Xrandr
diff --git a/lib/irrlicht/source/Irrlicht/CParticleMeshEmitter.cpp b/lib/irrlicht/source/Irrlicht/CParticleMeshEmitter.cpp
@@ -27,7 +27,7 @@ CParticleMeshEmitter::CParticleMeshEmitter(
 	MinParticlesPerSecond(minParticlesPerSecond), MaxParticlesPerSecond(maxParticlesPerSecond),
 	MinStartColor(minStartColor), MaxStartColor(maxStartColor),
 	MinLifeTime(lifeTimeMin), MaxLifeTime(lifeTimeMax),
-	Time(0), Emitted(0), MaxAngleDegrees(maxAngleDegrees),
+	Time(0), MaxAngleDegrees(maxAngleDegrees),
 	EveryMeshVertex(everyMeshVertex), UseNormalDirection(useNormalDirection)
 {
 	#ifdef _DEBUG
diff --git a/lib/irrlicht/source/Irrlicht/CParticleMeshEmitter.h b/lib/irrlicht/source/Irrlicht/CParticleMeshEmitter.h
@@ -145,7 +145,6 @@ class CParticleMeshEmitter : public IParticleMeshEmitter
 	u32 MinLifeTime, MaxLifeTime;
 
 	u32 Time;
-	u32 Emitted;
 	s32 MaxAngleDegrees;
 
 	bool EveryMeshVertex;
diff --git a/lib/irrlicht/source/Irrlicht/CParticlePointEmitter.cpp b/lib/irrlicht/source/Irrlicht/CParticlePointEmitter.cpp
@@ -25,7 +25,7 @@ CParticlePointEmitter::CParticlePointEmitter(
 	MaxParticlesPerSecond(maxParticlesPerSecond),
 	MinStartColor(minStartColor), MaxStartColor(maxStartColor),
 	MinLifeTime(lifeTimeMin), MaxLifeTime(lifeTimeMax),
-	MaxAngleDegrees(maxAngleDegrees), Time(0), Emitted(0)
+	MaxAngleDegrees(maxAngleDegrees), Time(0)
 {
 	#ifdef _DEBUG
 	setDebugName("CParticlePointEmitter");
diff --git a/lib/irrlicht/source/Irrlicht/CParticlePointEmitter.h b/lib/irrlicht/source/Irrlicht/CParticlePointEmitter.h
@@ -112,7 +112,6 @@ class CParticlePointEmitter : public IParticlePointEmitter
 	s32 MaxAngleDegrees;
 
 	u32 Time;
-	u32 Emitted;
 };
 
 } // end namespace scene
diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
@@ -1248,8 +1248,6 @@ void PostProcessing::renderHorizontalBlur(const FrameBuffer &in_fbo,
 {
     assert(in_fbo.getWidth() == auxiliary.getWidth() &&
            in_fbo.getHeight() == auxiliary.getHeight());
-    float inv_width  = 1.0f / in_fbo.getWidth();
-    float inv_height = 1.0f / in_fbo.getHeight();
 
     auxiliary.bind();
     Gaussian6HBlurShader::getInstance()->render(in_fbo, in_fbo.getWidth(),
@@ -1268,8 +1266,6 @@ void PostProcessing::renderGaussian17TapBlur(const FrameBuffer &in_fbo,
            in_fbo.getHeight() == auxiliary.getHeight());
     if (CVS->supportsComputeShadersFiltering())
         glMemoryBarrier(GL_FRAMEBUFFER_BARRIER_BIT);
-    float inv_width = 1.0f / in_fbo.getWidth();
-    float inv_height = 1.0f / in_fbo.getHeight();
     {
         if (!CVS->supportsComputeShadersFiltering())
         {
diff --git a/src/physics/btKart.cpp b/src/physics/btKart.cpp
@@ -538,12 +538,7 @@ void btKart::updateVehicle( btScalar step )
 
             btScalar proj = fwd.dot(wheel.m_raycastInfo.m_contactNormalWS);
             fwd -= wheel.m_raycastInfo.m_contactNormalWS * proj;
-
-            btScalar proj2 = fwd.dot(vel);
-
-
         } 
-
     }
 
     // If configured, add a force to keep karts on the track
diff --git a/src/race/history.cpp b/src/race/history.cpp
@@ -275,7 +275,7 @@ void History::Load()
     // Optional (not supported in older history files): include reverse
     fgets(s, 1023, fd);
     char r;
-    if (!sscanf(s, "reverse: %c", &r) != 1)
+    if (sscanf(s, "reverse: %c", &r) == 1)
     {
         fgets(s, 1023, fd);
         race_manager->setReverseTrack(r == 'y');
diff --git a/src/scriptengine/script_challenges.cpp b/src/scriptengine/script_challenges.cpp
@@ -66,7 +66,6 @@ namespace Scripting
 
         int getChallengeRequiredPoints(std::string* challenge_name)
         {
-            ::Track* track = World::getWorld()->getTrack();
             const ChallengeData* challenge = unlock_manager->getChallengeData(*challenge_name);
             if (challenge == NULL)
             {
@@ -81,7 +80,6 @@ namespace Scripting
 
         bool isChallengeUnlocked(std::string* challenge_name)
         {
-            ::Track* track = World::getWorld()->getTrack();
             const ChallengeData* challenge = unlock_manager->getChallengeData(*challenge_name);
             if (challenge == NULL)
             {

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ CParticleMeshEmitter::CParticleMeshEmitter(`
`27`	`27`	`MinParticlesPerSecond(minParticlesPerSecond), MaxParticlesPerSecond(maxParticlesPerSecond),`
`28`	`28`	`MinStartColor(minStartColor), MaxStartColor(maxStartColor),`
`29`	`29`	`MinLifeTime(lifeTimeMin), MaxLifeTime(lifeTimeMax),`
`30`		`- Time(0), Emitted(0), MaxAngleDegrees(maxAngleDegrees),`
	`30`	`+ Time(0), MaxAngleDegrees(maxAngleDegrees),`
`31`	`31`	`EveryMeshVertex(everyMeshVertex), UseNormalDirection(useNormalDirection)`
`32`	`32`	`{`
`33`	`33`	`#ifdef _DEBUG`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ CParticlePointEmitter::CParticlePointEmitter(`
`25`	`25`	`MaxParticlesPerSecond(maxParticlesPerSecond),`
`26`	`26`	`MinStartColor(minStartColor), MaxStartColor(maxStartColor),`
`27`	`27`	`MinLifeTime(lifeTimeMin), MaxLifeTime(lifeTimeMax),`
`28`		`- MaxAngleDegrees(maxAngleDegrees), Time(0), Emitted(0)`
	`28`	`+ MaxAngleDegrees(maxAngleDegrees), Time(0)`
`29`	`29`	`{`
`30`	`30`	`#ifdef _DEBUG`
`31`	`31`	`setDebugName("CParticlePointEmitter");`
Original file line number	Diff line number	Diff line change
`@@ -1248,8 +1248,6 @@ void PostProcessing::renderHorizontalBlur(const FrameBuffer &in_fbo,`
`1248`	`1248`	`{`
`1249`	`1249`	`assert(in_fbo.getWidth() == auxiliary.getWidth() &&`
`1250`	`1250`	`in_fbo.getHeight() == auxiliary.getHeight());`
`1251`		`- float inv_width = 1.0f / in_fbo.getWidth();`
`1252`		`- float inv_height = 1.0f / in_fbo.getHeight();`
`1253`	`1251`
`1254`	`1252`	`auxiliary.bind();`
`1255`	`1253`	`Gaussian6HBlurShader::getInstance()->render(in_fbo, in_fbo.getWidth(),`
`@@ -1268,8 +1266,6 @@ void PostProcessing::renderGaussian17TapBlur(const FrameBuffer &in_fbo,`
`1268`	`1266`	`in_fbo.getHeight() == auxiliary.getHeight());`
`1269`	`1267`	`if (CVS->supportsComputeShadersFiltering())`
`1270`	`1268`	`glMemoryBarrier(GL_FRAMEBUFFER_BARRIER_BIT);`
`1271`		`- float inv_width = 1.0f / in_fbo.getWidth();`
`1272`		`- float inv_height = 1.0f / in_fbo.getHeight();`
`1273`	`1269`	`{`
`1274`	`1270`	`if (!CVS->supportsComputeShadersFiltering())`
`1275`	`1271`	`{`
Original file line number	Diff line number	Diff line change
`@@ -538,12 +538,7 @@ void btKart::updateVehicle( btScalar step )`
`538`	`538`
`539`	`539`	`btScalar proj = fwd.dot(wheel.m_raycastInfo.m_contactNormalWS);`
`540`	`540`	`fwd -= wheel.m_raycastInfo.m_contactNormalWS * proj;`
`541`		`-`
`542`		`- btScalar proj2 = fwd.dot(vel);`
`543`		`-`
`544`		`-`
`545`	`541`	`}`
`546`		`-`
`547`	`542`	`}`
`548`	`543`
`549`	`544`	`// If configured, add a force to keep karts on the track`
Original file line number	Diff line number	Diff line change
`@@ -275,7 +275,7 @@ void History::Load()`
`275`	`275`	`// Optional (not supported in older history files): include reverse`
`276`	`276`	`fgets(s, 1023, fd);`
`277`	`277`	`char r;`
`278`		`- if (!sscanf(s, "reverse: %c", &r) != 1)`
	`278`	`+ if (sscanf(s, "reverse: %c", &r) == 1)`
`279`	`279`	`{`
`280`	`280`	`fgets(s, 1023, fd);`
`281`	`281`	`race_manager->setReverseTrack(r == 'y');`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,6 @@ namespace Scripting`
`66`	`66`
`67`	`67`	`int getChallengeRequiredPoints(std::string* challenge_name)`
`68`	`68`	`{`
`69`		`- ::Track* track = World::getWorld()->getTrack();`
`70`	`69`	`const ChallengeData* challenge = unlock_manager->getChallengeData(*challenge_name);`
`71`	`70`	`if (challenge == NULL)`
`72`	`71`	`{`
`@@ -81,7 +80,6 @@ namespace Scripting`
`81`	`80`
`82`	`81`	`bool isChallengeUnlocked(std::string* challenge_name)`
`83`	`82`	`{`
`84`		`- ::Track* track = World::getWorld()->getTrack();`
`85`	`83`	`const ChallengeData* challenge = unlock_manager->getChallengeData(*challenge_name);`
`86`	`84`	`if (challenge == NULL)`
`87`	`85`	`{`