summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFreeyorp <Freeyorp101@hotmail.com>2010-09-19 13:22:16 +1200
committerFreeyorp <Freeyorp101@hotmail.com>2010-10-17 17:23:37 +1300
commit181bd14f09baa1bf94a9ceae578e1fd3990a7439 (patch)
tree059ef641f217cde495e78490885a8f699d0c3b34 /src
parent1d9374215d8e6ad1160596dcd52fca201aeb2195 (diff)
downloadmanaserv-181bd14f09baa1bf94a9ceae578e1fd3990a7439.tar.gz
manaserv-181bd14f09baa1bf94a9ceae578e1fd3990a7439.tar.bz2
manaserv-181bd14f09baa1bf94a9ceae578e1fd3990a7439.tar.xz
manaserv-181bd14f09baa1bf94a9ceae578e1fd3990a7439.zip
Synchronise defaults between configuration file and source.
Reviewed-by: Bertram
Diffstat (limited to 'src')
-rw-r--r--src/account-server/serverhandler.cpp2
-rw-r--r--src/chat-server/chatchannelmanager.cpp2
-rw-r--r--src/game-server/accountconnection.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/account-server/serverhandler.cpp b/src/account-server/serverhandler.cpp
index c68cb623..9a263175 100644
--- a/src/account-server/serverhandler.cpp
+++ b/src/account-server/serverhandler.cpp
@@ -198,7 +198,7 @@ void ServerHandler::processMessage(NetComputer *comp, MessageIn &msg)
LOG_DEBUG("Item database of game server has a wrong version");
outMsg.writeShort(DATA_VERSION_OUTDATED);
}
- if (password == Configuration::getValue("net_password", "P@s$w0rd"))
+ if (password == Configuration::getValue("net_password", "changeMe"))
{
outMsg.writeShort(PASSWORD_OK);
comp->send(outMsg);
diff --git a/src/chat-server/chatchannelmanager.cpp b/src/chat-server/chatchannelmanager.cpp
index f2c52e8e..a8a3df08 100644
--- a/src/chat-server/chatchannelmanager.cpp
+++ b/src/chat-server/chatchannelmanager.cpp
@@ -65,7 +65,7 @@ bool ChatChannelManager::tryNewPublicChannel(const std::string &name)
}
// Checking strings for length and double quotes
- unsigned maxNameLength = Configuration::getValue("chat_maxChannelNameLength", 150);
+ unsigned maxNameLength = Configuration::getValue("chat_maxChannelNameLength", 15);
if (name.empty() ||
name.length() > maxNameLength ||
stringFilter->findDoubleQuotes(name))
diff --git a/src/game-server/accountconnection.cpp b/src/game-server/accountconnection.cpp
index e68d9c3b..1f8be4d3 100644
--- a/src/game-server/accountconnection.cpp
+++ b/src/game-server/accountconnection.cpp
@@ -64,7 +64,7 @@ bool AccountConnection::start(int gameServerPort)
const std::string gameServerAddress =
Configuration::getValue("net_gameServerAddress", "localhost");
const std::string password =
- Configuration::getValue("net_password", "P@s$w0rd");
+ Configuration::getValue("net_password", "changeMe");
// Register with the account server and send the list of maps we handle
MessageOut msg(GAMSG_REGISTER);