Changeset 6859 in orxonox.OLD for trunk/src/util/loading

Timestamp:

Jan 30, 2006, 5:24:12 AM (18 years ago)

Author:

bensch

Message:

trunk: error-correction

File:

• trunk/src/util/loading/resource_manager.cc (modified) (3 diffs)

trunk/src/util/loading/resource_manager.cc

@@ -488 +488 @@
       {
         PRINTF(4)("Image %s resides to %s\n", fileName, fullName);
-        tmpResource->pointer = new Texture(fullName);
+        tmpResource->pointer = new Texture(fullName, tmpResource->param[0].getInt());
       }
       else
@@ -742 +742 @@
           else if ((*resource)->param[0] == ((MultiType)param0).getString())
             match = true;
+          break;
 #endif /* NO_SHADERS */
 #ifndef NO_TEXTURES
@@ -752 +753 @@
           else if ((*resource)->param[0] ==  param0.getInt())
             match = true;
+          break;
 #endif /* NO_TEXTURES */
         default: