LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-17 02:58:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some type conversion warnings in VC. Mostly float <-> int and bool <-> int.

Browse Source
This commit is contained in:
rude
2011-01-09 16:28:30 +01:00
parent c5eb50d0d5
commit 31c9995082
9 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/Font.cpp
+4 -4
View File
@@ -62,7 +62,7 @@ namespace opengl
float Font::getHeight() const
{
return height;
return static_cast<float>(height);
}
void Font::print(std::string text, float x, float y, float angle, float sx, float sy) const
@@ -86,7 +86,7 @@ namespace opengl
if (type == FONT_TRUETYPE) glTranslatef(0, floor(getHeight() / 1.25f + 0.5f), 0);
glyphs[g]->draw(0, 0, 0, 1, 1, 0, 0);
glPopMatrix();
glTranslatef(spacing[g], 0, 0);
glTranslatef(static_cast<GLfloat>(spacing[g]), 0, 0);
dx += spacing[g];
}
glPopMatrix();
@@ -108,7 +108,7 @@ namespace opengl
for(unsigned int i = 0; i < line.size(); i++)
{
temp += (spacing[(int)line[i]] * mSpacing);
temp += static_cast<int>((spacing[(int)line[i]] * mSpacing));
}
return temp;
@@ -144,7 +144,7 @@ namespace opengl
temp = getWidth(text);
linen++;
}
temp += (spacing[(int)line[i]] * mSpacing);
temp += static_cast<int>((spacing[(int)line[i]] * mSpacing));
text += line[i];
}