summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-10-23 20:05:05 +0300
committerAndrei Karas <akaras@inbox.ru>2015-10-23 20:05:05 +0300
commit70e9b4d7aaf0e93dc715a201b1cca12900c72b37 (patch)
tree3bf4e7f35b9c59cdda4fe54686bebbca7e41ef03 /src/resources
parentcf1a1df92c0b6993df420456fce2654263e3dbc8 (diff)
downloadmv-70e9b4d7aaf0e93dc715a201b1cca12900c72b37.tar.gz
mv-70e9b4d7aaf0e93dc715a201b1cca12900c72b37.tar.bz2
mv-70e9b4d7aaf0e93dc715a201b1cca12900c72b37.tar.xz
mv-70e9b4d7aaf0e93dc715a201b1cca12900c72b37.zip
Fix code style.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/db/horsedb.cpp12
-rw-r--r--src/resources/horseinfo.h4
-rw-r--r--src/resources/map/maplayer.cpp7
3 files changed, 15 insertions, 8 deletions
diff --git a/src/resources/db/horsedb.cpp b/src/resources/db/horsedb.cpp
index db8aa7dc3..f4c5bf8c0 100644
--- a/src/resources/db/horsedb.cpp
+++ b/src/resources/db/horsedb.cpp
@@ -131,10 +131,14 @@ void HorseDB::loadXmlFile(const std::string &fileName)
continue;
const int offsetX = XML::getProperty(horseNode, "offsetX", 0);
const int offsetY = XML::getProperty(horseNode, "offsetY", 0);
- currentInfo->upOffsetX = XML::getProperty(horseNode, "upOffsetX", offsetX);
- currentInfo->upOffsetY = XML::getProperty(horseNode, "upOffsetY", offsetY);
- currentInfo->downOffsetX = XML::getProperty(horseNode, "downOffsetX", offsetX);
- currentInfo->downOffsetY = XML::getProperty(horseNode, "downOffsetY", offsetY);
+ currentInfo->upOffsetX = XML::getProperty(horseNode,
+ "upOffsetX", offsetX);
+ currentInfo->upOffsetY = XML::getProperty(horseNode,
+ "upOffsetY", offsetY);
+ currentInfo->downOffsetX = XML::getProperty(horseNode,
+ "downOffsetX", offsetX);
+ currentInfo->downOffsetY = XML::getProperty(horseNode,
+ "downOffsetY", offsetY);
for_each_xml_child_node(spriteNode, horseNode)
{
diff --git a/src/resources/horseinfo.h b/src/resources/horseinfo.h
index 8a96902d8..11cca4c8f 100644
--- a/src/resources/horseinfo.h
+++ b/src/resources/horseinfo.h
@@ -24,13 +24,13 @@
#include "resources/spritereference.h"
-#include <vector>
-
#include "localconsts.h"
struct HorseInfo final
{
HorseInfo() :
+ downSprites(),
+ upSprites(),
downOffsetX(0),
downOffsetY(0),
upOffsetX(0),
diff --git a/src/resources/map/maplayer.cpp b/src/resources/map/maplayer.cpp
index 23e347483..89629ea65 100644
--- a/src/resources/map/maplayer.cpp
+++ b/src/resources/map/maplayer.cpp
@@ -597,7 +597,9 @@ void MapLayer::drawFringe(Graphics *const graphics,
{
int width = 0;
// here need not draw over player position
- const int c = getTileDrawWidth(tilePtr, endX - x, width);
+ const int c = getTileDrawWidth(tilePtr,
+ endX - x,
+ width);
if (!c)
{
@@ -710,7 +712,8 @@ void MapLayer::updateConditionTiles(MetaTile *const metaTiles,
for (int x = mX; x < width1; x ++, metaPtr ++, tilePtr ++)
{
if (metaPtr->blockmask & mTileCondition ||
- (metaPtr->blockmask == 0 && mTileCondition == BlockMask::GROUND))
+ (metaPtr->blockmask == 0 &&
+ mTileCondition == BlockMask::GROUND))
{
tilePtr->isEnabled = true;
}