diff options
| author | blue112 <bluesansdouze@gmail.com> | 2009-04-21 15:36:50 +0200 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-04-21 08:31:07 -0600 |
| commit | 0d100ca5fc6854de9906d9e972ef26be6bbed802 (patch) | |
| tree | 012c4016af6243e3f33a5a39d74c9c6cd12e0f5f /src/game-server/trade.hpp | |
| parent | e26e524ad739dafd99954add3c2f35842e9fb6ec (diff) | |
| download | manaserv-0d100ca5fc6854de9906d9e972ef26be6bbed802.tar.gz manaserv-0d100ca5fc6854de9906d9e972ef26be6bbed802.tar.bz2 manaserv-0d100ca5fc6854de9906d9e972ef26be6bbed802.tar.xz manaserv-0d100ca5fc6854de9906d9e972ef26be6bbed802.zip | |
Trade System Patch (server side)
Server side modification for making the three steps trade working.
For tmwserv
Some trade related protocol modification too.
Diffstat (limited to 'src/game-server/trade.hpp')
| -rw-r--r-- | src/game-server/trade.hpp | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/src/game-server/trade.hpp b/src/game-server/trade.hpp index 14e99e82..f1a9613a 100644 --- a/src/game-server/trade.hpp +++ b/src/game-server/trade.hpp @@ -42,7 +42,7 @@ class Trade * Warns the other character the trade is cancelled. * Takes care of cleaning afterwards. */ - void cancel(Character *); + void cancel(void); /** * Requests a trade to start with given public ID. @@ -53,10 +53,15 @@ class Trade bool request(Character *, int); /** - * Agrees to complete the trade. + * Confirm the trade. */ - void accept(Character *); + void confirm(Character *); + /* + * Agree to complete the trade + */ + void agree(Character *c); + /** * Adds some items to the trade. */ @@ -79,11 +84,16 @@ class Trade typedef std::vector< TradedItem > TradedItems; + /* + * See trade.cpp for doc on TradeStates + */ enum TradeState { - TRADE_INIT = 0, /**< Waiting for an ack from player 2. */ - TRADE_RUN, /**< Currently trading. */ - TRADE_EXIT /**< Waiting for an ack from player 2. */ + TRADE_INIT = 0, + TRADE_RUN, + TRADE_CONFIRM_WAIT, + TRADE_CONFIRMED, + TRADE_AGREE_WAIT }; static bool perform(TradedItems items, Inventory &inv1, Inventory &inv2); |