Changeset 8858 for code/trunk/src/libraries/network/WANDiscovery.h
- Timestamp:
- Aug 23, 2011, 12:45:53 AM (13 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:ignore
-
old new 1 1 build 2 2 codeblocks 3 vs 3 4 dependencies
-
- Property svn:mergeinfo changed
/code/branches/output (added) merged: 8739-8740,8765,8771-8772,8774-8780,8787-8789,8794-8799,8801,8803-8812,8814,8816-8817,8820,8822,8825-8837,8840,8844,8846,8848-8850,8853-8854
- Property svn:ignore
-
code/trunk/src/libraries/network/WANDiscovery.h
r8351 r8858 19 19 * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 20 20 * 21 * Author: Fabian 'x3n' Landau (original) Co-authors: Sandro 'smerkli' Merkli 22 * (copied and adapted to WAN) 21 * Author: 22 * Sandro 'smerkli' Merkli 23 * Co-authors: 24 * Oliver Scheuss (original) 23 25 * 24 26 */ … … 30 32 #include "packet/ServerInformation.h" 31 33 #include "core/ConfigFileManager.h" 32 #include "util/Singleton.h"33 34 #include "core/OrxonoxClass.h" 34 35 #include "core/ConfigValueIncludes.h" … … 47 48 class _NetworkExport WANDiscovery 48 49 // tolua_end 49 : public Singleton<WANDiscovery>, publicOrxonoxClass50 : public OrxonoxClass 50 51 { // tolua_export 51 friend class Singleton<WANDiscovery>;52 52 public: 53 53 /** constructor */ 54 WANDiscovery(); 54 WANDiscovery(); // tolua_export 55 55 56 56 /** destructor */ … … 81 81 std::string getServerListItemIP( unsigned int index ); // tolua_export 82 82 83 /** \return an instance of WANDiscovery84 *85 * Create and return an instance of WANDiscovery.86 */87 static WANDiscovery& getInstance() { return Singleton<WANDiscovery>::getInstance(); } // tolua_export88 89 83 /* todo: might make this private and use getter/setter methods 90 84 * at some later time. … … 98 92 /** Master server communications object */ 99 93 MasterServerComm msc; 94 95 int rhandler( char *addr, ENetEvent *ev ); 100 96 101 97 private: 102 /** Singleton pointer */103 static WANDiscovery* singletonPtr_s;104 105 98 /** master server address */ 106 99 std::string msaddress;
Note: See TracChangeset
for help on using the changeset viewer.