Remove ambientoverlay class and files

It was renamed and duplicated to "ambientlayer"

3 files changed, 0 insertions, 166 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 38589505..c9f23cc1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -349,8 +349,6 @@ SET(SRCS
     resources/action.h
     resources/ambientlayer.cpp
     resources/ambientlayer.h
-    resources/ambientoverlay.cpp
-    resources/ambientoverlay.h
     resources/animation.cpp
     resources/animation.h
     resources/colordb.cpp
diff --git a/src/resources/ambientoverlay.cpp b/src/resources/ambientoverlay.cpp
deleted file mode 100644
index aba12f84..00000000
--- a/src/resources/ambientoverlay.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- *  The Mana Client
- *  Copyright (C) 2004-2009  The Mana World Development Team
- *  Copyright (C) 2009-2010  The Mana Developers
- *
- *  This file is part of The Mana Client.
- *
- *  This program 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.
- *
- *  This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "resources/ambientoverlay.h"
-
-#include "graphics.h"
-
-#include "resources/image.h"
-#include "resources/resourcemanager.h"
-
-AmbientOverlay::AmbientOverlay(Image *img, float parallax,
-                               float speedX, float speedY, bool keepRatio):
-    mImage(img), mParallax(parallax),
-    mPosX(0), mPosY(0),
-    mSpeedX(speedX), mSpeedY(speedY),
-    mKeepRatio(keepRatio)
-{
-
-    if (keepRatio && !mImage->useOpenGL()
-        && defaultScreenWidth != 0
-        && defaultScreenHeight != 0
-        && graphics->getWidth() != defaultScreenWidth
-        && graphics->getHeight() != defaultScreenHeight)
-    {
-        // Rescale the overlay to keep the ratio as if we were on
-        // the default resolution...
-        Image *rescaledOverlay = mImage->SDLgetScaledImage(
-         (int) mImage->getWidth() / defaultScreenWidth * graphics->getWidth(),
-     (int) mImage->getHeight() / defaultScreenHeight * graphics->getHeight());
-
-        if (rescaledOverlay)
-        {
-            // Replace the resource with the new one...
-            std::string idPath = mImage->getIdPath() + "_rescaled";
-            ResourceManager::getInstance()->addResource(idPath, rescaledOverlay);
-            mImage = rescaledOverlay;
-        }
-        else
-            mImage->incRef();
-    }
-    else
-        mImage->incRef();
-}
-
-AmbientOverlay::~AmbientOverlay()
-{
-    mImage->decRef();
-}
-
-void AmbientOverlay::update(int timePassed, float dx, float dy)
-{
-    // Self scrolling of the overlay
-    mPosX -= mSpeedX * timePassed / 10;
-    mPosY -= mSpeedY * timePassed / 10;
-
-    // Parallax scrolling
-    mPosX += dx * mParallax;
-    mPosY += dy * mParallax;
-
-    int imgW = mImage->getWidth();
-    int imgH = mImage->getHeight();
-
-    // Wrap values
-    while (mPosX > imgW)
-        mPosX -= imgW;
-    while (mPosX < 0)
-        mPosX += imgW;
-
-    while (mPosY > imgH)
-        mPosY -= imgH;
-    while (mPosY < 0)
-        mPosY += imgH;
-}
-
-void AmbientOverlay::draw(Graphics *graphics, int x, int y)
-{
-    if (!mImage->useOpenGL() || !mKeepRatio)
-        graphics->drawImagePattern(mImage,
-            (int) -mPosX, (int) -mPosY, x + (int) mPosX, y + (int) mPosY);
-    else
-        graphics->drawRescaledImagePattern(mImage,
-              (int) -mPosX, (int) -mPosY, x + (int) mPosX, y + (int) mPosY,
-         (int) mImage->getWidth() / defaultScreenWidth * graphics->getWidth(),
-     (int) mImage->getHeight() / defaultScreenHeight * graphics->getHeight());
-
-}
diff --git a/src/resources/ambientoverlay.h b/src/resources/ambientoverlay.h
deleted file mode 100644
index 023529c6..00000000
--- a/src/resources/ambientoverlay.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *  The Mana Client
- *  Copyright (C) 2004-2009  The Mana World Development Team
- *  Copyright (C) 2009-2010  The Mana Developers
- *
- *  This file is part of The Mana Client.
- *
- *  This program 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.
- *
- *  This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef RESOURCES_AMBIENTOVERLAY_H
-#define RESOURCES_AMBIENTOVERLAY_H
-
-class Graphics;
-class Image;
-
-class AmbientOverlay
-{
-    public:
-        /**
-         * Constructor.
-         *
-         * @param img       the image this overlay displays
-         * @param parallax  scroll factor based on camera position
-         * @param speedX    scrolling speed in x-direction
-         * @param speedY    scrolling speed in y-direction
-         * @param keepRatio  rescale the image to keep
-         * the same ratio than in 800x600 resolution mode.
-         */
-        AmbientOverlay(Image *img, float parallax,
-                       float speedX, float speedY, bool keepRatio = false);
-
-        ~AmbientOverlay();
-
-        void update(int timePassed, float dx, float dy);
-
-        void draw(Graphics *graphics, int x, int y);
-
-    private:
-        Image *mImage;
-        float mParallax;
-        float mPosX;              /**< Current layer X position. */
-        float mPosY;              /**< Current layer Y position. */
-        float mSpeedX;            /**< Scrolling speed in X direction. */
-        float mSpeedY;            /**< Scrolling speed in Y direction. */
-        bool mKeepRatio;          /**< Keep overlay ratio on every resolution */
-};
-
-#endif