Changeset 6421 in orxonox.OLD for branches/network/src/world_entities/world_entity.cc
- Timestamp:
- Jan 6, 2006, 7:11:34 PM (18 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/network/src/world_entities/world_entity.cc
r6419 r6421 49 49 50 50 this->obbTree = NULL; 51 52 this->md2TextureFileName = NULL; 51 53 52 54 if (root != NULL) … … 384 386 SYNCHELP_READ_FLOAT( scaling ); 385 387 //check if modelFileName is relative to datadir or absolute 386 if ( strstr(modelFileName, ResourceManager::getInstance()->getDataDir()) ) 387 { 388 loadModel( modelFileName+strlen(ResourceManager::getInstance()->getDataDir()), scaling ); 389 } 390 else 391 { 392 loadModel( modelFileName, scaling ); 388 389 if ( strcmp(modelFileName, "") ) 390 { 391 392 if ( strstr(modelFileName, ResourceManager::getInstance()->getDataDir()) ) 393 { 394 loadModel( modelFileName+strlen(ResourceManager::getInstance()->getDataDir()), scaling ); 395 } 396 else 397 { 398 loadModel( modelFileName, scaling ); 399 } 393 400 } 394 401 delete[] modelFileName; 402 403 SYNCHELP_READ_STRINGM( modelFileName ); 404 if ( strcmp(modelFileName, "") ) 405 this->md2TextureFileName = modelFileName; 395 406 396 407 return SYNCHELP_READ_N; … … 411 422 SYNCHELP_WRITE_STRING( getModel( 0 )->getName() ); 412 423 SYNCHELP_WRITE_FLOAT( scaling ); 424 if ( this->md2TextureFileName!=NULL && strcmp(this->md2TextureFileName, "") ) 425 { 426 SYNCHELP_WRITE_STRING(this->md2TextureFileName); 427 } 428 else 429 { 430 SYNCHELP_WRITE_STRING(""); 431 } 432 413 433 return SYNCHELP_WRITE_N; 414 434 }
Note: See TracChangeset
for help on using the changeset viewer.