summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIra Rice <irarice@gmail.com>2009-02-10 20:09:33 -0700
committerIra Rice <irarice@gmail.com>2009-02-10 20:09:33 -0700
commitd268447e18c6e3edd80658f8f8d4317740c33af9 (patch)
tree587684b160d9aa4f4662a54ebe1af6ef9a85fb5f
parentf5f67e6411fb8338664372c7bc5e8f6cbeda73f4 (diff)
downloadmana-d268447e18c6e3edd80658f8f8d4317740c33af9.tar.gz
mana-d268447e18c6e3edd80658f8f8d4317740c33af9.tar.bz2
mana-d268447e18c6e3edd80658f8f8d4317740c33af9.tar.xz
mana-d268447e18c6e3edd80658f8f8d4317740c33af9.zip
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>
-rw-r--r--aethyra.cbp2
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/animatedsprite.cpp5
-rw-r--r--src/animatedsprite.h5
-rw-r--r--src/animationparticle.cpp5
-rw-r--r--src/animationparticle.h5
-rw-r--r--src/being.cpp5
-rw-r--r--src/being.h5
-rw-r--r--src/beingmanager.cpp5
-rw-r--r--src/beingmanager.h5
-rw-r--r--src/configlistener.h5
-rw-r--r--src/configuration.cpp5
-rw-r--r--src/configuration.h5
-rw-r--r--src/effectmanager.cpp3
-rw-r--r--src/effectmanager.h3
-rw-r--r--src/emoteshortcut.cpp3
-rw-r--r--src/emoteshortcut.h3
-rw-r--r--src/engine.cpp5
-rw-r--r--src/engine.h3
-rw-r--r--src/equipment.cpp5
-rw-r--r--src/equipment.h5
-rw-r--r--src/floor_item.cpp5
-rw-r--r--src/floor_item.h5
-rw-r--r--src/flooritemmanager.cpp5
-rw-r--r--src/flooritemmanager.h3
-rw-r--r--src/game.cpp5
-rw-r--r--src/game.h5
-rw-r--r--src/graphics.cpp5
-rw-r--r--src/graphics.h5
-rw-r--r--src/gui/browserbox.cpp5
-rw-r--r--src/gui/browserbox.h5
-rw-r--r--src/gui/button.cpp5
-rw-r--r--src/gui/button.h5
-rw-r--r--src/gui/buy.cpp5
-rw-r--r--src/gui/buy.h5
-rw-r--r--src/gui/buysell.cpp5
-rw-r--r--src/gui/buysell.h5
-rw-r--r--src/gui/char_select.cpp5
-rw-r--r--src/gui/char_select.h5
-rw-r--r--src/gui/char_server.cpp5
-rw-r--r--src/gui/char_server.h5
-rw-r--r--src/gui/chat.cpp5
-rw-r--r--src/gui/chat.h5
-rw-r--r--src/gui/chatinput.cpp5
-rw-r--r--src/gui/chatinput.h5
-rw-r--r--src/gui/checkbox.cpp5
-rw-r--r--src/gui/checkbox.h5
-rw-r--r--src/gui/colour.cpp2
-rw-r--r--src/gui/colour.h2
-rw-r--r--src/gui/confirm_dialog.cpp5
-rw-r--r--src/gui/confirm_dialog.h5
-rw-r--r--src/gui/connection.cpp5
-rw-r--r--src/gui/connection.h5
-rw-r--r--src/gui/debugwindow.cpp5
-rw-r--r--src/gui/debugwindow.h5
-rw-r--r--src/gui/emotecontainer.cpp3
-rw-r--r--src/gui/emotecontainer.h3
-rw-r--r--src/gui/emoteshortcutcontainer.cpp3
-rw-r--r--src/gui/emoteshortcutcontainer.h3
-rw-r--r--src/gui/emotewindow.cpp2
-rw-r--r--src/gui/emotewindow.h2
-rw-r--r--src/gui/equipmentwindow.cpp5
-rw-r--r--src/gui/equipmentwindow.h5
-rw-r--r--src/gui/focushandler.cpp5
-rw-r--r--src/gui/focushandler.h5
-rw-r--r--src/gui/gccontainer.cpp5
-rw-r--r--src/gui/gccontainer.h5
-rw-r--r--src/gui/gui.cpp5
-rw-r--r--src/gui/gui.h5
-rw-r--r--src/gui/help.cpp5
-rw-r--r--src/gui/help.h5
-rw-r--r--src/gui/inttextfield.cpp6
-rw-r--r--src/gui/inttextfield.h6
-rw-r--r--src/gui/inventorywindow.cpp5
-rw-r--r--src/gui/inventorywindow.h5
-rw-r--r--src/gui/item_amount.cpp5
-rw-r--r--src/gui/item_amount.h5
-rw-r--r--src/gui/itemcontainer.cpp5
-rw-r--r--src/gui/itemcontainer.h5
-rw-r--r--src/gui/itemlinkhandler.cpp5
-rw-r--r--src/gui/itemlinkhandler.h5
-rw-r--r--src/gui/itempopup.cpp11
-rw-r--r--src/gui/itempopup.h11
-rw-r--r--src/gui/itemshortcutcontainer.cpp5
-rw-r--r--src/gui/itemshortcutcontainer.h5
-rw-r--r--src/gui/linkhandler.h5
-rw-r--r--src/gui/listbox.cpp5
-rw-r--r--src/gui/listbox.h5
-rw-r--r--src/gui/login.cpp5
-rw-r--r--src/gui/login.h5
-rw-r--r--src/gui/menuwindow.cpp5
-rw-r--r--src/gui/menuwindow.h5
-rw-r--r--src/gui/minimap.cpp5
-rw-r--r--src/gui/minimap.h5
-rw-r--r--src/gui/ministatus.cpp5
-rw-r--r--src/gui/ministatus.h5
-rw-r--r--src/gui/npc_text.cpp5
-rw-r--r--src/gui/npc_text.h5
-rw-r--r--src/gui/npcintegerdialog.cpp5
-rw-r--r--src/gui/npcintegerdialog.h5
-rw-r--r--src/gui/npclistdialog.cpp5
-rw-r--r--src/gui/npclistdialog.h5
-rw-r--r--src/gui/npcstringdialog.cpp5
-rw-r--r--src/gui/npcstringdialog.h5
-rw-r--r--src/gui/ok_dialog.cpp5
-rw-r--r--src/gui/ok_dialog.h5
-rw-r--r--src/gui/passwordfield.cpp5
-rw-r--r--src/gui/passwordfield.h5
-rw-r--r--src/gui/playerbox.cpp5
-rw-r--r--src/gui/playerbox.h5
-rw-r--r--src/gui/popupmenu.cpp5
-rw-r--r--src/gui/popupmenu.h5
-rw-r--r--src/gui/progressbar.cpp5
-rw-r--r--src/gui/progressbar.h5
-rw-r--r--src/gui/radiobutton.cpp5
-rw-r--r--src/gui/radiobutton.h5
-rw-r--r--src/gui/register.cpp5
-rw-r--r--src/gui/register.h5
-rw-r--r--src/gui/scrollarea.cpp5
-rw-r--r--src/gui/scrollarea.h5
-rw-r--r--src/gui/sell.cpp5
-rw-r--r--src/gui/sell.h5
-rw-r--r--src/gui/setup.cpp5
-rw-r--r--src/gui/setup.h5
-rw-r--r--src/gui/setup_audio.cpp5
-rw-r--r--src/gui/setup_audio.h5
-rw-r--r--src/gui/setup_colours.cpp2
-rw-r--r--src/gui/setup_colours.h2
-rw-r--r--src/gui/setup_joystick.cpp5
-rw-r--r--src/gui/setup_joystick.h5
-rw-r--r--src/gui/setup_keyboard.cpp5
-rw-r--r--src/gui/setup_keyboard.h5
-rw-r--r--src/gui/setup_players.cpp6
-rw-r--r--src/gui/setup_players.h6
-rw-r--r--src/gui/setup_video.cpp5
-rw-r--r--src/gui/setup_video.h5
-rw-r--r--src/gui/setuptab.h5
-rw-r--r--src/gui/shop.cpp5
-rw-r--r--src/gui/shop.h5
-rw-r--r--src/gui/shoplistbox.cpp5
-rw-r--r--src/gui/shoplistbox.h5
-rw-r--r--src/gui/shortcutcontainer.cpp11
-rw-r--r--src/gui/shortcutcontainer.h11
-rw-r--r--src/gui/shortcutwindow.cpp7
-rw-r--r--src/gui/shortcutwindow.h7
-rw-r--r--src/gui/skill.cpp5
-rw-r--r--src/gui/skill.h5
-rw-r--r--src/gui/slider.cpp5
-rw-r--r--src/gui/slider.h5
-rw-r--r--src/gui/speechbubble.cpp12
-rw-r--r--src/gui/speechbubble.h12
-rw-r--r--src/gui/status.cpp5
-rw-r--r--src/gui/status.h5
-rw-r--r--src/gui/table.cpp7
-rw-r--r--src/gui/table.h7
-rw-r--r--src/gui/table_model.cpp5
-rw-r--r--src/gui/table_model.h5
-rw-r--r--src/gui/textbox.cpp5
-rw-r--r--src/gui/textbox.h5
-rw-r--r--src/gui/textfield.cpp5
-rw-r--r--src/gui/textfield.h5
-rw-r--r--src/gui/trade.cpp5
-rw-r--r--src/gui/trade.h5
-rw-r--r--src/gui/truetypefont.cpp5
-rw-r--r--src/gui/truetypefont.h5
-rw-r--r--src/gui/updatewindow.cpp5
-rw-r--r--src/gui/updatewindow.h5
-rw-r--r--src/gui/viewport.cpp5
-rw-r--r--src/gui/viewport.h5
-rw-r--r--src/gui/widgets/dropdown.cpp12
-rw-r--r--src/gui/widgets/dropdown.h12
-rw-r--r--src/gui/widgets/layout.cpp5
-rw-r--r--src/gui/widgets/layout.h5
-rw-r--r--src/gui/widgets/layouthelper.cpp5
-rw-r--r--src/gui/widgets/layouthelper.h5
-rw-r--r--src/gui/widgets/resizegrip.cpp5
-rw-r--r--src/gui/widgets/resizegrip.h5
-rw-r--r--src/gui/widgets/tab.cpp5
-rw-r--r--src/gui/widgets/tab.h5
-rw-r--r--src/gui/widgets/tabbedarea.cpp5
-rw-r--r--src/gui/widgets/tabbedarea.h5
-rw-r--r--src/gui/window.cpp5
-rw-r--r--src/gui/window.h5
-rw-r--r--src/gui/windowcontainer.cpp5
-rw-r--r--src/gui/windowcontainer.h5
-rw-r--r--src/guichanfwd.h5
-rw-r--r--src/imageparticle.cpp5
-rw-r--r--src/imageparticle.h5
-rw-r--r--src/inventory.cpp5
-rw-r--r--src/inventory.h5
-rw-r--r--src/item.cpp5
-rw-r--r--src/item.h5
-rw-r--r--src/itemshortcut.cpp5
-rw-r--r--src/itemshortcut.h5
-rw-r--r--src/joystick.cpp5
-rw-r--r--src/joystick.h5
-rw-r--r--src/keyboardconfig.cpp5
-rw-r--r--src/keyboardconfig.h5
-rw-r--r--src/localplayer.cpp5
-rw-r--r--src/localplayer.h5
-rw-r--r--src/lockedarray.h5
-rw-r--r--src/log.cpp5
-rw-r--r--src/log.h5
-rw-r--r--src/logindata.h5
-rw-r--r--src/main.cpp5
-rw-r--r--src/main.h5
-rw-r--r--src/map.cpp5
-rw-r--r--src/map.h5
-rw-r--r--src/monster.cpp5
-rw-r--r--src/monster.h5
-rw-r--r--src/net/beinghandler.cpp5
-rw-r--r--src/net/beinghandler.h5
-rw-r--r--src/net/buysellhandler.cpp5
-rw-r--r--src/net/buysellhandler.h5
-rw-r--r--src/net/charserverhandler.cpp5
-rw-r--r--src/net/charserverhandler.h5
-rw-r--r--src/net/chathandler.cpp5
-rw-r--r--src/net/chathandler.h5
-rw-r--r--src/net/equipmenthandler.cpp5
-rw-r--r--src/net/equipmenthandler.h5
-rw-r--r--src/net/inventoryhandler.cpp5
-rw-r--r--src/net/inventoryhandler.h5
-rw-r--r--src/net/itemhandler.cpp5
-rw-r--r--src/net/itemhandler.h5
-rw-r--r--src/net/loginhandler.cpp5
-rw-r--r--src/net/loginhandler.h5
-rw-r--r--src/net/maploginhandler.cpp5
-rw-r--r--src/net/maploginhandler.h5
-rw-r--r--src/net/messagehandler.cpp5
-rw-r--r--src/net/messagehandler.h5
-rw-r--r--src/net/messagein.cpp5
-rw-r--r--src/net/messagein.h5
-rw-r--r--src/net/messageout.cpp5
-rw-r--r--src/net/messageout.h5
-rw-r--r--src/net/network.cpp5
-rw-r--r--src/net/network.h5
-rw-r--r--src/net/npchandler.cpp5
-rw-r--r--src/net/npchandler.h5
-rw-r--r--src/net/partyhandler.cpp10
-rw-r--r--src/net/partyhandler.h10
-rw-r--r--src/net/playerhandler.cpp5
-rw-r--r--src/net/playerhandler.h5
-rw-r--r--src/net/protocol.cpp5
-rw-r--r--src/net/protocol.h5
-rw-r--r--src/net/skillhandler.cpp5
-rw-r--r--src/net/skillhandler.h5
-rw-r--r--src/net/tradehandler.cpp5
-rw-r--r--src/net/tradehandler.h5
-rw-r--r--src/npc.cpp5
-rw-r--r--src/npc.h5
-rw-r--r--src/openglgraphics.cpp5
-rw-r--r--src/openglgraphics.h5
-rw-r--r--src/particle.cpp5
-rw-r--r--src/particle.h5
-rw-r--r--src/particlecontainer.cpp5
-rw-r--r--src/particlecontainer.h5
-rw-r--r--src/particleemitter.cpp5
-rw-r--r--src/particleemitter.h5
-rw-r--r--src/particleemitterprop.h5
-rw-r--r--src/party.cpp12
-rw-r--r--src/party.h12
-rw-r--r--src/player.cpp5
-rw-r--r--src/player.h5
-rw-r--r--src/player_relations.cpp5
-rw-r--r--src/player_relations.h5
-rw-r--r--src/position.cpp5
-rw-r--r--src/position.h5
-rw-r--r--src/properties.h5
-rw-r--r--src/resources/action.cpp5
-rw-r--r--src/resources/action.h5
-rw-r--r--src/resources/ambientoverlay.cpp5
-rw-r--r--src/resources/ambientoverlay.h5
-rw-r--r--src/resources/animation.cpp5
-rw-r--r--src/resources/animation.h5
-rw-r--r--src/resources/buddylist.cpp128
-rw-r--r--src/resources/buddylist.h80
-rw-r--r--src/resources/colordb.cpp8
-rw-r--r--src/resources/colordb.h8
-rw-r--r--src/resources/dye.cpp5
-rw-r--r--src/resources/dye.h5
-rw-r--r--src/resources/emotedb.cpp8
-rw-r--r--src/resources/emotedb.h8
-rw-r--r--src/resources/image.cpp5
-rw-r--r--src/resources/image.h5
-rw-r--r--src/resources/imageloader.cpp5
-rw-r--r--src/resources/imageloader.h5
-rw-r--r--src/resources/imageset.cpp5
-rw-r--r--src/resources/imageset.h5
-rw-r--r--src/resources/imagewriter.cpp5
-rw-r--r--src/resources/imagewriter.h5
-rw-r--r--src/resources/itemdb.cpp5
-rw-r--r--src/resources/itemdb.h5
-rw-r--r--src/resources/iteminfo.cpp5
-rw-r--r--src/resources/iteminfo.h5
-rw-r--r--src/resources/mapreader.cpp5
-rw-r--r--src/resources/mapreader.h5
-rw-r--r--src/resources/monsterdb.cpp5
-rw-r--r--src/resources/monsterdb.h5
-rw-r--r--src/resources/monsterinfo.cpp5
-rw-r--r--src/resources/monsterinfo.h5
-rw-r--r--src/resources/music.cpp5
-rw-r--r--src/resources/music.h5
-rw-r--r--src/resources/npcdb.cpp5
-rw-r--r--src/resources/npcdb.h5
-rw-r--r--src/resources/resource.cpp5
-rw-r--r--src/resources/resource.h5
-rw-r--r--src/resources/resourcemanager.cpp5
-rw-r--r--src/resources/resourcemanager.h5
-rw-r--r--src/resources/soundeffect.cpp5
-rw-r--r--src/resources/soundeffect.h5
-rw-r--r--src/resources/spritedef.cpp5
-rw-r--r--src/resources/spritedef.h5
-rw-r--r--src/serverinfo.h5
-rw-r--r--src/shopitem.cpp5
-rw-r--r--src/shopitem.h5
-rw-r--r--src/simpleanimation.cpp5
-rw-r--r--src/simpleanimation.h5
-rw-r--r--src/sound.cpp5
-rw-r--r--src/sound.h5
-rw-r--r--src/sprite.h5
-rw-r--r--src/textparticle.cpp5
-rw-r--r--src/textparticle.h5
-rw-r--r--src/tileset.h5
-rw-r--r--src/utils/dtor.h5
-rw-r--r--src/utils/gettext.h5
-rw-r--r--src/utils/mutex.h5
-rw-r--r--src/utils/strprintf.cpp5
-rw-r--r--src/utils/strprintf.h5
-rw-r--r--src/utils/tostring.h7
-rw-r--r--src/utils/trim.h5
-rw-r--r--src/utils/xml.cpp5
-rw-r--r--src/utils/xml.h5
-rw-r--r--src/vector.cpp5
-rw-r--r--src/vector.h5
335 files changed, 1010 insertions, 918 deletions
diff --git a/aethyra.cbp b/aethyra.cbp
index c383dff3..795e179a 100644
--- a/aethyra.cbp
+++ b/aethyra.cbp
@@ -363,8 +363,6 @@
<Unit filename="src\resources\ambientoverlay.h" />
<Unit filename="src\resources\animation.cpp" />
<Unit filename="src\resources\animation.h" />
- <Unit filename="src\resources\buddylist.cpp" />
- <Unit filename="src\resources\buddylist.h" />
<Unit filename="src\resources\colordb.cpp" />
<Unit filename="src\resources\colordb.h" />
<Unit filename="src\resources\dye.cpp" />
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 86deec0c..5e26ff97 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -255,8 +255,6 @@ SET(SRCS
resources/ambientoverlay.h
resources/animation.cpp
resources/animation.h
- resources/buddylist.cpp
- resources/buddylist.h
resources/colordb.cpp
resources/colordb.h
resources/dye.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 4a6461dd..b6b052f4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -205,8 +205,6 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \
resources/ambientoverlay.h \
resources/animation.cpp \
resources/animation.h \
- resources/buddylist.cpp \
- resources/buddylist.h \
resources/colordb.cpp \
resources/colordb.h \
resources/dye.cpp \
diff --git a/src/animatedsprite.cpp b/src/animatedsprite.cpp
index aa2fb4ee..108f5166 100644
--- a/src/animatedsprite.cpp
+++ b/src/animatedsprite.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/animatedsprite.h b/src/animatedsprite.h
index b196b990..756d9aed 100644
--- a/src/animatedsprite.h
+++ b/src/animatedsprite.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/animationparticle.cpp b/src/animationparticle.cpp
index 9c1f7ccb..4e1c348b 100644
--- a/src/animationparticle.cpp
+++ b/src/animationparticle.cpp
@@ -1,8 +1,9 @@
/*
- * The Mana World
+ * Aethyra
* Copyright (C) 2006 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/animationparticle.h b/src/animationparticle.h
index 03065eb7..444703f3 100644
--- a/src/animationparticle.h
+++ b/src/animationparticle.h
@@ -1,8 +1,9 @@
/*
- * The Mana World
+ * Aethyra
* Copyright (C) 2006 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/being.cpp b/src/being.cpp
index 869cc970..1acbdb50 100644
--- a/src/being.cpp
+++ b/src/being.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/being.h b/src/being.h
index 1d39e726..7fd0c7ef 100644
--- a/src/being.h
+++ b/src/being.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/beingmanager.cpp b/src/beingmanager.cpp
index a417ee50..b4ffa76c 100644
--- a/src/beingmanager.cpp
+++ b/src/beingmanager.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/beingmanager.h b/src/beingmanager.h
index 11721709..59a7c76a 100644
--- a/src/beingmanager.h
+++ b/src/beingmanager.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/configlistener.h b/src/configlistener.h
index ec7d6a2c..edd9e90a 100644
--- a/src/configlistener.h
+++ b/src/configlistener.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/configuration.cpp b/src/configuration.cpp
index f6c74428..2224a6c7 100644
--- a/src/configuration.cpp
+++ b/src/configuration.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/configuration.h b/src/configuration.h
index da12e1e4..3e201dcb 100644
--- a/src/configuration.h
+++ b/src/configuration.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/effectmanager.cpp b/src/effectmanager.cpp
index f004a450..567e692b 100644
--- a/src/effectmanager.cpp
+++ b/src/effectmanager.cpp
@@ -3,7 +3,8 @@
* Copyright (C) 2008 Fate <fate.tmw@googlemail.com>
* Copyright (C) 2008 Chuck Miller <shadowmil@gmail.com>
*
- * 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/effectmanager.h b/src/effectmanager.h
index a06ecbc7..0d694f4a 100644
--- a/src/effectmanager.h
+++ b/src/effectmanager.h
@@ -3,7 +3,8 @@
* Copyright (C) 2008 Fate <fate.tmw@googlemail.com>
* Copyright (C) 2008 Chuck Miller <shadowmil@gmail.com>
*
- * 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/emoteshortcut.cpp b/src/emoteshortcut.cpp
index 807fa3a2..c1ca3c2c 100644
--- a/src/emoteshortcut.cpp
+++ b/src/emoteshortcut.cpp
@@ -2,7 +2,8 @@
* Extended support for activating emotes
* Copyright (C) 2009 Aethyra Development Team
*
- * This file is part of The Mana World.
+ * This file is part of Aethyra derived from 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/emoteshortcut.h b/src/emoteshortcut.h
index ceb51a9b..3fe911dd 100644
--- a/src/emoteshortcut.h
+++ b/src/emoteshortcut.h
@@ -2,7 +2,8 @@
* Extended support for activating emotes
* Copyright (C) 2009 Aethyra Development Team
*
- * This file is part of The Mana World.
+ * This file is part of Aethyra derived from 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/engine.cpp b/src/engine.cpp
index 39b9b3ec..d491b3ff 100644
--- a/src/engine.cpp
+++ b/src/engine.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/engine.h b/src/engine.h
index 7ad6d894..e2fec2f6 100644
--- a/src/engine.h
+++ b/src/engine.h
@@ -2,7 +2,8 @@
* The Mana World
* 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/equipment.cpp b/src/equipment.cpp
index cb7acd44..558df216 100644
--- a/src/equipment.cpp
+++ b/src/equipment.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/equipment.h b/src/equipment.h
index ace76e63..d75069dc 100644
--- a/src/equipment.h
+++ b/src/equipment.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/floor_item.cpp b/src/floor_item.cpp
index fbe606b4..232c1aee 100644
--- a/src/floor_item.cpp
+++ b/src/floor_item.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/floor_item.h b/src/floor_item.h
index 444c756a..8485172c 100644
--- a/src/floor_item.h
+++ b/src/floor_item.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/flooritemmanager.cpp b/src/flooritemmanager.cpp
index 65556abb..dbb93526 100644
--- a/src/flooritemmanager.cpp
+++ b/src/flooritemmanager.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/flooritemmanager.h b/src/flooritemmanager.h
index 3f96b587..5ff8fe5c 100644
--- a/src/flooritemmanager.h
+++ b/src/flooritemmanager.h
@@ -2,7 +2,8 @@
* The Mana World
* 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/game.cpp b/src/game.cpp
index f8903ed2..99888c73 100644
--- a/src/game.cpp
+++ b/src/game.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/game.h b/src/game.h
index d7d2a562..85bb9c07 100644
--- a/src/game.h
+++ b/src/game.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/graphics.cpp b/src/graphics.cpp
index 4af7b723..3c507f4b 100644
--- a/src/graphics.cpp
+++ b/src/graphics.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/graphics.h b/src/graphics.h
index 172032dc..3ad3b85c 100644
--- a/src/graphics.h
+++ b/src/graphics.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/gui/browserbox.cpp b/src/gui/browserbox.cpp
index 65659df6..f0c77e46 100644
--- a/src/gui/browserbox.cpp
+++ b/src/gui/browserbox.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/gui/browserbox.h b/src/gui/browserbox.h
index 5dde402e..500c9fba 100644
--- a/src/gui/browserbox.h
+++ b/src/gui/browserbox.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/gui/button.cpp b/src/gui/button.cpp
index 1d3a04e4..dbb5f568 100644
--- a/src/gui/button.cpp
+++ b/src/gui/button.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/gui/button.h b/src/gui/button.h
index abaf5c43..f21d2661 100644
--- a/src/gui/button.h
+++ b/src/gui/button.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/gui/buy.cpp b/src/gui/buy.cpp
index 0c8c4d9d..a2485ca1 100644
--- a/src/gui/buy.cpp
+++ b/src/gui/buy.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/gui/buy.h b/src/gui/buy.h
index 0f1cfede..b05608c0 100644
--- a/src/gui/buy.h
+++ b/src/gui/buy.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/gui/buysell.cpp b/src/gui/buysell.cpp
index d060db85..7d63f184 100644
--- a/src/gui/buysell.cpp
+++ b/src/gui/buysell.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/gui/buysell.h b/src/gui/buysell.h
index e3cdc52a..c12e3c9b 100644
--- a/src/gui/buysell.h
+++ b/src/gui/buysell.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/gui/char_select.cpp b/src/gui/char_select.cpp
index 8de4f5a7..6e7548e8 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.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/gui/char_select.h b/src/gui/char_select.h
index 23de061d..037b809f 100644
--- a/src/gui/char_select.h
+++ b/src/gui/char_select.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/gui/char_server.cpp b/src/gui/char_server.cpp
index bc096379..60f8f5dd 100644
--- a/src/gui/char_server.cpp
+++ b/src/gui/char_server.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/gui/char_server.h b/src/gui/char_server.h
index 49a5b47b..207fb86e 100644
--- a/src/gui/char_server.h
+++ b/src/gui/char_server.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/gui/chat.cpp b/src/gui/chat.cpp
index 92dd46d7..49df0f9d 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.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/gui/chat.h b/src/gui/chat.h
index 2fadb014..45d0c92f 100644
--- a/src/gui/chat.h
+++ b/src/gui/chat.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/gui/chatinput.cpp b/src/gui/chatinput.cpp
index 43f3cde4..42c6d4de 100644
--- a/src/gui/chatinput.cpp
+++ b/src/gui/chatinput.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/gui/chatinput.h b/src/gui/chatinput.h
index a4a50502..96c30b3f 100644
--- a/src/gui/chatinput.h
+++ b/src/gui/chatinput.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/gui/checkbox.cpp b/src/gui/checkbox.cpp
index 511ed34c..7a3e2fde 100644
--- a/src/gui/checkbox.cpp
+++ b/src/gui/checkbox.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/gui/checkbox.h b/src/gui/checkbox.h
index 20adb43c..260ed3a1 100644
--- a/src/gui/checkbox.h
+++ b/src/gui/checkbox.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/gui/colour.cpp b/src/gui/colour.cpp
index cdb5a3fd..095662ef 100644
--- a/src/gui/colour.cpp
+++ b/src/gui/colour.cpp
@@ -2,7 +2,7 @@
* Configurable text colors
* Copyright (C) 2008 Douglas Boffey <dougaboffey@netscape.net>
*
- * This file is part of The Mana World.
+ * This file is part of Aethyra.
*
* 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/gui/colour.h b/src/gui/colour.h
index 6ea02840..820c319d 100644
--- a/src/gui/colour.h
+++ b/src/gui/colour.h
@@ -2,7 +2,7 @@
* Configurable text colors
* Copyright (C) 2008 Douglas Boffey <dougaboffey@netscape.net>
*
- * This file is part of The Mana World.
+ * This file is part of Aethyra.
*
* 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/gui/confirm_dialog.cpp b/src/gui/confirm_dialog.cpp
index 38697f3a..2287a195 100644
--- a/src/gui/confirm_dialog.cpp
+++ b/src/gui/confirm_dialog.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/gui/confirm_dialog.h b/src/gui/confirm_dialog.h
index 3fa2b90d..493e9dda 100644
--- a/src/gui/confirm_dialog.h
+++ b/src/gui/confirm_dialog.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/gui/connection.cpp b/src/gui/connection.cpp
index a69698e9..f6033cd7 100644
--- a/src/gui/connection.cpp
+++ b/src/gui/connection.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/gui/connection.h b/src/gui/connection.h
index 3caa611f..f91a0ad1 100644
--- a/src/gui/connection.h
+++ b/src/gui/connection.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/gui/debugwindow.cpp b/src/gui/debugwindow.cpp
index 5a5acfad..2d8bb826 100644
--- a/src/gui/debugwindow.cpp
+++ b/src/gui/debugwindow.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/gui/debugwindow.h b/src/gui/debugwindow.h
index e089de27..95e8b5e4 100644
--- a/src/gui/debugwindow.h
+++ b/src/gui/debugwindow.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/gui/emotecontainer.cpp b/src/gui/emotecontainer.cpp
index 94ce9736..721a0ebd 100644
--- a/src/gui/emotecontainer.cpp
+++ b/src/gui/emotecontainer.cpp
@@ -2,7 +2,8 @@
* Extended support for activating emotes
* Copyright (C) 2009 Aethyra Development Team
*
- * This file is part of The Mana World.
+ * This file is part of Aethyra derived from 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/gui/emotecontainer.h b/src/gui/emotecontainer.h
index fefce793..260f1754 100644
--- a/src/gui/emotecontainer.h
+++ b/src/gui/emotecontainer.h
@@ -2,7 +2,8 @@
* Extended support for activating emotes
* Copyright (C) 2009 Aethyra Development Team
*
- * This file is part of The Mana World.
+ * This file is part of Aethyra derived from 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/gui/emoteshortcutcontainer.cpp b/src/gui/emoteshortcutcontainer.cpp
index b66592c1..af83a743 100644
--- a/src/gui/emoteshortcutcontainer.cpp
+++ b/src/gui/emoteshortcutcontainer.cpp
@@ -2,7 +2,8 @@
* Extended support for activating emotes
* Copyright (C) 2009 Aethyra Development Team
*
- * This file is part of The Mana World.
+ * This file is part of Aethyra derived from 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/gui/emoteshortcutcontainer.h b/src/gui/emoteshortcutcontainer.h
index d32a9f79..4c4b3614 100644
--- a/src/gui/emoteshortcutcontainer.h
+++ b/src/gui/emoteshortcutcontainer.h
@@ -2,7 +2,8 @@
* Extended support for activating emotes
* Copyright (C) 2009 Aethyra Development Team
*
- * This file is part of The Mana World.
+ * This file is part of Aethyra derived from 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/gui/emotewindow.cpp b/src/gui/emotewindow.cpp
index f4a8999a..8cf1d730 100644
--- a/src/gui/emotewindow.cpp
+++ b/src/gui/emotewindow.cpp
@@ -2,7 +2,7 @@
* Extended support for activating emotes
* Copyright (C) 2009 Aethyra Development Team
*
- * This file is part of The Mana World.
+ * This file is part of Aethyra.
*
* 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/gui/emotewindow.h b/src/gui/emotewindow.h
index 8af24a7b..81ee4f05 100644
--- a/src/gui/emotewindow.h
+++ b/src/gui/emotewindow.h
@@ -2,7 +2,7 @@
* Extended support for activating emotes
* Copyright (C) 2009 Aethyra Development Team
*
- * This file is part of The Mana World.
+ * This file is part of Aethyra.
*
* 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/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index a2be6b00..10784be8 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.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 derived from 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/gui/equipmentwindow.h b/src/gui/equipmentwindow.h
index 4ae3300f..7fdbaac8 100644
--- a/src/gui/equipmentwindow.h
+++ b/src/gui/equipmentwindow.h
@@ -1,8 +1,9 @@
/*
- * The Mana World
+ * Aethyra
* Copyright 2004 The Mana World Development Team
*
- * This file is part of The Mana World.
+ * This file is part of Aethyra derived from original code
+ * from The Mana World.
*
* The Mana World 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/gui/focushandler.cpp b/src/gui/focushandler.cpp
index dd605be6..cb52ae9f 100644
--- a/src/gui/focushandler.cpp
+++ b/src/gui/focushandler.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/gui/focushandler.h b/src/gui/focushandler.h
index b0639bd8..fc5dd240 100644
--- a/src/gui/focushandler.h
+++ b/src/gui/focushandler.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/gui/gccontainer.cpp b/src/gui/gccontainer.cpp
index 8325ccd4..7aebed15 100644
--- a/src/gui/gccontainer.cpp
+++ b/src/gui/gccontainer.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/gui/gccontainer.h b/src/gui/gccontainer.h
index da584a42..2071955d 100644
--- a/src/gui/gccontainer.h
+++ b/src/gui/gccontainer.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/gui/gui.cpp b/src/gui/gui.cpp
index 7779a503..a8a2a72f 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.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/gui/gui.h b/src/gui/gui.h
index 5c0c24f7..0c6529bd 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.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/gui/help.cpp b/src/gui/help.cpp
index ece2dce4..fec39199 100644
--- a/src/gui/help.cpp
+++ b/src/gui/help.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/gui/help.h b/src/gui/help.h
index 98e3aa67..93d32c18 100644
--- a/src/gui/help.h
+++ b/src/gui/help.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/gui/inttextfield.cpp b/src/gui/inttextfield.cpp
index fcbe938d..adade3b9 100644
--- a/src/gui/inttextfield.cpp
+++ b/src/gui/inttextfield.cpp
@@ -1,8 +1,8 @@
/*
- * The Mana World
- * Copyright (C) 2004 The Mana World Development Team
+ * Aethyra
+ * Copyright (C) 2008 Douglas Boffey <dougaboffey@netscape.net>
*
- * This file is part of The Mana World.
+ * This file is part of Aethyra.
*
* 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/gui/inttextfield.h b/src/gui/inttextfield.h
index add78084..f2e294ca 100644
--- a/src/gui/inttextfield.h
+++ b/src/gui/inttextfield.h
@@ -1,8 +1,8 @@
/*
- * The Mana World
- * Copyright (C) 2004 The Mana World Development Team
+ * Aethyra
+ * Copyright (C) 2008 Douglas Boffey <dougaboffey@netscape.net>
*
- * This file is part of The Mana World.
+ * This file is part of Aethyra.
*
* 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/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index af3b29a2..52aea2d3 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.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/gui/inventorywindow.h b/src/gui/inventorywindow.h
index 78d30461..a46a3fbb 100644
--- a/src/gui/inventorywindow.h
+++ b/src/gui/inventorywindow.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/gui/item_amount.cpp b/src/gui/item_amount.cpp
index 92be3d6e..8ab36df0 100644
--- a/src/gui/item_amount.cpp
+++ b/src/gui/item_amount.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/gui/item_amount.h b/src/gui/item_amount.h
index 618d7d51..6bec86b3 100644
--- a/src/gui/item_amount.h
+++ b/src/gui/item_amount.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/gui/itemcontainer.cpp b/src/gui/itemcontainer.cpp
index 5693d001..e84c79ca 100644
--- a/src/gui/itemcontainer.cpp
+++ b/src/gui/itemcontainer.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/gui/itemcontainer.h b/src/gui/itemcontainer.h
index 23b9e5e1..fba4656f 100644
--- a/src/gui/itemcontainer.h
+++ b/src/gui/itemcontainer.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/gui/itemlinkhandler.cpp b/src/gui/itemlinkhandler.cpp
index 97c0b94f..4a64d53f 100644
--- a/src/gui/itemlinkhandler.cpp
+++ b/src/gui/itemlinkhandler.cpp
@@ -1,8 +1,9 @@
/*
- * The Mana World
+ * Aethyra
* Copyright 2009 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.
*
* The Mana World 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/gui/itemlinkhandler.h b/src/gui/itemlinkhandler.h
index cd6fd900..e4c3ea4a 100644
--- a/src/gui/itemlinkhandler.h
+++ b/src/gui/itemlinkhandler.h
@@ -1,8 +1,9 @@
/*
- * The Mana World
+ * Aethyra
* Copyright 2009 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.
*
* The Mana World 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/gui/itempopup.cpp b/src/gui/itempopup.cpp
index ddce449a..9c0bd65c 100644
--- a/src/gui/itempopup.cpp
+++ b/src/gui/itempopup.cpp
@@ -1,22 +1,23 @@
/*
- * The Mana World
+ * Aethyra
* Copyright (C) 2008 The Legend of Mazzeroth Development Team
* 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 Legend of Mazzeroth.
*
- * 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.
*
* You should have received a copy of the GNU General Public License
- * along with The Mana World; if not, write to the Free Software
+ * 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/gui/itempopup.h b/src/gui/itempopup.h
index 1d37346e..a91d8c6f 100644
--- a/src/gui/itempopup.h
+++ b/src/gui/itempopup.h
@@ -1,22 +1,23 @@
/*
- * The Mana World
+ * Aethyra
* Copyright (C) 2008 The Legend of Mazzeroth Development Team
* 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 Legend of Mazzeroth.
*
- * 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.
*
* You should have received a copy of the GNU General Public License
- * along with The Mana World; if not, write to the Free Software
+ * 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/gui/itemshortcutcontainer.cpp b/src/gui/itemshortcutcontainer.cpp
index d3cc2c22..324e1b6c 100644
--- a/src/gui/itemshortcutcontainer.cpp
+++ b/src/gui/itemshortcutcontainer.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/gui/itemshortcutcontainer.h b/src/gui/itemshortcutcontainer.h
index 22d94ec2..f6137af0 100644
--- a/src/gui/itemshortcutcontainer.h
+++ b/src/gui/itemshortcutcontainer.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/gui/linkhandler.h b/src/gui/linkhandler.h
index ecc05b13..ea1b25c8 100644
--- a/src/gui/linkhandler.h
+++ b/src/gui/linkhandler.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/gui/listbox.cpp b/src/gui/listbox.cpp
index b63d6424..97b3bbd0 100644
--- a/src/gui/listbox.cpp
+++ b/src/gui/listbox.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/gui/listbox.h b/src/gui/listbox.h
index 12fcb955..e783083f 100644
--- a/src/gui/listbox.h
+++ b/src/gui/listbox.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/gui/login.cpp b/src/gui/login.cpp
index 3c8e7cb3..14370485 100644
--- a/src/gui/login.cpp
+++ b/src/gui/login.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/gui/login.h b/src/gui/login.h
index c0d6e755..cfe4443b 100644
--- a/src/gui/login.h
+++ b/src/gui/login.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/gui/menuwindow.cpp b/src/gui/menuwindow.cpp
index 0dcc999f..65bd7082 100644
--- a/src/gui/menuwindow.cpp
+++ b/src/gui/menuwindow.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/gui/menuwindow.h b/src/gui/menuwindow.h
index 9bb54e29..f70a332e 100644
--- a/src/gui/menuwindow.h
+++ b/src/gui/menuwindow.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/gui/minimap.cpp b/src/gui/minimap.cpp
index 55cd8b5d..5c52b38e 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -1,8 +1,9 @@
/*
- * The Mana World
+ * Aethyra
* Copyright (C) 2004-2005 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/gui/minimap.h b/src/gui/minimap.h
index 3ce0aacd..6e88f821 100644
--- a/src/gui/minimap.h
+++ b/src/gui/minimap.h
@@ -1,8 +1,9 @@
/*
- * The Mana World
+ * Aethyra
* Copyright (C) 2004-2005 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/gui/ministatus.cpp b/src/gui/ministatus.cpp
index 13351915..629cf45c 100644
--- a/src/gui/ministatus.cpp
+++ b/src/gui/ministatus.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/gui/ministatus.h b/src/gui/ministatus.h
index 832475f1..33ee548d 100644
--- a/src/gui/ministatus.h
+++ b/src/gui/ministatus.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/gui/npc_text.cpp b/src/gui/npc_text.cpp
index b4313b70..88db46b3 100644
--- a/src/gui/npc_text.cpp
+++ b/src/gui/npc_text.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/gui/npc_text.h b/src/gui/npc_text.h
index a07aa04f..1f2abd42 100644
--- a/src/gui/npc_text.h
+++ b/src/gui/npc_text.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/gui/npcintegerdialog.cpp b/src/gui/npcintegerdialog.cpp
index c58fc460..9db71d67 100644
--- a/src/gui/npcintegerdialog.cpp
+++ b/src/gui/npcintegerdialog.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/gui/npcintegerdialog.h b/src/gui/npcintegerdialog.h
index 10ec60b9..858bce5b 100644
--- a/src/gui/npcintegerdialog.h
+++ b/src/gui/npcintegerdialog.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/gui/npclistdialog.cpp b/src/gui/npclistdialog.cpp
index 7d8a362a..59bf0716 100644
--- a/src/gui/npclistdialog.cpp
+++ b/src/gui/npclistdialog.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/gui/npclistdialog.h b/src/gui/npclistdialog.h
index 30167a5e..8d8b6545 100644
--- a/src/gui/npclistdialog.h
+++ b/src/gui/npclistdialog.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/gui/npcstringdialog.cpp b/src/gui/npcstringdialog.cpp
index 718c416f..8d66d9bc 100644
--- a/src/gui/npcstringdialog.cpp
+++ b/src/gui/npcstringdialog.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/gui/npcstringdialog.h b/src/gui/npcstringdialog.h
index 1933e0f1..71d1f15c 100644
--- a/src/gui/npcstringdialog.h
+++ b/src/gui/npcstringdialog.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/gui/ok_dialog.cpp b/src/gui/ok_dialog.cpp
index 2c67e71f..23c4d465 100644
--- a/src/gui/ok_dialog.cpp
+++ b/src/gui/ok_dialog.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/gui/ok_dialog.h b/src/gui/ok_dialog.h
index 3a438513..c84cf4c4 100644
--- a/src/gui/ok_dialog.h
+++ b/src/gui/ok_dialog.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/gui/passwordfield.cpp b/src/gui/passwordfield.cpp
index 345ee1c3..073f5e36 100644
--- a/src/gui/passwordfield.cpp
+++ b/src/gui/passwordfield.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/gui/passwordfield.h b/src/gui/passwordfield.h
index 42f8d187..adad54fe 100644
--- a/src/gui/passwordfield.h
+++ b/src/gui/passwordfield.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/gui/playerbox.cpp b/src/gui/playerbox.cpp
index 60003fb5..e05288cc 100644
--- a/src/gui/playerbox.cpp
+++ b/src/gui/playerbox.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/gui/playerbox.h b/src/gui/playerbox.h
index 7c08defd..ee25520a 100644
--- a/src/gui/playerbox.h
+++ b/src/gui/playerbox.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/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 53c24960..d10faa0d 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.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/gui/popupmenu.h b/src/gui/popupmenu.h
index 715a9bb5..c62014f9 100644
--- a/src/gui/popupmenu.h
+++ b/src/gui/popupmenu.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/gui/progressbar.cpp b/src/gui/progressbar.cpp
index 867477e0..10e8f1f1 100644
--- a/src/gui/progressbar.cpp
+++ b/src/gui/progressbar.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/gui/progressbar.h b/src/gui/progressbar.h
index 2c1b22da..ff146745 100644
--- a/src/gui/progressbar.h
+++ b/src/gui/progressbar.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/gui/radiobutton.cpp b/src/gui/radiobutton.cpp
index de8d4d9d..2e48f78a 100644
--- a/src/gui/radiobutton.cpp
+++ b/src/gui/radiobutton.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/gui/radiobutton.h b/src/gui/radiobutton.h
index 3d952b3f..cd501126 100644
--- a/src/gui/radiobutton.h
+++ b/src/gui/radiobutton.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/gui/register.cpp b/src/gui/register.cpp
index cf12375c..9be44f43 100644
--- a/src/gui/register.cpp
+++ b/src/gui/register.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/gui/register.h b/src/gui/register.h
index 9588e07e..922320db 100644
--- a/src/gui/register.h
+++ b/src/gui/register.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/gui/scrollarea.cpp b/src/gui/scrollarea.cpp
index eacc4714..4c225e81 100644
--- a/src/gui/scrollarea.cpp
+++ b/src/gui/scrollarea.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/gui/scrollarea.h b/src/gui/scrollarea.h
index 33ebc692..080b851c 100644
--- a/src/gui/scrollarea.h
+++ b/src/gui/scrollarea.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/gui/sell.cpp b/src/gui/sell.cpp
index e4be7921..fd271c63 100644
--- a/src/gui/sell.cpp
+++ b/src/gui/sell.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/gui/sell.h b/src/gui/sell.h
index c11a7b7c..3776477f 100644
--- a/src/gui/sell.h
+++ b/src/gui/sell.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/gui/setup.cpp b/src/gui/setup.cpp
index e165ba57..2c187f94 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.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/gui/setup.h b/src/gui/setup.h
index e4eb0902..9f1bafc7 100644
--- a/src/gui/setup.h
+++ b/src/gui/setup.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/gui/setup_audio.cpp b/src/gui/setup_audio.cpp
index a4bc05ae..3c26f14b 100644
--- a/src/gui/setup_audio.cpp
+++ b/src/gui/setup_audio.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/gui/setup_audio.h b/src/gui/setup_audio.h
index 9e951895..aad16617 100644
--- a/src/gui/setup_audio.h
+++ b/src/gui/setup_audio.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/gui/setup_colours.cpp b/src/gui/setup_colours.cpp
index ee2d2f5e..03fdcfec 100644
--- a/src/gui/setup_colours.cpp
+++ b/src/gui/setup_colours.cpp
@@ -2,7 +2,7 @@
* Configurable text colors
* Copyright (C) 2008 Douglas Boffey <dougaboffey@netscape.net>
*
- * This file is part of The Mana World.
+ * This file is part of Aethyra.
*
* 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/gui/setup_colours.h b/src/gui/setup_colours.h
index 57d9e304..ac06c178 100644
--- a/src/gui/setup_colours.h
+++ b/src/gui/setup_colours.h
@@ -2,7 +2,7 @@
* Configurable text colors
* Copyright (C) 2008 Douglas Boffey <dougaboffey@netscape.net>
*
- * This file is part of The Mana World.
+ * This file is part of Aethyra.
*
* 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/gui/setup_joystick.cpp b/src/gui/setup_joystick.cpp
index c0c04949..5bbaa368 100644
--- a/src/gui/setup_joystick.cpp
+++ b/src/gui/setup_joystick.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/gui/setup_joystick.h b/src/gui/setup_joystick.h
index eba8a2cc..ae888206 100644
--- a/src/gui/setup_joystick.h
+++ b/src/gui/setup_joystick.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/gui/setup_keyboard.cpp b/src/gui/setup_keyboard.cpp
index 8638b277..1fb0b443 100644
--- a/src/gui/setup_keyboard.cpp
+++ b/src/gui/setup_keyboard.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/gui/setup_keyboard.h b/src/gui/setup_keyboard.h
index 082fa84d..5fa961ae 100644
--- a/src/gui/setup_keyboard.h
+++ b/src/gui/setup_keyboard.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/gui/setup_players.cpp b/src/gui/setup_players.cpp
index 8601d289..0ea6d167 100644
--- a/src/gui/setup_players.cpp
+++ b/src/gui/setup_players.cpp
@@ -1,8 +1,8 @@
/*
- * The Mana World
- * Copyright (C) 2004 The Mana World Development Team
+ * Aethyra
+ * Copyright (C) 2008 Douglas Boffey <dougaboffey@netscape.net>
*
- * This file is part of The Mana World.
+ * This file is part of Aethyra.
*
* 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/gui/setup_players.h b/src/gui/setup_players.h
index 2edc6983..07f70b00 100644
--- a/src/gui/setup_players.h
+++ b/src/gui/setup_players.h
@@ -1,8 +1,8 @@
/*
- * The Mana World
- * Copyright (C) 2004 The Mana World Development Team
+ * Aethyra
+ * Copyright (C) 2008 Douglas Boffey <dougaboffey@netscape.net>
*
- * This file is part of The Mana World.
+ * This file is part of Aethyra.
*
* 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/gui/setup_video.cpp b/src/gui/setup_video.cpp
index 7c891f44..48bf63e7 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.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/gui/setup_video.h b/src/gui/setup_video.h
index 13735e0f..9e4689bc 100644
--- a/src/gui/setup_video.h
+++ b/src/gui/setup_video.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/gui/setuptab.h b/src/gui/setuptab.h
index 3e0c51e2..7e1bc36f 100644
--- a/src/gui/setuptab.h
+++ b/src/gui/setuptab.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/gui/shop.cpp b/src/gui/shop.cpp
index a5f59bac..a56116d3 100644
--- a/src/gui/shop.cpp
+++ b/src/gui/shop.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/gui/shop.h b/src/gui/shop.h
index e0db4c59..166eb00b 100644
--- a/src/gui/shop.h
+++ b/src/gui/shop.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/gui/shoplistbox.cpp b/src/gui/shoplistbox.cpp
index b5761535..9e53dff7 100644
--- a/src/gui/shoplistbox.cpp
+++ b/src/gui/shoplistbox.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/gui/shoplistbox.h b/src/gui/shoplistbox.h
index cde4786e..8542a7b8 100644
--- a/src/gui/shoplistbox.h
+++ b/src/gui/shoplistbox.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/gui/shortcutcontainer.cpp b/src/gui/shortcutcontainer.cpp
index 4472818e..cc559def 100644
--- a/src/gui/shortcutcontainer.cpp
+++ b/src/gui/shortcutcontainer.cpp
@@ -1,21 +1,22 @@
/*
- * The Mana World
+ * Aethyra
* Copyright 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.
*
- * 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.
*
* You should have received a copy of the GNU General Public License
- * along with The Mana World; if not, write to the Free Software
+ * 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/gui/shortcutcontainer.h b/src/gui/shortcutcontainer.h
index f5f06163..3f2e1c60 100644
--- a/src/gui/shortcutcontainer.h
+++ b/src/gui/shortcutcontainer.h
@@ -1,21 +1,22 @@
/*
- * The Mana World
+ * Aethyra
* Copyright 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.
*
- * 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.
*
* You should have received a copy of the GNU General Public License
- * along with The Mana World; if not, write to the Free Software
+ * 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/gui/shortcutwindow.cpp b/src/gui/shortcutwindow.cpp
index 5d49a3c6..754b410a 100644
--- a/src/gui/shortcutwindow.cpp
+++ b/src/gui/shortcutwindow.cpp
@@ -1,8 +1,9 @@
/*
- * The Mana World
- * Copyright (C) 2007 The Mana World Development Team
+ * Aethyra
+ * Copyright 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/gui/shortcutwindow.h b/src/gui/shortcutwindow.h
index 64592328..42077d9c 100644
--- a/src/gui/shortcutwindow.h
+++ b/src/gui/shortcutwindow.h
@@ -1,8 +1,9 @@
/*
- * The Mana World
- * Copyright (C) 2007 The Mana World Development Team
+ * Aethyra
+ * Copyright 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/gui/skill.cpp b/src/gui/skill.cpp
index 11db25ce..6c0414f3 100644
--- a/src/gui/skill.cpp
+++ b/src/gui/skill.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/gui/skill.h b/src/gui/skill.h
index 91c2b640..bcdd515c 100644
--- a/src/gui/skill.h
+++ b/src/gui/skill.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/gui/slider.cpp b/src/gui/slider.cpp
index 9bfa840f..db34cc6a 100644
--- a/src/gui/slider.cpp
+++ b/src/gui/slider.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/gui/slider.h b/src/gui/slider.h
index 56ea334a..35d875db 100644
--- a/src/gui/slider.h
+++ b/src/gui/slider.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/gui/speechbubble.cpp b/src/gui/speechbubble.cpp
index 7a191c37..c814253c 100644
--- a/src/gui/speechbubble.cpp
+++ b/src/gui/speechbubble.cpp
@@ -1,22 +1,22 @@
/*
- * The Legend of Mazzeroth
+ * Aethyra
* Copyright (C) 2008, The Legend of Mazzeroth Development Team
*
- * This file is part of The Legend of Mazzeroth based on original code
- * from The Mana World.
+ * This file is part of Aethyra based on original code
+ * from The Legend of Mazzeroth.
*
- * The Legend of Mazzeroth 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 Legend of Mazzeroth 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 The Legend of Mazzeroth; if not, write to the Free Software
+ * 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/gui/speechbubble.h b/src/gui/speechbubble.h
index 6b71c09e..d30f5416 100644
--- a/src/gui/speechbubble.h
+++ b/src/gui/speechbubble.h
@@ -1,22 +1,22 @@
/*
- * The Legend of Mazzeroth
+ * Aethyra
* Copyright (C) 2008, The Legend of Mazzeroth Development Team
*
- * This file is part of The Legend of Mazzeroth based on original code
- * from The Mana World.
+ * This file is part of Aethyra based on original code
+ * from The Legend of Mazzeroth.
*
- * The Legend of Mazzeroth 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 Legend of Mazzeroth 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 The Legend of Mazzeroth; if not, write to the Free Software
+ * 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/gui/status.cpp b/src/gui/status.cpp
index 271b6f1e..5547b996 100644
--- a/src/gui/status.cpp
+++ b/src/gui/status.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/gui/status.h b/src/gui/status.h
index 00a48f4e..5056f631 100644
--- a/src/gui/status.h
+++ b/src/gui/status.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/gui/table.cpp b/src/gui/table.cpp
index 674f3891..425c5b6f 100644
--- a/src/gui/table.cpp
+++ b/src/gui/table.cpp
@@ -1,8 +1,9 @@
/*
- * The Mana World
- * Copyright (C) 2004 The Mana World Development Team
+ * Aethyra
+ * Copyright (C) 2008 Douglas Boffey <dougaboffey@netscape.net>
*
- * This file is part of The Mana World.
+ * This file is part of Aethyra derived from original code
+ * from Guichan.
*
* 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/gui/table.h b/src/gui/table.h
index 912eb284..c84272a3 100644
--- a/src/gui/table.h
+++ b/src/gui/table.h
@@ -1,8 +1,9 @@
/*
- * The Mana World
- * Copyright (C) 2008 The Mana World Development Team
+ * Aethyra
+ * Copyright (C) 2008 Douglas Boffey <dougaboffey@netscape.net>
*
- * This file is part of The Mana World.
+ * This file is part of Aethyra derived from original code
+ * from Guichan.
*
* 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/gui/table_model.cpp b/src/gui/table_model.cpp
index 19e780f3..8998961e 100644
--- a/src/gui/table_model.cpp
+++ b/src/gui/table_model.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/gui/table_model.h b/src/gui/table_model.h
index 1d966e8b..6edd7d65 100644
--- a/src/gui/table_model.h
+++ b/src/gui/table_model.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/gui/textbox.cpp b/src/gui/textbox.cpp
index 2a86d549..dc94ead2 100644
--- a/src/gui/textbox.cpp
+++ b/src/gui/textbox.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/gui/textbox.h b/src/gui/textbox.h
index 10a81fc0..33ea42f9 100644
--- a/src/gui/textbox.h
+++ b/src/gui/textbox.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/gui/textfield.cpp b/src/gui/textfield.cpp
index 99a95a2e..ed83622d 100644
--- a/src/gui/textfield.cpp
+++ b/src/gui/textfield.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/gui/textfield.h b/src/gui/textfield.h
index 73824615..b82912c0 100644
--- a/src/gui/textfield.h
+++ b/src/gui/textfield.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/gui/trade.cpp b/src/gui/trade.cpp
index af30d1fe..c57cac59 100644
--- a/src/gui/trade.cpp
+++ b/src/gui/trade.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/gui/trade.h b/src/gui/trade.h
index df724038..f4a6b5cd 100644
--- a/src/gui/trade.h
+++ b/src/gui/trade.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/gui/truetypefont.cpp b/src/gui/truetypefont.cpp
index 2d32a213..a92e0dab 100644
--- a/src/gui/truetypefont.cpp
+++ b/src/gui/truetypefont.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/gui/truetypefont.h b/src/gui/truetypefont.h
index 017bc4fc..35e8270f 100644
--- a/src/gui/truetypefont.h
+++ b/src/gui/truetypefont.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/gui/updatewindow.cpp b/src/gui/updatewindow.cpp
index 1f62bd2d..29e7e763 100644
--- a/src/gui/updatewindow.cpp
+++ b/src/gui/updatewindow.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/gui/updatewindow.h b/src/gui/updatewindow.h
index 4ada3c3a..234a6f57 100644
--- a/src/gui/updatewindow.h
+++ b/src/gui/updatewindow.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/gui/viewport.cpp b/src/gui/viewport.cpp
index 6b6c982a..79a37227 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.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/gui/viewport.h b/src/gui/viewport.h
index 522ea734..a131d162 100644
--- a/src/gui/viewport.h
+++ b/src/gui/viewport.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/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp
index 31d35cb0..a292edd5 100644
--- a/src/gui/widgets/dropdown.cpp
+++ b/src/gui/widgets/dropdown.cpp
@@ -1,21 +1,21 @@
/*
- * The Mana World
- * Copyright 2004 The Mana World Development Team
+ * Aethyra
+ * Copyright (C) 2008 Douglas Boffey <dougaboffey@netscape.net>
*
- * This file is part of The Mana World.
+ * This file is part of Aethyra.
*
- * 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.
*
* You should have received a copy of the GNU General Public License
- * along with The Mana World; if not, write to the Free Software
+ * 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/gui/widgets/dropdown.h b/src/gui/widgets/dropdown.h
index e5919dc7..ef53d930 100644
--- a/src/gui/widgets/dropdown.h
+++ b/src/gui/widgets/dropdown.h
@@ -1,21 +1,21 @@
/*
- * The Mana World
- * Copyright 2004 The Mana World Development Team
+ * Aethyra
+ * Copyright (C) 2008 Douglas Boffey <dougaboffey@netscape.net>
*
- * This file is part of The Mana World.
+ * This file is part of Aethyra.
*
- * 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.
*
* You should have received a copy of the GNU General Public License
- * along with The Mana World; if not, write to the Free Software
+ * 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/gui/widgets/layout.cpp b/src/gui/widgets/layout.cpp
index 4ffdda36..7fab91d7 100644
--- a/src/gui/widgets/layout.cpp
+++ b/src/gui/widgets/layout.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/gui/widgets/layout.h b/src/gui/widgets/layout.h
index 20a4222d..04b75ca5 100644
--- a/src/gui/widgets/layout.h
+++ b/src/gui/widgets/layout.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/gui/widgets/layouthelper.cpp b/src/gui/widgets/layouthelper.cpp
index 410de98a..ed002f99 100644
--- a/src/gui/widgets/layouthelper.cpp
+++ b/src/gui/widgets/layouthelper.cpp
@@ -1,8 +1,9 @@
/*
- * The Mana World
+ * Aethyra
* Copyright (C) 2009 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/gui/widgets/layouthelper.h b/src/gui/widgets/layouthelper.h
index afa92a18..1125d209 100644
--- a/src/gui/widgets/layouthelper.h
+++ b/src/gui/widgets/layouthelper.h
@@ -1,8 +1,9 @@
/*
- * The Mana World
+ * Aethyra
* Copyright (C) 2009 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/gui/widgets/resizegrip.cpp b/src/gui/widgets/resizegrip.cpp
index fa264e37..f3cc4f83 100644
--- a/src/gui/widgets/resizegrip.cpp
+++ b/src/gui/widgets/resizegrip.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/gui/widgets/resizegrip.h b/src/gui/widgets/resizegrip.h
index 620c133f..7c96af45 100644
--- a/src/gui/widgets/resizegrip.h
+++ b/src/gui/widgets/resizegrip.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/gui/widgets/tab.cpp b/src/gui/widgets/tab.cpp
index 22e952e7..1562e3f2 100644
--- a/src/gui/widgets/tab.cpp
+++ b/src/gui/widgets/tab.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/gui/widgets/tab.h b/src/gui/widgets/tab.h
index 3af4e2bf..4b331d66 100644
--- a/src/gui/widgets/tab.h
+++ b/src/gui/widgets/tab.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/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp
index c4e22bff..f0d719c6 100644
--- a/src/gui/widgets/tabbedarea.cpp
+++ b/src/gui/widgets/tabbedarea.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/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h
index 01d70380..863ff79e 100644
--- a/src/gui/widgets/tabbedarea.h
+++ b/src/gui/widgets/tabbedarea.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/gui/window.cpp b/src/gui/window.cpp
index 8000179d..516b4138 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.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/gui/window.h b/src/gui/window.h
index 25bf903a..0a0f4be9 100644
--- a/src/gui/window.h
+++ b/src/gui/window.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/gui/windowcontainer.cpp b/src/gui/windowcontainer.cpp
index 2846b1c1..0aa61965 100644
--- a/src/gui/windowcontainer.cpp
+++ b/src/gui/windowcontainer.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/gui/windowcontainer.h b/src/gui/windowcontainer.h
index 62704d1b..09f34cf5 100644
--- a/src/gui/windowcontainer.h
+++ b/src/gui/windowcontainer.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/guichanfwd.h b/src/guichanfwd.h
index 4863421c..8859780f 100644
--- a/src/guichanfwd.h
+++ b/src/guichanfwd.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/imageparticle.cpp b/src/imageparticle.cpp
index 557b3553..d2c955ee 100644
--- a/src/imageparticle.cpp
+++ b/src/imageparticle.cpp
@@ -1,8 +1,9 @@
/*
- * The Mana World
+ * Aethyra
* Copyright (C) 2006 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/imageparticle.h b/src/imageparticle.h
index 317b17ea..3465b3e0 100644
--- a/src/imageparticle.h
+++ b/src/imageparticle.h
@@ -1,8 +1,9 @@
/*
- * The Mana World
+ * Aethyra
* Copyright (C) 2006 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/inventory.cpp b/src/inventory.cpp
index 3ca26e1e..4053bc96 100644
--- a/src/inventory.cpp
+++ b/src/inventory.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/inventory.h b/src/inventory.h
index 2c5d99e3..3b3ec507 100644
--- a/src/inventory.h
+++ b/src/inventory.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/item.cpp b/src/item.cpp
index 9165c6c8..2125756a 100644
--- a/src/item.cpp
+++ b/src/item.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/item.h b/src/item.h
index 3ea4a905..d67b5be4 100644
--- a/src/item.h
+++ b/src/item.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/itemshortcut.cpp b/src/itemshortcut.cpp
index 3404b0e3..fd32c4f5 100644
--- a/src/itemshortcut.cpp
+++ b/src/itemshortcut.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/itemshortcut.h b/src/itemshortcut.h
index 95e17f44..4203f600 100644
--- a/src/itemshortcut.h
+++ b/src/itemshortcut.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/joystick.cpp b/src/joystick.cpp
index 7e9a2285..18a09207 100644
--- a/src/joystick.cpp
+++ b/src/joystick.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/joystick.h b/src/joystick.h
index 4c5390c2..67b5ab70 100644
--- a/src/joystick.h
+++ b/src/joystick.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/keyboardconfig.cpp b/src/keyboardconfig.cpp
index 6c836a62..b75a3c1c 100644
--- a/src/keyboardconfig.cpp
+++ b/src/keyboardconfig.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/keyboardconfig.h b/src/keyboardconfig.h
index bfcde31c..484c0c63 100644
--- a/src/keyboardconfig.h
+++ b/src/keyboardconfig.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/localplayer.cpp b/src/localplayer.cpp
index efcebf28..fb539a46 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.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/localplayer.h b/src/localplayer.h
index a4625f73..0ba0dd90 100644
--- a/src/localplayer.h
+++ b/src/localplayer.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/lockedarray.h b/src/lockedarray.h
index 2b4b099d..3ef2bb99 100644
--- a/src/lockedarray.h
+++ b/src/lockedarray.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/log.cpp b/src/log.cpp
index b0024f80..29eeb010 100644
--- a/src/log.cpp
+++ b/src/log.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/log.h b/src/log.h
index b06bdc89..a50eab9d 100644
--- a/src/log.h
+++ b/src/log.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/logindata.h b/src/logindata.h
index 410d2e73..3f686a22 100644
--- a/src/logindata.h
+++ b/src/logindata.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/main.cpp b/src/main.cpp
index 35943abf..7f2012c9 100644
--- a/src/main.cpp
+++ b/src/main.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/main.h b/src/main.h
index 5a337d15..5f7ec54e 100644
--- a/src/main.h
+++ b/src/main.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/map.cpp b/src/map.cpp
index 16882540..5e38aee2 100644
--- a/src/map.cpp
+++ b/src/map.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/map.h b/src/map.h
index 9703c5b3..eebdade1 100644
--- a/src/map.h
+++ b/src/map.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/monster.cpp b/src/monster.cpp
index 4cdcbb11..9f12ebf4 100644
--- a/src/monster.cpp
+++ b/src/monster.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/monster.h b/src/monster.h
index 8d7f8ae7..776a215b 100644
--- a/src/monster.h
+++ b/src/monster.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/net/beinghandler.cpp b/src/net/beinghandler.cpp
index 2f5f0fee..15a659b3 100644
--- a/src/net/beinghandler.cpp
+++ b/src/net/beinghandler.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/net/beinghandler.h b/src/net/beinghandler.h
index 54b82075..5fbb57ce 100644
--- a/src/net/beinghandler.h
+++ b/src/net/beinghandler.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/net/buysellhandler.cpp b/src/net/buysellhandler.cpp
index 67c79ec4..245b8a50 100644
--- a/src/net/buysellhandler.cpp
+++ b/src/net/buysellhandler.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/net/buysellhandler.h b/src/net/buysellhandler.h
index 0ede7b48..2b4aaf4f 100644
--- a/src/net/buysellhandler.h
+++ b/src/net/buysellhandler.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/net/charserverhandler.cpp b/src/net/charserverhandler.cpp
index 932cf705..5bf45bb4 100644
--- a/src/net/charserverhandler.cpp
+++ b/src/net/charserverhandler.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/net/charserverhandler.h b/src/net/charserverhandler.h
index 37b378f2..2a5331b5 100644
--- a/src/net/charserverhandler.h
+++ b/src/net/charserverhandler.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/net/chathandler.cpp b/src/net/chathandler.cpp
index 25877907..14566b39 100644
--- a/src/net/chathandler.cpp
+++ b/src/net/chathandler.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/net/chathandler.h b/src/net/chathandler.h
index ff649205..9a47c633 100644
--- a/src/net/chathandler.h
+++ b/src/net/chathandler.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/net/equipmenthandler.cpp b/src/net/equipmenthandler.cpp
index 9a3c396a..fe158198 100644
--- a/src/net/equipmenthandler.cpp
+++ b/src/net/equipmenthandler.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/net/equipmenthandler.h b/src/net/equipmenthandler.h
index c66d7932..08de3b36 100644
--- a/src/net/equipmenthandler.h
+++ b/src/net/equipmenthandler.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/net/inventoryhandler.cpp b/src/net/inventoryhandler.cpp
index 46f03e28..ac5f94d3 100644
--- a/src/net/inventoryhandler.cpp
+++ b/src/net/inventoryhandler.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/net/inventoryhandler.h b/src/net/inventoryhandler.h
index 336b2e98..f87e1214 100644
--- a/src/net/inventoryhandler.h
+++ b/src/net/inventoryhandler.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/net/itemhandler.cpp b/src/net/itemhandler.cpp
index 8c4af4e4..e38be454 100644
--- a/src/net/itemhandler.cpp
+++ b/src/net/itemhandler.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/net/itemhandler.h b/src/net/itemhandler.h
index 0cb3b42a..0f292d46 100644
--- a/src/net/itemhandler.h
+++ b/src/net/itemhandler.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/net/loginhandler.cpp b/src/net/loginhandler.cpp
index 41314d16..34da5c6d 100644
--- a/src/net/loginhandler.cpp
+++ b/src/net/loginhandler.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/net/loginhandler.h b/src/net/loginhandler.h
index df86b634..6b938627 100644
--- a/src/net/loginhandler.h
+++ b/src/net/loginhandler.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/net/maploginhandler.cpp b/src/net/maploginhandler.cpp
index b5192bd7..bcd3dd62 100644
--- a/src/net/maploginhandler.cpp
+++ b/src/net/maploginhandler.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/net/maploginhandler.h b/src/net/maploginhandler.h
index c7fee70c..fb083b51 100644
--- a/src/net/maploginhandler.h
+++ b/src/net/maploginhandler.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/net/messagehandler.cpp b/src/net/messagehandler.cpp
index f1561a31..f45000be 100644
--- a/src/net/messagehandler.cpp
+++ b/src/net/messagehandler.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/net/messagehandler.h b/src/net/messagehandler.h
index 45cdf8cd..7ff5194b 100644
--- a/src/net/messagehandler.h
+++ b/src/net/messagehandler.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/net/messagein.cpp b/src/net/messagein.cpp
index a288d936..f1ff4013 100644
--- a/src/net/messagein.cpp
+++ b/src/net/messagein.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/net/messagein.h b/src/net/messagein.h
index 0ff6e78a..94f2bee7 100644
--- a/src/net/messagein.h
+++ b/src/net/messagein.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/net/messageout.cpp b/src/net/messageout.cpp
index bf4957be..ab17f537 100644
--- a/src/net/messageout.cpp
+++ b/src/net/messageout.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/net/messageout.h b/src/net/messageout.h
index b3a4ef68..93f1c2e8 100644
--- a/src/net/messageout.h
+++ b/src/net/messageout.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/net/network.cpp b/src/net/network.cpp
index 059da779..02d8bf4f 100644
--- a/src/net/network.cpp
+++ b/src/net/network.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/net/network.h b/src/net/network.h
index 02fe7538..e264f8a5 100644
--- a/src/net/network.h
+++ b/src/net/network.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/net/npchandler.cpp b/src/net/npchandler.cpp
index ea03537f..8425a215 100644
--- a/src/net/npchandler.cpp
+++ b/src/net/npchandler.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/net/npchandler.h b/src/net/npchandler.h
index 7ac962eb..35db2956 100644
--- a/src/net/npchandler.h
+++ b/src/net/npchandler.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/net/partyhandler.cpp b/src/net/partyhandler.cpp
index 03aca66d..3378a5d0 100644
--- a/src/net/partyhandler.cpp
+++ b/src/net/partyhandler.cpp
@@ -1,15 +1,15 @@
/*
- * The Mana World
- * Copyright 2004 The Mana World Development Team
+ * Aethyra
+ * Copyright (C) 2008 Lloyd Bryant <lloyd_bryant@netzero.net>
*
- * This file is part of The Mana World.
+ * This file is part of Aethyra.
*
- * 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.
diff --git a/src/net/partyhandler.h b/src/net/partyhandler.h
index 048da9b1..158e89e6 100644
--- a/src/net/partyhandler.h
+++ b/src/net/partyhandler.h
@@ -1,15 +1,15 @@
/*
- * The Mana World
- * Copyright 2004 The Mana World Development Team
+ * Aethyra
+ * Copyright (C) 2008 Lloyd Bryant <lloyd_bryant@netzero.net>
*
- * This file is part of The Mana World.
+ * This file is part of Aethyra.
*
- * 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.
diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp
index 46ded32e..21c37ea3 100644
--- a/src/net/playerhandler.cpp
+++ b/src/net/playerhandler.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/net/playerhandler.h b/src/net/playerhandler.h
index 1a7c8da3..0500ae44 100644
--- a/src/net/playerhandler.h
+++ b/src/net/playerhandler.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/net/protocol.cpp b/src/net/protocol.cpp
index 69d69901..563c1cc4 100644
--- a/src/net/protocol.cpp
+++ b/src/net/protocol.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/net/protocol.h b/src/net/protocol.h
index e9053451..081f8873 100644
--- a/src/net/protocol.h
+++ b/src/net/protocol.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/net/skillhandler.cpp b/src/net/skillhandler.cpp
index e2185524..8ef37101 100644
--- a/src/net/skillhandler.cpp
+++ b/src/net/skillhandler.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/net/skillhandler.h b/src/net/skillhandler.h
index 2b55605d..689e42dc 100644
--- a/src/net/skillhandler.h
+++ b/src/net/skillhandler.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/net/tradehandler.cpp b/src/net/tradehandler.cpp
index c5465835..98f26cbd 100644
--- a/src/net/tradehandler.cpp
+++ b/src/net/tradehandler.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/net/tradehandler.h b/src/net/tradehandler.h
index d479e43f..8f108248 100644
--- a/src/net/tradehandler.h
+++ b/src/net/tradehandler.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/npc.cpp b/src/npc.cpp
index 7b7db125..c667e11e 100644
--- a/src/npc.cpp
+++ b/src/npc.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/npc.h b/src/npc.h
index dd8d7f5d..f8aaad7f 100644
--- a/src/npc.h
+++ b/src/npc.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/openglgraphics.cpp b/src/openglgraphics.cpp
index e7e7b204..71ab2fe3 100644
--- a/src/openglgraphics.cpp
+++ b/src/openglgraphics.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/openglgraphics.h b/src/openglgraphics.h
index 566d6252..207d6725 100644
--- a/src/openglgraphics.h
+++ b/src/openglgraphics.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/particle.cpp b/src/particle.cpp
index d89d0a3e..9510573f 100644
--- a/src/particle.cpp
+++ b/src/particle.cpp
@@ -1,8 +1,9 @@
/*
- * The Mana World
+ * Aethyra
* Copyright (C) 2006 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/particle.h b/src/particle.h
index 881bbb74..9c01bcdf 100644
--- a/src/particle.h
+++ b/src/particle.h
@@ -1,8 +1,9 @@
/*
- * The Mana World
+ * Aethyra
* Copyright (C) 2006 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/particlecontainer.cpp b/src/particlecontainer.cpp
index 1ed51053..0ebf4bc3 100644
--- a/src/particlecontainer.cpp
+++ b/src/particlecontainer.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/particlecontainer.h b/src/particlecontainer.h
index 4fb00027..1e2f8ff7 100644
--- a/src/particlecontainer.h
+++ b/src/particlecontainer.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/particleemitter.cpp b/src/particleemitter.cpp
index fa5dcde4..2c239fb9 100644
--- a/src/particleemitter.cpp
+++ b/src/particleemitter.cpp
@@ -1,8 +1,9 @@
/*
- * The Mana World
+ * Aethyra
* Copyright (C) 2006 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/particleemitter.h b/src/particleemitter.h
index 67b35ae2..835f39c5 100644
--- a/src/particleemitter.h
+++ b/src/particleemitter.h
@@ -1,8 +1,9 @@
/*
- * The Mana World
+ * Aethyra
* Copyright (C) 2006 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/particleemitterprop.h b/src/particleemitterprop.h
index e68ac222..e3817763 100644
--- a/src/particleemitterprop.h
+++ b/src/particleemitterprop.h
@@ -1,8 +1,9 @@
/*
- * The Mana World
+ * Aethyra
* Copyright (C) 2006 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/party.cpp b/src/party.cpp
index fe575a37..75569bc5 100644
--- a/src/party.cpp
+++ b/src/party.cpp
@@ -1,21 +1,21 @@
/*
- * The Mana World
- * Copyright 2004 The Mana World Development Team
+ * Aethyra
+ * Copyright 2008 Lloyd Bryant <lloyd_bryant@netzero.net>
*
- * This file is part of The Mana World.
+ * This file is part of Aethyra.
*
- * 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.
*
* You should have received a copy of the GNU General Public License
- * along with The Mana World; if not, write to the Free Software
+ * 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/party.h b/src/party.h
index 98252c37..0a19ae1d 100644
--- a/src/party.h
+++ b/src/party.h
@@ -1,21 +1,21 @@
/*
- * The Mana World
- * Copyright 2004 The Mana World Development Team
+ * Aethyra
+ * Copyright 2008 Lloyd Bryant <lloyd_bryant@netzero.net>
*
- * This file is part of The Mana World.
+ * This file is part of Aethyra.
*
- * 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.
*
* You should have received a copy of the GNU General Public License
- * along with The Mana World; if not, write to the Free Software
+ * 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/player.cpp b/src/player.cpp
index 610dfeb1..0eea8a6a 100644
--- a/src/player.cpp
+++ b/src/player.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/player.h b/src/player.h
index f9911bb8..b815b829 100644
--- a/src/player.h
+++ b/src/player.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/player_relations.cpp b/src/player_relations.cpp
index aa83115c..d9ff4b8d 100644
--- a/src/player_relations.cpp
+++ b/src/player_relations.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/player_relations.h b/src/player_relations.h
index 1eb4ede6..0440cace 100644
--- a/src/player_relations.h
+++ b/src/player_relations.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/position.cpp b/src/position.cpp
index 69d50476..f370f27b 100644
--- a/src/position.cpp
+++ b/src/position.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/position.h b/src/position.h
index cbcf8c99..1c961c46 100644
--- a/src/position.h
+++ b/src/position.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/properties.h b/src/properties.h
index 4bad8e59..ad5af1d6 100644
--- a/src/properties.h
+++ b/src/properties.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/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
diff --git a/src/serverinfo.h b/src/serverinfo.h
index c38d13c7..fc3ef032 100644
--- a/src/serverinfo.h
+++ b/src/serverinfo.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/shopitem.cpp b/src/shopitem.cpp
index 3b90dfdd..70a68719 100644
--- a/src/shopitem.cpp
+++ b/src/shopitem.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/shopitem.h b/src/shopitem.h
index 3353ebe7..8b1ba4b2 100644
--- a/src/shopitem.h
+++ b/src/shopitem.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/simpleanimation.cpp b/src/simpleanimation.cpp
index 030619ce..09e8e0d3 100644
--- a/src/simpleanimation.cpp
+++ b/src/simpleanimation.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/simpleanimation.h b/src/simpleanimation.h
index a639cf14..384823b7 100644
--- a/src/simpleanimation.h
+++ b/src/simpleanimation.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/sound.cpp b/src/sound.cpp
index 78538c09..083ffb6a 100644
--- a/src/sound.cpp
+++ b/src/sound.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/sound.h b/src/sound.h
index 05b2def3..53fde14e 100644
--- a/src/sound.h
+++ b/src/sound.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/sprite.h b/src/sprite.h
index a6384e94..c2b0fc7c 100644
--- a/src/sprite.h
+++ b/src/sprite.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/textparticle.cpp b/src/textparticle.cpp
index f38c32ce..3283f9fd 100644
--- a/src/textparticle.cpp
+++ b/src/textparticle.cpp
@@ -1,8 +1,9 @@
/*
- * The Mana World
+ * Aethyra
* Copyright (C) 2006 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/textparticle.h b/src/textparticle.h
index cdf99d8f..d847eb00 100644
--- a/src/textparticle.h
+++ b/src/textparticle.h
@@ -1,8 +1,9 @@
/*
- * The Mana World
+ * Aethyra
* Copyright (C) 2006 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/tileset.h b/src/tileset.h
index d4de7ba5..28f7d9d5 100644
--- a/src/tileset.h
+++ b/src/tileset.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/utils/dtor.h b/src/utils/dtor.h
index 0b71fa50..96ce63d4 100644
--- a/src/utils/dtor.h
+++ b/src/utils/dtor.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/utils/gettext.h b/src/utils/gettext.h
index 5281d491..f7286187 100644
--- a/src/utils/gettext.h
+++ b/src/utils/gettext.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/utils/mutex.h b/src/utils/mutex.h
index 5e5df8f8..569b6808 100644
--- a/src/utils/mutex.h
+++ b/src/utils/mutex.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/utils/strprintf.cpp b/src/utils/strprintf.cpp
index 07fb3508..f90e6258 100644
--- a/src/utils/strprintf.cpp
+++ b/src/utils/strprintf.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/utils/strprintf.h b/src/utils/strprintf.h
index 78e7a04c..1d33c3f7 100644
--- a/src/utils/strprintf.h
+++ b/src/utils/strprintf.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/utils/tostring.h b/src/utils/tostring.h
index 62eb44e4..131d559d 100644
--- a/src/utils/tostring.h
+++ b/src/utils/tostring.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
@@ -32,8 +33,6 @@ std::string toString(const T &arg)
return ss.str();
}
-// TODO: Is there a good way to suppress warnings from classes which don't use
-// this function?
inline char *iptostring(int address)
{
static char asciiIP[16];
diff --git a/src/utils/trim.h b/src/utils/trim.h
index b7474ac7..0602842f 100644
--- a/src/utils/trim.h
+++ b/src/utils/trim.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/utils/xml.cpp b/src/utils/xml.cpp
index 24058558..562f69e3 100644
--- a/src/utils/xml.cpp
+++ b/src/utils/xml.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/utils/xml.h b/src/utils/xml.h
index 2e08dd50..b7d67924 100644
--- a/src/utils/xml.h
+++ b/src/utils/xml.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/vector.cpp b/src/vector.cpp
index 9b573e88..bbfb1a70 100644
--- a/src/vector.cpp
+++ b/src/vector.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/vector.h b/src/vector.h
index 6dd461ac..48933155 100644
--- a/src/vector.h
+++ b/src/vector.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