Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Jan 25, 2007, 12:48:13 PM (18 years ago)
Author:
patrick
Message:

merged the playability branche. working

Location:
branches/playability.merge
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/playability.merge

    • Property svn:ignore

      •  

        old new  
        1010autom4te.cache
        1111aclocal.m4
         12tags
         13test.bmp
         14config.sub
         15config.guess
         16OrxonoxPlayability.kdevses
         17OrxonoxPlayability.kdevelop.pcs

  • branches/playability.merge/src/world_entities/sound_entity.cc

    r10351 r10366  
    1717#include "sound_entity.h"
    1818
     19#include "util/loading/load_param.h"
    1920#include "util/loading/factory.h"
    2021#include "material.h"
    … …  
    4344    this->loadParams(root);
    4445
    45   this->thunderBuffer = OrxSound::ResourceSoundBuffer("sounds/atmosphere/thunder.wav");
     46//  this->thunderBuffer = OrxSound::ResourceSoundBuffer("sounds/atmosphere/thunder.wav");
    4647}
    4748
    … …  
    7374 * @param fileName name of the sound source
    7475 */
    75 void SoundEntity::setSoundFile(const std::string fileName)
     76void SoundEntity::setSoundFile(const std::string& fileName)
    7677{
    7778  this->soundBuffer = OrxSound::ResourceSoundBuffer(fileName);
Note: See TracChangeset for help on using the changeset viewer.