From: Matthias Braun Date: Tue, 21 Mar 2006 01:00:29 +0000 (+0000) Subject: - some win32 fixes X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=551c54f2ea0a4ef991a24e66e70635ed8c41fb10;p=supertux.git - some win32 fixes SVN-Revision: 3108 --- diff --git a/src/video/font.cpp b/src/video/font.cpp index c38557689..bc46d9bba 100644 --- a/src/video/font.cpp +++ b/src/video/font.cpp @@ -64,7 +64,7 @@ Font::get_text_width(const std::string& text) const if(hl == 0) hl = text.size(); - for (uint i = 0; i < text.size(); i++) + for (unsigned int i = 0; i < text.size(); i++) if ((unsigned char) text[i] > 0xC2 && (unsigned char) text[i] < 0xC6) hl--; // control characters are a WASTE. diff --git a/src/video/glutil.hpp b/src/video/glutil.hpp index fb55084d8..be09ba46e 100644 --- a/src/video/glutil.hpp +++ b/src/video/glutil.hpp @@ -52,10 +52,6 @@ static inline void assert_gl(const char* message) msg << "OUT_OF_MEMORY: There is not enough memory left to execute the " "command."; break; - case GL_TABLE_TOO_LARGE: - msg << "TABLE_TOO_LARGE: The specified table exceeds the " - "implementation's maximum supported table size."; - break; default: msg << "Unknown error (code " << error << ")"; } diff --git a/src/video/texture_manager.cpp b/src/video/texture_manager.cpp index 73c71fd26..237aff3ef 100644 --- a/src/video/texture_manager.cpp +++ b/src/video/texture_manager.cpp @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include