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

Fix some warnings.

Browse Source
This commit is contained in:
leper 2015-01-02 18:16:34 +01:00
parent d6c099b50b
commit cb3babef64
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/graphics/mesh_tools.cpp
View File

@ -444,7 +444,7 @@ scene::IMesh* MeshTools::createMeshWithTangents(scene::IMesh* mesh, bool(*predic
{
scene::IMeshBuffer* mb = clone->getMeshBuffer(i);
for (int t = 0; t < video::MATERIAL_MAX_TEXTURES; t++)
for (u32 t = 0; t < video::MATERIAL_MAX_TEXTURES; t++)
{
video::ITexture* texture = mb->getMaterial().TextureLayer[t].Texture;
if (texture != NULL)

4
src/graphics/stkmeshscenenode.cpp
View File

@ -222,8 +222,6 @@ void STKMeshSceneNode::OnRegisterSceneNode()
CMeshSceneNode::OnRegisterSceneNode();
}
static video::ITexture *spareWhiteTex = 0;
void STKMeshSceneNode::render()
{
irr::video::IVideoDriver* driver = irr_driver->getVideoDriver();
@ -236,7 +234,7 @@ void STKMeshSceneNode::render()
updateNoGL();
updateGL();
bool isTransparent;
bool isTransparent = false;
for (u32 i = 0; i < Mesh->getMeshBufferCount(); ++i)
{

10
src/states_screens/race_gui.cpp
View File

@ -235,7 +235,7 @@ void RaceGUI::drawScores()
"soccer_ball_red.png");
irr::video::ITexture *blue_team = irr_driver->getTexture(FileManager::GUI,
"soccer_ball_blue.png");
irr::video::ITexture *team_icon;
irr::video::ITexture *team_icon = red_team;
int numLeader = 1;
for(unsigned int i=0; i<soccerWorld->getNumKarts(); i++)
@ -259,12 +259,10 @@ void RaceGUI::drawScores()
position.LowerRightCorner.Y + string_height);
font->draw(score.c_str(),pos,color);
switch(numLeader)
if (numLeader == 2)
{
case 1: team_icon = red_team; break;
case 2: team_icon = blue_team; break;
default: break;
team_icon = blue_team;
}
core::rect<s32> indicatorPos(offsetX, offsetY,
offsetX + (int)(m_minimap_player_size/1.25f),