Fixed a gazillion of warnings occuring when compiling Wagic with Clang with Werror.
This commit is contained in:
+8
-7
@@ -1584,7 +1584,7 @@ void JRenderer::Plot(float x, float y, PIXEL_TYPE color)
|
||||
glEnd();
|
||||
glColor4ub(255, 255, 255, 255);
|
||||
#else
|
||||
// FIXME, not used
|
||||
cerr << x << " " << y << " " << color << endl;
|
||||
#endif //#if (!defined GL_ES_VERSION_2_0) && (!defined GL_VERSION_2_0)
|
||||
glEnable(GL_TEXTURE_2D);
|
||||
checkGlError();
|
||||
@@ -1606,6 +1606,7 @@ void JRenderer::PlotArray(float *x, float *y, int count, PIXEL_TYPE color)
|
||||
glColor4ub(255, 255, 255, 255);
|
||||
#else
|
||||
// FIXME, not used
|
||||
cerr << x << " " << y << " " << count << " " << " " << color << endl;
|
||||
#endif //#if (!defined GL_ES_VERSION_2_0) && (!defined GL_VERSION_2_0)
|
||||
glEnable(GL_TEXTURE_2D);
|
||||
checkGlError();
|
||||
@@ -2242,7 +2243,7 @@ JTexture* JRenderer::LoadTexture(const char* filename, int mode, int TextureForm
|
||||
return tex;
|
||||
}
|
||||
#elif (defined QT_CONFIG)
|
||||
JTexture* JRenderer::LoadTexture(const char* filename, int mode, int TextureFormat __attribute__((unused)))
|
||||
JTexture* JRenderer::LoadTexture(const char* filename, int, int)
|
||||
{
|
||||
JTexture *tex = NULL;
|
||||
int rawsize = 0;
|
||||
@@ -2518,7 +2519,7 @@ void JRenderer::Enable3D()
|
||||
}
|
||||
|
||||
|
||||
void JRenderer::SetClip(int x, int y, int width, int height)
|
||||
void JRenderer::SetClip(int, int, int, int)
|
||||
{// NOT USED
|
||||
//glScissor(x, y, width, height);
|
||||
}
|
||||
@@ -2530,25 +2531,25 @@ void JRenderer::LoadIdentity()
|
||||
}
|
||||
|
||||
|
||||
void JRenderer::Translate(float x, float y, float z)
|
||||
void JRenderer::Translate(float, float, float)
|
||||
{// NOT USED
|
||||
//glTranslatef(x, y, z);
|
||||
}
|
||||
|
||||
|
||||
void JRenderer::RotateX(float angle)
|
||||
void JRenderer::RotateX(float)
|
||||
{// NOT USED
|
||||
//glRotatef(angle*RAD2DEG, 1.0f, 0.0f, 0.0f);
|
||||
}
|
||||
|
||||
|
||||
void JRenderer::RotateY(float angle)
|
||||
void JRenderer::RotateY(float)
|
||||
{// NOT USED
|
||||
//glRotatef(angle*RAD2DEG, 0.0f, 1.0f, 0.0f);
|
||||
}
|
||||
|
||||
|
||||
void JRenderer::RotateZ(float angle)
|
||||
void JRenderer::RotateZ(float)
|
||||
{// NOT USED
|
||||
//glRotatef(angle*RAD2DEG, 0.0f, 0.0f, 1.0f);
|
||||
}
|
||||
|
||||
@@ -174,6 +174,7 @@ JMusic *JSoundSystem::LoadMusic(const char *fileName)
|
||||
}
|
||||
return music;
|
||||
#else
|
||||
cerr << fileName << endl;
|
||||
return NULL;
|
||||
#endif
|
||||
}
|
||||
@@ -203,6 +204,9 @@ void JSoundSystem::PlayMusic(JMusic *music, bool looping)
|
||||
else
|
||||
FSOUND_SetLoopMode(mChannel, FSOUND_LOOP_OFF);
|
||||
}
|
||||
#else
|
||||
music = 0;
|
||||
looping = false;
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -216,6 +220,8 @@ void JSoundSystem::StopMusic(JMusic *music)
|
||||
}
|
||||
#elif (defined WITH_FMOD)
|
||||
FSOUND_StopSound(mChannel);
|
||||
#else
|
||||
music = 0;
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -290,6 +296,7 @@ JSample *JSoundSystem::LoadSample(const char *fileName)
|
||||
}
|
||||
return sample;
|
||||
#else
|
||||
cerr << fileName << endl;
|
||||
return NULL;
|
||||
#endif
|
||||
}
|
||||
@@ -308,6 +315,8 @@ void JSoundSystem::PlaySample(JSample *sample)
|
||||
int channel = FSOUND_PlaySound(FSOUND_FREE, sample->mSample);
|
||||
FSOUND_SetVolumeAbsolute(channel, static_cast<int>(mSampleVolume * 2.55));
|
||||
}
|
||||
#else
|
||||
sample = 0;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user