diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-03-22 19:45:03 +0100 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-03-22 19:45:56 +0100 |
| commit | 0c43d04b438d41c277ae80402d4b4888db1a0b64 (patch) | |
| tree | 3aaeb75ecd1bcbe85decedab5f1fa426fe0411e3 /src/gui/ministatus.h | |
| parent | a7f5eaeb7f643658d356533a608f0f18d85b6d32 (diff) | |
| parent | 401802c1d7a1b3d659bdc53a45d9a6292fc1121e (diff) | |
| download | mana-client-0c43d04b438d41c277ae80402d4b4888db1a0b64.tar.gz mana-client-0c43d04b438d41c277ae80402d4b4888db1a0b64.tar.bz2 mana-client-0c43d04b438d41c277ae80402d4b4888db1a0b64.tar.xz mana-client-0c43d04b438d41c277ae80402d4b4888db1a0b64.zip | |
Merged the tmwserv client with the eAthena client
This merge involved major changes on both sides, and as such took
several weeks. Lots of things are expected to be broken now, however, we
now have a single code base to improve and extend, which can be compiled
to support either eAthena or tmwserv.
In the coming months, the plan is to work towards a client that supports
both eAthena and tmwserv, without needing to be recompiled.
Conflicts:
Everywhere!
Diffstat (limited to 'src/gui/ministatus.h')
| -rw-r--r-- | src/gui/ministatus.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/ministatus.h b/src/gui/ministatus.h index f262a2a0..b69f9a14 100644 --- a/src/gui/ministatus.h +++ b/src/gui/ministatus.h @@ -66,8 +66,10 @@ class MiniStatusWindow : public Window * Mini Status Bars */ ProgressBar *mHpBar; +#ifdef EATHENA_SUPPORT ProgressBar *mMpBar; ProgressBar *mXpBar; +#endif std::vector<AnimatedSprite *> mIcons; }; |