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

11 files changed, 25 insertions, 37 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 926455b2..8de13464 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -350,5 +350,5 @@ tmw_SOURCES = gui/widgets/dropdown.cpp \
 # set the include path found by configure
 INCLUDES =					\
 	$(all_includes)				\
-	-DTMW_DATADIR=\""$(pkgdatadir)/"\"      \
+	-DPKG_DATADIR=\""$(pkgdatadir)/"\"      \
 	-DLOCALEDIR=\""$(localedir)"\"
diff --git a/src/effectmanager.h b/src/effectmanager.h
index 12fe3133..a06ecbc7 100644
--- a/src/effectmanager.h
+++ b/src/effectmanager.h
@@ -30,7 +30,6 @@ class Being;
 
 class EffectManager
 {
-
     public: 
         struct EffectDescription
         {
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index b9fe1c90..af3b29a2 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -87,12 +87,12 @@ InventoryWindow::InventoryWindow(int invSize):
     mWeightBar = new ProgressBar(1.0f, 100, 20, 0, 0, 255);
 
     setMinHeight(130);
-    setMinWidth(mWeightLabel->getWidth() + mSlotsLabel->getWidth() + 310);
+    setMinWidth(mWeightLabel->getWidth() + mSlotsLabel->getWidth() + 280);
 
     place(0, 0, mWeightLabel).setPadding(3);
-    place(1, 0, mWeightBar, 2);
-    place(3, 0, mSlotsLabel).setPadding(3);
-    place(4, 0, mSlotsBar, 2);
+    place(1, 0, mWeightBar, 3);
+    place(4, 0, mSlotsLabel).setPadding(3);
+    place(5, 0, mSlotsBar, 2);
     place(0, 1, mInvenScroll, 7, 4);
     place(5, 5, mDropButton);
     place(6, 5, mUseButton);
diff --git a/src/gui/recorder.cpp b/src/gui/recorder.cpp
index 1e7d8e13..153bffae 100644
--- a/src/gui/recorder.cpp
+++ b/src/gui/recorder.cpp
@@ -1,15 +1,15 @@
 /*
- *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  A chat recorder
+ *  Copyright (C) 2008  Lloyd Bryant <lloyd_bryant@netzero.net>
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  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.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  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.
@@ -52,6 +52,10 @@ Recorder::Recorder(ChatWindow *chat, const std::string &title,
     loadWindowState();
 }
 
+Recorder::~Recorder()
+{
+}
+
 void Recorder::record(const std::string &msg)
 {
     if (mStream.is_open())
@@ -110,6 +114,3 @@ void Recorder::action(const gcn::ActionEvent &event)
     changeRecordingStatus("");
 }
 
-Recorder::~Recorder()
-{
-}
diff --git a/src/gui/status.cpp b/src/gui/status.cpp
index 21087fad..e8426ec4 100644
--- a/src/gui/status.cpp
+++ b/src/gui/status.cpp
@@ -41,7 +41,7 @@ StatusWindow::StatusWindow(LocalPlayer *player):
     setWindowName(_("Status"));
     setCloseButton(true);
     setDefaultSize((windowContainer->getWidth() - 365) / 2,
-                   (windowContainer->getHeight() - 255) / 2, 400, 335);
+                   (windowContainer->getHeight() - 255) / 2, 400, 345);
 
     // ----------------------
     // Status Part
@@ -119,13 +119,13 @@ StatusWindow::StatusWindow(LocalPlayer *player):
     place(0, 0, mLvlLabel, 3);
     place(5, 0, mJobLvlLabel, 3);
     place(8, 0, mGpLabel, 3);
-    place(1, 1, mHpLabel);
+    place(1, 1, mHpLabel).setPadding(3);
     place(2, 1, mHpBar, 3);
-    place(6, 1, mXpLabel);
+    place(6, 1, mXpLabel).setPadding(3);
     place(7, 1, mXpBar, 3);
-    place(1, 2, mMpLabel);
+    place(1, 2, mMpLabel).setPadding(3);
     place(2, 2, mMpBar, 3);
-    place(6, 2, mJobLabel);
+    place(6, 2, mJobLabel).setPadding(3);
     place(7, 2, mJobBar, 3);
     place.getCell().matchColWidth(0, 1);
     place = getPlacer(0, 3);
diff --git a/src/joystick.h b/src/joystick.h
index 4e5c3d23..4c5390c2 100644
--- a/src/joystick.h
+++ b/src/joystick.h
@@ -31,7 +31,7 @@ class Joystick
          * Number of buttons we can handle.
          */
         enum
-        { 
+        {
             MAX_BUTTONS = 6
         };
 
diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp
index 413a8036..6405966c 100644
--- a/src/keyboardconfig.cpp
+++ b/src/keyboardconfig.cpp
@@ -154,7 +154,7 @@ bool KeyboardConfig::hasConflicts()
                    ((j >= KEY_EMOTE_1) && (j <= KEY_EMOTE_12))) || 
                    ((i == KEY_TOGGLE_CHAT) && (j == KEY_OK))) &&
                    (mKey[i].value == mKey[j].value)
-	       )
+               )
             {
                 return true;
             }
diff --git a/src/main.cpp b/src/main.cpp
index 42f73eef..244f8972 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -332,7 +332,7 @@ void init_engine(const Options &options)
     strncat(path, "/data", PATH_MAX - 1);
     resman->addToSearchPath(path, true);
 #else
-    resman->addToSearchPath(TMW_DATADIR "data", true);
+    resman->addToSearchPath(PKG_DATADIR "data", true);
 #endif
 
     // Fill configuration with defaults
@@ -389,7 +389,7 @@ void init_engine(const Options &options)
         SetClassLong(pInfo.window, GCL_HICON, (LONG) icon);
     }
 #else
-    SDL_Surface *icon = IMG_Load(TMW_DATADIR "data/icons/tmw.png");
+    SDL_Surface *icon = IMG_Load(PKG_DATADIR "data/icons/tmw.png");
     if (icon)
     {
         SDL_SetAlpha(icon, SDL_SRCALPHA, SDL_ALPHA_OPAQUE);
diff --git a/src/main.h b/src/main.h
index 0e884fb2..5a337d15 100644
--- a/src/main.h
+++ b/src/main.h
@@ -30,8 +30,8 @@
 #include "winver.h"
 #endif
 
-#ifndef TMW_DATADIR
-#define TMW_DATADIR ""
+#ifndef PKG_DATADIR
+#define PKG_DATADIR ""
 #endif
 
 /*
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;