diff options
| -rw-r--r-- | docs/manaserv.xml.example | 20 | ||||
| -rw-r--r-- | src/account-server/serverhandler.cpp | 2 | ||||
| -rw-r--r-- | src/chat-server/chatchannelmanager.cpp | 2 | ||||
| -rw-r--r-- | src/game-server/accountconnection.cpp | 2 |
4 files changed, 13 insertions, 13 deletions
diff --git a/docs/manaserv.xml.example b/docs/manaserv.xml.example index 68b2f2a..bdd96b2 100644 --- a/docs/manaserv.xml.example +++ b/docs/manaserv.xml.example @@ -171,7 +171,7 @@ <option name="account_minEmailLength" value="7" /> <option name="account_maxEmailLength" value="128" /> <option name="account_minNameLength" value="4" /> - <option name="account_maxNameLength" value="16" /> + <option name="account_maxNameLength" value="15" /> <option name="account_minPasswordLength" value="6" /> <option name="account_maxPasswordLength" value="25" /> <option name="account_maxCharacters" value="3" /> @@ -183,7 +183,7 @@ --> <option name="char_numHairStyles" value="17" /> - <option name="char_numHairColors" value="9" /> + <option name="char_numHairColors" value="11" /> <option name="char_numGenders" value="2" /> <option name="char_minNameLength" value="4" /> <option name="char_maxNameLength" value="25" /> @@ -196,17 +196,17 @@ Respawn coordinates on the start map: In pixels, not in tiles. --> - <option name="char_startX" value="720"/> - <option name="char_startY" value="840"/> + <option name="char_startX" value="1024"/> + <option name="char_startY" value="1024"/> <!-- Respawn options --> - <option name="char_respawnMap" value="4"/> + <option name="char_respawnMap" value="1"/> <!-- Respawn coordinates on the respawn map: In pixels, not in tiles. --> - <option name="char_respawnX" value="1000"/> - <option name="char_respawnY" value="1000"/> + <option name="char_respawnX" value="1024"/> + <option name="char_respawnY" value="1024"/> <!-- Default Map id at character loading --> <option name="char_defaultMap" value="1" /> @@ -226,19 +226,19 @@ The time in seconds an item standing on the floor will remain before vanishing. Set it to 0 to disable it. --> - <option name="game_floorItemDecayTime" value="10" /> + <option name="game_floorItemDecayTime" value="0" /> <!-- Set how much time the auto-regeneration is stopped when hurt. (in 1/10th seconds.) --> - <option name="game_hpRegenBreakAfterHit" value="50" /> + <option name="game_hpRegenBreakAfterHit" value="0" /> <!-- Default PVP (Player-versus-player) rule on a map not setting this property. Values available: none (No PVP), free (All PVP). --> - <option name="game_defaultPvp" value="free" /> + <option name="game_defaultPvp" value="" /> <!-- end of game configuration ******************************************** --> diff --git a/src/account-server/serverhandler.cpp b/src/account-server/serverhandler.cpp index c68cb62..9a26317 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 f2c52e8..a8a3df0 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 e68d9c3..1f8be4d 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); |