diff options
26 files changed, 109 insertions, 99 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("|"); diff --git a/src/chat-server/chatchannelmanager.cpp b/src/chat-server/chatchannelmanager.cpp index 59e580ff..7f7e1c41 100644 --- a/src/chat-server/chatchannelmanager.cpp +++ b/src/chat-server/chatchannelmanager.cpp @@ -41,11 +41,10 @@ ChatChannelManager::~ChatChannelManager() { } -int -ChatChannelManager::createNewChannel(const std::string &channelName, - const std::string &channelAnnouncement, - const std::string &channelPassword, - bool joinable) +int ChatChannelManager::createNewChannel(const std::string &channelName, + const std::string &channelAnnouncement, + const std::string &channelPassword, + bool joinable) { int channelId = nextUsable(); @@ -83,8 +82,8 @@ bool ChatChannelManager::tryNewPublicChannel(const std::string &name) else { // We attempt to create a new channel - short id = createNewChannel(name, "", "", true); - return id ? true : false; + short id = createNewChannel(name, std::string(), std::string(), true); + return id != 0; } } diff --git a/src/chat-server/chathandler.cpp b/src/chat-server/chathandler.cpp index 8723ec8b..f69d51f2 100644 --- a/src/chat-server/chathandler.cpp +++ b/src/chat-server/chathandler.cpp @@ -594,7 +594,6 @@ void ChatHandler::handleListChannelsMessage(ChatClient &client, MessageIn &) Transaction trans; trans.mCharacterId = client.characterId; trans.mAction = TRANS_CHANNEL_LIST; - trans.mMessage = ""; storage->addTransaction(trans); } @@ -626,7 +625,6 @@ void ChatHandler::handleListChannelUsersMessage(ChatClient &client, Transaction trans; trans.mCharacterId = client.characterId; trans.mAction = TRANS_CHANNEL_USERLIST; - trans.mMessage = ""; storage->addTransaction(trans); } diff --git a/src/chat-server/guildhandler.cpp b/src/chat-server/guildhandler.cpp index 7e7783dd..6cc301fd 100644 --- a/src/chat-server/guildhandler.cpp +++ b/src/chat-server/guildhandler.cpp @@ -86,8 +86,8 @@ ChatChannel *ChatHandler::joinGuildChannel(const std::string &guildName, ChatCli if (!channel) { // Channel doesnt exist so create it - int channelId = chatChannelManager->createNewChannel(guildName, - "Guild Channel", "", false); + int channelId = chatChannelManager->createNewChannel( + guildName, "Guild Channel", std::string(), false); channel = chatChannelManager->getChannel(channelId); } diff --git a/src/chat-server/partyhandler.cpp b/src/chat-server/partyhandler.cpp index ba9f95f3..a285ee9b 100644 --- a/src/chat-server/partyhandler.cpp +++ b/src/chat-server/partyhandler.cpp @@ -92,12 +92,12 @@ void ChatHandler::handlePartyInvite(ChatClient &client, MessageIn &msg) out.writeString(client.characterName); - std::string invited = msg.readString(); + const std::string invited = msg.readString(); if (invited == client.characterName) { return; } - if (invited != "") + if (!invited.empty()) { // Get client and send it the invite ChatClient *c = getClient(invited); diff --git a/src/dal/dalexcept.h b/src/dal/dalexcept.h index bf202820..377c8ee1 100644 --- a/src/dal/dalexcept.h +++ b/src/dal/dalexcept.h @@ -75,7 +75,7 @@ class DbConnectionFailure: public DbException */ DbConnectionFailure() throw() - : DbException("") + : DbException(std::string()) {} @@ -102,7 +102,7 @@ class DbDisconnectionFailure: public DbException */ DbDisconnectionFailure() throw() - : DbException("") + : DbException(std::string()) {} /** @@ -128,7 +128,7 @@ class DbSqlQueryExecFailure: public DbException */ DbSqlQueryExecFailure() throw() - : DbException("") + : DbException(std::string()) {} /** diff --git a/src/dal/dataprovider.cpp b/src/dal/dataprovider.cpp index a88e205d..6c8c1674 100644 --- a/src/dal/dataprovider.cpp +++ b/src/dal/dataprovider.cpp @@ -83,7 +83,7 @@ bool DataProvider::isConnected() const std::string DataProvider::getDbName() const { if (!isConnected()) - return ""; + return std::string(); return mDbName; } diff --git a/src/dal/pqdataprovider.cpp b/src/dal/pqdataprovider.cpp index 1ba62f22..58959129 100644 --- a/src/dal/pqdataprovider.cpp +++ b/src/dal/pqdataprovider.cpp @@ -55,9 +55,9 @@ void PqDataProvider::connect(const std::string& dbName, { // Create string to pass to PQconnectdb std::string connStr = "dbname = " + dbName + " "; // database name - if (userName != "") + if (!userName.empty()) connStr += "user = " + userName + " "; // username - if (password != "") + if (!password.empty()) connStr += "password = " + password; // password // Connect to database diff --git a/src/dal/sqlitedataprovider.cpp b/src/dal/sqlitedataprovider.cpp index 74fa0721..2e005d9d 100644 --- a/src/dal/sqlitedataprovider.cpp +++ b/src/dal/sqlitedataprovider.cpp @@ -370,7 +370,7 @@ const RecordSet &SqLiteDataProvider::processSql() { fieldNames.push_back(sqlite3_column_name(mStmt, col)); const unsigned char *txt = sqlite3_column_text(mStmt, col); - r.push_back(txt ? (char*)txt : ""); + r.push_back(txt ? (char*)txt : std::string()); } // ensure we set column headers before adding a row diff --git a/src/game-server/attributemanager.cpp b/src/game-server/attributemanager.cpp index d590a951..d6cdeae1 100644 --- a/src/game-server/attributemanager.cpp +++ b/src/game-server/attributemanager.cpp @@ -79,11 +79,14 @@ void AttributeManager::reload() if (xmlStrEqual(subnode->name, BAD_CAST "modifier")) { std::string sType = utils::toUpper( - XML::getProperty(subnode, "stacktype", "")); + XML::getProperty(subnode, "stacktype", + std::string())); std::string eType = utils::toUpper( - XML::getProperty(subnode, "modtype", "")); + XML::getProperty(subnode, "modtype", + std::string())); std::string tag = utils::toUpper( - XML::getProperty(subnode, "tag", "")); + XML::getProperty(subnode, "tag", + std::string())); AT_TY pSType; AME_TY pEType; if (!sType.empty()) @@ -124,7 +127,7 @@ void AttributeManager::reload() mAttributeMap[id].second.push_back( AttributeInfoType(pSType, pEType)); std::string tag = XML::getProperty( - subnode, "tag", ""); + subnode, "tag", std::string()); if (!tag.empty()) mTagMap.insert( diff --git a/src/game-server/commandhandler.cpp b/src/game-server/commandhandler.cpp index 3e385360..d68ffb0e 100644 --- a/src/game-server/commandhandler.cpp +++ b/src/game-server/commandhandler.cpp @@ -155,12 +155,12 @@ static bool checkPermission(Character *player, unsigned int permissions) */ static std::string getArgument(std::string &args) { - std::string argument = ""; + std::string argument; std::string::size_type pos = std::string::npos; bool doubleQuotes = false; // Finds out if the next argument is between double-quotes - if (args.substr(0, 1).compare("\"")) + if (args.empty() || args.at(0) != '"') { // No double-quotes, we then search an ending space. pos = args.find(' '); @@ -193,7 +193,7 @@ static std::string getArgument(std::string &args) else { argument = args.substr(0); - args = ""; + args = std::string(); } return argument; } @@ -218,7 +218,7 @@ static Character* getPlayer(const std::string &player) static void handleHelp(Character *player, std::string &args) { - if (args == "") + if (args.empty()) { // short list of all commands say("=Available Commands=", player); @@ -266,7 +266,7 @@ static void handleWarp(Character *player, std::string &args) std::string ystr = getArgument(args); // if any of them are empty strings, no argument was given - if (mapstr == "" || xstr == "" || ystr == "") + if (mapstr.empty() || xstr.empty() || ystr.empty()) { say("Invalid number of arguments given.", player); say("Usage: @warp <map> <x> <y>", player); @@ -352,7 +352,7 @@ static void handleCharWarp(Character *player, std::string &args) std::string ystr = getArgument(args); // if any of them are empty strings, no argument was given - if (character == "" || mapstr == "" || xstr == "" || ystr == "") + if (character.empty() || mapstr.empty() || xstr.empty() || ystr.empty()) { say("Invalid number of arguments given.", player); say("Usage: @warp <character> <map> <x> <y>", player); @@ -454,7 +454,7 @@ static void handleItem(Character *player, std::string &args) std::string valuestr = getArgument(args); // check all arguments are there - if (character == "" || itemclass == "") + if (character.empty() || itemclass.empty()) { say("Invalid number of arguments given.", player); say("Usage: @item <character> <item> [amount]", player); @@ -494,7 +494,7 @@ static void handleItem(Character *player, std::string &args) } //identify the amount - if (valuestr == "") + if (valuestr.empty()) { value = 1; } @@ -528,7 +528,7 @@ static void handleDrop(Character *player, std::string &args) std::string valuestr = getArgument(args); // check all arguments are there - if (itemclass == "" ) + if (itemclass.empty()) { say("Invalid number of arguments given.", player); say("Usage: @drop <item> [amount]", player); @@ -552,7 +552,7 @@ static void handleDrop(Character *player, std::string &args) } //identify the amount - if (valuestr == "") + if (valuestr.empty()) { value = 1; } @@ -589,7 +589,7 @@ static void handleMoney(Character *player, std::string &args) std::string valuestr = getArgument(args); // check all arguments are there - if (character == "" || valuestr == "") + if (character.empty() || valuestr.empty()) { say("Invalid number of arguments given", player); say("Usage: @money <character> <amount>", player); @@ -643,7 +643,7 @@ static void handleSpawn(Character *player, std::string &args) std::string valuestr = getArgument(args); // check all arguments are there - if (monsterclass == "") + if (monsterclass.empty()) { say("Invalid amount of arguments given.", player); say("Usage: @spawn <monster> [number]", player); @@ -668,7 +668,7 @@ static void handleSpawn(Character *player, std::string &args) } //identify the amount - if (valuestr == "") + if (valuestr.empty()) { value = 1; } @@ -710,7 +710,7 @@ static void handleGoto(Character *player, std::string &args) std::string character = getArgument(args); // check all arguments are there - if (character == "") + if (character.empty()) { say("Invalid amount of arguments given.", player); say("Usage: @goto <character>", player); @@ -744,7 +744,7 @@ static void handleRecall(Character *player, std::string &args) std::string character = getArgument(args); // check all arguments are there - if (character == "") + if (character.empty()) { say("Invalid amount of arguments given.", player); say("Usage: @recall <character>", player); @@ -782,7 +782,7 @@ static void handleBan(Character *player, std::string &args) std::string valuestr = getArgument(args); // check all arguments are there - if (character == "" || valuestr == "") + if (character.empty() || valuestr.empty()) { say("Invalid number of arguments given.", player); say("Usage: @ban <character> <duration>", player); @@ -830,7 +830,7 @@ static void handleGivePermission(Character *player, std::string &args) std::string strPermission = getArgument(args); // check all arguments are there - if (character == "" || strPermission == "") + if (character.empty() || strPermission.empty()) { say("Invalid number of arguments given.", player); say("Usage: @givepermission <character> <permission class>", player); @@ -888,7 +888,7 @@ static void handleTakePermission(Character *player, std::string &args) std::string strPermission = getArgument(args); // check all arguments are there - if (character == "" || strPermission == "") + if (character.empty() || strPermission.empty()) { say("Invalid number of arguments given.", player); say("Usage: @takepermission <character> <permission class>", player); @@ -948,7 +948,7 @@ static void handleAttribute(Character *player, std::string &args) std::string valuestr = getArgument(args); // check all arguments are there - if (character == "" || valuestr == "" || attrstr == "") + if (character.empty() || valuestr.empty() || attrstr.empty()) { say("Invalid number of arguments given.", player); say("Usage: @attribute <character> <attribute> <value>", player); @@ -1010,7 +1010,7 @@ static void handleReport(Character *player, std::string &args) { std::string bugReport = getArgument(args); - if (bugReport == "") + if (bugReport.empty()) { say("Invalid number of arguments given.", player); say("Usage: @report <message>", player); @@ -1022,7 +1022,7 @@ static void handleReport(Character *player, std::string &args) static void handleAnnounce(Character *player, std::string &msg) { - if (msg == "") + if (msg.empty()) { say("Invalid number of arguments given.", player); say("Usage: @announce <message>", player); @@ -1209,7 +1209,7 @@ static void handleKick(Character *player, std::string &args) static void handleLog(Character *player, std::string &msg) { - if (msg == "") + if (msg.empty()) { say("Invalid number of arguments given.", player); say("Usage: @log <message>", player); @@ -1226,7 +1226,7 @@ static void handleLog(Character *player, std::string &msg) static void handleLogsay(Character *player, std::string &msg) { - if (msg == "") + if (msg.empty()) { say("Invalid number of arguments given.", player); say("Usage: @logsay <message>", player); diff --git a/src/game-server/itemmanager.cpp b/src/game-server/itemmanager.cpp index 33bced02..0fe464ee 100644 --- a/src/game-server/itemmanager.cpp +++ b/src/game-server/itemmanager.cpp @@ -73,8 +73,9 @@ void ItemManager::reload() { if (xmlStrEqual(node->name, BAD_CAST "slot")) { - std::string name = XML::getProperty(node, "name", ""); - int count = XML::getProperty(node, "count", 0); + const std::string name = XML::getProperty(node, "name", + std::string()); + const int count = XML::getProperty(node, "count", 0); if (name.empty() || !count || count < 0) LOG_WARN("Item Manager: equip slot has no name or zero count"); else @@ -137,7 +138,7 @@ void ItemManager::reload() // Type is mostly unused, but still serves for // hairsheets and race sheets. - std::string sItemType = XML::getProperty(node, "type", ""); + std::string sItemType = XML::getProperty(node, "type", std::string()); if (sItemType == "hairsprite" || sItemType == "racesprite") continue; @@ -178,7 +179,8 @@ void ItemManager::reload() for_each_xml_child_node(equipnode, subnode) if (xmlStrEqual(equipnode->name, BAD_CAST "slot")) { - std::string slot = XML::getProperty(equipnode, "type", ""); + std::string slot = XML::getProperty(equipnode, "type", + std::string()); if (slot.empty()) { LOG_WARN("Item Manager: empty equip slot definition!"); @@ -200,8 +202,10 @@ void ItemManager::reload() { std::pair< ItemTriggerType, ItemTriggerType> triggerTypes; { - std::string triggerName = XML::getProperty(subnode, "trigger", ""), - dispellTrigger = XML::getProperty(subnode, "dispell", ""); + const std::string triggerName = XML::getProperty( + subnode, "trigger", std::string()); + const std::string dispellTrigger = XML::getProperty( + subnode, "dispell", std::string()); // label -> { trigger (apply), trigger (cancel (default)) } // The latter can be overridden. static std::map<const std::string, @@ -255,7 +259,7 @@ void ItemManager::reload() { if (xmlStrEqual(effectnode->name, BAD_CAST "modifier")) { - std::string tag = XML::getProperty(effectnode, "attribute", ""); + std::string tag = XML::getProperty(effectnode, "attribute", std::string()); if (tag.empty()) { LOG_WARN("Item Manager: Warning, modifier found " @@ -292,13 +296,13 @@ void ItemManager::reload() item->addEffect(new ItemEffectConsumes(), triggerTypes.first); else if (xmlStrEqual(effectnode->name, BAD_CAST "script")) { - std::string src = XML::getProperty(effectnode, "src", ""); + std::string src = XML::getProperty(effectnode, "src", std::string()); if (src.empty()) { LOG_WARN("Item Manager: Empty src definition for script effect, skipping!"); continue; } - std::string func = XML::getProperty(effectnode, "function", ""); + std::string func = XML::getProperty(effectnode, "function", std::string()); if (func.empty()) { LOG_WARN ("Item Manager: Empty func definition for script effect, skipping!"); @@ -308,7 +312,7 @@ void ItemManager::reload() { // TODO: Load variables from variable subnodes } - std::string dfunc = XML::getProperty(effectnode, "dispell-function", ""); + std::string dfunc = XML::getProperty(effectnode, "dispell-function", std::string()); // STUB item->addEffect(new ItemEffectScript(), triggerTypes.first, triggerTypes.second); } diff --git a/src/game-server/main-game.cpp b/src/game-server/main-game.cpp index c610b7a2..a654d3d2 100644 --- a/src/game-server/main-game.cpp +++ b/src/game-server/main-game.cpp @@ -140,7 +140,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/game-server/mapcomposite.cpp b/src/game-server/mapcomposite.cpp index 56c983f3..d3475f7a 100644 --- a/src/game-server/mapcomposite.cpp +++ b/src/game-server/mapcomposite.cpp @@ -551,8 +551,8 @@ void MapComposite::setMap(Map *m) mContent = new MapContent(m); std::string sPvP = m->getProperty("pvp"); - if (sPvP == "") - sPvP = Configuration::getValue("game_defaultPvp", ""); + if (sPvP.empty()) + sPvP = Configuration::getValue("game_defaultPvp", std::string()); if (sPvP == "free") mPvPRules = PVP_FREE; diff --git a/src/game-server/mapreader.cpp b/src/game-server/mapreader.cpp index eefca086..80d0a107 100644 --- a/src/game-server/mapreader.cpp +++ b/src/game-server/mapreader.cpp @@ -144,9 +144,11 @@ Map* MapReader::readMap(xmlNodePtr node, const std::string &path, { if (xmlStrEqual(propNode->name, BAD_CAST "property")) { - std::string key = XML::getProperty(propNode, "name", ""); - std::string val = XML::getProperty(propNode, "value", ""); - LOG_DEBUG(" "<<key<<": "<<val); + std::string key = XML::getProperty(propNode, "name", + std::string()); + std::string val = XML::getProperty(propNode, "value", + std::string()); + LOG_DEBUG(" " << key << ": " << val); map->setProperty(key, val); } } @@ -169,8 +171,10 @@ Map* MapReader::readMap(xmlNodePtr node, const std::string &path, continue; } - std::string objName = XML::getProperty(objectNode, "name", ""); - std::string objType = XML::getProperty(objectNode, "type", ""); + std::string objName = XML::getProperty(objectNode, "name", + std::string()); + std::string objType = XML::getProperty(objectNode, "type", + std::string()); objType = utils::toUpper(objType); int objX = XML::getProperty(objectNode, "x", 0); int objY = XML::getProperty(objectNode, "y", 0); @@ -217,7 +221,7 @@ Map* MapReader::readMap(xmlNodePtr node, const std::string &path, } } - if (destMapName != "" && destX != -1 && destY != -1) + if (!destMapName.empty() && destX != -1 && destY != -1) { MapComposite *destMap = MapManager::getMap(destMapName); if (destMap) @@ -311,7 +315,7 @@ Map* MapReader::readMap(xmlNodePtr node, const std::string &path, } else if (utils::compareStrI(value, "SCRIPT") == 0) { - scriptText = getObjectProperty(propertyNode, ""); + scriptText = getObjectProperty(propertyNode, std::string()); } } } @@ -350,11 +354,13 @@ Map* MapReader::readMap(xmlNodePtr node, const std::string &path, { if (xmlStrEqual(propertyNode->name, BAD_CAST "property")) { - std::string value = XML::getProperty(propertyNode, "name", std::string()); + std::string value = XML::getProperty(propertyNode, "name", + std::string()); value = utils::toUpper(value); if (utils::compareStrI(value, "FILENAME") == 0) { - scriptFilename = getObjectProperty(propertyNode, ""); + scriptFilename = getObjectProperty(propertyNode, + std::string()); utils::trim(scriptFilename); } else if (utils::compareStrI(value, "TEXT") == 0) diff --git a/src/game-server/monster.h b/src/game-server/monster.h index 78a4bddc..a9512146 100644 --- a/src/game-server/monster.h +++ b/src/game-server/monster.h @@ -79,8 +79,7 @@ class MonsterClass mStrollRange(0), mMutation(0), mAttackDistance(0), - mOptimalLevel(0), - mScript("") + mOptimalLevel(0) {} /** diff --git a/src/game-server/monstermanager.cpp b/src/game-server/monstermanager.cpp index 0810164f..a719e1a8 100644 --- a/src/game-server/monstermanager.cpp +++ b/src/game-server/monstermanager.cpp @@ -239,7 +239,8 @@ void MonsterManager::reload() att->aftDelay = XML::getProperty(subnode, "aft-delay", 0); att->range = XML::getProperty(subnode, "range", 0); att->scriptFunction = XML::getProperty(subnode, - "script-function", ""); + "script-function", + std::string()); std::string sElement = XML::getProperty(subnode, "element", "neutral"); att->element = elementFromString(sElement); diff --git a/src/game-server/statusmanager.cpp b/src/game-server/statusmanager.cpp index 5e9bfcb6..3d79d892 100644 --- a/src/game-server/statusmanager.cpp +++ b/src/game-server/statusmanager.cpp @@ -73,7 +73,7 @@ void StatusManager::reload() continue; } - std::string scriptFile = XML::getProperty(node, "script", ""); + std::string scriptFile = XML::getProperty(node, "script", std::string()); //TODO: Get these modifiers /* modifiers.setAttributeValue(BASE_ATTR_PHY_ATK_MIN, XML::getProperty(node, "attack-min", 0)); diff --git a/src/scripting/lua.cpp b/src/scripting/lua.cpp index 11f42f50..e0cd4e16 100644 --- a/src/scripting/lua.cpp +++ b/src/scripting/lua.cpp @@ -1241,9 +1241,9 @@ static int chatmessage(lua_State *s) if (lua_gettop(s) == 2 && lua_isuserdata(s, 1) && lua_isstring(s, 2) ) { Being *being = getBeing(s, 1); - std::string message = lua_tostring(s, 2); + const std::string message = lua_tostring(s, 2); - if (being && message != "") + if (being && !message.empty()) { GameState::sayTo(being, NULL, message); } diff --git a/src/scripting/luascript.cpp b/src/scripting/luascript.cpp index ff993899..a9c43b72 100644 --- a/src/scripting/luascript.cpp +++ b/src/scripting/luascript.cpp @@ -80,7 +80,7 @@ int LuaScript::execute() res = lua_tointeger(mState, -1); lua_pop(mState, 1); return res; - mCurFunction = ""; + mCurFunction.clear(); } void LuaScript::load(const char *prog, const char *name) diff --git a/src/utils/encryption.cpp b/src/utils/encryption.cpp index 1a7cfb41..9062248f 100644 --- a/src/utils/encryption.cpp +++ b/src/utils/encryption.cpp @@ -46,7 +46,7 @@ static char getRandomCharacter() */ std::string createRandomPassword() { - std::string result = ""; + std::string result; // Ititializing random seed. srand(time(NULL)); @@ -55,9 +55,7 @@ std::string createRandomPassword() int characterNumber = (rand() % 10) + 20; for (int a = 1; a < characterNumber; a++) - { result += getRandomCharacter(); - } return result; } diff --git a/src/utils/logger.cpp b/src/utils/logger.cpp index d3f82418..e5ceb9bc 100644 --- a/src/utils/logger.cpp +++ b/src/utils/logger.cpp @@ -36,7 +36,7 @@ namespace utils /** Log file. */ static std::ofstream mLogFile; /** current log filename */ -std::string Logger::mFilename = ""; +std::string Logger::mFilename; /** Timestamp flag. */ bool Logger::mHasTimestamp = true; /** Tee mode flag. */ @@ -50,13 +50,13 @@ long Logger::mMaxFileSize = 1024; // 1 Mb /** Switch log file each day. */ bool Logger::mSwitchLogEachDay = false; /** Last call date */ -static std::string mLastCallDate = ""; +static std::string mLastCallDate; /** * Old date * For code simplificatiion, the old Date is kept separate * from the last call date. */ -static std::string mOldDate = ""; +static std::string mOldDate; /** * Check whether the day has changed since the last call. diff --git a/src/utils/sha256.cpp b/src/utils/sha256.cpp index ba6a5078..102171e9 100644 --- a/src/utils/sha256.cpp +++ b/src/utils/sha256.cpp @@ -263,7 +263,7 @@ std::string SHA256Hash(const char *src, int len) SHA256Final(&ctx, bytehash); // Convert it to hex const char* hxc = "0123456789abcdef"; - std::string hash = ""; + std::string hash; for (int i = 0; i < SHA256_DIGEST_SIZE; i++) { hash += hxc[bytehash[i] / 16]; diff --git a/src/utils/stringfilter.cpp b/src/utils/stringfilter.cpp index 617da90d..b48d267f 100644 --- a/src/utils/stringfilter.cpp +++ b/src/utils/stringfilter.cpp @@ -43,13 +43,13 @@ bool StringFilter::loadSlangFilterList() { mInitialized = false; - std::string slangsList = Configuration::getValue("SlangsList", ""); - if (slangsList != "") { + const std::string slangsList = Configuration::getValue("SlangsList", + std::string()); + if (!slangsList.empty()) { std::istringstream iss(slangsList); std::string tmp; - while (getline(iss, tmp, ',')) { + while (getline(iss, tmp, ',')) mSlangs.push_back(tmp); - } mInitialized = true; } @@ -59,7 +59,7 @@ bool StringFilter::loadSlangFilterList() void StringFilter::writeSlangFilterList() { // Write the list to config - std::string slangsList = ""; + std::string slangsList; for (SlangIterator i = mSlangs.begin(); i != mSlangs.end(); ) { slangsList += *i; |