Merge branch 'eathena/master'

Conflicts:
	A lot of files.

1 files changed, 7 insertions, 7 deletions

diff --git a/src/map.cpp b/src/map.cpp
index e7646fd2..551c10f3 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -85,7 +85,7 @@ void TileAnimation::update()
     Image *img = mAnimation->getCurrentImage();
     if (img != mLastImage)
     {
-        for (std::list<std::pair<MapLayer*, int> >::iterator i = 
+        for (std::list<std::pair<MapLayer*, int> >::iterator i =
              mAffected.begin(); i != mAffected.end(); i++)
         {
             i->first->setTile(i->second, img);
@@ -119,10 +119,8 @@ Image* MapLayer::getTile(int x, int y) const
     return mTiles[x + y * mWidth];
 }
 
-void MapLayer::draw(Graphics *graphics,
-                    int startX, int startY,
-                    int endX, int endY,
-                    int scrollX, int scrollY,
+void MapLayer::draw(Graphics *graphics, int startX, int startY,
+                    int endX, int endY, int scrollX, int scrollY,
                     const Sprites &sprites) const
 {
     startX -= mX;
@@ -167,8 +165,10 @@ void MapLayer::draw(Graphics *graphics,
     }
 
     // Draw any remaining sprites
-    if (mIsFringeLayer) {
-        while (si != sprites.end()) {
+    if (mIsFringeLayer)
+    {
+        while (si != sprites.end())
+        {
             (*si)->draw(graphics, -scrollX, -scrollY);
             si++;
         }