Updated TMW to be compatible with Guichan 0.5.0 (merged from guichan-0.5.0

branch).

3 files changed, 12 insertions, 5 deletions

diff --git a/src/net/network.cpp b/src/net/network.cpp
index aa18e888..64cbf331 100644
--- a/src/net/network.cpp
+++ b/src/net/network.cpp
@@ -66,7 +66,7 @@ bool Network::connect(const std::string &address, short port)
 
     mState = CONNECTING;
 
-    mClient = enet_host_create (0, 1, 0, 0);
+    mClient = enet_host_create(0, 1, 0, 0);
 
     if (!mClient)
     {
@@ -160,8 +160,10 @@ void Network::dispatchMessages()
 
 void Network::flush()
 {
+    logger->log("Network::flush()");
     if (mState == IDLE || mState == NET_ERROR)
     {
+        logger->log("Idle or error, returning");
         return;
     }
 
@@ -173,20 +175,25 @@ void Network::flush()
         switch (event.type)
         {
             case ENET_EVENT_TYPE_CONNECT:
+                logger->log("Connected.");
                 mState = CONNECTED;
                 // Store any relevant server information here.
                 event.peer->data = 0;
                 break;
 
             case ENET_EVENT_TYPE_RECEIVE:
+                logger->log("Incoming data...");
                 mIncomingPackets.push(event.packet);
                 break;
             case ENET_EVENT_TYPE_DISCONNECT:
                 mState = IDLE;
-                printf("Disconnected\n");
+                logger->log("Disconnected.");
                 // Reset the server information.
                 event.peer->data = 0;
                 break;
+            case ENET_EVENT_TYPE_NONE:
+                logger->log("No event during 10 milliseconds.");
+                break;
             default:
                 logger->log("Unhandled enet event.");
                 break;
diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp
index 5453eae4..c70eada3 100644
--- a/src/net/playerhandler.cpp
+++ b/src/net/playerhandler.cpp
@@ -46,7 +46,7 @@ OkDialog *deathNotice = NULL;
 namespace {
     struct WeightListener : public gcn::ActionListener
     {
-        void action(const std::string &eventId) { weightNotice = NULL; }
+        void action(const std::string &eventId, gcn::Widget *widget) { weightNotice = NULL; }
     } weightListener;
 }
 
@@ -56,7 +56,7 @@ namespace {
 // TODO Move somewhere else
 namespace {
     struct DeathListener : public gcn::ActionListener {
-        void action(const std::string &eventId) {
+        void action(const std::string &eventId, gcn::Widget *widget) {
             player_node->revive();
             deathNotice = NULL;
         }
diff --git a/src/net/tradehandler.cpp b/src/net/tradehandler.cpp
index 0f5bdcdc..b0baa5ea 100644
--- a/src/net/tradehandler.cpp
+++ b/src/net/tradehandler.cpp
@@ -41,7 +41,7 @@ std::string tradePartnerName;
 namespace {
     struct RequestTradeListener : public gcn::ActionListener
     {
-        void action(const std::string& eventId)
+        void action(const std::string &eventId, gcn::Widget *widget)
         {
             player_node->tradeReply(eventId == "yes");
         };