diff options
author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2008-08-28 18:32:11 +0000 |
---|---|---|
committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2008-12-13 20:21:56 +0100 |
commit | 0a2fc4d340911b28b9dc6b3b23c69e9fe7729082 (patch) | |
tree | bddecd4581bb8591d0ac079a48eec3a66c411238 /src/engine.h | |
parent | 5c4b6363d5065fb98a53b6981f5a590aaa37829b (diff) | |
download | mana-0a2fc4d340911b28b9dc6b3b23c69e9fe7729082.tar.gz mana-0a2fc4d340911b28b9dc6b3b23c69e9fe7729082.tar.bz2 mana-0a2fc4d340911b28b9dc6b3b23c69e9fe7729082.tar.xz mana-0a2fc4d340911b28b9dc6b3b23c69e9fe7729082.zip |
Added support for being effects through the eAthena levelup message, and check
whether the being exists before referencing it. Re-enabled proper MP bar
display. Improved handling of a warp to the same map.
(patch by Fate)
(cherry picked from eAthena client, the part about the levelup message
doesn't apply, and we now seem to have a second "effect manager"...)
Conflicts:
ChangeLog
src/being.cpp
src/being.h
src/engine.cpp
src/engine.h
src/gui/ministatus.cpp
src/net/beinghandler.cpp
src/net/playerhandler.cpp
src/net/protocol.h
Diffstat (limited to 'src/engine.h')
-rw-r--r-- | src/engine.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/engine.h b/src/engine.h index dbee1258..f676a271 100644 --- a/src/engine.h +++ b/src/engine.h @@ -23,6 +23,7 @@ #define _ENGINE_H #include <iosfwd> +#include <string> class Map; @@ -48,6 +49,9 @@ class Engine */ Map *getCurrentMap() { return mCurrentMap; } + const std::string &getCurrentMapName() { return mMapName; } + + /** * Sets the currently active map. */ @@ -60,6 +64,7 @@ class Engine private: Map *mCurrentMap; + std::string mMapName; }; extern Engine *engine; |