diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-04-16 23:06:58 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-04-18 21:31:52 +0300 |
| commit | 67d3b8c193b51bbf892fd965547746511e8ddf87 (patch) | |
| tree | b11031d009c6df44263f0be9f01503fae2c09615 /src/gui | |
| parent | 884c064f762c4d5ca23458ea43d9c34348259840 (diff) | |
| download | mv-67d3b8c193b51bbf892fd965547746511e8ddf87.tar.gz mv-67d3b8c193b51bbf892fd965547746511e8ddf87.tar.bz2 mv-67d3b8c193b51bbf892fd965547746511e8ddf87.tar.xz mv-67d3b8c193b51bbf892fd965547746511e8ddf87.zip | |
add delay to action sounds.
delay now unused.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/skilldialog.cpp | 13 | ||||
| -rw-r--r-- | src/gui/skilldialog.h | 6 |
2 files changed, 14 insertions, 5 deletions
diff --git a/src/gui/skilldialog.cpp b/src/gui/skilldialog.cpp index 2a673a277..cb4d2e481 100644 --- a/src/gui/skilldialog.cpp +++ b/src/gui/skilldialog.cpp @@ -525,10 +525,15 @@ void SkillDialog::loadSkills() node, "description", ""); data->particle = XML::getProperty( node, "particle", ""); - data->soundHit = XML::getProperty( + + data->soundHit.sound = XML::getProperty( node, "soundHit", ""); - data->soundMiss = XML::getProperty( + data->soundHit.delay = XML::getProperty( + node, "soundHitDelay", 0); + data->soundMiss.sound = XML::getProperty( node, "soundMiss", ""); + data->soundMiss.delay = XML::getProperty( + node, "soundMissDelay", 0); skill->addData(level, data); } @@ -773,7 +778,9 @@ SkillData *SkillInfo::getData1(const int lev) } SkillData::SkillData() : - icon(nullptr) + icon(nullptr), + soundHit("", 0), + soundMiss("", 0) { } diff --git a/src/gui/skilldialog.h b/src/gui/skilldialog.h index 968e171d9..2a9f69a77 100644 --- a/src/gui/skilldialog.h +++ b/src/gui/skilldialog.h @@ -25,6 +25,8 @@ #include "gui/widgets/window.h" +#include "resources/soundinfo.h" + #include <guichan/actionlistener.hpp> #include <guichan/mouselistener.hpp> @@ -50,8 +52,8 @@ struct SkillData final Image *icon; std::string particle; - std::string soundHit; - std::string soundMiss; + SoundInfo soundHit; + SoundInfo soundMiss; SkillData(); A_DELETE_COPY(SkillData) |