Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5111 in orxonox.OLD for trunk/src/util/resource_manager.cc


Ignore:
Timestamp:
Aug 23, 2005, 11:13:56 PM (20 years ago)
Author:
bensch
Message:

orxonox/trunk: reverted the last steps, because they created a huge pack of seg-faults

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/util/resource_manager.cc

    r5110 r5111  
    7474  // deleting the Directorie Lists
    7575  tIterator<char>* tmpIt = imageDirs->getIterator();
    76   char* tmpDir = tmpIt->firstElement();
     76  char* tmpDir = tmpIt->nextElement();
    7777  while(tmpDir)
    7878    {
    … …  
    9999      this->dataDir = new char[strlen(realDir)+1];
    100100      strcpy(this->dataDir, realDir);
    101       delete[] realDir;
     101      delete realDir;
    102102      return true;
    103103    }
    104104  else
    105105    {
    106       PRINTF(1)("%s is not a Directory, and can not be the Data Directory, leaving as %s \n", realDir, this->dataDir);
    107       delete[] realDir;
     106      PRINTF(1)("%s is not a Directory, and can not be the Data Directory, leaving as %s \n", dataDir, this->dataDir);
     107      delete realDir;
    108108      return false;
    109109    }
    … …  
    144144      // check if the Directory has been added before
    145145      tIterator<char>* tmpImageDirs = imageDirs->getIterator();
    146       char* tmpDir = tmpImageDirs->firstElement();
     146      char* tmpDir = tmpImageDirs->nextElement();
    147147      while(tmpDir)
    148148        {
    … …  
    363363            {
    364364              tIterator<char>* iterator = imageDirs->getIterator();
    365               tmpDir = iterator->firstElement();
     365              tmpDir = iterator->nextElement();
     366              //tmpDir = imageDirs->enumerate();
    366367              while(tmpDir)
    367368                {
    … …  
    491492{
    492493  tIterator<Resource>* iterator = resourceList->getIterator();
    493   Resource* enumRes = iterator->firstElement();
     494  Resource* enumRes = iterator->nextElement();
    494495  while (enumRes)
    495496    {
    … …  
    520521  //  Resource* enumRes = resourceList->enumerate();
    521522  tIterator<Resource>* iterator = resourceList->getIterator();
    522   Resource* enumRes = iterator->firstElement();
     523  Resource* enumRes = iterator->nextElement();
    523524  while (enumRes)
    524525    {
    … …  
    602603  //  Resource* enumRes = resourceList->enumerate();
    603604  tIterator<Resource>* iterator = resourceList->getIterator();
    604   Resource* enumRes = iterator->firstElement();
     605  Resource* enumRes = iterator->nextElement();
    605606  while (enumRes)
    606607    {
    … …  
    630631
    631632  // checking for the termination of the string given. If there is a "/" at the end cut it away
    632   if (directoryName[strlen(directoryName)-1] == '/' ||
    633       directoryName[strlen(directoryName)-1] == '\\')
     633  if (directoryName[strlen(directoryName)-1] == '/')
    634634    {
    635635      tmpDirName = new char[strlen(directoryName)+1];
    … …  
    651651                            ))
    652652        {
    653           delete[] tmpDirName;
     653          delete tmpDirName;
    654654          return true;
    655655        }
    … …  
    798798  PRINT(0)(" List of Image-Directories: ");
    799799  tIterator<char>* tmpIt = imageDirs->getIterator();
    800   char* tmpDir = tmpIt->firstElement();
     800  char* tmpDir = tmpIt->nextElement();
    801801  while(tmpDir)
    802802    {
    … …  
    809809  PRINT(0)("List of all stored Resources:\n");
    810810  tIterator<Resource>* iterator = resourceList->getIterator();
    811   Resource* enumRes = iterator->firstElement();
     811  Resource* enumRes = iterator->nextElement();
    812812  while (enumRes)
    813813    {
Note: See TracChangeset for help on using the changeset viewer.