diff options
| author | Przemysław Grzywacz <nexather@gmail.com> | 2013-05-24 18:55:53 +0200 |
|---|---|---|
| committer | Przemysław Grzywacz <nexather@gmail.com> | 2013-05-24 18:55:53 +0200 |
| commit | 05dc1666dc794ed6aa7f6568b768c652f8922c4e (patch) | |
| tree | af83e22418e912e8eb8b2bc6b9595da344f461c1 /src/statuseffect.h | |
| parent | 703cd73c0baa82d5f8ae3a1b390401f17de32f7a (diff) | |
| parent | f9cd8a5d6b4460ffcb945979d1e8cd8ebadc9b8d (diff) | |
| download | mana-client-05dc1666dc794ed6aa7f6568b768c652f8922c4e.tar.gz mana-client-05dc1666dc794ed6aa7f6568b768c652f8922c4e.tar.bz2 mana-client-05dc1666dc794ed6aa7f6568b768c652f8922c4e.tar.xz mana-client-05dc1666dc794ed6aa7f6568b768c652f8922c4e.zip | |
Merge remote-tracking branch 'origin/master' into lpc2012 branch
Diffstat (limited to 'src/statuseffect.h')
| -rw-r--r-- | src/statuseffect.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/statuseffect.h b/src/statuseffect.h index 432f1c0e..5b1a7e23 100644 --- a/src/statuseffect.h +++ b/src/statuseffect.h @@ -1,7 +1,7 @@ /* * The Mana Client * Copyright (C) 2008-2009 The Mana World Development Team - * Copyright (C) 2009-2012 The Mana Developers + * Copyright (C) 2009-2013 The Mana Developers * * This file is part of The Mana Client. * @@ -26,6 +26,7 @@ #include "animatedsprite.h" #include "resources/animation.h" +#include "utils/xml.h" class StatusEffect { @@ -94,7 +95,11 @@ public: */ static int blockEffectIndexToEffectIndex(int blocKIndex); - static void load(); + static void init(); + + static void readStatusEffectNode(xmlNodePtr node, const std::string &filename); + + static void checkStatus(); static void unload(); private: |