Changeset 7632

Timestamp:

Nov 10, 2010, 3:54:59 PM (14 years ago)

Author:

smerkli

Message:

oops, forgot to rename the new lua function.

Location:

code/branches/masterserver

Files:

• data/gui/scripts/MultiplayerMenu.lua (modified) (1 diff)
• src/libraries/network/MasterServerComm.cc (modified) (2 diffs)
• src/libraries/network/Server.cc (modified) (2 diffs)

code/branches/masterserver/data/gui/scripts/MultiplayerMenu.lua

@@ -131 +131 @@
 
 -- same as above, but use WAN Discovery
-function P.showServerList()
+function P.showServerListWAN()
     local listbox = winMgr:getWindow("orxonox/MultiplayerListbox")
     CEGUI.toListbox(listbox):resetList()

code/branches/masterserver/src/libraries/network/MasterServerComm.cc

@@ -63 +63 @@
       return 1;
     }
+
+    return 0;
   }
 
@@ -164 +166 @@
     enet_host_flush( this->client );
     if( packet ) free( packet );
+
+    /* all done. */
+    return 0;
   }
 

code/branches/masterserver/src/libraries/network/Server.cc

@@ -108 +108 @@
     this->openListener();
     LANDiscoverable::setActivity(true);
+
+    /* TODO connect to master server here and say you're there */
     return;
   }
@@ -149 +151 @@
     // receive incoming packets
     Connection::processQueue();
+
     // receive and process incoming discovery packets
     LANDiscoverable::update();