diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-09-27 14:54:09 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-09-27 14:54:09 +0000 |
| commit | 285da0d05eb2e6b680a8dfc497cf4ecab75b7aa4 (patch) | |
| tree | 0a4e4169ffada0fbdc25fd91822a8c0fe678571c /src/resources | |
| parent | c24856707233ceb3995e43f8f7da63e65999df1e (diff) | |
| download | mana-285da0d05eb2e6b680a8dfc497cf4ecab75b7aa4.tar.gz mana-285da0d05eb2e6b680a8dfc497cf4ecab75b7aa4.tar.bz2 mana-285da0d05eb2e6b680a8dfc497cf4ecab75b7aa4.tar.xz mana-285da0d05eb2e6b680a8dfc497cf4ecab75b7aa4.zip | |
Merged another bunch of changes from trunk to 0.0 to reduce the difference.
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/monsterdb.h | 2 | ||||
| -rw-r--r-- | src/resources/monsterinfo.cpp | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/resources/monsterdb.h b/src/resources/monsterdb.h index f0cd7d08..46a33b06 100644 --- a/src/resources/monsterdb.h +++ b/src/resources/monsterdb.h @@ -18,7 +18,7 @@ * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: + * $Id$ */ #ifndef _TMW_MONSTER_DB_H diff --git a/src/resources/monsterinfo.cpp b/src/resources/monsterinfo.cpp index 7b7bad70..9b841058 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 (MonsterSoundEvent event, std::string filename) +MonsterInfo::addSound(MonsterSoundEvent event, std::string filename) { if (mSounds.find(event) == mSounds.end()) { @@ -53,7 +53,7 @@ MonsterInfo::addSound (MonsterSoundEvent event, std::string filename) std::string -MonsterInfo::getSound (MonsterSoundEvent event) const +MonsterInfo::getSound(MonsterSoundEvent event) const { std::map<MonsterSoundEvent, std::vector<std::string>* >::const_iterator i; |