Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

source: code/trunk/src/libraries/network/WANDiscoverable.cc @ 8907

Last change on this file since 8907 was 8858, checked in by landauf, 13 years ago

merged output branch back to trunk.

Changes:

  • you have to include util/Output.h instead of util/Debug.h
  • COUT(x) is now called orxout(level)
  • output levels are now defined by an enum instead of numbers. see util/Output.h for the definition
  • it's possible to use output contexts with orxout(level, context). see util/Output.h for some common contexts. you can define more contexts
  • you must use 'endl' at the end of an output message, '\n' does not flush the message

Output levels:

  • instead of COUT(0) use orxout()
  • instead of COUT(1) use orxout(user_error) or orxout(internal_error)
  • instead of COUT(2) use orxout(user_warning) or orxout(internal_warning)
  • instead of COUT(3) use orxout(user_status/user_info) or orxout(internal_status/internal_info)
  • instead of COUT(4) use orxout(verbose)
  • instead of COUT(5) use orxout(verbose_more)
  • instead of COUT(6) use orxout(verbose_ultra)

Guidelines:

  • user_* levels are for the user, visible in the console and the log-file
  • internal_* levels are for developers, visible in the log-file
  • verbose_* levels are for debugging, only visible if the context of the output is activated

Usage in C++:

  • orxout() << "message" << endl;
  • orxout(level) << "message" << endl;
  • orxout(level, context) << "message" << endl;

Usage in Lua:

  • orxout("message")
  • orxout(orxonox.level.levelname, "message")
  • orxout(orxonox.level.levelname, "context", "message")

Usage in Tcl (and in the in-game-console):

  • orxout levelname message
  • orxout_context levelname context message
  • shortcuts: log message, error message, warning message, status message, info message, debug message
  • Property svn:eol-style set to native
File size: 3.1 KB
RevLine 
[7793]1/*
2 *   ORXONOX - the hottest 3D action shooter ever to exist
3 *                    > www.orxonox.net <
4 *
5 *
6 *   License notice:
7 *
8 *   This program is free software; you can redistribute it and/or
9 *   modify it under the terms of the GNU General Public License
10 *   as published by the Free Software Foundation; either version 2
11 *   of the License, or (at your option) any later version.
12 *
13 *   This program is distributed in the hope that it will be useful,
14 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
15 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
16 *   GNU General Public License for more details.
17 *
18 *   You should have received a copy of the GNU General Public License
19 *   along with this program; if not, write to the Free Software
20 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
21 *
22 *   Author:
[8858]23 *      Sandro 'smerkli' Merkli
[7793]24 *   Co-authors:
[8858]25 *      Oliver Scheuss (original)
[7793]26 *
27 */
28
29#include "WANDiscoverable.h"
30
31#include <enet/enet.h>
32#include <cstring>
33
34#include "MasterServerProtocol.h"
35#include "core/ConfigValueIncludes.h"
36#include "core/CoreIncludes.h"
37
38
39namespace orxonox
40{
41
42  WANDiscoverable::WANDiscoverable(): bActive_(false)
43  {
44    /* debugging output */
[8858]45    orxout(verbose, context::master_server) << "Creating WANDiscoverable." << endl;
[7793]46 
47    /* register object in orxonox */
48    RegisterObject(WANDiscoverable);
49
50    /* check for the masterserver address option in orxonox.ini */
51    this->setConfigValues();
52   
53  }
54
55  void WANDiscoverable::setConfigValues()
56  {
57    /* update msaddress string from orxonox.ini config file, if it
58     * has changed.
59     */
60    SetConfigValueExternal(msaddress, "WANDiscovery", "msaddress", "orxonox.net");
61//     SetConfigValue( msaddress, "orxonox.net");
62  } 
63
64  WANDiscoverable::~WANDiscoverable()
65  {
66    if( this->bActive_ )
67      this->disconnect();
68  }
69 
70  void WANDiscoverable::setActivity(bool bActive)
71  {
72    if( bActive==this->bActive_ )
73      return;
74   
75    if( bActive )
76    {
77      if( this->connect() )
78        this->bActive_ = true;
79    }
80    else
81    {
82      this->disconnect();
83      this->bActive_ = false;
84    }
85  }
86 
87  bool WANDiscoverable::connect()
88  {
89    /* initialize it and see if it worked */
90    if( msc.initialize() )
91    {
[8858]92      orxout(internal_error, context::master_server) << "Could not initialize master server communications!" << endl;
[7793]93      return false;
94    }
95   
96    /* connect and see if it worked */
97    if( msc.connect( this->msaddress.c_str(), ORX_MSERVER_PORT ) )
98    {
[8858]99      orxout(internal_error, context::master_server) << "Could not connect to master server at " 
100                 << this->msaddress << endl;
[7793]101      return false;
102    }
103                 
104    /* debugging output */
[8858]105    orxout(verbose, context::master_server) << "Initialization of WANDiscoverable complete." << endl;
[7793]106   
107   
108    // Now register the server at the master server
109    this->msc.sendRequest( MSPROTO_GAME_SERVER " " MSPROTO_REGISTER_SERVER );
110   
111    return true;
112  }
113
114  void WANDiscoverable::disconnect()
115  {
116    this->msc.sendRequest( MSPROTO_GAME_SERVER " " MSPROTO_SERVERDC );
117    msc.disconnect();
118  }
119
120
121
122 
123} // namespace orxonox
Note: See TracBrowser for help on using the repository browser.