summaryrefslogtreecommitdiff
path: root/src/net/ea
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-02-26 13:35:24 +0300
committerAndrei Karas <akaras@inbox.ru>2013-02-26 13:35:24 +0300
commit5190fe2cdac7c259d96619e4686f8543bdc96af4 (patch)
tree3a49895b4371fcd58a2446c0b3b0128ca1933568 /src/net/ea
parentd4febba47388979b26cd4680cb8a6f20e548e399 (diff)
downloadmanaplus-5190fe2cdac7c259d96619e4686f8543bdc96af4.tar.gz
manaplus-5190fe2cdac7c259d96619e4686f8543bdc96af4.tar.bz2
manaplus-5190fe2cdac7c259d96619e4686f8543bdc96af4.tar.xz
manaplus-5190fe2cdac7c259d96619e4686f8543bdc96af4.zip
Improve string usage in other files.
Diffstat (limited to 'src/net/ea')
-rw-r--r--src/net/ea/chathandler.cpp2
-rw-r--r--src/net/ea/network.cpp6
-rw-r--r--src/net/ea/skillhandler.cpp26
3 files changed, 17 insertions, 17 deletions
diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp
index 61ae2eee7..b72c301e9 100644
--- a/src/net/ea/chathandler.cpp
+++ b/src/net/ea/chathandler.cpp
@@ -307,7 +307,7 @@ void ChatHandler::processBeingChat(Net::MessageIn &msg)
PlayerRelation::SPEECH_LOG) && chatWindow)
{
chatWindow->resortChatLog(removeColors(sender_name)
- + " : " + chatMsg, BY_OTHER);
+ .append(" : ").append(chatMsg), BY_OTHER);
}
if (player_relations.hasPermission(sender_name,
diff --git a/src/net/ea/network.cpp b/src/net/ea/network.cpp
index af2c1837d..b0a2802bd 100644
--- a/src/net/ea/network.cpp
+++ b/src/net/ea/network.cpp
@@ -150,7 +150,7 @@ void Network::flush()
SDL_mutexP(mMutex);
ret = SDLNet_TCP_Send(mSocket, mOutBuffer, mOutSize);
- DEBUGLOG("Send " + toString(mOutSize) + " bytes");
+ DEBUGLOG(std::string("Send ").append(toString(mOutSize)).append(" bytes"));
if (ret < static_cast<int>(mOutSize))
{
setError("Error in SDLNet_TCP_Send(): " +
@@ -191,8 +191,8 @@ bool Network::realConnect()
if (SDLNet_ResolveHost(&ipAddress, mServer.hostname.c_str(),
mServer.port) == -1)
{
- std::string errorMessage = _("Unable to resolve host \"") +
- mServer.hostname + "\"";
+ std::string errorMessage = std::string(_("Unable to resolve host \""))
+ .append(mServer.hostname).append("\"");
setError(errorMessage);
logger->log("SDLNet_ResolveHost: %s", errorMessage.c_str());
return false;
diff --git a/src/net/ea/skillhandler.cpp b/src/net/ea/skillhandler.cpp
index 5a7268a6e..35a809ac9 100644
--- a/src/net/ea/skillhandler.cpp
+++ b/src/net/ea/skillhandler.cpp
@@ -176,43 +176,43 @@ void SkillHandler::processSkillFailed(Net::MessageIn &msg)
break;
}
- txt += " ";
+ txt.append(" ");
switch (reason)
{
case RFAIL_SKILLDEP:
- txt += _("You have not yet reached a high enough lvl!");
+ txt.append(_("You have not yet reached a high enough lvl!"));
break;
case RFAIL_INSUFHP:
- txt += _("Insufficient HP!");
+ txt.append(_("Insufficient HP!"));
break;
case RFAIL_INSUFSP:
- txt += _("Insufficient SP!");
+ txt.append(_("Insufficient SP!"));
break;
case RFAIL_NOMEMO:
- txt += _("You have no memos!");
+ txt.append(_("You have no memos!"));
break;
case RFAIL_SKILLDELAY:
- txt += _("You cannot do that right now!");
+ txt.append(_("You cannot do that right now!"));
break;
case RFAIL_ZENY:
- txt += _("Seems you need more money... ;-)");
+ txt.append(_("Seems you need more money... ;-)"));
break;
case RFAIL_WEAPON:
- txt += _("You cannot use this skill with that "
- "kind of weapon!");
+ txt.append(_("You cannot use this skill with that "
+ "kind of weapon!"));
break;
case RFAIL_REDGEM:
- txt += _("You need another red gem!");
+ txt.append(_("You need another red gem!"));
break;
case RFAIL_BLUEGEM:
- txt += _("You need another blue gem!");
+ txt.append(_("You need another blue gem!"));
break;
case RFAIL_OVERWEIGHT:
- txt += _("You're carrying to much to do this!");
+ txt.append(_("You're carrying to much to do this!"));
break;
default:
- txt += _("Huh? What's that?");
+ txt.append(_("Huh? What's that?"));
logger->log("QQQ SMSG_SKILL_FAILED: reason "
+ toString(reason));
break;