summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-02-26 01:40:00 +0300
committerAndrei Karas <akaras@inbox.ru>2013-02-26 01:40:00 +0300
commitd4febba47388979b26cd4680cb8a6f20e548e399 (patch)
tree2d520db672ed39b755e668828d27f0dd9d18ed6e /src/net
parent803b6afd00b0e3574b40b866f21a0d3d01f6dc4d (diff)
downloadmv-d4febba47388979b26cd4680cb8a6f20e548e399.tar.gz
mv-d4febba47388979b26cd4680cb8a6f20e548e399.tar.bz2
mv-d4febba47388979b26cd4680cb8a6f20e548e399.tar.xz
mv-d4febba47388979b26cd4680cb8a6f20e548e399.zip
Improve string usage in other files.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/messagein.cpp30
1 files changed, 16 insertions, 14 deletions
diff --git a/src/net/messagein.cpp b/src/net/messagein.cpp
index f491e1377..2858368e2 100644
--- a/src/net/messagein.cpp
+++ b/src/net/messagein.cpp
@@ -69,8 +69,9 @@ void MessageIn::readCoordinates(uint16_t &x, uint16_t &y)
}
mPos += 3;
PacketCounters::incInBytes(3);
- DEBUGLOG("readCoordinates: " + toString(static_cast<int>(x)) + ","
- + toString(static_cast<int>(y)));
+ DEBUGLOG(std::string("readCoordinates: ").append(toString(
+ static_cast<int>(x))).append(",").append(toString(
+ static_cast<int>(y))));
}
uint8_t MessageIn::fromServerDirection(uint8_t serverDir)
@@ -124,9 +125,10 @@ void MessageIn::readCoordinates(uint16_t &x, uint16_t &y, uint8_t &direction)
}
mPos += 3;
PacketCounters::incInBytes(3);
- DEBUGLOG("readCoordinates: " + toString(static_cast<int>(x))
- + "," + toString(static_cast<int>(y)) + "," + toString(
- static_cast<int>(serverDir)));
+ DEBUGLOG(std::string("readCoordinates: ").append(toString(
+ static_cast<int>(x))).append(",").append(toString(
+ static_cast<int>(y))).append(",").append(toString(
+ static_cast<int>(serverDir))));
}
void MessageIn::readCoordinatePair(uint16_t &srcX, uint16_t &srcY,
@@ -149,10 +151,11 @@ void MessageIn::readCoordinatePair(uint16_t &srcX, uint16_t &srcY,
srcY = static_cast<unsigned short>(temp >> 4);
}
mPos += 5;
- DEBUGLOG("readCoordinatePair: " + toString(static_cast<int>(srcX)) + ","
- + toString(static_cast<int>(srcY)) + " "
- + toString(static_cast<int>(dstX)) + ","
- + toString(static_cast<int>(dstY)));
+ DEBUGLOG(std::string("readCoordinatePair: ").append(toString(
+ static_cast<int>(srcX))).append(",").append(toString(
+ static_cast<int>(srcY))).append(" ").append(toString(
+ static_cast<int>(dstX))).append(",").append(toString(
+ static_cast<int>(dstY))));
PacketCounters::incInBytes(5);
}
@@ -223,8 +226,7 @@ std::string MessageIn::readRawString(int length)
if (hiddenPart.length() > 0)
{
DEBUGLOG("readString2: " + hiddenPart);
-
- return str + "|" + hiddenPart;
+ return str.append("|").append(hiddenPart);
}
}
@@ -255,14 +257,14 @@ unsigned char *MessageIn::readBytes(int length)
#ifdef ENABLEDEBUGLOG
std::string str;
for (int f = 0; f < length; f ++)
- str += strprintf ("%02x", static_cast<unsigned>(buf[f]));
+ str.append(strprintf("%02x", static_cast<unsigned>(buf[f])));
str += " ";
for (int f = 0; f < length; f ++)
{
if (buf[f])
- str += strprintf ("%c", buf[f]);
+ str.append(strprintf("%c", buf[f]));
else
- str += "_";
+ str.append("_");
}
logger->dlog("ReadBytes: " + str);
#endif