Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6498 in orxonox.OLD for trunk/src/world_entities/world_entity.cc


Ignore:
Timestamp:
Jan 11, 2006, 9:58:22 PM (18 years ago)
Author:
patrick
Message:

trunk: merged the network branche into the trunk

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/world_entities/world_entity.cc

    r6440 r6498  
    491491
    492492
     493
     494
     495/********************************************************************************************
     496 NETWORK STUFF
     497 ********************************************************************************************/
     498
     499
    493500/**
    494501 * Writes data from network containing information about the state
     
    523530
    524531  SYNCHELP_READ_STRINGM( modelFileName );
     532
    525533  if ( strcmp(modelFileName, "") )
    526     this->md2TextureFileName = modelFileName;
     534    if ( strstr(modelFileName, ResourceManager::getInstance()->getDataDir()) )
     535    {
     536      this->md2TextureFileName = new char[strlen(modelFileName)-strlen(ResourceManager::getInstance()->getDataDir())+1];
     537      strcpy((char*)this->md2TextureFileName, modelFileName+strlen(ResourceManager::getInstance()->getDataDir()));
     538    }
     539    else
     540    {
     541      this->md2TextureFileName = modelFileName;
     542    }
    527543
    528544  return SYNCHELP_READ_N;
    529545}
     546
    530547
    531548/**
Note: See TracChangeset for help on using the changeset viewer.