From e80e2536085d2a2f0d971007eb00c662ccfc5fda Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 11 May 2014 14:42:54 +0300 Subject: Move maprowvertexes into separate file. --- src/resources/map/maplayer.cpp | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) (limited to 'src/resources/map/maplayer.cpp') 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(); -} -- cgit v1.2.3-70-g09d2