Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

source: code/branches/output/src/libraries/network/WANDiscovery.h @ 9548

Last change on this file since 9548 was 8832, checked in by landauf, 13 years ago

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.

  • Property svn:eol-style set to native
File size: 2.8 KB
Line 
1/*
2 *   ORXONOX - the hottest 3D action shooter ever to exist > www.orxonox.net <
3 *
4 *
5 *   License notice:
6 *
7 *   This program is free software; you can redistribute it and/or modify it
8 *   under the terms of the GNU General Public License as published by the Free
9 *   Software Foundation; either version 2 of the License, or (at your option)
10 *   any later version.
11 *
12 *   This program is distributed in the hope that it will be useful, but
13 *   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
14 *   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
15 *   for more details.
16 *
17 *   You should have received a copy of the GNU General Public License along
18 *   with this program; if not, write to the Free Software Foundation, Inc., 51
19 *   Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
20 *
21 *   Author:
22 *      Sandro 'smerkli' Merkli
23 *   Co-authors:
24 *      Oliver Scheuss (original)
25 *
26 */
27
28#ifndef _WANDiscovery_H__
29#define _WANDiscovery_H__
30
31#include "NetworkPrereqs.h"
32#include "packet/ServerInformation.h"
33#include "core/ConfigFileManager.h"
34#include "core/OrxonoxClass.h"
35#include "core/ConfigValueIncludes.h"
36#include "core/CoreIncludes.h"
37#include "MasterServerComm.h"
38#include "MasterServerProtocol.h"
39
40#include <vector>
41
42#define WANDISC_MAXTRIES 5
43
44// tolua_begin
45namespace orxonox
46{
47
48  class _NetworkExport WANDiscovery
49// tolua_end
50    : public OrxonoxClass
51  { // tolua_export
52    public:
53      /** constructor */
54      WANDiscovery(); // tolua_export
55
56      /** destructor */
57      ~WANDiscovery();
58
59      /** \return Address of the master server
60       *
61       * Get the master server address
62       */
63      std::string getMSAddress()
64      { return this->msaddress; }
65
66      /** ask server for server list  */
67      void discover(); // tolua_export
68
69      /** \param index Index to get the name of
70       * \return The name of the server
71       *
72       * Get the name of the server at index index.
73       */
74      std::string getServerListItemName( unsigned int index ); // tolua_export
75
76      /** \param index Index to get the IP of
77       * \return The IP of the server
78       *
79       * Get the IP of the server at index index.
80       */
81      std::string getServerListItemIP( unsigned int index ); // tolua_export
82
83      /* todo: might make this private and use getter/setter methods
84       * at some later time.
85       */
86      /** game server list */
87      std::vector<packet::ServerInformation> servers_;
88
89      /** Function used for the configuration file parameter update */
90      void setConfigValues();
91
92      /** Master server communications object */
93      MasterServerComm msc;
94
95      int rhandler( char *addr, ENetEvent *ev );
96     
97    private:
98      /** master server address */
99      std::string msaddress;
100
101  }; // tolua_export
102
103} // tolua_export
104
105#endif // _WANDiscovery_H__
Note: See TracBrowser for help on using the repository browser.