summaryrefslogtreecommitdiff
path: root/src/effectmanager.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-02-09 23:47:02 +0100
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-02-09 23:47:02 +0100
commitfa2f3ac593a792c32095c2e885665ec91bb4019d (patch)
treef44aee845f0229dfcc6b2ad3c74613e0352f36c2 /src/effectmanager.cpp
parent07f7d52f661a74e6d0c780ca53e724651e3dcc48 (diff)
parent40edf4e91558cffd83d9015a2cf4a16360e27855 (diff)
downloadmana-client-fa2f3ac593a792c32095c2e885665ec91bb4019d.tar.gz
mana-client-fa2f3ac593a792c32095c2e885665ec91bb4019d.tar.bz2
mana-client-fa2f3ac593a792c32095c2e885665ec91bb4019d.tar.xz
mana-client-fa2f3ac593a792c32095c2e885665ec91bb4019d.zip
Merged with Aethyra master as of 2009-02-09
Conflicts: A lot of files...
Diffstat (limited to 'src/effectmanager.cpp')
-rw-r--r--src/effectmanager.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/effectmanager.cpp b/src/effectmanager.cpp
index 8e029cf0..f004a450 100644
--- a/src/effectmanager.cpp
+++ b/src/effectmanager.cpp
@@ -20,6 +20,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include "being.h"
#include "effectmanager.h"
#include "log.h"
#include "particle.h"
@@ -69,7 +70,6 @@ bool EffectManager::trigger(int id, Being* being)
{
if ((*i).id == id)
{
- printf("Found effect, playing it");
rValue = true;
if (!(*i).GFX.empty())
{
@@ -92,7 +92,6 @@ bool EffectManager::trigger(int id, int x, int y)
{
if ((*i).id == id)
{
- printf("Found effect, playing it");
rValue = true;
if (!(*i).GFX.empty())
particleEngine->addEffect((*i).GFX, x, y);