Merge branch 'aethyra/master'

Conflicts:
	docs/FAQ.txt
	packaging/windows/make-translations.vbs
	src/Makefile.am
	src/gui/colour.cpp
	src/gui/colour.h
	src/gui/popupmenu.cpp
	src/gui/setup_colours.h
	src/main.cpp
	src/main.h
	src/resources/resourcemanager.cpp
	src/text.cpp
	src/text.h
	src/textmanager.cpp
	src/textmanager.h

2 files changed, 1 insertions, 13 deletions

diff --git a/src/resources/image.h b/src/resources/image.h
index 9af10fda..fe3081ac 100644
--- a/src/resources/image.h
+++ b/src/resources/image.h
@@ -94,12 +94,6 @@ class Image : public Resource
         virtual void unload();
 
         /**
-         * Returns the image.
-         */
-        virtual const Image* getImage() const
-        { return this; }
-
-        /**
          * Returns the width of the image.
          */
         virtual int getWidth() const
@@ -189,12 +183,6 @@ class SubImage : public Image
         ~SubImage();
 
         /**
-         * Returns the image.
-         */
-        virtual const Image* getImage() const
-        { return mParent; }
-
-        /**
          * Creates a new image with the desired clipping rectangle.
          *
          * @return <code>NULL</code> if creation failed and a valid
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index 3f58076e..d005c212 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -207,7 +207,7 @@ std::string ResourceManager::getPath(const std::string &file)
     else
     {
         // if not found in search path return the default path
-        path = std::string(TMW_DATADIR) + std::string("data") + "/" + file;
+        path = std::string(PKG_DATADIR) + std::string("data") + "/" + file;
     }
 
     return path;