Author: mordante
Date: Sat Apr 18 00:46:51 2009
New Revision: 34996
URL: http://svn.gna.org/viewcvs/wesnoth?rev=34996&view=rev
Log:
Change #define to const variable.
This also fixes a bug since the default portnumber was somehow changed.
Modified:
trunk/src/addon_checks.cpp
trunk/src/addon_checks.hpp
trunk/src/addon_management.cpp
trunk/src/campaign_server/campaign_server.cpp
Modified: trunk/src/addon_checks.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/addon_checks.cpp?rev=34996&r1=34995&r2=34996&view=diff
==============================================================================
--- trunk/src/addon_checks.cpp (original)
+++ trunk/src/addon_checks.cpp Sat Apr 18 00:46:51 2009
@@ -19,6 +19,8 @@
#include "foreach.hpp"
#include <cstring>
+
+const unsigned short default_campaignd_port = 15004;
static bool two_dots(char a, char b)
{
Modified: trunk/src/addon_checks.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/addon_checks.hpp?rev=34996&r1=34995&r2=34996&view=diff
==============================================================================
--- trunk/src/addon_checks.hpp (original)
+++ trunk/src/addon_checks.hpp Sat Apr 18 00:46:51 2009
@@ -20,6 +20,14 @@
#include <string>
class config;
+
+/**
+ * Defaulr port number for the addon server.append(
+ *
+ * @Note, This might not be the best place to declare the variable, but it's
+ * one of the few files shared by the server and the game.
+ */
+extern const unsigned short default_campaignd_port;
/**
* Values used for add-on classification; UI-only
Modified: trunk/src/addon_management.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/addon_management.cpp?rev=34996&r1=34995&r2=34996&view=diff
==============================================================================
--- trunk/src/addon_management.cpp (original)
+++ trunk/src/addon_management.cpp Sat Apr 18 00:46:51 2009
@@ -32,9 +32,6 @@
#include "version.hpp"
#include "wml_separators.hpp"
#include "formula_string_utils.hpp"
-
-
-#define DEFAULT_CAMPAIGND_PORT 15004
#define ERR_CFG LOG_STREAM(err , config)
#define LOG_CFG LOG_STREAM(info, config)
@@ -878,7 +875,7 @@
const std::string old_host = preferences::campaign_server();
const int remote_port =
lexical_cast_default<int>(address_components.back(),
-
DEFAULT_CAMPAIGND_PORT);
+
default_campaignd_port);
remote_host = address_components.front();
preferences::set_campaign_server(remote_host);
Modified: trunk/src/campaign_server/campaign_server.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/campaign_server/campaign_server.cpp?rev=34996&r1=34995&r2=34996&view=diff
==============================================================================
--- trunk/src/campaign_server/campaign_server.cpp (original)
+++ trunk/src/campaign_server/campaign_server.cpp Sat Apr 18 00:46:51 2009
@@ -66,8 +66,6 @@
LOG_CS << "SIGTERM caught, exiting without cleanup immediately.\n";
exit(-1);
}
-
-#define DEFAULT_CAMPAIGND_PORT 15003
namespace {
@@ -165,7 +163,7 @@
/** Seems like compression level above 6 is waste of cpu cycle
*/
compress_level_ =
lexical_cast_default<int>(cfg_["compress_level"],6);
cfg_["compress_level"] =
lexical_cast<std::string>(compress_level_);
- return lexical_cast_default<int>(cfg_["port"],
DEFAULT_CAMPAIGND_PORT);
+ return lexical_cast_default<int>(cfg_["port"],
default_campaignd_port);
}
campaign_server::campaign_server(const std::string& cfgfile,
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
