diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-03-25 22:50:59 +0100 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-03-25 22:50:59 +0100 |
| commit | cc79f0fe21e1a2ef73cbe987d54e848b9a47142d (patch) | |
| tree | edd316eb6094f0c02d6d014385865dcd88a2bc56 /src/statuseffect.h | |
| parent | b0df784f1be44a657ca8092069488602270629b7 (diff) | |
| parent | 99e8a3fd77b63a029fe02dcf771b6af1aad252ed (diff) | |
| download | mana-cc79f0fe21e1a2ef73cbe987d54e848b9a47142d.tar.gz mana-cc79f0fe21e1a2ef73cbe987d54e848b9a47142d.tar.bz2 mana-cc79f0fe21e1a2ef73cbe987d54e848b9a47142d.tar.xz mana-cc79f0fe21e1a2ef73cbe987d54e848b9a47142d.zip | |
Merge branch 'eathena/master'
Conflicts:
A lot of files.
Diffstat (limited to 'src/statuseffect.h')
| -rw-r--r-- | src/statuseffect.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/statuseffect.h b/src/statuseffect.h index 16fed69a..f1af93d2 100644 --- a/src/statuseffect.h +++ b/src/statuseffect.h @@ -94,9 +94,11 @@ public: */ static int blockEffectIndexToEffectIndex(int blocKIndex); -private: static void load(); + static void unload(); +private: + std::string mMessage; std::string mSFXEffect; std::string mParticleEffect; |