summaryrefslogtreecommitdiff
path: root/src/map.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2006-10-07 20:01:34 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2006-10-07 20:01:34 +0000
commit479f674875455fbe26e712d22518cc896b020c16 (patch)
tree2062429bda85362948a86a7269a9f343d37abf9d /src/map.cpp
parente4530c6d0cd180ab18469bf8e32fb978229dedde (diff)
downloadMana-479f674875455fbe26e712d22518cc896b020c16.tar.gz
Mana-479f674875455fbe26e712d22518cc896b020c16.tar.bz2
Mana-479f674875455fbe26e712d22518cc896b020c16.tar.xz
Mana-479f674875455fbe26e712d22518cc896b020c16.zip
Resolved some weirdness involving the terms scroll and speed.
Diffstat (limited to 'src/map.cpp')
-rw-r--r--src/map.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/map.cpp b/src/map.cpp
index 8e85e6ee..05dea951 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -98,16 +98,14 @@ Map::initializeOverlays()
const std::string name = "overlay" + toString(i);
Image *img = resman->getImage(getProperty(name + "image"));
- float scrollX = getFloatProperty(name + "scrollX");
- //float scrollY = getFloatProperty(name + "scrollY");
+ float speedX = getFloatProperty(name + "scrollX");
+ float speedY = getFloatProperty(name + "scrollY");
float parallax = getFloatProperty(name + "parallax");
if (img)
{
- // TODO: For some reason scrollX is passed as speedX and speedY.
- // Maybe Crush knows why?
mOverlays.push_back(
- new AmbientOverlay(img, parallax, 0, 0, scrollX, scrollX));
+ new AmbientOverlay(img, parallax, speedX, speedY));
// The AmbientOverlay takes control over the image.
img->decRef();