Changeset 4356 in orxonox.OLD for orxonox/trunk/src

Timestamp:

May 28, 2005, 10:59:32 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: fixed an error in the resource manager, when a texture could not be loaded it still returned a pointer into nothingness.
This is fixed

Location:

orxonox/trunk/src

Files:

• subprojects/particles/particle_fun.cc (modified) (1 diff)
• util/resource_manager.cc (modified) (2 diffs)

orxonox/trunk/src/subprojects/particles/particle_fun.cc

@@ -36 +36 @@
 void Framework::moduleInit(int argc, char** argv)
 {
+  verbose = 5;
+
   // Creating a Test Particle System
   ParticleSystem* system = new ParticleSystem(100000, PINIT_PARTICLE_TYPE);

orxonox/trunk/src/util/resource_manager.cc

@@ -220 +220 @@
       tmpResource->type = type;
       tmpResource->prio = prio;
+      tmpResource->pointer = NULL;
       tmpResource->name = new char[strlen(fileName)+1];
       strcpy(tmpResource->name, fileName);
@@ -323 +324 @@
           break;
         }
-      this->resourceList->add(tmpResource);
+      if (tmpResource->pointer)
+        this->resourceList->add(tmpResource);
       delete []fullName;
     }