Turned AmbientOverlay into a class. Cleaned up the associated code.

3 files changed, 150 insertions, 12 deletions

diff --git a/src/resources/ambientoverlay.cpp b/src/resources/ambientoverlay.cpp
new file mode 100644
index 00000000..b5304627
--- /dev/null
+++ b/src/resources/ambientoverlay.cpp
@@ -0,0 +1,73 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#include "ambientoverlay.h"
+
+#include "image.h"
+
+#include "../graphics.h"
+
+AmbientOverlay::AmbientOverlay(Image *img, float parallax,
+        float scrollX, float scrollY, float speedX, float speedY):
+    mImage(img), mParallax(parallax),
+    mScrollX(scrollX), mScrollY(scrollY),
+    mSpeedX(speedX), mSpeedY(speedY)
+{
+    mImage->incRef();
+}
+
+AmbientOverlay::~AmbientOverlay()
+{
+    mImage->decRef();
+}
+
+void AmbientOverlay::update(int timePassed, float dx, float dy)
+{
+    // Self scrolling of the overlay
+    mScrollX -= mSpeedX * timePassed / 10;
+    mScrollY -= mSpeedY * timePassed / 10;
+
+    // Parallax scrolling
+    mScrollX += dx * mParallax;
+    mScrollY += dy * mParallax;
+
+    int imgW = mImage->getWidth();
+    int imgH = mImage->getHeight();
+
+    // Wrap values
+    while (mScrollX > imgW)
+        mScrollX -= imgW;
+    while (mScrollX < 0)
+        mScrollX += imgW;
+
+    while (mScrollY > imgH)
+        mScrollY -= imgH;
+    while (mScrollY < 0)
+        mScrollY += imgH;
+}
+
+void AmbientOverlay::draw(Graphics *graphics, int x, int y)
+{
+    graphics->drawImagePattern(mImage, (int)(-mScrollX), (int)(-mScrollY),
+            x + (int)mScrollX, y + (int)mScrollY);
+}
diff --git a/src/resources/ambientoverlay.h b/src/resources/ambientoverlay.h
new file mode 100644
index 00000000..25bc28ef
--- /dev/null
+++ b/src/resources/ambientoverlay.h
@@ -0,0 +1,51 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#ifndef _TMW_RESOURCES_AMBIENTOVERLAY_H_
+#define _TMW_RESOURCES_AMBIENTOVERLAY_H_
+
+class Graphics;
+class Image;
+
+class AmbientOverlay
+{
+    public:
+        AmbientOverlay(Image *img, float parallax,
+                float scrollX, float scrollY, float speedX, float speedY);
+
+        ~AmbientOverlay();
+
+        void update(int timePassed, float dx, float dy);
+
+        void draw(Graphics *graphics, int x, int y);
+
+    private:
+        Image *mImage;
+        float mParallax;
+        float mScrollX;
+        float mScrollY;
+        float mSpeedX;
+        float mSpeedY;
+};
+
+#endif
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index c1ae911c..2377a8f4 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -24,6 +24,7 @@
 #include "mapreader.h"
 
 #include <cassert>
+#include <iostream>
 #include <zlib.h>
 
 #include "resourcemanager.h"
@@ -215,29 +216,37 @@ MapReader::readMap(xmlNodePtr node, const std::string &path)
     }
 
     //set Overlays
-    int i = 0;
     ResourceManager *resman = ResourceManager::getInstance();
-
-    while (map->hasProperty("overlay" + toString(i) + "image"))
+    for (int i = 0; ; i++)
     {
-        Image *overlayImage = resman->getImage(map->getProperty("overlay" + toString(i) + "image"));
+        const std::string name = "overlay" + toString(i);
+
+        if (!map->hasProperty(name + "image"))
+            break; // Finished
+
+        Image *img = resman->getImage(map->getProperty(name + "image"));
         float scrollX = 0.0f;
         float scrollY = 0.0f;
         float parallax = 0.0f;
-        if (map->hasProperty("overlay" + toString(i) + "scrollX"))
+        std::stringstream ss;
+
+        if (map->hasProperty(name + "scrollX"))
         {
-            scrollX = atof(map->getProperty("overlay" + toString(i) + "scrollX").c_str());
+            ss.str(map->getProperty(name + "scrollX"));
+            ss >> scrollX;
         }
-        if (map->hasProperty("overlay" + toString(i) + "scrollY"))
+        if (map->hasProperty(name + "scrollY"))
         {
-            scrollY = atof(map->getProperty("overlay" + toString(i) + "scrollY").c_str());
+            ss.str(map->getProperty(name + "scrollY"));
+            ss >> scrollY;
         }
-        if (map->hasProperty("overlay" + toString(i) + "parallax"))
+        if (map->hasProperty(name + "parallax"))
         {
-            parallax = atof(map->getProperty("overlay" + toString(i) + "parallax").c_str());
+            ss.str(map->getProperty(name + "parallax"));
+            ss >> parallax;
         }
-        map->setOverlay (overlayImage, scrollX, scrollY, parallax);
-        i++;
+        map->setOverlay(img, scrollX, scrollY, parallax);
+        img->decRef();
     }
 
     return map;
@@ -351,6 +360,11 @@ MapReader::readLayer(xmlNodePtr node, Map *map, int layer)
             }
         }
 
+        if (y < h)
+            std::cerr << "TOO SMALL!\n";
+        if (x)
+            std::cerr << "TOO SMALL!\n";
+
         // There can be only one data element
         break;
     }