Changeset 7059 in orxonox.OLD for trunk/src/util/loading/resource_manager.cc

Timestamp:

Feb 6, 2006, 5:02:09 PM (18 years ago)

Author:

bensch

Message:

md2 model resource managed

File:

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

trunk/src/util/loading/resource_manager.cc

@@ -447 +447 @@
       {
         tmpResource->param[0] = param0;
-        tmpResource->pointer = new MD2Data(fullName, tmpResource->param[0].getString());
-        //               tmpResource->pointer = new MD2Model(fullName, tmpResource->secFileName);
-
+        tmpResource->param[1] = param1;
+        tmpResource->pointer = new MD2Data(fullName, tmpResource->param[0].getString(), tmpResource->param[1].getFloat());
       }
       break;
@@ -713 +712 @@
           break;
         case MD2:
-          if (param0 == MT_NULL)
-          {
-            if ((*resource)->param[0] == "")
+          if (param0 == MT_NULL && ((*resource)->param[0] == "") && param1 == MT_NULL && ((*resource)->param[0] == 1.0f))
               match = true;
-          }
-          else if ((*resource)->param[0] == ((MultiType)param0).getString())
+          else if ((*resource)->param[0] == ((MultiType)param0).getString() && (*resource)->param[1] == ((MultiType)param1).getFloat())
             match = true;
           break;