summaryrefslogtreecommitdiff
path: root/src/resources/map
diff options
context:
space:
mode:
Diffstat (limited to 'src/resources/map')
-rw-r--r--src/resources/map/maplayer.cpp20
-rw-r--r--src/resources/map/maplayer.h21
-rw-r--r--src/resources/map/maprowvertexes.h54
3 files changed, 64 insertions, 31 deletions
diff --git a/src/resources/map/maplayer.cpp b/src/resources/map/maplayer.cpp
index dae071565..2908f6a42 100644
--- a/src/resources/map/maplayer.cpp
+++ b/src/resources/map/maplayer.cpp
@@ -36,6 +36,8 @@
#include "resources/image.h"
#include "resources/resourcemanager.h"
+#include "resources/map/maprowvertexes.h"
+
#include "gui/font.h"
#include "gui/gui.h"
@@ -164,9 +166,9 @@ void MapLayer::drawSDL(Graphics *const graphics)
const MapRows::const_iterator rit_end = mTempRows.end();
while (rit != rit_end)
{
- MepRowImages *const images = &(*rit)->images;
- MepRowImages::const_iterator iit = images->begin();
- const MepRowImages::const_iterator iit_end = images->end();
+ MapRowImages *const images = &(*rit)->images;
+ MapRowImages::const_iterator iit = images->begin();
+ const MapRowImages::const_iterator iit_end = images->end();
while (iit != iit_end)
{
graphics->drawTileVertexes(*iit);
@@ -331,9 +333,9 @@ void MapLayer::drawOGL(Graphics *const graphics)
// int k = 0;
while (rit != rit_end)
{
- const MepRowImages *const images = &(*rit)->images;
- MepRowImages::const_iterator iit = images->begin();
- const MepRowImages::const_iterator iit_end = images->end();
+ const MapRowImages *const images = &(*rit)->images;
+ MapRowImages::const_iterator iit = images->begin();
+ const MapRowImages::const_iterator iit_end = images->end();
while (iit != iit_end)
{
graphics->drawTileVertexes(*iit);
@@ -884,9 +886,3 @@ MapObjectList *ObjectsLayer::getAt(const unsigned x, const unsigned y) const
return nullptr;
return mTiles[x + y * mWidth];
}
-
-MapRowVertexes::~MapRowVertexes()
-{
- delete_all(images);
- images.clear();
-}
diff --git a/src/resources/map/maplayer.h b/src/resources/map/maplayer.h
index 2c3fc23f1..f6eff689c 100644
--- a/src/resources/map/maplayer.h
+++ b/src/resources/map/maplayer.h
@@ -34,27 +34,10 @@
#include <vector>
class Image;
+class ImageVertexes;
class MapItem;
+class MapRowVertexes;
class SpecialLayer;
-class ImageVertexes;
-
-typedef std::vector<ImageVertexes*> MepRowImages;
-
-class MapRowVertexes final
-{
- public:
- MapRowVertexes() :
- images()
- {
- images.reserve(30);
- }
-
- A_DELETE_COPY(MapRowVertexes)
-
- ~MapRowVertexes();
-
- MepRowImages images;
-};
class MapObject final
{
diff --git a/src/resources/map/maprowvertexes.h b/src/resources/map/maprowvertexes.h
new file mode 100644
index 000000000..d00ec07fd
--- /dev/null
+++ b/src/resources/map/maprowvertexes.h
@@ -0,0 +1,54 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef RESOURCES_MAP_MAPROWVERTEXES_H
+#define RESOURCES_MAP_MAPROWVERTEXES_H
+
+#include "utils/dtor.h"
+
+#include <vector>
+
+#include "localconsts.h"
+
+class ImageVertexes;
+
+typedef std::vector<ImageVertexes*> MapRowImages;
+
+class MapRowVertexes final
+{
+ public:
+ MapRowVertexes() :
+ images()
+ {
+ images.reserve(30);
+ }
+
+ A_DELETE_COPY(MapRowVertexes)
+
+ ~MapRowVertexes()
+ {
+ delete_all(images);
+ images.clear();
+ }
+
+ MapRowImages images;
+};
+
+#endif // RESOURCES_MAP_MAPROWVERTEXES_H