Merge commit 'aethyra/master'

Conflicts:
	CMakeLists.txt
	configure.ac
	data/help/header.txt
	packaging/windows/setup.nsi
	po/POTFILES.in
	src/being.cpp
	src/being.h
	src/game.cpp
	src/gui/color.cpp
	src/gui/color.h
	src/gui/equipmentwindow.h
	src/gui/popupmenu.cpp
	src/gui/recorder.cpp
	src/gui/setup_colors.h
	src/gui/setup_keyboard.cpp
	src/gui/setup_keyboard.h
	src/gui/skill.cpp
	src/gui/speechbubble.cpp
	src/gui/speechbubble.h
	src/gui/table.cpp
	src/keyboardconfig.cpp
	src/keyboardconfig.h
	src/localplayer.cpp
	src/main.cpp
	src/main.h
	src/map.cpp
	src/resources/colordb.cpp
	src/resources/colordb.h
	src/resources/emotedb.cpp
	src/resources/emotedb.h
	src/text.cpp
	src/text.h
	src/tmw.rc
	src/winver.h

8 files changed, 13 insertions, 214 deletions

diff --git a/src/resources/buddylist.cpp b/src/resources/buddylist.cpp
deleted file mode 100644
index 719ecab1..00000000
--- a/src/resources/buddylist.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- *  The Mana World
- *  Copyright (C) 2004  The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  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, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include <algorithm>
-#include <cstring>
-#include <fstream>
-#include <iostream>
-
-#include "buddylist.h"
-
-#include "../configuration.h"
-#include "../main.h"
-
-BuddyList::BuddyList()
-{
-    // TODO: A buddy list would have to use the Configuration class to store
-    //       the buddies. Also, there is now a player relationship manager
-    //       which probably makes this buddy list kind of obsolete.
-
-    // Find saved buddy list file
-    //mFilename = homeDir + "/buddy.txt";
-
-    // Load buddy from file
-    loadFile();
-}
-
-void BuddyList::loadFile()
-{
-    // Open file
-    std::ifstream inputStream(mFilename.c_str(), std::ios::in);
-    if (!inputStream) {
-        std::cerr << "Error opening input stream" << std::endl;
-        return;
-    }
-
-    do {
-        char *buddy = new char[LEN_MAX_USERNAME];
-        inputStream.getline(buddy, LEN_MAX_USERNAME);
-        // Ugly ?
-        if (strcmp(buddy, "")) mBuddylist.push_back(buddy);
-        delete [] buddy;
-    } while (!inputStream.eof());
-
-    // Read buddy and close file
-    inputStream.close();
-}
-
-void BuddyList::saveFile()
-{
-    std::string str;
-
-    // Open file
-    std::ofstream outputStream(mFilename.c_str(), std::ios::trunc);
-    if (!outputStream) {
-        std::cerr << "Error opening output stream" << std::endl;
-        return;
-    }
-
-    // Write buddy and close file
-    for (BuddyIterator i = mBuddylist.begin(); i != mBuddylist.end(); ++i)
-    {
-        outputStream << (const char*) i->c_str() << std::endl;
-    }
-    outputStream.close();
-}
-
-bool BuddyList::addBuddy(const std::string buddy)
-{
-    if (find(mBuddylist.begin(), mBuddylist.end(), buddy) != mBuddylist.end())
-    {
-        return false;
-    }
-
-    // Buddy doesnt exist, add it
-    mBuddylist.push_back(buddy);
-
-    // Save file
-    saveFile();
-
-    return true;
-}
-
-bool BuddyList::removeBuddy(const std::string buddy)
-{
-    BuddyIterator i = find(mBuddylist.begin(), mBuddylist.end(), buddy);
-
-    if (i != mBuddylist.end()) {
-        mBuddylist.erase(i);
-        saveFile();
-        return true;
-    }
-
-    return false;
-}
-
-int BuddyList::getNumberOfElements()
-{
-    return mBuddylist.size();
-}
-
-std::string BuddyList::getElementAt(int number)
-{
-    if (number >= (int) mBuddylist.size()) {
-        return "";
-    }
-
-    BuddyIterator i = mBuddylist.begin();
-    std::advance(i, number);
-    return *i;
-}
diff --git a/src/resources/buddylist.h b/src/resources/buddylist.h
deleted file mode 100644
index f0758c25..00000000
--- a/src/resources/buddylist.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- *  The Mana World
- *  Copyright (C) 2004  The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  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, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef BUDDYLIST_H
-#define BUDDYLIST_H
-
-#include <list>
-#include <string>
-
-#include <guichan/listmodel.hpp>
-
-class BuddyList : public gcn::ListModel
-{
-    public:
-        /**
-         * Constructor
-         */
-        BuddyList();
-
-        /**
-         * Destructor
-         */
-        virtual ~BuddyList() { }
-
-        /**
-         * Adds buddy to the list
-         */
-        bool addBuddy(const std::string buddy);
-
-        /**
-         * Removes buddy from the list
-         */
-        bool removeBuddy(const std::string buddy);
-
-        /**
-         * Returns the number of buddy on the list
-         */
-        int getNumberOfElements();
-
-        /**
-         * Returns the buddy of the number or null
-         */
-        std::string getElementAt(int number);
-
-    private:
-        /**
-         * Save buddy to file
-         */
-        void saveFile();
-
-        /**
-         * Load buddy from file
-         */
-        void loadFile();
-
-        typedef std::list<std::string> Buddies;
-        typedef Buddies::iterator BuddyIterator;
-        Buddies mBuddylist;               /**< Buddy list */
-        std::string mFilename;            /* File to work with */
-};
-
-#endif /* BUDDYLIST_H */
diff --git a/src/resources/emotedb.cpp b/src/resources/emotedb.cpp
index 77c3c2fb..5e9a146c 100644
--- a/src/resources/emotedb.cpp
+++ b/src/resources/emotedb.cpp
@@ -1,6 +1,6 @@
 /*
  *  Emote database
- *  Copyright (C) 2008  Aethyra Development Team
+ *  Copyright (C) 2009  Aethyra Development Team
  *
  *  This file is part of The Mana World.
  *
diff --git a/src/resources/emotedb.h b/src/resources/emotedb.h
index 2cf3af62..ad21722a 100644
--- a/src/resources/emotedb.h
+++ b/src/resources/emotedb.h
@@ -1,6 +1,6 @@
 /*
  *  Emote database
- *  Copyright (C) 2008  Aethyra Development Team
+ *  Copyright (C) 2009  Aethyra Development Team
  *
  *  This file is part of The Mana World.
  *
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index 6fa010d4..47538b87 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -62,7 +62,7 @@ void ItemDB::load()
 
     if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "items"))
     {
-        logger->error(_("ItemDB: Error while loading items.xml!"));
+        logger->error("ItemDB: Error while loading items.xml!");
     }
 
     for_each_xml_child_node(node, rootNode)
diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp
index 15451c95..25a3102c 100644
--- a/src/resources/monsterdb.cpp
+++ b/src/resources/monsterdb.cpp
@@ -50,7 +50,7 @@ void MonsterDB::load()
 
     if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "monsters"))
     {
-        logger->error(_("Monster Database: Error while loading monster.xml!"));
+        logger->error("Monster Database: Error while loading monster.xml!");
     }
 
     //iterate <monster>s
@@ -63,7 +63,7 @@ void MonsterDB::load()
 
         MonsterInfo *currentInfo = new MonsterInfo();
 
-        currentInfo->setName (XML::getProperty(monsterNode, "name", "unnamed"));
+        currentInfo->setName(XML::getProperty(monsterNode, "name", _("unnamed")));
 
         std::string targetCursor;
         targetCursor = XML::getProperty(monsterNode, "targetCursor", "medium");
diff --git a/src/resources/music.h b/src/resources/music.h
index 65f1ee88..34907cf1 100644
--- a/src/resources/music.h
+++ b/src/resources/music.h
@@ -22,8 +22,11 @@
 #ifndef MUSIC_H
 #define MUSIC_H
 
+#ifdef __APPLE__
+#include <SDL_mixer/SDL_mixer.h>
+#else
 #include <SDL_mixer.h>
-
+#endif
 #include "resource.h"
 
 /**
diff --git a/src/resources/soundeffect.h b/src/resources/soundeffect.h
index 116df930..fc2d4a69 100644
--- a/src/resources/soundeffect.h
+++ b/src/resources/soundeffect.h
@@ -22,7 +22,11 @@
 #ifndef SOUND_EFFECT_H
 #define SOUND_EFFECT_H
 
+#ifdef __APPLE__
+#include <SDL_mixer/SDL_mixer.h>
+#else
 #include <SDL_mixer.h>
+#endif
 
 #include "resource.h"