summaryrefslogtreecommitdiff
path: root/src/being
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-02-27 20:53:45 +0300
committerAndrei Karas <akaras@inbox.ru>2015-02-27 20:53:45 +0300
commitde7d095b98846529e2394e9868a6dd2e4344acc8 (patch)
tree922f05aaa5746fa90e4c43c0a9160b5f6b51fe81 /src/being
parent32947c0634ec582f6d641402433d2037f5087a36 (diff)
downloadplus-de7d095b98846529e2394e9868a6dd2e4344acc8.tar.gz
plus-de7d095b98846529e2394e9868a6dd2e4344acc8.tar.bz2
plus-de7d095b98846529e2394e9868a6dd2e4344acc8.tar.xz
plus-de7d095b98846529e2394e9868a6dd2e4344acc8.zip
fix code style.
Diffstat (limited to 'src/being')
-rw-r--r--src/being/crazymoves.cpp24
-rw-r--r--src/being/mercenaryinfo.h2
-rw-r--r--src/being/petinfo.h2
3 files changed, 20 insertions, 8 deletions
diff --git a/src/being/crazymoves.cpp b/src/being/crazymoves.cpp
index e5baaf76c..bc91feb57 100644
--- a/src/being/crazymoves.cpp
+++ b/src/being/crazymoves.cpp
@@ -138,28 +138,32 @@ void CrazyMoves::crazyMove2()
switch (localPlayer->getDirection())
{
case BeingDirection::UP:
- localPlayer->setWalkingDir(BeingDirection::UP | BeingDirection::LEFT);
+ localPlayer->setWalkingDir(BeingDirection::UP |
+ BeingDirection::LEFT);
localPlayer->setDirection(BeingDirection::RIGHT);
playerHandler->setDirection(
BeingDirection::DOWN | BeingDirection::RIGHT);
break;
case BeingDirection::RIGHT:
- localPlayer->setWalkingDir(BeingDirection::UP | BeingDirection::RIGHT);
+ localPlayer->setWalkingDir(BeingDirection::UP |
+ BeingDirection::RIGHT);
localPlayer->setDirection(BeingDirection::DOWN);
playerHandler->setDirection(
BeingDirection::DOWN | BeingDirection::LEFT);
break;
case BeingDirection::DOWN:
- localPlayer->setWalkingDir(BeingDirection::DOWN | BeingDirection::RIGHT);
+ localPlayer->setWalkingDir(BeingDirection::DOWN |
+ BeingDirection::RIGHT);
localPlayer->setDirection(BeingDirection::LEFT);
playerHandler->setDirection(
BeingDirection::UP | BeingDirection::LEFT);
break;
case BeingDirection::LEFT:
- localPlayer->setWalkingDir(BeingDirection::DOWN | BeingDirection::LEFT);
+ localPlayer->setWalkingDir(BeingDirection::DOWN |
+ BeingDirection::LEFT);
localPlayer->setDirection(BeingDirection::UP);
playerHandler->setDirection(
BeingDirection::UP | BeingDirection::RIGHT);
@@ -381,7 +385,8 @@ void CrazyMoves::crazyMove8()
{
mult ++;
}
- localPlayer->move(movesX[idx][0] * (mult - 1), movesY[idx][0] * (mult - 1));
+ localPlayer->move(movesX[idx][0] * (mult - 1),
+ movesY[idx][0] * (mult - 1));
}
else if (map->getWalk(x + movesX[idx][1],
y + movesY[idx][1], blockWalkMask))
@@ -392,7 +397,8 @@ void CrazyMoves::crazyMove8()
{
mult ++;
}
- localPlayer->move(movesX[idx][1] * (mult - 1), movesY[idx][1] * (mult - 1));
+ localPlayer->move(movesX[idx][1] * (mult - 1),
+ movesY[idx][1] * (mult - 1));
}
else if (map->getWalk(x + movesX[idx][2],
y + movesY[idx][2], blockWalkMask))
@@ -403,7 +409,8 @@ void CrazyMoves::crazyMove8()
{
mult ++;
}
- localPlayer->move(movesX[idx][2] * (mult - 1), movesY[idx][2] * (mult - 1));
+ localPlayer->move(movesX[idx][2] * (mult - 1),
+ movesY[idx][2] * (mult - 1));
}
else if (map->getWalk(x + movesX[idx][3],
y + movesY[idx][3], blockWalkMask))
@@ -414,7 +421,8 @@ void CrazyMoves::crazyMove8()
{
mult ++;
}
- localPlayer->move(movesX[idx][3] * (mult - 1), movesY[idx][3] * (mult - 1));
+ localPlayer->move(movesX[idx][3] * (mult - 1),
+ movesY[idx][3] * (mult - 1));
}
}
diff --git a/src/being/mercenaryinfo.h b/src/being/mercenaryinfo.h
index 948f93760..8e63afdc2 100644
--- a/src/being/mercenaryinfo.h
+++ b/src/being/mercenaryinfo.h
@@ -21,6 +21,8 @@
#ifndef BEING_MERCENARYINFO_H
#define BEING_MERCENARYINFO_H
+#include <string>
+
#include "localconsts.h"
struct MercenaryInfo final
diff --git a/src/being/petinfo.h b/src/being/petinfo.h
index caaf8022c..e67ae4139 100644
--- a/src/being/petinfo.h
+++ b/src/being/petinfo.h
@@ -21,6 +21,8 @@
#ifndef BEING_PETINFO_H
#define BEING_PETINFO_H
+#include <string>
+
#include "localconsts.h"
struct PetInfo final