Set GL texture index to zero when an image uses the SDL backend (fix by Guillaume Melquiond from trunk version)

2 files changed, 11 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index a3cc0165..fef94424 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-2007-06-13  Philipp Sehmisch  <tmw@crushnet.org>
+2007-06-20  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/resources/image.cpp: Set GL texture index to zero when an image
+	uses the SDL backend (fix by Guillaume Melquiond from trunk version)
+
+2007-06-13  Philipp Sehmisch  <tmw@crushnet.org>
 
 	* The Mana World.dev: Updated DevCpp project file.
 
diff --git a/src/resources/image.cpp b/src/resources/image.cpp
index 31e38d6d..2d5cbe82 100644
--- a/src/resources/image.cpp
+++ b/src/resources/image.cpp
@@ -32,7 +32,11 @@ bool Image::mUseOpenGL = false;
 #endif
 
 Image::Image(const std::string &idPath, SDL_Surface *image):
-    Resource(idPath), mImage(image),
+    Resource(idPath),
+#ifdef USE_OPENGL
+    mGLImage(0),
+#endif
+    mImage(image),
     mAlpha(1.0f)
 {
     mBounds.x = 0;