diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-10-09 21:25:13 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-10-09 21:25:13 +0300 |
| commit | 7e19951e61f7b9647afee74a9b8e49863e0f4e95 (patch) | |
| tree | e39e4321e2eff304eeff08b9328d45088f82d587 | |
| parent | 129f1a7c91466da4499e25225b66f84edb946126 (diff) | |
| download | manaplus-7e19951e61f7b9647afee74a9b8e49863e0f4e95.tar.gz manaplus-7e19951e61f7b9647afee74a9b8e49863e0f4e95.tar.bz2 manaplus-7e19951e61f7b9647afee74a9b8e49863e0f4e95.tar.xz manaplus-7e19951e61f7b9647afee74a9b8e49863e0f4e95.zip | |
Fix code style.
| -rw-r--r-- | src/net/eathena/battlegroundrecv.cpp | 1 | ||||
| -rw-r--r-- | src/resources/beingcommon.cpp | 2 | ||||
| -rw-r--r-- | src/resources/db/homunculusdb.cpp | 2 | ||||
| -rw-r--r-- | src/resources/db/mercenarydb.cpp | 2 | ||||
| -rw-r--r-- | src/resources/db/monsterdb.cpp | 2 |
5 files changed, 1 insertions, 8 deletions
diff --git a/src/net/eathena/battlegroundrecv.cpp b/src/net/eathena/battlegroundrecv.cpp index 48525a37c..ad5059f01 100644 --- a/src/net/eathena/battlegroundrecv.cpp +++ b/src/net/eathena/battlegroundrecv.cpp @@ -50,7 +50,6 @@ void BattleGroundRecv::processBattleEmblem2(Net::MessageIn &msg) Being *const dstBeing = actorManager->findBeing(id); if (dstBeing) dstBeing->setTeamId(teamId); - } void BattleGroundRecv::processBattleUpdateScore(Net::MessageIn &msg) diff --git a/src/resources/beingcommon.cpp b/src/resources/beingcommon.cpp index 78c55853e..6c64a162d 100644 --- a/src/resources/beingcommon.cpp +++ b/src/resources/beingcommon.cpp @@ -75,7 +75,7 @@ void BeingCommon::readBasicAttributes(BeingInfo *const info, block |= BlockMask::WALL; else if (walkStr == "swim" || walkStr == "water") block |= BlockMask::WATER; - else if (walkStr == "walkswim" || walkStr == "swimwalk") // legacy + else if (walkStr == "walkswim" || walkStr == "swimwalk") // legacy block |= BlockMask::GROUND | BlockMask::WATER; } info->setBlockWalkMask(static_cast<unsigned char>(block ^ allFlags)); diff --git a/src/resources/db/homunculusdb.cpp b/src/resources/db/homunculusdb.cpp index 1b5e1650b..4cf2671b4 100644 --- a/src/resources/db/homunculusdb.cpp +++ b/src/resources/db/homunculusdb.cpp @@ -24,8 +24,6 @@ #include "logger.h" -#include "enums/resources/map/blockmask.h" - #include "resources/beingcommon.h" #include "resources/beinginfo.h" diff --git a/src/resources/db/mercenarydb.cpp b/src/resources/db/mercenarydb.cpp index 5ca92e347..1d8d21173 100644 --- a/src/resources/db/mercenarydb.cpp +++ b/src/resources/db/mercenarydb.cpp @@ -24,8 +24,6 @@ #include "logger.h" -#include "enums/resources/map/blockmask.h" - #include "resources/beingcommon.h" #include "resources/beinginfo.h" diff --git a/src/resources/db/monsterdb.cpp b/src/resources/db/monsterdb.cpp index c5e80e866..813497b2a 100644 --- a/src/resources/db/monsterdb.cpp +++ b/src/resources/db/monsterdb.cpp @@ -24,8 +24,6 @@ #include "logger.h" -#include "enums/resources/map/blockmask.h" - #include "resources/beingcommon.h" #include "resources/beinginfo.h" |