Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8201 in orxonox.OLD


Ignore:
Timestamp:
Jun 7, 2006, 4:02:50 PM (18 years ago)
Author:
bottac
Message:

bugfix

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/bsp_model/src/lib/graphics/importer/bsp_file.cc

    r8198 r8201  
    391391{
    392392  ::std::string absFileName;
    393   char * baseName = "worlds/bsp/";
     393   char* baseName = "/worlds/bsp";
    394394 
    395   char fileName [228];
    396   char ext [228];
     395  char fileName [500];
     396  char ext [500];
    397397  struct stat results;
    398398
    … …  
    425425    strcpy(fileName, baseName);
    426426    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]) );
    428428    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);
    430432
    431433    absFileName = ResourceManager::getFullName(fileName);
    … …  
    440442    strcpy(fileName, baseName);
    441443    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]) );
    443445    strcpy(ext, ".avi");
    444446    strncat (fileName, ext, strlen(fileName));
    … …  
    455457    strcpy(fileName, baseName);
    456458    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]) );
    458460    strcpy(ext, ".mpg");
    459461    strncat (fileName, ext, strlen(fileName));
    … …  
    470472    strcpy(fileName, baseName);
    471473    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]) );
    473475    strcpy(ext, ".tga");
    474476    strncat (fileName, ext, strlen(fileName));
    … …  
    484486    strcpy(fileName, baseName);
    485487    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]) );
    487489    strcpy(ext, ".TGA");
    488490    strncat (fileName, ext, strlen(fileName));
    … …  
    497499    strcpy(fileName, baseName);
    498500    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]) );
    500502    strcpy(ext, ".jpg");
    501503    strncat (fileName, ext, strlen(fileName));
    … …  
    511513    strcpy(fileName, baseName);
    512514    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]) );
    514516    strcpy(ext, ".JPG");
    515517    strncat (fileName, ext, strlen(fileName));
    … …  
    526528    strcpy(fileName, baseName);
    527529    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]) );
    529531    strcpy(ext, ".bmp");
    530532    strncat (fileName, ext, strlen(fileName));
    … …  
    540542    strcpy(fileName, baseName);
    541543    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]) );
    543545    strcpy(ext, ".BMP");
    544546    strncat (fileName, ext, strlen(fileName));
Note: See TracChangeset for help on using the changeset viewer.