- some win32 fixes

SVN-Revision: 3108

diff --git a/src/video/font.cpp b/src/video/font.cpp
index c385576..bc46d9b 100644 (file)
--- 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 fb55084..be09ba4 100644 (file)
--- 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 73c71fd..237aff3 100644 (file)
--- a/src/video/texture_manager.cpp
+++ b/src/video/texture_manager.cpp
@@ -6,6 +6,7 @@
 #include <SDL.h>
 #include <SDL_image.h>
 #include <GL/gl.h>
+#include <GL/glext.h>
 #include <iostream>
 #include <sstream>
 #include <stdexcept>