Changeset 8201 in orxonox.OLD for branches/bsp_model/src/lib/graphics/importer
- Timestamp:
- Jun 7, 2006, 4:02:50 PM (18 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/bsp_model/src/lib/graphics/importer/bsp_file.cc
r8198 r8201 391 391 { 392 392 ::std::string absFileName; 393 char * baseName = "worlds/bsp/";393 char* baseName = "/worlds/bsp"; 394 394 395 char fileName [ 228];396 char ext [ 228];395 char fileName [500]; 396 char ext [500]; 397 397 struct stat results; 398 398 … … 425 425 strcpy(fileName, baseName); 426 426 strcpy(ext, &this->textures[8+ 72*i]); 427 strncat(fileName, ext, strlen(fileName) );427 strncat(fileName, ext, strlen(fileName) + strlen(&this->textures[8+ 72*i]) ); 428 428 strcpy(ext, ".mov"); 429 strncat (fileName, ext, strlen(fileName)); 429 strncat (fileName, ext, strlen(fileName) ); 430 431 PRINTF(0)("BSP FILE: Name %s . \n", fileName); 430 432 431 433 absFileName = ResourceManager::getFullName(fileName); … … 440 442 strcpy(fileName, baseName); 441 443 strcpy(ext, &this->textures[8+ 72*i]); 442 strncat(fileName, ext, strlen(fileName) );444 strncat(fileName, ext, strlen(fileName) + strlen(&this->textures[8+ 72*i]) ); 443 445 strcpy(ext, ".avi"); 444 446 strncat (fileName, ext, strlen(fileName)); … … 455 457 strcpy(fileName, baseName); 456 458 strcpy(ext, &this->textures[8+ 72*i]); 457 strncat(fileName, ext, strlen(fileName) );459 strncat(fileName, ext, strlen(fileName) + strlen(&this->textures[8+ 72*i]) ); 458 460 strcpy(ext, ".mpg"); 459 461 strncat (fileName, ext, strlen(fileName)); … … 470 472 strcpy(fileName, baseName); 471 473 strcpy(ext, &this->textures[8+ 72*i]); 472 strncat(fileName, ext, strlen(fileName) );474 strncat(fileName, ext, strlen(fileName) + strlen(&this->textures[8+ 72*i]) ); 473 475 strcpy(ext, ".tga"); 474 476 strncat (fileName, ext, strlen(fileName)); … … 484 486 strcpy(fileName, baseName); 485 487 strcpy(ext, &this->textures[8+ 72*i]); 486 strncat(fileName, ext, strlen(fileName) );488 strncat(fileName, ext, strlen(fileName) + strlen(&this->textures[8+ 72*i]) ); 487 489 strcpy(ext, ".TGA"); 488 490 strncat (fileName, ext, strlen(fileName)); … … 497 499 strcpy(fileName, baseName); 498 500 strcpy(ext, &this->textures[8+ 72*i]); 499 strncat(fileName, ext, strlen(fileName) );501 strncat(fileName, ext, strlen(fileName) + strlen(&this->textures[8+ 72*i]) ); 500 502 strcpy(ext, ".jpg"); 501 503 strncat (fileName, ext, strlen(fileName)); … … 511 513 strcpy(fileName, baseName); 512 514 strcpy(ext, &this->textures[8+ 72*i]); 513 strncat(fileName, ext, strlen(fileName) );515 strncat(fileName, ext, strlen(fileName) + strlen(&this->textures[8+ 72*i]) ); 514 516 strcpy(ext, ".JPG"); 515 517 strncat (fileName, ext, strlen(fileName)); … … 526 528 strcpy(fileName, baseName); 527 529 strcpy(ext, &this->textures[8+ 72*i]); 528 strncat(fileName, ext, strlen(fileName) );530 strncat(fileName, ext, strlen(fileName) + strlen(&this->textures[8+ 72*i]) ); 529 531 strcpy(ext, ".bmp"); 530 532 strncat (fileName, ext, strlen(fileName)); … … 540 542 strcpy(fileName, baseName); 541 543 strcpy(ext, &this->textures[8+ 72*i]); 542 strncat(fileName, ext, strlen(fileName) );544 strncat(fileName, ext, strlen(fileName) + strlen(&this->textures[8+ 72*i]) ); 543 545 strcpy(ext, ".BMP"); 544 546 strncat (fileName, ext, strlen(fileName));
Note: See TracChangeset
for help on using the changeset viewer.