ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing some -Wunused-variable

Browse Source
This commit is contained in:
Nado 2015-11-13 12:07:37 +01:00
parent 97de0cbc34
commit d66a70b250
7 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/irrlicht/source/Irrlicht/CParticleMeshEmitter.cpp
View File

@ -27,7 +27,7 @@ CParticleMeshEmitter::CParticleMeshEmitter(
MinParticlesPerSecond(minParticlesPerSecond), MaxParticlesPerSecond(maxParticlesPerSecond), MinParticlesPerSecond(minParticlesPerSecond), MaxParticlesPerSecond(maxParticlesPerSecond),
MinStartColor(minStartColor), MaxStartColor(maxStartColor), MinStartColor(minStartColor), MaxStartColor(maxStartColor),
MinLifeTime(lifeTimeMin), MaxLifeTime(lifeTimeMax), MinLifeTime(lifeTimeMin), MaxLifeTime(lifeTimeMax),
Time(0), Emitted(0), MaxAngleDegrees(maxAngleDegrees), Time(0), MaxAngleDegrees(maxAngleDegrees),
EveryMeshVertex(everyMeshVertex), UseNormalDirection(useNormalDirection) EveryMeshVertex(everyMeshVertex), UseNormalDirection(useNormalDirection)
{ {
#ifdef _DEBUG #ifdef _DEBUG

1
lib/irrlicht/source/Irrlicht/CParticleMeshEmitter.h
View File

@ -145,7 +145,6 @@ private:
u32 MinLifeTime, MaxLifeTime; u32 MinLifeTime, MaxLifeTime;
u32 Time; u32 Time;
u32 Emitted;
s32 MaxAngleDegrees; s32 MaxAngleDegrees;
bool EveryMeshVertex; bool EveryMeshVertex;

2
lib/irrlicht/source/Irrlicht/CParticlePointEmitter.cpp
View File

@ -25,7 +25,7 @@ CParticlePointEmitter::CParticlePointEmitter(
MaxParticlesPerSecond(maxParticlesPerSecond), MaxParticlesPerSecond(maxParticlesPerSecond),
MinStartColor(minStartColor), MaxStartColor(maxStartColor), MinStartColor(minStartColor), MaxStartColor(maxStartColor),
MinLifeTime(lifeTimeMin), MaxLifeTime(lifeTimeMax), MinLifeTime(lifeTimeMin), MaxLifeTime(lifeTimeMax),
MaxAngleDegrees(maxAngleDegrees), Time(0), Emitted(0) MaxAngleDegrees(maxAngleDegrees), Time(0)
{ {
#ifdef _DEBUG #ifdef _DEBUG
setDebugName("CParticlePointEmitter"); setDebugName("CParticlePointEmitter");

1
lib/irrlicht/source/Irrlicht/CParticlePointEmitter.h
View File

@ -112,7 +112,6 @@ private:
s32 MaxAngleDegrees; s32 MaxAngleDegrees;
u32 Time; u32 Time;
u32 Emitted;
}; };
} // end namespace scene } // end namespace scene

4
src/graphics/post_processing.cpp
View File

@ -1248,8 +1248,6 @@ void PostProcessing::renderHorizontalBlur(const FrameBuffer &in_fbo,
{ {
assert(in_fbo.getWidth() == auxiliary.getWidth() && assert(in_fbo.getWidth() == auxiliary.getWidth() &&
in_fbo.getHeight() == auxiliary.getHeight()); in_fbo.getHeight() == auxiliary.getHeight());
float inv_width = 1.0f / in_fbo.getWidth();
float inv_height = 1.0f / in_fbo.getHeight();
auxiliary.bind(); auxiliary.bind();
Gaussian6HBlurShader::getInstance()->render(in_fbo, in_fbo.getWidth(), Gaussian6HBlurShader::getInstance()->render(in_fbo, in_fbo.getWidth(),
@ -1268,8 +1266,6 @@ void PostProcessing::renderGaussian17TapBlur(const FrameBuffer &in_fbo,
in_fbo.getHeight() == auxiliary.getHeight()); in_fbo.getHeight() == auxiliary.getHeight());
if (CVS->supportsComputeShadersFiltering()) if (CVS->supportsComputeShadersFiltering())
glMemoryBarrier(GL_FRAMEBUFFER_BARRIER_BIT); glMemoryBarrier(GL_FRAMEBUFFER_BARRIER_BIT);
float inv_width = 1.0f / in_fbo.getWidth();
float inv_height = 1.0f / in_fbo.getHeight();
{ {
if (!CVS->supportsComputeShadersFiltering()) if (!CVS->supportsComputeShadersFiltering())
{ {

5
src/physics/btKart.cpp
View File

@ -538,12 +538,7 @@ void btKart::updateVehicle( btScalar step )
btScalar proj = fwd.dot(wheel.m_raycastInfo.m_contactNormalWS); btScalar proj = fwd.dot(wheel.m_raycastInfo.m_contactNormalWS);
fwd -= wheel.m_raycastInfo.m_contactNormalWS * proj; fwd -= wheel.m_raycastInfo.m_contactNormalWS * proj;
btScalar proj2 = fwd.dot(vel);
} }
} }
// If configured, add a force to keep karts on the track // If configured, add a force to keep karts on the track

2
src/scriptengine/script_challenges.cpp
View File

@ -66,7 +66,6 @@ namespace Scripting
int getChallengeRequiredPoints(std::string* challenge_name) int getChallengeRequiredPoints(std::string* challenge_name)
{ {
::Track* track = World::getWorld()->getTrack();
const ChallengeData* challenge = unlock_manager->getChallengeData(*challenge_name); const ChallengeData* challenge = unlock_manager->getChallengeData(*challenge_name);
if (challenge == NULL) if (challenge == NULL)
{ {
@ -81,7 +80,6 @@ namespace Scripting
bool isChallengeUnlocked(std::string* challenge_name) bool isChallengeUnlocked(std::string* challenge_name)
{ {
::Track* track = World::getWorld()->getTrack();
const ChallengeData* challenge = unlock_manager->getChallengeData(*challenge_name); const ChallengeData* challenge = unlock_manager->getChallengeData(*challenge_name);
if (challenge == NULL) if (challenge == NULL)
{ {