Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Aug 13, 2009, 10:50:07 PM (15 years ago)
Author:
rgrieder
Message:

Renamed media to data to restore consistency with game/data/trunk folder name.
Couldn't yet rename the media folder though probably due to some fundamental limitations of SVN (believe me, I tried).

Location:
code/branches/resource2
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • code/branches/resource2

    • Property svn:externals

      •  

        old new  
        1 media_stripped http://svn.orxonox.net/game/data/branches/media_stripped
         1data_stripped https://svn.orxonox.net/game/data/branches/media_stripped

  • code/branches/resource2/src/orxonox/LevelManager.cc

    r3370 r5645  
    135135        availableLevels_.clear();
    136136
    137         boost::filesystem::directory_iterator file(Core::getMediaPathString() + "levels");
     137        boost::filesystem::directory_iterator file(Core::getDataPathString() + "levels");
    138138        boost::filesystem::directory_iterator end;
    139139

  • code/branches/resource2/src/orxonox/gamestates/GSGraphics.cc

    r3370 r5645  
    9696        // load debug overlay
    9797        COUT(3) << "Loading Debug Overlay..." << std::endl;
    98         this->debugOverlay_ = new XMLFile(Core::getMediaPathString() + "overlay/debug.oxo");
     98        this->debugOverlay_ = new XMLFile(Core::getDataPathString() + "overlay/debug.oxo");
    9999        Loader::open(debugOverlay_);
    100100

  • code/branches/resource2/src/orxonox/gamestates/GSLevel.cc

    r5614 r5645  
    246246        // call the loader
    247247        COUT(0) << "Loading level..." << std::endl;
    248         startFile_s = new XMLFile(Core::getMediaPathString() + "levels" + '/' + LevelManager::getInstance().getDefaultLevel());
     248        startFile_s = new XMLFile(Core::getDataPathString() + "levels" + '/' + LevelManager::getInstance().getDefaultLevel());
    249249        Loader::open(startFile_s);
    250250    }

  • code/branches/resource2/src/orxonox/objects/Level.cc

    r3325 r5645  
    5454        this->xmlfilename_ = this->getFilename();
    5555
    56         if (this->xmlfilename_.length() >= Core::getMediaPathString().length())
    57             this->xmlfilename_ = this->xmlfilename_.substr(Core::getMediaPathString().length());
     56        if (this->xmlfilename_.length() >= Core::getDataPathString().length())
     57            this->xmlfilename_ = this->xmlfilename_.substr(Core::getDataPathString().length());
    5858    }
    5959
    … …  
    101101        mask.include(Class(OverlayGroup)); // HACK to include the ChatOverlay
    102102
    103         this->xmlfile_ = new XMLFile(Core::getMediaPathString() + this->xmlfilename_, mask);
     103        this->xmlfile_ = new XMLFile(Core::getDataPathString() + this->xmlfilename_, mask);
    104104
    105105        Loader::open(this->xmlfile_);

  • code/branches/resource2/src/orxonox/sound/SoundBase.cc

    r3370 r5645  
    135135
    136136    bool SoundBase::loadFile(std::string filename) {
    137         filename = Core::getMediaPathString() + "/audio/" + filename;
     137        filename = Core::getDataPathString() + "/audio/" + filename;
    138138
    139139        if(!SoundManager::getInstance().isSoundAvailable())
Note: See TracChangeset for help on using the changeset viewer.