--- Irrlicht.old/COpenGLDriver.cpp	2005-03-28 11:39:08.000000000 +0200
+++ Irrlicht-0.9/COpenGLDriver.cpp	2005-04-06 13:16:27.057722522 +0200
@@ -14,8 +14,9 @@
 #include "COpenGLNormalMapRenderer.h"
 #include "COpenGLParallaxMapRenderer.h"
 #include "os.h"
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
+#include <cctype>
 
 namespace irr
 {
@@ -344,6 +345,21 @@
 	renderer->drop();
 }
 
+bool COpenGLDriver::hasExtension(const char *extensionName)
+{
+	const GLubyte* t = glGetString(GL_EXTENSIONS);
+	const char *p = (const char *)t;
+	const int length = strlen(extensionName);
+
+	while ((p=strstr(p, extensionName)))
+	{
+		p+=length;
+		if ((!*p) || isspace(*p))
+			return true;
+	}
+	return false;
+}
+
 void COpenGLDriver::loadExtensions()
 {
 	if (atof((c8*)glGetString(GL_VERSION)) >= 1.2)
@@ -322,41 +338,12 @@
 	else
 		os::Printer::log("OpenGL driver version is not 1.2 or better.", ELL_WARNING);
 
-	const GLubyte* t = glGetString(GL_EXTENSIONS);
-	s32 len = (s32)strlen((const char*)t);
-	c8 *str = new c8[len+1];
-	c8* p = str;
-
-	for (s32 i=0; i<len; ++i)
-	{
-		str[i] = (char)t[i];
-
-		if (str[i] == ' ')
-		{
-			str[i] = 0;
-			if (strstr(p, "GL_ARB_multitexture"))
-				MultiTextureExtension = true;
-			else
-			if (strstr(p, "GL_ARB_vertex_program"))
-				ARBVertexProgramExtension = true;
-			else
-			if (strstr(p, "GL_ARB_fragment_program"))
-				ARBFragmentProgramExtension = true;
-			else 
-			if (strstr(p, "GL_ARB_shading_language_100"))
-				ARBShadingLanguage100Extension = true; 
-			else 
-			if (strstr(p, "GL_EXT_texture_filter_anisotropic"))
-				AnisotropyExtension = true;
-			else 
-			if (strstr(p, "GL_ARB_texture_compression"))
-				TextureCompressionExtension = true;
-
-			p = p + strlen(p) + 1;
-		}
-	}
-
-	delete [] str;
+	MultiTextureExtension = hasExtension("GL_ARB_multitexture");
+	ARBVertexProgramExtension = hasExtension("GL_ARB_vertex_program");
+	ARBFragmentProgramExtension = hasExtension("GL_ARB_fragment_program");
+	ARBShadingLanguage100Extension = hasExtension("GL_ARB_shading_language_100");
+	AnisotropyExtension = hasExtension("GL_EXT_texture_filter_anisotropic");
+	TextureCompressionExtension = hasExtension("GL_ARB_texture_compression");
 
 	if (MultiTextureExtension)
 	{
--- Irrlicht.old/COpenGLDriver.h	2005-03-28 10:47:32.000000000 +0200
+++ Irrlicht-0.9/COpenGLDriver.h	2005-04-06 13:17:27.036226463 +0200
@@ -229,6 +229,7 @@
 		// returns the current size of the screen or rendertarget
 		core::dimension2d<s32> getCurrentRenderTargetSize();
 
+		bool hasExtension(const char* extensionName);
 		void loadExtensions();
 		void createMaterialRenderers();