Changeset 3013 for code/branches/sound2/src/orxonox/objects/Level.h
- 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.h
- Property svn:mergeinfo changed
/code/branches/sound/src/orxonox/objects/Level.h (added) merged: 2950,2966,2980
r2911 r3013 51 51 { return this->description_; } 52 52 53 void loadAmbientSound(const std::string& filename); 54 53 55 void playerEntered(PlayerInfo* player); 54 56 void playerLeft(PlayerInfo* player); … … 69 71 XMLFile* xmlfile_; 70 72 std::list<BaseObject*> objects_; 73 74 SoundBase* ambientsound_; 71 75 }; 72 76 } - Property svn:mergeinfo changed
Note: See TracChangeset
for help on using the changeset viewer.