diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-11-09 17:59:14 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-11-09 17:59:14 +0300 |
| commit | db1e60556c72b1b87ff2a384c556ccca724c46d6 (patch) | |
| tree | 22a5f4e9c4f436ef8e746e0a2d688de80c1597a6 /src/resources/ambientlayer.cpp | |
| parent | c2bb49be52a92deccec7428b6859242688fc8987 (diff) | |
| parent | 1716861f0ee2f7a3714c5b44bb0f017c3d8d3b2c (diff) | |
| download | plus-db1e60556c72b1b87ff2a384c556ccca724c46d6.tar.gz plus-db1e60556c72b1b87ff2a384c556ccca724c46d6.tar.bz2 plus-db1e60556c72b1b87ff2a384c556ccca724c46d6.tar.xz plus-db1e60556c72b1b87ff2a384c556ccca724c46d6.zip | |
Merge branch 'master' into stable
Diffstat (limited to 'src/resources/ambientlayer.cpp')
| -rw-r--r-- | src/resources/ambientlayer.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/resources/ambientlayer.cpp b/src/resources/ambientlayer.cpp index 6814b0365..cc9ebdaec 100644 --- a/src/resources/ambientlayer.cpp +++ b/src/resources/ambientlayer.cpp @@ -21,6 +21,8 @@ #include "resources/ambientlayer.h" +#include "map.h" + #include "render/graphics.h" #include "resources/image.h" @@ -31,10 +33,14 @@ AmbientLayer::AmbientLayer(Image *const img, const float parallax, const float speedX, const float speedY, - const bool keepRatio) : - mImage(img), mParallax(parallax), - mPosX(0), mPosY(0), - mSpeedX(speedX), mSpeedY(speedY), + const bool keepRatio, int mask) : + mImage(img), + mParallax(parallax), + mPosX(0), + mPosY(0), + mSpeedX(speedX), + mSpeedY(speedY), + mMask(mask), mKeepRatio(keepRatio) { if (!mImage) |