diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-01-14 16:45:13 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-01-14 16:45:13 +0000 |
| commit | d1395845cdc678db2a71326f2e6f20253ed14cac (patch) | |
| tree | 9a75fe0591fc7bd74f828aa048aa027f59a4ae66 /src/net | |
| parent | 6c3a2550813c14290307f2ad91e1d76eea3e6a02 (diff) | |
| download | mana-d1395845cdc678db2a71326f2e6f20253ed14cac.tar.gz mana-d1395845cdc678db2a71326f2e6f20253ed14cac.tar.bz2 mana-d1395845cdc678db2a71326f2e6f20253ed14cac.tar.xz mana-d1395845cdc678db2a71326f2e6f20253ed14cac.zip | |
Merged 0.0 changes from revision 2988 to 3035 to trunk.
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/playerhandler.cpp | 4 | ||||
| -rw-r--r-- | src/net/tradehandler.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp index f16037cf..327edea3 100644 --- a/src/net/playerhandler.cpp +++ b/src/net/playerhandler.cpp @@ -56,7 +56,7 @@ extern Window *buySellDialog; namespace { struct WeightListener : public gcn::ActionListener { - void action(const std::string &eventId, gcn::Widget *widget) + void action(const gcn::ActionEvent &event) { weightNotice = NULL; } @@ -70,7 +70,7 @@ namespace { namespace { struct DeathListener : public gcn::ActionListener { - void action(const std::string &eventId, gcn::Widget *widget) + void action(const gcn::ActionEvent &event) { player_node->revive(); deathNotice = NULL; diff --git a/src/net/tradehandler.cpp b/src/net/tradehandler.cpp index 2ebc160f..b3e80675 100644 --- a/src/net/tradehandler.cpp +++ b/src/net/tradehandler.cpp @@ -41,9 +41,9 @@ std::string tradePartnerName; namespace { struct RequestTradeListener : public gcn::ActionListener { - void action(const std::string &eventId, gcn::Widget *widget) + void action(const gcn::ActionEvent &event) { - player_node->tradeReply(eventId == "yes"); + player_node->tradeReply(event.getId() == "yes"); }; } listener; } |