summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-08-01 21:35:49 +0300
committerAndrei Karas <akaras@inbox.ru>2012-08-01 22:40:36 +0300
commitfc854786ed73fe768d6a3ca22c02f7013560a930 (patch)
tree3a12f555d194679957559760567ff8eb701b494b /src/net
parent09d74d9273cca445b7019edacaff53452a1eee3c (diff)
downloadplus-fc854786ed73fe768d6a3ca22c02f7013560a930.tar.gz
plus-fc854786ed73fe768d6a3ca22c02f7013560a930.tar.bz2
plus-fc854786ed73fe768d6a3ca22c02f7013560a930.tar.xz
plus-fc854786ed73fe768d6a3ca22c02f7013560a930.zip
Fix code style.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/download.cpp2
-rw-r--r--src/net/ea/beinghandler.cpp2
-rw-r--r--src/net/eathena/beinghandler.cpp2
-rw-r--r--src/net/eathena/charserverhandler.cpp7
-rw-r--r--src/net/tmwa/charserverhandler.cpp7
5 files changed, 11 insertions, 9 deletions
diff --git a/src/net/download.cpp b/src/net/download.cpp
index 77ca69fa2..a0d7dbe25 100644
--- a/src/net/download.cpp
+++ b/src/net/download.cpp
@@ -129,7 +129,7 @@ void Download::setFile(const std::string &filename, int64_t adler32)
}
else
{
- mOptions.checkAdler = 0;
+ mOptions.checkAdler = 0;
}
}
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp
index 0e4fefa21..765cbc651 100644
--- a/src/net/ea/beinghandler.cpp
+++ b/src/net/ea/beinghandler.cpp
@@ -273,7 +273,7 @@ void BeingHandler::processBeingVisibleOrMove(Net::MessageIn &msg, bool visible)
setSprite(dstBeing, EA_SPRITE_HAT, headTop);
setSprite(dstBeing, EA_SPRITE_SHOE, shoes);
setSprite(dstBeing, EA_SPRITE_GLOVES, gloves);
- setSprite(dstBeing, EA_SPRITE_WEAPON, weapon, "", true);
+ setSprite(dstBeing, EA_SPRITE_WEAPON, weapon, "", 1, true);
if (!config.getBoolValue("hideShield"))
setSprite(dstBeing, EA_SPRITE_SHIELD, shield);
}
diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp
index 799282d59..9cd7fdeaf 100644
--- a/src/net/eathena/beinghandler.cpp
+++ b/src/net/eathena/beinghandler.cpp
@@ -782,7 +782,7 @@ void BeingHandler::processBeingVisibleOrMove(Net::MessageIn &msg, bool visible)
setSprite(dstBeing, SPRITE_HAT, headTop);
setSprite(dstBeing, SPRITE_SHOE, shoes);
setSprite(dstBeing, SPRITE_GLOVES, gloves);
- setSprite(dstBeing, SPRITE_WEAPON, weapon, "", true);
+ setSprite(dstBeing, SPRITE_WEAPON, weapon, "", 1, true);
if (!config.getBoolValue("hideShield"))
setSprite(dstBeing, SPRITE_SHIELD, shield);
}
diff --git a/src/net/eathena/charserverhandler.cpp b/src/net/eathena/charserverhandler.cpp
index 2348e0a67..085767a46 100644
--- a/src/net/eathena/charserverhandler.cpp
+++ b/src/net/eathena/charserverhandler.cpp
@@ -178,11 +178,12 @@ void CharServerHandler::readPlayerData(Net::MessageIn &msg,
PlayerInfoBackend &data = character->data;
data.mAttributes[PlayerInfo::EXP] = msg.readInt32();
data.mAttributes[PlayerInfo::MONEY] = msg.readInt32();
- data.mStats[JOB].exp = msg.readInt32();
+ Stat &jobStat = data.mStats[JOB];
+ jobStat.exp = msg.readInt32();
int temp = msg.readInt32();
- data.mStats[JOB].base = temp;
- data.mStats[JOB].mod = temp;
+ jobStat.base = temp;
+ jobStat.mod = temp;
int shoes = msg.readInt16();
int gloves = msg.readInt16();
diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp
index b851a5093..0a660a79d 100644
--- a/src/net/tmwa/charserverhandler.cpp
+++ b/src/net/tmwa/charserverhandler.cpp
@@ -179,11 +179,12 @@ void CharServerHandler::readPlayerData(Net::MessageIn &msg,
PlayerInfoBackend &data = character->data;
data.mAttributes[PlayerInfo::EXP] = msg.readInt32();
data.mAttributes[PlayerInfo::MONEY] = msg.readInt32();
- data.mStats[JOB].exp = msg.readInt32();
+ Stat &jobStat = data.mStats[JOB];
+ jobStat.exp = msg.readInt32();
int temp = msg.readInt32();
- data.mStats[JOB].base = temp;
- data.mStats[JOB].mod = temp;
+ jobStat.base = temp;
+ jobStat.mod = temp;
int shoes = msg.readInt16();
int gloves = msg.readInt16();