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

Silence int -> float warnings on Windows.

Browse Source
This commit is contained in:
rude
2011-03-09 11:11:21 +01:00
parent 3dd2cc0c57
commit 10a1602840
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/Graphics.cpp
+3 -3
View File
@@ -735,7 +735,7 @@ namespace opengl
using namespace std; using namespace std;
string text(str); string text(str);
const float width_space = currentFont->getWidth(' '); const float width_space = static_cast<float>(currentFont->getWidth(' '));
vector<string> lines_to_draw; vector<string> lines_to_draw;
//split text at newlines //split text at newlines
@@ -760,7 +760,7 @@ namespace opengl
if (width >= wrap) { if (width >= wrap) {
lines_to_draw.push_back( string_builder.str() ); lines_to_draw.push_back( string_builder.str() );
string_builder.str( "" ); string_builder.str( "" );
width = currentFont->getWidth( word ); width = static_cast<float>(currentFont->getWidth( word ));
} }
string_builder << word << " "; string_builder << word << " ";
width += width_space; width += width_space;
@@ -772,7 +772,7 @@ namespace opengl
// now for the actual printing // now for the actual printing
vector<string>::const_iterator line_iter, line_end = lines_to_draw.end(); vector<string>::const_iterator line_iter, line_end = lines_to_draw.end();
for (line_iter = lines_to_draw.begin(); line_iter != line_end; ++line_iter) { for (line_iter = lines_to_draw.begin(); line_iter != line_end; ++line_iter) {
float width = currentFont->getWidth( *line_iter ); float width = static_cast<float>(currentFont->getWidth( *line_iter ));
switch (align) { switch (align) {
case ALIGN_RIGHT: case ALIGN_RIGHT:
currentFont->print(*line_iter, ceil(x + wrap - width), ceil(y)); currentFont->print(*line_iter, ceil(x + wrap - width), ceil(y));