summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Sehmisch <tmw@crushnet.org>2006-11-29 23:29:34 +0000
committerPhilipp Sehmisch <tmw@crushnet.org>2006-11-29 23:29:34 +0000
commit3c5f684a4927968ffdf6d8be7821aa1e60e09cd7 (patch)
tree7792e115111225dcc1a99b6470aab846e736864e
parentdb318570f51ddc13d80cecbf90a40d7b4647ade5 (diff)
downloadmana-3c5f684a4927968ffdf6d8be7821aa1e60e09cd7.tar.gz
mana-3c5f684a4927968ffdf6d8be7821aa1e60e09cd7.tar.bz2
mana-3c5f684a4927968ffdf6d8be7821aa1e60e09cd7.tar.xz
mana-3c5f684a4927968ffdf6d8be7821aa1e60e09cd7.zip
renamed addSFX to addSound
-rw-r--r--src/resources/monsterdb.cpp8
-rw-r--r--src/resources/monsterinfo.cpp2
-rw-r--r--src/resources/monsterinfo.h2
3 files changed, 6 insertions, 6 deletions
diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp
index f61c2d39..fb03f6c1 100644
--- a/src/resources/monsterdb.cpp
+++ b/src/resources/monsterdb.cpp
@@ -100,19 +100,19 @@ MonsterDB::load()
if (event == "hit")
{
- currentInfo->addSFX(EVENT_HIT, filename);
+ currentInfo->addSound(EVENT_HIT, filename);
}
else if (event == "miss")
{
- currentInfo->addSFX(EVENT_MISS, filename);
+ currentInfo->addSound(EVENT_MISS, filename);
}
else if (event == "hurt")
{
- currentInfo->addSFX(EVENT_HURT, filename);
+ currentInfo->addSound(EVENT_HURT, filename);
}
else if (event == "die")
{
- currentInfo->addSFX(EVENT_DIE, filename);
+ currentInfo->addSound(EVENT_DIE, filename);
}
else
{
diff --git a/src/resources/monsterinfo.cpp b/src/resources/monsterinfo.cpp
index b71d50d1..1808d1c8 100644
--- a/src/resources/monsterinfo.cpp
+++ b/src/resources/monsterinfo.cpp
@@ -41,7 +41,7 @@ MonsterInfo::~MonsterInfo()
void
-MonsterInfo::addSFX (SoundEvent event, std::string filename)
+MonsterInfo::addSound (SoundEvent event, std::string filename)
{
if (mSounds.find(event) == mSounds.end())
{
diff --git a/src/resources/monsterinfo.h b/src/resources/monsterinfo.h
index 25aaf12c..c5ded375 100644
--- a/src/resources/monsterinfo.h
+++ b/src/resources/monsterinfo.h
@@ -52,7 +52,7 @@ class MonsterInfo
setSprite(std::string filename) { mSprite = filename; }
void
- addSFX (SoundEvent event, std::string filename);
+ addSound (SoundEvent event, std::string filename);
const std::string&
getName () const { return mName; };