diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-09-19 17:28:33 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-09-19 17:28:33 +0000 |
| commit | 1a9320fafb23940d0463e6f384713d0f99fc0c61 (patch) | |
| tree | d152680dbdc8febf0b5a445ba760255068d72f04 /src/resources/monsterinfo.cpp | |
| parent | 2f027ebcf8f0ad78f7edf58af7dda94d89034c85 (diff) | |
| download | mana-1a9320fafb23940d0463e6f384713d0f99fc0c61.tar.gz mana-1a9320fafb23940d0463e6f384713d0f99fc0c61.tar.bz2 mana-1a9320fafb23940d0463e6f384713d0f99fc0c61.tar.xz mana-1a9320fafb23940d0463e6f384713d0f99fc0c61.zip | |
Merged 0.0 changes from revision 3362 to 3580 to trunk.
Diffstat (limited to 'src/resources/monsterinfo.cpp')
| -rw-r--r-- | src/resources/monsterinfo.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/resources/monsterinfo.cpp b/src/resources/monsterinfo.cpp index 2a59419e..2e896237 100644 --- a/src/resources/monsterinfo.cpp +++ b/src/resources/monsterinfo.cpp @@ -33,15 +33,15 @@ MonsterInfo::MonsterInfo(): MonsterInfo::~MonsterInfo() { - //kill vectors in mSoundEffects - for_each ( mSounds.begin(), mSounds.end(), - make_dtor(mSounds)); + // kill vectors in mSoundEffects + for_each (mSounds.begin(), mSounds.end(), + make_dtor(mSounds)); mSounds.clear(); } void -MonsterInfo::addSound (SoundEvent event, std::string filename) +MonsterInfo::addSound(MonsterSoundEvent event, std::string filename) { if (mSounds.find(event) == mSounds.end()) { @@ -53,9 +53,9 @@ MonsterInfo::addSound (SoundEvent event, std::string filename) std::string -MonsterInfo::getSound (SoundEvent event) const +MonsterInfo::getSound(MonsterSoundEvent event) const { - std::map<SoundEvent, std::vector<std::string>* >::const_iterator i; + std::map<MonsterSoundEvent, std::vector<std::string>* >::const_iterator i; i = mSounds.find(event); |