Changeset 5305 in orxonox.OLD

Timestamp:

Oct 7, 2005, 3:34:01 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: better implementation of the Texture-loading

Location:

trunk/src

Files:

• lib/graphics/importer/texture.cc (modified) (3 diffs)
• story_entities/campaign.cc (modified) (1 diff)

trunk/src/lib/graphics/importer/texture.cc

@@ -36 +36 @@
   this->bAlpha = false;
   this->texture = 0;
-  if (imageName)
+  if (imageName != NULL)
     this->loadImage(imageName);
 }
@@ -146 +146 @@
   if (GraphicsEngine::texturesEnabled)
     {
-      if (imageName)
+      if (imageName != NULL)
         {
           SDL_Surface* tmpSurf;
@@ -153 +153 @@
           // load the new Image to memory
           tmpSurf = IMG_Load(imageName);
-          if(!tmpSurf)
+          if(tmpSurf == NULL)
             {
               PRINTF(1)("IMG_Load: %s\n", IMG_GetError());
+              this->texture = 0;
               return false;
             }
-
-          GLubyte* pixels = (GLubyte*)tmpSurf->pixels;
-
-          PRINTF(3)("loading Image %s\n", imageName);
-          if (tmpSurf)
+          else
+          {
+            PRINTF(3)("loading Image %s\n", imageName);
             loadTexToGL(tmpSurf);
-
-
-          SDL_FreeSurface(tmpSurf);
-          return true;
+            SDL_FreeSurface(tmpSurf);
+            return true;
+          }
         }
       else
         {
-          PRINTF(2)("Image not Found: %s\n", imageName);
           return false;
         }
     }
+    return false;
 }

trunk/src/story_entities/campaign.cc

@@ -144 +144 @@
       if( ( nextWorldID == WORLD_ID_GAMEEND) ||( se == NULL) )
         {
-          PRINTF(0)("Quitting campaing story loop\n");
+          PRINTF(4)("Quitting campaing story loop\n");
           if(se != NULL)
             delete se;