Changeset 3013 for code/branches/sound2/src/orxonox/objects/Level.cc
- Timestamp:
- May 21, 2009, 9:25:16 PM (15 years ago)
- Location:
- code/branches/sound2
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/sound2
- Property svn:mergeinfo changed
/code/branches/sound (added) merged: 2829,2866,2899,2930-2932,2950,2955,2966-2968,2980,2982,2984,2998-2999,3010
- Property svn:mergeinfo changed
-
code/branches/sound2/src/orxonox/objects/Level.cc
- Property svn:mergeinfo changed
/code/branches/sound/src/orxonox/objects/Level.cc (added) merged: 2950,2955,2966,2980
r2911 r3013 41 41 #include "objects/gametypes/Gametype.h" 42 42 #include "overlays/OverlayGroup.h" 43 #include "sound/SoundBase.h" 43 44 44 45 #include "util/Math.h" … … 68 69 if (this->xmlfile_) 69 70 Loader::unload(this->xmlfile_); 71 72 if(this->ambientsound_ != NULL) 73 delete this->ambientsound_; 70 74 } 71 75 } … … 77 81 XMLPortParam(Level, "description", setDescription, getDescription, xmlelement, mode); 78 82 XMLPortParam(Level, "gametype", setGametypeString, getGametypeString, xmlelement, mode).defaultValues("Gametype"); 83 84 XMLPortParamLoadOnly(Level, "ambientsound", loadAmbientSound, xmlelement, mode); 79 85 80 86 XMLPortObjectExtended(Level, BaseObject, "", addObject, getObject, xmlelement, mode, true, false); … … 148 154 } 149 155 156 void Level::loadAmbientSound(const std::string& filename) 157 { 158 if(filename == "") return; 159 else 160 { 161 if(this->ambientsound_ == NULL) 162 { 163 this->ambientsound_ = new SoundBase(); 164 } 165 166 this->ambientsound_->loadFile(filename); 167 this->ambientsound_->play(true); 168 } 169 } 170 150 171 void Level::playerEntered(PlayerInfo* player) 151 172 { - Property svn:mergeinfo changed
Note: See TracChangeset
for help on using the changeset viewer.