diff options
author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-01-14 14:54:39 +0000 |
---|---|---|
committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-01-14 14:54:39 +0000 |
commit | f842e0b40d8382011f0bc46b1446945d99ac0425 (patch) | |
tree | 5ddbb7c146a8ece28a4260d788350b1c2cf0dbed /src/net | |
parent | cbbcc5489e2f72a76b66ae849cbe8f1dc44246ca (diff) | |
download | mana-f842e0b40d8382011f0bc46b1446945d99ac0425.tar.gz mana-f842e0b40d8382011f0bc46b1446945d99ac0425.tar.bz2 mana-f842e0b40d8382011f0bc46b1446945d99ac0425.tar.xz mana-f842e0b40d8382011f0bc46b1446945d99ac0425.zip |
Upgraded to Guichan 0.6.0 (merge from guichan-0.6.0 branch).
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 42c21774..0eab86ca 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 8f9788a2..0b4cb512 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; } |