[Orxonox-commit 2932] r7632 - in code/branches/masterserver: data/gui/scripts src/libraries/network

[smerkli at orxonox.net]

Author: smerkli
Date: 2010-11-10 15:54:59 +0100 (Wed, 10 Nov 2010)
New Revision: 7632

Modified:
   code/branches/masterserver/data/gui/scripts/MultiplayerMenu.lua
   code/branches/masterserver/src/libraries/network/MasterServerComm.cc
   code/branches/masterserver/src/libraries/network/Server.cc
Log:
oops, forgot to rename the new lua function.

Modified: code/branches/masterserver/data/gui/scripts/MultiplayerMenu.lua
===================================================================
--- code/branches/masterserver/data/gui/scripts/MultiplayerMenu.lua	2010-11-10 14:35:39 UTC (rev 7631)
+++ code/branches/masterserver/data/gui/scripts/MultiplayerMenu.lua	2010-11-10 14:54:59 UTC (rev 7632)
@@ -130,7 +130,7 @@
 
 
 -- same as above, but use WAN Discovery
-function P.showServerList()
+function P.showServerListWAN()
     local listbox = winMgr:getWindow("orxonox/MultiplayerListbox")
     CEGUI.toListbox(listbox):resetList()
     local discovery = orxonox.WANDiscovery:getInstance()

Modified: code/branches/masterserver/src/libraries/network/MasterServerComm.cc
===================================================================
--- code/branches/masterserver/src/libraries/network/MasterServerComm.cc	2010-11-10 14:35:39 UTC (rev 7631)
+++ code/branches/masterserver/src/libraries/network/MasterServerComm.cc	2010-11-10 14:54:59 UTC (rev 7632)
@@ -62,6 +62,8 @@
     { COUT(1) << "An error occurred while trying to create an ENet client host.\n";
       return 1;
     }
+
+    return 0;
   }
 
   MasterServerComm::~MasterServerComm()
@@ -163,6 +165,9 @@
     /* One could just use enet_host_service() instead. */
     enet_host_flush( this->client );
     if( packet ) free( packet );
+
+    /* all done. */
+    return 0;
   }
 
 }

Modified: code/branches/masterserver/src/libraries/network/Server.cc
===================================================================
--- code/branches/masterserver/src/libraries/network/Server.cc	2010-11-10 14:35:39 UTC (rev 7631)
+++ code/branches/masterserver/src/libraries/network/Server.cc	2010-11-10 14:54:59 UTC (rev 7632)
@@ -107,6 +107,8 @@
     COUT(4) << "opening server" << endl;
     this->openListener();
     LANDiscoverable::setActivity(true);
+
+    /* TODO connect to master server here and say you're there */
     return;
   }
 
@@ -148,6 +150,7 @@
   {
     // receive incoming packets
     Connection::processQueue();
+
     // receive and process incoming discovery packets
     LANDiscoverable::update();