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/equipment.h | |
| parent | a7f5eaeb7f643658d356533a608f0f18d85b6d32 (diff) | |
| parent | 401802c1d7a1b3d659bdc53a45d9a6292fc1121e (diff) | |
| download | mana-0c43d04b438d41c277ae80402d4b4888db1a0b64.tar.gz mana-0c43d04b438d41c277ae80402d4b4888db1a0b64.tar.bz2 mana-0c43d04b438d41c277ae80402d4b4888db1a0b64.tar.xz mana-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/equipment.h')
| -rw-r--r-- | src/equipment.h | 36 |
1 files changed, 34 insertions, 2 deletions
diff --git a/src/equipment.h b/src/equipment.h index ace76e63..7605175a 100644 --- a/src/equipment.h +++ b/src/equipment.h @@ -22,9 +22,13 @@ #ifndef EQUIPMENT_H #define EQUIPMENT_H -class Item; - +#ifdef TMWSERV_SUPPORT +#define EQUIPMENT_SIZE 11 +#else #define EQUIPMENT_SIZE 10 +#endif + +class Item; class Equipment { @@ -34,17 +38,40 @@ class Equipment */ Equipment(); +#ifdef TMWSERV_SUPPORT + /** + * Destructor. + */ + ~Equipment(); +#endif + /** * Get equipment at the given slot. */ +#ifdef TMWSERV_SUPPORT + Item* getEquipment(int index) +#else int getEquipment(int index) const +#endif { return mEquipment[index]; } +#ifdef TMWSERV_SUPPORT + /** + * Clears equipment. + */ + void clear(); +#endif + /** * Set equipment at the given slot. */ +#ifdef TMWSERV_SUPPORT + void setEquipment(int index, int id); +#else void setEquipment(int index, int inventoryIndex); +#endif +#ifdef EATHENA_SUPPORT /** * Remove equipment from the given slot. */ @@ -59,10 +86,15 @@ class Equipment * Set the item used in the arrow slot. */ void setArrows(int arrows) { mArrows = arrows; } +#endif private: +#ifdef TMWSERV_SUPPORT + Item* mEquipment[EQUIPMENT_SIZE]; +#else int mEquipment[EQUIPMENT_SIZE]; int mArrows; +#endif }; #endif |