Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6543 in orxonox.OLD for branches/network


Ignore:
Timestamp:
Jan 18, 2006, 2:06:21 PM (19 years ago)
Author:
rennerc
Message:

maybe fixed bug with relative model file names

Location:
branches/network/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/network/src/lib/lang/base_object.cc

    r6530 r6543  
    218218  SYNCHELP_WRITE_BEGIN();
    219219
    220   PRINTF(0)("objectname = %s\n", this->objectName);
     220  //PRINTF(0)("objectname = %s\n", this->objectName);
    221221  SYNCHELP_WRITE_STRING( this->objectName );
    222222
  • branches/network/src/world_entities/world_entity.cc

    r6534 r6543  
    517517  if ( strcmp(modelFileName, "") )
    518518  {
    519 
    520     if ( strstr(modelFileName, ResourceManager::getInstance()->getDataDir()) )
    521     {
    522       loadModel( modelFileName+strlen(ResourceManager::getInstance()->getDataDir()), scaling );
    523     }
    524     else
    525     {
    526       loadModel( modelFileName, scaling );
    527     }
     519    loadModel( modelFileName, scaling );
    528520  }
    529521  delete[] modelFileName;
     
    561553  if ( getModel(0) )
    562554  {
    563     SYNCHELP_WRITE_STRING( getModel( 0 )->getName() );
     555    char* name = (char*)getModel( 0 )->getName();
     556
     557    if ( strstr(name, ResourceManager::getInstance()->getDataDir()) )
     558    {
     559      name += strlen(ResourceManager::getInstance()->getDataDir());
     560    }
     561
     562    SYNCHELP_WRITE_STRING( name );
    564563  }
    565564  else
Note: See TracChangeset for help on using the changeset viewer.