diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-02-02 18:58:31 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-02-02 18:58:31 +0300 |
| commit | d0db8d81ebf49b0e3c9872152cb5749f701cb9d6 (patch) | |
| tree | 4af10a2849ec74e593b568d906370ca4483f8940 | |
| parent | ef1a1be4a87913ed5c50eb10401622275da1c842 (diff) | |
| download | manaplus-d0db8d81ebf49b0e3c9872152cb5749f701cb9d6.tar.gz manaplus-d0db8d81ebf49b0e3c9872152cb5749f701cb9d6.tar.bz2 manaplus-d0db8d81ebf49b0e3c9872152cb5749f701cb9d6.tar.xz manaplus-d0db8d81ebf49b0e3c9872152cb5749f701cb9d6.zip | |
Add new attributes for start position for ambient layers.
New attributes: posX, posY
| -rw-r--r-- | src/map.cpp | 4 | ||||
| -rw-r--r-- | src/resources/ambientlayer.cpp | 15 | ||||
| -rw-r--r-- | src/resources/ambientlayer.h | 11 |
3 files changed, 22 insertions, 8 deletions
diff --git a/src/map.cpp b/src/map.cpp index b17e9ebdb..5dc1bfc0f 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -290,6 +290,8 @@ void Map::initializeAmbientLayers() mForegrounds.push_back(new AmbientLayer(img, getFloatProperty(name + "parallaxX", parallax), getFloatProperty(name + "parallaxY", parallax), + getFloatProperty(name + "posX"), + getFloatProperty(name + "posY"), getFloatProperty(name + "scrollX"), getFloatProperty(name + "scrollY"), getBoolProperty(name + "keepratio"), @@ -317,6 +319,8 @@ void Map::initializeAmbientLayers() mForegrounds.push_back(new AmbientLayer(img, getFloatProperty(name + "parallaxX", parallax), getFloatProperty(name + "parallaxY", parallax), + getFloatProperty(name + "posX"), + getFloatProperty(name + "posY"), getFloatProperty(name + "scrollX"), getFloatProperty(name + "scrollY"), getBoolProperty(name + "keepratio"), diff --git a/src/resources/ambientlayer.cpp b/src/resources/ambientlayer.cpp index c9574c589..b839064be 100644 --- a/src/resources/ambientlayer.cpp +++ b/src/resources/ambientlayer.cpp @@ -32,14 +32,19 @@ #include "debug.h" AmbientLayer::AmbientLayer(Image *const img, - const float parallaxX, const float parallaxY, - const float speedX, const float speedY, - const bool keepRatio, const int mask) : + const float parallaxX, + const float parallaxY, + const float posX, + const float posY, + const float speedX, + const float speedY, + const bool keepRatio, + const int mask) : mImage(img), mParallaxX(parallaxX), mParallaxY(parallaxY), - mPosX(0), - mPosY(0), + mPosX(posX), + mPosY(posY), mSpeedX(speedX), mSpeedY(speedY), mMask(mask), diff --git a/src/resources/ambientlayer.h b/src/resources/ambientlayer.h index 9a694bb2f..f6dd6d120 100644 --- a/src/resources/ambientlayer.h +++ b/src/resources/ambientlayer.h @@ -44,9 +44,14 @@ class AmbientLayer final * the same ratio than in 800x600 resolution mode. */ AmbientLayer(Image *const img, - const float parallax, const float parallaxY, - const float speedX, const float speedY, - const bool keepRatio, const int mask); + const float parallax, + const float parallaxY, + const float posX, + const float posY, + const float speedX, + const float speedY, + const bool keepRatio, + const int mask); A_DELETE_COPY(AmbientLayer) |