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/shop.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/gui/shop.h')
-rw-r--r-- | src/gui/shop.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/gui/shop.h b/src/gui/shop.h index e0db4c59..aa72bf2a 100644 --- a/src/gui/shop.h +++ b/src/gui/shop.h @@ -40,14 +40,16 @@ class ShopItems : public gcn::ListModel ~ShopItems(); /** - * Adds an item to the list (used by sell dialog). + * Adds an item to the list. */ - void addItem(int inventoryIndex, short id, int amount, int price); + void addItem(int id, int amount, int price); +#ifdef EATHENA_SUPPORT /** - * Adds an item to the list (used by buy dialog). + * Adds an item to the list (used by eAthena sell dialog). */ - void addItem(short id, int price); + void addItem(int inventoryIndex, int id, int amount, int price); +#endif /** * Returns the number of items in the shop. |