Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7059 in orxonox.OLD for trunk/src/util


Ignore:
Timestamp:
Feb 6, 2006, 5:02:09 PM (19 years ago)
Author:
bensch
Message:

md2 model resource managed

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/util/loading/resource_manager.cc

    r6859 r7059  
    447447      {
    448448        tmpResource->param[0] = param0;
    449         tmpResource->pointer = new MD2Data(fullName, tmpResource->param[0].getString());
    450         //               tmpResource->pointer = new MD2Model(fullName, tmpResource->secFileName);
    451 
     449        tmpResource->param[1] = param1;
     450        tmpResource->pointer = new MD2Data(fullName, tmpResource->param[0].getString(), tmpResource->param[1].getFloat());
    452451      }
    453452      break;
     
    713712          break;
    714713        case MD2:
    715           if (param0 == MT_NULL)
    716           {
    717             if ((*resource)->param[0] == "")
     714          if (param0 == MT_NULL && ((*resource)->param[0] == "") && param1 == MT_NULL && ((*resource)->param[0] == 1.0f))
    718715              match = true;
    719           }
    720           else if ((*resource)->param[0] == ((MultiType)param0).getString())
     716          else if ((*resource)->param[0] == ((MultiType)param0).getString() && (*resource)->param[1] == ((MultiType)param1).getFloat())
    721717            match = true;
    722718          break;
Note: See TracChangeset for help on using the changeset viewer.