From 7e19951e61f7b9647afee74a9b8e49863e0f4e95 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 9 Oct 2015 21:25:13 +0300
Subject: Fix code style.
---
src/net/eathena/battlegroundrecv.cpp | 1 -
src/resources/beingcommon.cpp | 2 +-
src/resources/db/homunculusdb.cpp | 2 --
src/resources/db/mercenarydb.cpp | 2 --
src/resources/db/monsterdb.cpp | 2 --
5 files changed, 1 insertion(+), 8 deletions(-)
(limited to 'src')
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"
--
cgit v1.2.3-70-g09d2