summaryrefslogtreecommitdiff
path: root/src/statuseffect.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/statuseffect.cpp')
-rw-r--r--src/statuseffect.cpp15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/statuseffect.cpp b/src/statuseffect.cpp
index 1f913f4a..d7c3f17a 100644
--- a/src/statuseffect.cpp
+++ b/src/statuseffect.cpp
@@ -21,11 +21,10 @@
#include "statuseffect.h"
+#include "event.h"
#include "log.h"
#include "sound.h"
-#include "gui/widgets/chattab.h"
-
#include "utils/xml.h"
#include "configuration.h"
@@ -52,7 +51,7 @@ void StatusEffect::playSFX()
void StatusEffect::deliverMessage()
{
if (!mMessage.empty())
- localChatTab->chatLog(mMessage, BY_SERVER);
+ SERVER_NOTICE(mMessage)
}
Particle *StatusEffect::getParticle()
@@ -70,22 +69,22 @@ AnimatedSprite *StatusEffect::getIcon()
else
{
AnimatedSprite *sprite = AnimatedSprite::load(
- paths.getValue("sprites", "graphics/sprites/") + mIcon);
+ paths.getStringValue("sprites") + mIcon);
if (false && sprite)
{
- sprite->play(ACTION_DEFAULT);
+ sprite->play(SpriteAction::DEFAULT);
sprite->reset();
}
return sprite;
}
}
-SpriteAction StatusEffect::getAction()
+std::string StatusEffect::getAction()
{
if (mAction.empty())
- return ACTION_INVALID;
+ return SpriteAction::INVALID;
else
- return SpriteDef::makeSpriteAction(mAction);
+ return mAction;
}