diff options
| author | Erik Schilling <ablu.erikschilling@googlemail.com> | 2013-02-24 21:08:44 +0100 |
|---|---|---|
| committer | Erik Schilling <ablu.erikschilling@googlemail.com> | 2013-02-24 21:08:44 +0100 |
| commit | 7a75bd8b0215a3d8ad1e6be7baf5e6a056d1607a (patch) | |
| tree | bea619f7ef1b9657d18d84a190d07f397b0c13cf | |
| parent | a3be27ce7b045a22e53655fd7f639c9ddbe1f9c0 (diff) | |
| parent | 802eb61090abaf245617bc136ea21303af1c71b9 (diff) | |
| download | manaserv-7a75bd8b0215a3d8ad1e6be7baf5e6a056d1607a.tar.gz manaserv-7a75bd8b0215a3d8ad1e6be7baf5e6a056d1607a.tar.bz2 manaserv-7a75bd8b0215a3d8ad1e6be7baf5e6a056d1607a.tar.xz manaserv-7a75bd8b0215a3d8ad1e6be7baf5e6a056d1607a.zip | |
Merge branch 'master' into lpc2012
| -rw-r--r-- | src/account-server/serverhandler.cpp | 3 | ||||
| -rw-r--r-- | src/game-server/accountconnection.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/account-server/serverhandler.cpp b/src/account-server/serverhandler.cpp index 3260f44d..024266bb 100644 --- a/src/account-server/serverhandler.cpp +++ b/src/account-server/serverhandler.cpp @@ -247,7 +247,8 @@ void ServerHandler::processMessage(NetComputer *comp, MessageIn &msg) // Map variables outMsg.writeInt16(id); - LOG_DEBUG("Issued server '" << server->name << "' " + LOG_DEBUG("Issued server " << server->name << "(" + << server->address << ":" << server->port << ") " << "to enable map " << id); std::map<std::string, std::string> variables; variables = storage->getAllWorldStateVars(id); diff --git a/src/game-server/accountconnection.cpp b/src/game-server/accountconnection.cpp index 0507eb09..8b517f54 100644 --- a/src/game-server/accountconnection.cpp +++ b/src/game-server/accountconnection.cpp @@ -78,7 +78,7 @@ bool AccountConnection::start(int gameServerPort) LOG_INFO("Connection established to the account server."); const std::string gameServerName = - Configuration::getValue("net_gameServerName", "server1"); + Configuration::getValue("net_gameServerName", std::string()); const std::string gameServerAddress = Configuration::getValue("net_publicGameHost", Configuration::getValue("net_gameHost", |