Fix code style.

2 files changed, 12 insertions, 11 deletions

diff --git a/src/resources/map/maplayer.cpp b/src/resources/map/maplayer.cpp
index ef1c1961c..2389de12b 100644
--- a/src/resources/map/maplayer.cpp
+++ b/src/resources/map/maplayer.cpp
@@ -37,7 +37,6 @@
 
 #include "resources/map/mapitem.h"
 #include "resources/map/maprowvertexes.h"
-#include "resources/map/maptype.h"
 #include "resources/map/speciallayer.h"
 
 #include "debug.h"
@@ -401,8 +400,8 @@ void MapLayer::drawFringe(Graphics *const graphics, int startX, int startY,
             const int y32s = (y + mActorsFix) * mapTileSize;
 
             BLOCK_START("MapLayer::drawFringe drawmobs")
-            // If drawing the fringe layer, make sure all actors above this row of
-            // tiles have been drawn
+            // If drawing the fringe layer, make sure all actors above this
+            // row of tiles have been drawn
             while (ai != ai_end && (*ai)->getSortPixelY() <= y32s)
             {
                 (*ai)->draw(graphics, -scrollX, -scrollY);
@@ -446,8 +445,8 @@ void MapLayer::drawFringe(Graphics *const graphics, int startX, int startY,
             const int y32s = (y + mActorsFix) * mapTileSize;
 
             BLOCK_START("MapLayer::drawFringe drawmobs")
-            // If drawing the fringe layer, make sure all actors above this row of
-            // tiles have been drawn
+            // If drawing the fringe layer, make sure all actors above this
+            // row of tiles have been drawn
             while (ai != ai_end && (*ai)->getSortPixelY() <= y32s)
             {
                 (*ai)->draw(graphics, -scrollX, -scrollY);
@@ -465,8 +464,8 @@ void MapLayer::drawFringe(Graphics *const graphics, int startX, int startY,
             const int yWidth = y * mWidth;
 
             BLOCK_START("MapLayer::drawFringe drawmobs")
-            // If drawing the fringe layer, make sure all actors above this row of
-            // tiles have been drawn
+            // If drawing the fringe layer, make sure all actors above this
+            // row of tiles have been drawn
             while (ai != ai_end && (*ai)->getSortPixelY() <= y32s)
             {
                 (*ai)->draw(graphics, -scrollX, -scrollY);
@@ -551,8 +550,8 @@ void MapLayer::drawFringe(Graphics *const graphics, int startX, int startY,
             const int yWidth = y * mWidth;
 
             BLOCK_START("MapLayer::drawFringe drawmobs")
-            // If drawing the fringe layer, make sure all actors above this row of
-            // tiles have been drawn
+            // If drawing the fringe layer, make sure all actors above this
+            // row of tiles have been drawn
             while (ai != ai_end && (*ai)->getSortPixelY() <= y32s)
             {
                 (*ai)->draw(graphics, -scrollX, -scrollY);
@@ -566,12 +565,12 @@ void MapLayer::drawFringe(Graphics *const graphics, int startX, int startY,
             for (int x = startX; x < endX; x++, tilePtr++)
             {
                 const int x32 = x * mapTileSize;
-                int c = 0;
                 const Image *const img = *tilePtr;
                 if (img)
                 {
                     const int px = x32 + dx;
                     const int py = py0 - img->mBounds.h;
+                    int c = 0;
                     if (mSpecialFlag || img->mBounds.h <= mapTileSize)
                     {
                         int width = 0;
diff --git a/src/resources/mstack.h b/src/resources/mstack.h
index 3e7c28b80..c7c78a748 100644
--- a/src/resources/mstack.h
+++ b/src/resources/mstack.h
@@ -28,7 +28,7 @@
 template<typename T>
 struct MStack final
 {
-    MStack(const size_t maxSize) :
+    explicit MStack(const size_t maxSize) :
         mStack(new T[maxSize]),
         mMaxSize(maxSize),
         mPointer(mStack - 1),
@@ -42,6 +42,8 @@ struct MStack final
         delete [] mStack;
     }
 
+    A_DELETE_COPY(MStack)
+
     T &push()
     {
         if (mPointer == mEndPointer)