Changeset 8832 for code/branches/output/data/gui/scripts

Timestamp:

Aug 9, 2011, 12:37:21 AM (13 years ago)

Author:

landauf

Message:

Quick and dirty fix to un-singletonize WANDiscovery. It is now created on demand by the multiplayer menu. This delays the master server connection until we really need it (and avoids the annoying connection-failed error/warning during startup if the master server can't be reached).
Also removed some unneeded/commented functions related to WANDiscovery from Server.
Presumably won't collide with the changes in the masterserver2 branch, but needs some review.

File:

• code/branches/output/data/gui/scripts/MultiplayerMenu.lua (modified) (1 diff)

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

@@ -117 +117 @@
         local listbox = winMgr:getWindow("orxonox/MultiplayerListbox")
         CEGUI.toListbox(listbox):resetList()
-        local discovery = orxonox.WANDiscovery:getInstance()
+        local discovery = orxonox.WANDiscovery()
         cout(0, "discovering.\n" )
         discovery:discover()