projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
*include stdio.h in a couple files for MinGW GCC 4.4.0
[supertux.git]
/
src
/
video
/
font.cpp
diff --git
a/src/video/font.cpp
b/src/video/font.cpp
index
7ddebbd
..
e0a8e19
100644
(file)
--- a/
src/video/font.cpp
+++ b/
src/video/font.cpp
@@
-179,7
+179,7
@@
Font::loadFontFile(const std::string &filename)
msg << "Font:" << filename << ": missing shadows image";
throw std::runtime_error(msg.str());
}
msg << "Font:" << filename << ": missing shadows image";
throw std::runtime_error(msg.str());
}
- if( ! glyphs_val->get
_vector
("chars", chars) || chars.size() == 0) {
+ if( ! glyphs_val->get("chars", chars) || chars.size() == 0) {
std::ostringstream msg;
msg << "Font:" << filename << ": missing chars definition";
throw std::runtime_error(msg.str());
std::ostringstream msg;
msg << "Font:" << filename << ": missing chars definition";
throw std::runtime_error(msg.str());
@@
-232,8
+232,8
@@
Font::loadFontSurface(
for( unsigned int i = 0; i < chars.size(); i++) {
for(UTF8Iterator chr(chars[i]); !chr.done(); ++chr) {
for( unsigned int i = 0; i < chars.size(); i++) {
for(UTF8Iterator chr(chars[i]); !chr.done(); ++chr) {
-
floa
t y = row * char_height;
-
floa
t x = col * char_width;
+
in
t y = row * char_height;
+
in
t x = col * char_width;
if( ++col == wrap ) { col=0; row++; }
if( *chr == 0x0020 && glyphs[0x20].surface_idx != -1) continue;
if( ++col == wrap ) { col=0; row++; }
if( *chr == 0x0020 && glyphs[0x20].surface_idx != -1) continue;