diff options
Diffstat (limited to 'src/account-server')
| -rw-r--r-- | src/account-server/accounthandler.cpp | 9 | ||||
| -rw-r--r-- | src/account-server/main-account.cpp | 2 | ||||
| -rw-r--r-- | src/account-server/storage.cpp | 13 |
3 files changed, 13 insertions, 11 deletions
diff --git a/src/account-server/accounthandler.cpp b/src/account-server/accounthandler.cpp index 1e6ee8e0..6ac1f42d 100644 --- a/src/account-server/accounthandler.cpp +++ b/src/account-server/accounthandler.cpp @@ -64,7 +64,8 @@ static void addServerInfo(MessageOut *msg) * This is for developing/testing an experimental new resource manager that * downloads only the files it needs on demand. */ - std::string dataUrl = Configuration::getValue("net_clientDataUrl", ""); + std::string dataUrl = Configuration::getValue("net_clientDataUrl", + std::string()); msg->writeString(dataUrl); // Send the number of available slots (empty or not) @@ -187,7 +188,8 @@ AccountHandler::AccountHandler(const std::string &attrFile): // Store as string initially to check // that the property is defined. - std::string defStr = XML::getProperty(attributenode, "default", ""); + std::string defStr = XML::getProperty(attributenode, "default", + std::string()); if (!defStr.empty()) { const double val = string_to<double>()(defStr); @@ -592,7 +594,7 @@ void AccountHandler::handleRequestRegisterInfoMessage(AccountClient &client, { reply.writeInt8(false); reply.writeString(Configuration::getValue( - "account_denyRegisterReason", "")); + "account_denyRegisterReason", std::string())); } else { @@ -916,7 +918,6 @@ void AccountHandler::handleCharacterSelectMessage(AccountClient &client, Transaction trans; trans.mCharacterId = selectedChar->getDatabaseID(); trans.mAction = TRANS_CHAR_SELECTED; - trans.mMessage = ""; storage->addTransaction(trans); } diff --git a/src/account-server/main-account.cpp b/src/account-server/main-account.cpp index 7c49350b..9447cb05 100644 --- a/src/account-server/main-account.cpp +++ b/src/account-server/main-account.cpp @@ -116,7 +116,7 @@ static void initializeConfiguration(std::string configPath = std::string()) LOG_INFO("Using config file: " << configPath); // Check inter-server password. - if (Configuration::getValue("net_password", "") == "") + if (Configuration::getValue("net_password", std::string()).empty()) { LOG_FATAL("SECURITY WARNING: 'net_password' not set!"); exit(EXIT_BAD_CONFIG_PARAMETER); diff --git a/src/account-server/storage.cpp b/src/account-server/storage.cpp index 9d293a37..333f3aaf 100644 --- a/src/account-server/storage.cpp +++ b/src/account-server/storage.cpp @@ -1981,12 +1981,13 @@ void Storage::syncDatabase() continue; int weight = XML::getProperty(node, "weight", 0); - std::string type = XML::getProperty(node, "type", ""); - std::string name = XML::getProperty(node, "name", ""); - std::string desc = XML::getProperty(node, "description", ""); - std::string eff = XML::getProperty(node, "effect", ""); - std::string image = XML::getProperty(node, "image", ""); - std::string dye(""); + std::string type = XML::getProperty(node, "type", std::string()); + std::string name = XML::getProperty(node, "name", std::string()); + std::string desc = XML::getProperty(node, "description", + std::string()); + std::string eff = XML::getProperty(node, "effect", std::string()); + std::string image = XML::getProperty(node, "image", std::string()); + std::string dye; // Split image name and dye string size_t pipe = image.find("|"); |