Fixed header files, as well as removed the unused buddy list class (not

useful since buddy lists are tracked through the player relation
interface instead)

Signed-off-by: Ira Rice <irarice@gmail.com>

44 files changed, 130 insertions, 300 deletions

diff --git a/src/resources/action.cpp b/src/resources/action.cpp
index e2cb11f2..67acf1b1 100644
--- a/src/resources/action.cpp
+++ b/src/resources/action.cpp
@@ -1,8 +1,9 @@
 /*
- *  The Mana World
+ *  Aethyra
  *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of Aethyra based on original code
+ *  from 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
diff --git a/src/resources/action.h b/src/resources/action.h
index 649d3828..8dde068c 100644
--- a/src/resources/action.h
+++ b/src/resources/action.h
@@ -1,8 +1,9 @@
 /*
- *  The Mana World
+ *  Aethyra
  *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of Aethyra based on original code
+ *  from 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
diff --git a/src/resources/ambientoverlay.cpp b/src/resources/ambientoverlay.cpp
index 32ed47d1..9585f4f7 100644
--- a/src/resources/ambientoverlay.cpp
+++ b/src/resources/ambientoverlay.cpp
@@ -1,8 +1,9 @@
 /*
- *  The Mana World
+ *  Aethyra
  *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of Aethyra based on original code
+ *  from 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
diff --git a/src/resources/ambientoverlay.h b/src/resources/ambientoverlay.h
index 65f9891d..bb61f826 100644
--- a/src/resources/ambientoverlay.h
+++ b/src/resources/ambientoverlay.h
@@ -1,8 +1,9 @@
 /*
- *  The Mana World
+ *  Aethyra
  *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of Aethyra based on original code
+ *  from 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
diff --git a/src/resources/animation.cpp b/src/resources/animation.cpp
index 54c319de..901f4f25 100644
--- a/src/resources/animation.cpp
+++ b/src/resources/animation.cpp
@@ -1,8 +1,9 @@
 /*
- *  The Mana World
+ *  Aethyra
  *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of Aethyra based on original code
+ *  from 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
diff --git a/src/resources/animation.h b/src/resources/animation.h
index 0c461ebe..bc8431c7 100644
--- a/src/resources/animation.h
+++ b/src/resources/animation.h
@@ -1,8 +1,9 @@
 /*
- *  The Mana World
+ *  Aethyra
  *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of Aethyra based on original code
+ *  from 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
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/colordb.cpp b/src/resources/colordb.cpp
index 61ea4bc0..4ff8944c 100644
--- a/src/resources/colordb.cpp
+++ b/src/resources/colordb.cpp
@@ -1,21 +1,21 @@
 /*
- *  Aethyra
+ *  Color Database
  *  Copyright 2008 Aethyra Development Team
  *
  *  This file is part of Aethyra.
  *
- *  Aethyra 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.
  *
- *  Aethyra 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.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with Aethyra; if not, write to the Free Software Foundation,
+ *  along with this program; if not, write to the Free Software Foundation,
  *  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/resources/colordb.h b/src/resources/colordb.h
index 2166abcf..d4568d54 100644
--- a/src/resources/colordb.h
+++ b/src/resources/colordb.h
@@ -1,21 +1,21 @@
 /*
- *  Aethyra
+ *  Color Database
  *  Copyright 2008 Aethyra Development Team
  *
  *  This file is part of Aethyra.
  *
- *  Aethyra 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.
  *
- *  Aethyra 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.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with Aethyra; if not, write to the Free Software Foundation,
+ *  along with this program; if not, write to the Free Software Foundation,
  *  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/resources/dye.cpp b/src/resources/dye.cpp
index 63d85501..a5998017 100644
--- a/src/resources/dye.cpp
+++ b/src/resources/dye.cpp
@@ -1,8 +1,9 @@
 /*
- *  The Mana World
+ *  Aethyra
  *  Copyright (C) 2007  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of Aethyra based on original code
+ *  from 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
diff --git a/src/resources/dye.h b/src/resources/dye.h
index 1db16c6a..48254b6f 100644
--- a/src/resources/dye.h
+++ b/src/resources/dye.h
@@ -1,8 +1,9 @@
 /*
- *  The Mana World
+ *  Aethyra
  *  Copyright (C) 2007  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of Aethyra based on original code
+ *  from 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
diff --git a/src/resources/emotedb.cpp b/src/resources/emotedb.cpp
index ac41b59c..5a014c95 100644
--- a/src/resources/emotedb.cpp
+++ b/src/resources/emotedb.cpp
@@ -1,21 +1,21 @@
 /*
- *  Aethyra
+ *  Emote database
  *  Copyright 2009 Aethyra Development Team
  *
  *  This file is part of Aethyra.
  *
- *  Aethyra 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.
  *
- *  Aethyra 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.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with Aethyra; if not, write to the Free Software Foundation,
+ *  along with this program; if not, write to the Free Software Foundation,
  *  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/resources/emotedb.h b/src/resources/emotedb.h
index 2b9dbbc2..d0cd4d71 100644
--- a/src/resources/emotedb.h
+++ b/src/resources/emotedb.h
@@ -1,21 +1,21 @@
 /*
- *  Aethyra
+ *  Emote database
  *  Copyright 2009 Aethyra Development Team
  *
  *  This file is part of Aethyra.
  *
- *  Aethyra 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.
  *
- *  Aethyra 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.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with Aethyra; if not, write to the Free Software Foundation,
+ *  along with this program; if not, write to the Free Software Foundation,
  *  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
diff --git a/src/resources/image.cpp b/src/resources/image.cpp
index 7a7e6ac8..7a15b762 100644
--- a/src/resources/image.cpp
+++ b/src/resources/image.cpp
@@ -1,8 +1,9 @@
 /*
- *  The Mana World
+ *  Aethyra
  *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of Aethyra based on original code
+ *  from 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
diff --git a/src/resources/image.h b/src/resources/image.h
index fe3081ac..596917ce 100644
--- a/src/resources/image.h
+++ b/src/resources/image.h
@@ -1,8 +1,9 @@
 /*
- *  The Mana World
+ *  Aethyra
  *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of Aethyra based on original code
+ *  from 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
diff --git a/src/resources/imageloader.cpp b/src/resources/imageloader.cpp
index c182b44c..fe420e89 100644
--- a/src/resources/imageloader.cpp
+++ b/src/resources/imageloader.cpp
@@ -1,8 +1,9 @@
 /*
- *  The Mana World
+ *  Aethyra
  *  Copyright (C) 2007  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of Aethyra based on original code
+ *  from 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
diff --git a/src/resources/imageloader.h b/src/resources/imageloader.h
index 0ac7c899..2695b99c 100644
--- a/src/resources/imageloader.h
+++ b/src/resources/imageloader.h
@@ -1,8 +1,9 @@
 /*
- *  The Mana World
+ *  Aethyra
  *  Copyright (C) 2007  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of Aethyra based on original code
+ *  from 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
diff --git a/src/resources/imageset.cpp b/src/resources/imageset.cpp
index 92bb3242..33be1573 100644
--- a/src/resources/imageset.cpp
+++ b/src/resources/imageset.cpp
@@ -1,8 +1,9 @@
 /*
- *  The Mana World
+ *  Aethyra
  *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of Aethyra based on original code
+ *  from 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
diff --git a/src/resources/imageset.h b/src/resources/imageset.h
index f59c76bb..ad209aaf 100644
--- a/src/resources/imageset.h
+++ b/src/resources/imageset.h
@@ -1,8 +1,9 @@
 /*
- *  The Mana World
+ *  Aethyra
  *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of Aethyra based on original code
+ *  from 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
diff --git a/src/resources/imagewriter.cpp b/src/resources/imagewriter.cpp
index c350ac07..5ddd24e3 100644
--- a/src/resources/imagewriter.cpp
+++ b/src/resources/imagewriter.cpp
@@ -1,8 +1,9 @@
 /*
- *  The Mana World
+ *  Aethyra
  *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of Aethyra based on original code
+ *  from 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
diff --git a/src/resources/imagewriter.h b/src/resources/imagewriter.h
index 039d3afb..c69eb2d3 100644
--- a/src/resources/imagewriter.h
+++ b/src/resources/imagewriter.h
@@ -1,8 +1,9 @@
 /*
- *  The Mana World
+ *  Aethyra
  *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of Aethyra based on original code
+ *  from 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
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index 9976f0d4..5577b5e1 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -1,8 +1,9 @@
 /*
- *  The Mana World
+ *  Aethyra
  *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of Aethyra based on original code
+ *  from 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
diff --git a/src/resources/itemdb.h b/src/resources/itemdb.h
index 08a7acd0..1e55f146 100644
--- a/src/resources/itemdb.h
+++ b/src/resources/itemdb.h
@@ -1,8 +1,9 @@
 /*
- *  The Mana World
+ *  Aethyra
  *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of Aethyra based on original code
+ *  from 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
diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp
index 2f118284..8dcb1c32 100644
--- a/src/resources/iteminfo.cpp
+++ b/src/resources/iteminfo.cpp
@@ -1,8 +1,9 @@
 /*
- *  The Mana World
+ *  Aethyra
  *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of Aethyra based on original code
+ *  from 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
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index c03dec28..d3dd4908 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -1,8 +1,9 @@
 /*
- *  The Mana World
+ *  Aethyra
  *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of Aethyra based on original code
+ *  from 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
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index 2278dc67..840f0677 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -1,8 +1,9 @@
 /*
- *  The Mana World
+ *  Aethyra
  *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of Aethyra based on original code
+ *  from 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
diff --git a/src/resources/mapreader.h b/src/resources/mapreader.h
index 0ed553c3..2f64aa8c 100644
--- a/src/resources/mapreader.h
+++ b/src/resources/mapreader.h
@@ -1,8 +1,9 @@
 /*
- *  The Mana World
+ *  Aethyra
  *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of Aethyra based on original code
+ *  from 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
diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp
index c7824a5d..13f3a7ee 100644
--- a/src/resources/monsterdb.cpp
+++ b/src/resources/monsterdb.cpp
@@ -1,8 +1,9 @@
 /*
- *  The Mana World
+ *  Aethyra
  *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of Aethyra based on original code
+ *  from 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
diff --git a/src/resources/monsterdb.h b/src/resources/monsterdb.h
index 0a218661..e49901d5 100644
--- a/src/resources/monsterdb.h
+++ b/src/resources/monsterdb.h
@@ -1,8 +1,9 @@
 /*
- *  The Mana World
+ *  Aethyra
  *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of Aethyra based on original code
+ *  from 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
diff --git a/src/resources/monsterinfo.cpp b/src/resources/monsterinfo.cpp
index 503990e7..5491a0bd 100644
--- a/src/resources/monsterinfo.cpp
+++ b/src/resources/monsterinfo.cpp
@@ -1,8 +1,9 @@
 /*
- *  The Mana World
+ *  Aethyra
  *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of Aethyra based on original code
+ *  from 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
diff --git a/src/resources/monsterinfo.h b/src/resources/monsterinfo.h
index 359791fd..4a3208f4 100644
--- a/src/resources/monsterinfo.h
+++ b/src/resources/monsterinfo.h
@@ -1,8 +1,9 @@
 /*
- *  The Mana World
+ *  Aethyra
  *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of Aethyra based on original code
+ *  from 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
diff --git a/src/resources/music.cpp b/src/resources/music.cpp
index ed78a541..72094025 100644
--- a/src/resources/music.cpp
+++ b/src/resources/music.cpp
@@ -1,8 +1,9 @@
 /*
- *  The Mana World
+ *  Aethyra
  *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of Aethyra based on original code
+ *  from 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
diff --git a/src/resources/music.h b/src/resources/music.h
index 65f1ee88..36da6a61 100644
--- a/src/resources/music.h
+++ b/src/resources/music.h
@@ -1,8 +1,9 @@
 /*
- *  The Mana World
+ *  Aethyra
  *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of Aethyra based on original code
+ *  from 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
diff --git a/src/resources/npcdb.cpp b/src/resources/npcdb.cpp
index 73c3939d..177d3116 100644
--- a/src/resources/npcdb.cpp
+++ b/src/resources/npcdb.cpp
@@ -1,8 +1,9 @@
 /*
- *  The Mana World
+ *  Aethyra
  *  Copyright (C) 2008  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of Aethyra based on original code
+ *  from 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
diff --git a/src/resources/npcdb.h b/src/resources/npcdb.h
index af6764bf..394154fa 100644
--- a/src/resources/npcdb.h
+++ b/src/resources/npcdb.h
@@ -1,8 +1,9 @@
 /*
- *  The Mana World
+ *  Aethyra
  *  Copyright (C) 2008  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of Aethyra based on original code
+ *  from 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
diff --git a/src/resources/resource.cpp b/src/resources/resource.cpp
index d1c3ada4..ca9a69c3 100644
--- a/src/resources/resource.cpp
+++ b/src/resources/resource.cpp
@@ -1,8 +1,9 @@
 /*
- *  The Mana World
+ *  Aethyra
  *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of Aethyra based on original code
+ *  from 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
diff --git a/src/resources/resource.h b/src/resources/resource.h
index 7c5f989e..f8822d72 100644
--- a/src/resources/resource.h
+++ b/src/resources/resource.h
@@ -1,8 +1,9 @@
 /*
- *  The Mana World
+ *  Aethyra
  *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of Aethyra based on original code
+ *  from 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
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index a5d927dd..fcd9495f 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -1,8 +1,9 @@
 /*
- *  The Mana World
+ *  Aethyra
  *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of Aethyra based on original code
+ *  from 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
diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager.h
index 3a97c05f..10f6fffe 100644
--- a/src/resources/resourcemanager.h
+++ b/src/resources/resourcemanager.h
@@ -1,8 +1,9 @@
 /*
- *  The Mana World
+ *  Aethyra
  *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of Aethyra based on original code
+ *  from 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
diff --git a/src/resources/soundeffect.cpp b/src/resources/soundeffect.cpp
index 3a285730..d1d24afb 100644
--- a/src/resources/soundeffect.cpp
+++ b/src/resources/soundeffect.cpp
@@ -1,8 +1,9 @@
 /*
- *  The Mana World
+ *  Aethyra
  *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of Aethyra based on original code
+ *  from 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
diff --git a/src/resources/soundeffect.h b/src/resources/soundeffect.h
index 116df930..e2181767 100644
--- a/src/resources/soundeffect.h
+++ b/src/resources/soundeffect.h
@@ -1,8 +1,9 @@
 /*
- *  The Mana World
+ *  Aethyra
  *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of Aethyra based on original code
+ *  from 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
diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp
index e8d064d4..989741dc 100644
--- a/src/resources/spritedef.cpp
+++ b/src/resources/spritedef.cpp
@@ -1,8 +1,9 @@
 /*
- *  The Mana World
+ *  Aethyra
  *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of Aethyra based on original code
+ *  from 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
diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h
index 99d570f1..040d96e2 100644
--- a/src/resources/spritedef.h
+++ b/src/resources/spritedef.h
@@ -1,8 +1,9 @@
 /*
- *  The Mana World
+ *  Aethyra
  *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of The Mana World.
+ *  This file is part of Aethyra based on original code
+ *  from 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