summaryrefslogtreecommitdiff
path: root/src/map.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-06-06 00:04:33 +0300
committerAndrei Karas <akaras@inbox.ru>2012-06-06 00:04:33 +0300
commit7b155f111daf5d7ae477b16d0f0789b1113bea74 (patch)
tree2d2711ab1f9daed793171383af1a7e1fa6ff737c /src/map.cpp
parentc3afff20d4989ab2835545715bbe67e5b5d9b353 (diff)
downloadmv-7b155f111daf5d7ae477b16d0f0789b1113bea74.tar.gz
mv-7b155f111daf5d7ae477b16d0f0789b1113bea74.tar.bz2
mv-7b155f111daf5d7ae477b16d0f0789b1113bea74.tar.xz
mv-7b155f111daf5d7ae477b16d0f0789b1113bea74.zip
Fix some issues after auto checking.
Diffstat (limited to 'src/map.cpp')
-rw-r--r--src/map.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/map.cpp b/src/map.cpp
index 6afaaa727..43c5f406d 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -84,9 +84,9 @@ class ActorFunctuator
} actorCompare;
TileAnimation::TileAnimation(Animation *ani):
+ mAnimation(new SimpleAnimation(ani)),
mLastImage(nullptr)
{
- mAnimation = new SimpleAnimation(ani);
}
TileAnimation::~TileAnimation()
@@ -123,6 +123,7 @@ Map::Map(int width, int height, int tileWidth, int tileHeight):
mWidth(width), mHeight(height),
mTileWidth(tileWidth), mTileHeight(tileHeight),
mMaxTileHeight(height),
+ mMetaTiles(new MetaTile[mWidth * mHeight]),
mHasWarps(false),
mDebugFlags(MAP_NORMAL),
mOnClosedList(1), mOnOpenList(2),
@@ -135,6 +136,10 @@ Map::Map(int width, int height, int tileWidth, int tileHeight):
mIndexedTilesetsSize(0),
mActorFixX(0),
mActorFixY(0),
+ mVersion(0),
+ mSpecialLayer(new SpecialLayer(width, height)),
+ mTempLayer(new SpecialLayer(width, height, true)),
+ mObjects(new ObjectsLayer(width, height)),
mFringeLayer(nullptr),
mLastX(-1),
mLastY(-1),
@@ -148,17 +153,11 @@ Map::Map(int width, int height, int tileWidth, int tileHeight):
mBeingOpacity(false)
{
const int size = mWidth * mHeight;
-
- mDebugFlags = 0;
- mMetaTiles = new MetaTile[size];
for (int i = 0; i < NB_BLOCKTYPES; i++)
{
mOccupation[i] = new unsigned[size];
memset(mOccupation[i], 0, size * sizeof(unsigned));
}
- mSpecialLayer = new SpecialLayer(width, height);
- mTempLayer = new SpecialLayer(width, height, true);
- mObjects = new ObjectsLayer(width, height);
config.addListener("OverlayDetail", this);
config.addListener("guialpha", this);
@@ -351,7 +350,6 @@ void Map::draw(Graphics *graphics, int scrollX, int scrollY)
graphics->mWidth, graphics->mHeight));
}
- bool overFringe = false;
int updateFlag = 0;
if (mOpenGL == 1)
@@ -389,6 +387,8 @@ void Map::draw(Graphics *graphics, int scrollX, int scrollY)
}
else
{
+ bool overFringe = false;
+
for (LayersCIter layeri = mLayers.begin(), layeri_end = mLayers.end();
layeri != layeri_end && !overFringe; ++ layeri)
{