Fixed up the copyright headers

Decision is to go with exact authors when some file is basically done by
one person, and in most other cases assign TMW or Aethyra team copyright
when multiple people from those teams have been involved.

Also, the first summary line should now contain the subset of
functionality that the file is part of, not the name of the whole
project.

21 files changed, 202 insertions, 206 deletions

diff --git a/src/effectmanager.cpp b/src/effectmanager.cpp
index cf77de37..14b932d3 100644
--- a/src/effectmanager.cpp
+++ b/src/effectmanager.cpp
@@ -1,8 +1,9 @@
 /*
- *  The Mana World
- *  Copyright 2008 The Mana World Development Team
+ *  An effects manager
+ *  Copyright (C) 2008  Fate <fate.tmw@googlemail.com>
+ *  Copyright (C) 2008  Chuck Miller <shadowmil@gmail.com>
  *
- *  This file is part of Aethyra.
+ *  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
@@ -19,7 +20,6 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-
 #include "effectmanager.h"
 #include "log.h"
 #include "particle.h"
@@ -40,7 +40,7 @@ EffectManager::EffectManager()
     else
     {
         logger->log("Effects are now loading");
-    } 
+    }
 
     for_each_xml_child_node(node, root)
     {
@@ -79,7 +79,7 @@ bool EffectManager::trigger(int id, Being* being)
             }
             if((*i).SFX != "")
                 sound.playSfx((*i).SFX);
-            break;            
+            break;
         }
     }
     return rValue;
@@ -98,9 +98,8 @@ bool EffectManager::trigger(int id, int x, int y)
                 particleEngine->addEffect((*i).GFX, x, y);
             if((*i).SFX != "")
                 sound.playSfx((*i).SFX);
-            break;            
+            break;
         }
     }
     return rValue;
 }
-
diff --git a/src/effectmanager.h b/src/effectmanager.h
index a9efcdbc..90fbce34 100644
--- a/src/effectmanager.h
+++ b/src/effectmanager.h
@@ -1,8 +1,9 @@
 /*
- *  The Mana World
- *  Copyright 2008 The Mana World Development Team
+ *  An effects manager
+ *  Copyright (C) 2008  Fate <fate.tmw@googlemail.com>
+ *  Copyright (C) 2008  Chuck Miller <shadowmil@gmail.com>
  *
- *  This file is part of Aethyra.
+ *  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
@@ -19,8 +20,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _EFFECT_MANAGER_H
-#define _EFFECT_MANAGER_H
+#ifndef EFFECT_MANAGER_H
+#define EFFECT_MANAGER_H
 
 #include <list>
 #include <string>
@@ -32,35 +33,32 @@ class Being;
 class EffectManager
 {
 
-    public: 
+    public:
         struct EffectDescription {
              int id;
              std::string GFX;
              std::string SFX;
         };
 
-        
         EffectManager();
-        
         ~EffectManager();
 
         /**
          * Triggers a effect with the id, at
          * the specified being.
          */
-	bool trigger(int id, Being* being);
+        bool trigger(int id, Being* being);
 
         /**
          * Triggers a effect with the id, at
          * the specified x and y coordinate.
          */
-	bool trigger(int id, int x, int y);
+        bool trigger(int id, int x, int y);
 
    private:
         std::list<EffectDescription> mEffects;
-
 };
 
 extern EffectManager *effectManager;
 
-#endif // _EFFECT_MANAGER_H
+#endif // EFFECT_MANAGER_H
diff --git a/src/emoteshortcut.cpp b/src/emoteshortcut.cpp
index 66989d44..807fa3a2 100644
--- a/src/emoteshortcut.cpp
+++ b/src/emoteshortcut.cpp
@@ -1,22 +1,22 @@
 /*
- *  Aethyra
- *  Copyright 2009 Aethyra Development Team
+ *  Extended support for activating emotes
+ *  Copyright (C) 2009  Aethyra Development Team
  *
- *  This file is part of Aethyra.
+ *  This file is part of The Mana World.
  *
- *  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, 
- *  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "emoteshortcut.h"
diff --git a/src/emoteshortcut.h b/src/emoteshortcut.h
index 3f907e1b..ceb51a9b 100644
--- a/src/emoteshortcut.h
+++ b/src/emoteshortcut.h
@@ -1,26 +1,26 @@
 /*
- *  Aethyra
- *  Copyright 2009 Aethyra Development Team
+ *  Extended support for activating emotes
+ *  Copyright (C) 2009  Aethyra Development Team
  *
- *  This file is part of Aethyra.
+ *  This file is part of The Mana World.
  *
- *  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, 
- *  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef EMOTESHORTCUT_H__
-#define EMOTESHORTCUT_H__
+#ifndef EMOTESHORTCUT_H
+#define EMOTESHORTCUT_H
 
 #define SHORTCUT_EMOTES 12
 
diff --git a/src/extensions.h b/src/extensions.h
index 5b95afc8..dad00cfb 100644
--- a/src/extensions.h
+++ b/src/extensions.h
@@ -1,27 +1,26 @@
 /*
- *  Aethyra
- *  Copyright 2008  Lloyd Bryant <sanga@aethyra.com>
+ *  eAthena extension handling
+ *  Copyright (C) 2008  Lloyd Bryant <lloyd_bryant@netzero.net>
  *
- *  This file is part of the Aethyra project.
+ *  This file is part of The Mana World.
  *
- *  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 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
- *
  */
 
-#ifndef _EXTENSIONS_
-#define _EXTENSIONS_
+#ifndef EXTENSIONS_H
+#define EXTENSIONS_H
 
 struct EXTENSIONS
 {
@@ -31,4 +30,5 @@ struct EXTENSIONS
 };
 
 extern struct EXTENSIONS extensions;
+
 #endif
diff --git a/src/gui/colour.cpp b/src/gui/colour.cpp
index 816420ed..78e35e97 100644
--- a/src/gui/colour.cpp
+++ b/src/gui/colour.cpp
@@ -1,23 +1,23 @@
-/***************************************************************************
- *   Copyright (C) 2008 by Douglas Boffey                                  *
- *                                                                         *
- *       DougABoffey@netscape.net                                          *
- *   This 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     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed with The Mana Experiment                  *
- *   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.             *
- ***************************************************************************/
+/*
+ *  Configurable text colors
+ *  Copyright (C) 2008  Douglas Boffey <dougaboffey@netscape.net>
+ *
+ *  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 <cstdio>
 
diff --git a/src/gui/colour.h b/src/gui/colour.h
index 1e8ba3db..1ffe6e30 100644
--- a/src/gui/colour.h
+++ b/src/gui/colour.h
@@ -1,26 +1,26 @@
-/***************************************************************************
- *   Copyright (C) 2008 by Douglas Boffey                                  *
- *                                                                         *
- *       DougABoffey@netscape.net                                          *
- *   This 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     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed with The Mana Experiment                  *
- *   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 _COLOUR_H
-#define _COLOUR_H
+/*
+ *  Configurable text colors
+ *  Copyright (C) 2008  Douglas Boffey <dougaboffey@netscape.net>
+ *
+ *  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 COLOUR_H
+#define COLOUR_H
 
 #include <cstdio>
 #include <string>
diff --git a/src/gui/emotecontainer.cpp b/src/gui/emotecontainer.cpp
index fa63d4bb..94ce9736 100644
--- a/src/gui/emotecontainer.cpp
+++ b/src/gui/emotecontainer.cpp
@@ -1,22 +1,22 @@
 /*
- *  Aethyra
- *  Copyright 2009 Aethyra Development Team
+ *  Extended support for activating emotes
+ *  Copyright (C) 2009  Aethyra Development Team
  *
- *  This file is part of Aethyra.
+ *  This file is part of The Mana World.
  *
- *  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, 
- *  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <guichan/mouseinput.hpp>
@@ -90,7 +90,7 @@ void EmoteContainer::draw(gcn::Graphics *graphics)
     {
         int emoteX = ((i) % columns) * gridWidth;
         int emoteY = ((i) / columns) * gridHeight;
-           
+
         // Draw emote icon
         mEmoteImg[i]->draw(static_cast<Graphics*>(graphics), emoteX, emoteY);
 
@@ -121,7 +121,7 @@ void EmoteContainer::recalculateHeight()
         setHeight(height);
 }
 
-int EmoteContainer::getSelectedEmote() 
+int EmoteContainer::getSelectedEmote()
 {
     if (mSelectedEmoteIndex == NO_EMOTE)
         return 0;
diff --git a/src/gui/emotecontainer.h b/src/gui/emotecontainer.h
index 8e52a206..ca7b533a 100644
--- a/src/gui/emotecontainer.h
+++ b/src/gui/emotecontainer.h
@@ -1,26 +1,26 @@
 /*
- *  Aethyra
- *  Copyright 2009 Aethyra Development Team
+ *  Extended support for activating emotes
+ *  Copyright (C) 2009  Aethyra Development Team
  *
- *  This file is part of Aethyra.
+ *  This file is part of The Mana World.
  *
- *  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, 
- *  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef EMOTECONTAINER_H__
-#define EMOTECONTAINER_H__
+#ifndef EMOTECONTAINER_H
+#define EMOTECONTAINER_H
 
 #include <list>
 #include <vector>
@@ -43,7 +43,7 @@ namespace gcn {
  *
  * \ingroup GUI
  */
-class EmoteContainer : public gcn::Widget, 
+class EmoteContainer : public gcn::Widget,
                        public gcn::MouseListener,
                        public gcn::WidgetListener
 {
@@ -103,8 +103,8 @@ class EmoteContainer : public gcn::Widget,
 
     private:
         /**
-
-         * Sets the currently selected emote.  Invalid (e.g., negative) indices set `no emotr'.
+         * Sets the currently selected emote.  Invalid (e.g., negative) indices
+         * set `no emotr'.
          */
         void setSelectedEmoteIndex(int index);
 
diff --git a/src/gui/emoteshortcutcontainer.cpp b/src/gui/emoteshortcutcontainer.cpp
index f5ee9843..a0142663 100644
--- a/src/gui/emoteshortcutcontainer.cpp
+++ b/src/gui/emoteshortcutcontainer.cpp
@@ -1,22 +1,22 @@
 /*
- *  Aethyra
- *  Copyright 2009 Aethyra Development Team
+ *  Extended support for activating emotes
+ *  Copyright (C) 2009  Aethyra Development Team
  *
- *  This file is part of Aethyra.
+ *  This file is part of The Mana World.
  *
- *  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, 
- *  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "emoteshortcutcontainer.h"
@@ -112,14 +112,14 @@ void EmoteShortcutContainer::draw(gcn::Graphics *graphics)
 
 void EmoteShortcutContainer::mouseDragged(gcn::MouseEvent &event)
 {
-    if (event.getButton() == gcn::MouseEvent::LEFT) 
+    if (event.getButton() == gcn::MouseEvent::LEFT)
     {
-        if (!mEmoteMoved && mEmoteClicked) 
+        if (!mEmoteMoved && mEmoteClicked)
         {
             const int index = getIndexFromGrid(event.getX(), event.getY());
             const int emoteId = emoteShortcut->getEmote(index);
 
-            if (index == -1) 
+            if (index == -1)
             {
                 return;
             }
@@ -130,7 +130,7 @@ void EmoteShortcutContainer::mouseDragged(gcn::MouseEvent &event)
                 emoteShortcut->removeEmote(index);
             }
         }
-        if (mEmoteMoved) 
+        if (mEmoteMoved)
         {
             mCursorPosX = event.getX();
             mCursorPosY = event.getY();
@@ -142,18 +142,18 @@ void EmoteShortcutContainer::mousePressed(gcn::MouseEvent &event)
 {
     const int index = getIndexFromGrid(event.getX(), event.getY());
 
-    if (index == -1) 
+    if (index == -1)
     {
          return;
     }
 
     // Stores the selected emote if there is one.
-    if (emoteShortcut->isEmoteSelected()) 
+    if (emoteShortcut->isEmoteSelected())
     {
          emoteShortcut->setEmote(index);
          emoteShortcut->setEmoteSelected(0);
     }
-    else if (emoteShortcut->getEmote(index)) 
+    else if (emoteShortcut->getEmote(index))
     {
          mEmoteClicked = true;
     }
@@ -170,13 +170,13 @@ void EmoteShortcutContainer::mouseReleased(gcn::MouseEvent &event)
             emoteShortcut->setEmoteSelected(0);
         }
 
-        if (index == -1) 
+        if (index == -1)
         {
             mEmoteMoved = 0;
             return;
         }
 
-        if (mEmoteMoved) 
+        if (mEmoteMoved)
         {
             emoteShortcut->setEmotes(index, mEmoteMoved);
             mEmoteMoved = 0;
@@ -186,7 +186,7 @@ void EmoteShortcutContainer::mouseReleased(gcn::MouseEvent &event)
             emoteShortcut->useEmote(index + 1);
         }
 
-        if (mEmoteClicked) 
+        if (mEmoteClicked)
         {
             mEmoteClicked = false;
         }
diff --git a/src/gui/emoteshortcutcontainer.h b/src/gui/emoteshortcutcontainer.h
index cffaee6f..54ca1714 100644
--- a/src/gui/emoteshortcutcontainer.h
+++ b/src/gui/emoteshortcutcontainer.h
@@ -1,26 +1,26 @@
 /*
- *  Aethyra
- *  Copyright 2009 Aethyra Development Team
+ *  Extended support for activating emotes
+ *  Copyright (C) 2009  Aethyra Development Team
  *
- *  This file is part of Aethyra.
+ *  This file is part of The Mana World.
  *
- *  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, 
- *  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef EMOTESHORTCUTCONTAINER_H__
-#define EMOTESHORTCUTCONTAINER_H__
+#ifndef EMOTESHORTCUTCONTAINER_H
+#define EMOTESHORTCUTCONTAINER_H
 
 #include <vector>
 
diff --git a/src/gui/emotewindow.cpp b/src/gui/emotewindow.cpp
index b4e9c735..95f73933 100644
--- a/src/gui/emotewindow.cpp
+++ b/src/gui/emotewindow.cpp
@@ -1,22 +1,22 @@
 /*
- *  Aethyra
- *  Copyright 2009 Aethyra Development Team
+ *  Extended support for activating emotes
+ *  Copyright (C) 2009  Aethyra Development Team
  *
- *  This file is part of Aethyra.
+ *  This file is part of The Mana World.
  *
- *  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, 
- *  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <string>
@@ -34,7 +34,7 @@
 
 #include "../localplayer.h"
 
-#include "../utils/gettext.h"      
+#include "../utils/gettext.h"
 #include "../utils/tostring.h"
 
 EmoteWindow::EmoteWindow():
diff --git a/src/gui/emotewindow.h b/src/gui/emotewindow.h
index 8e36e5ce..0e938bc9 100644
--- a/src/gui/emotewindow.h
+++ b/src/gui/emotewindow.h
@@ -1,22 +1,22 @@
 /*
- *  Aethyra
- *  Copyright 2009 Aethyra Development Team
+ *  Extended support for activating emotes
+ *  Copyright (C) 2009  Aethyra Development Team
  *
- *  This file is part of Aethyra.
+ *  This file is part of The Mana World.
  *
- *  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, 
- *  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #ifndef EMOTEWINDOW_H
diff --git a/src/gui/setup_colours.cpp b/src/gui/setup_colours.cpp
index c08c94ef..112925ae 100644
--- a/src/gui/setup_colours.cpp
+++ b/src/gui/setup_colours.cpp
@@ -1,23 +1,23 @@
-/***************************************************************************
- *   Copyright (C) 2008 by Douglas Boffey                                  *
- *                                                                         *
- *       DougABoffey@netscape.net                                          *
- *   This 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     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed with The Mana Experiment                  *
- *   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.             *
- ***************************************************************************/
+/*
+ *  Configurable text colors
+ *  Copyright (C) 2008  Douglas Boffey <dougaboffey@netscape.net>
+ *
+ *  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 <vector>
 
diff --git a/src/gui/setup_colours.h b/src/gui/setup_colours.h
index 628efb43..79afe122 100644
--- a/src/gui/setup_colours.h
+++ b/src/gui/setup_colours.h
@@ -1,26 +1,26 @@
-/***************************************************************************
- *   Copyright (C) 2008 by Douglas Boffey                                  *
- *                                                                         *
- *       DougABoffey@netscape.net                                          *
- *   This 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     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed with The Mana Experiment                  *
- *   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.             *
- ***************************************************************************/
+/*
+ *  Configurable text colors
+ *  Copyright (C) 2008  Douglas Boffey <dougaboffey@netscape.net>
+ *
+ *  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 _SETUP_COLOURS_H
-#define _SETUP_COLOURS_H
+#ifndef SETUP_COLOURS_H
+#define SETUP_COLOURS_H
 
 #include <string>
 #include <vector>
diff --git a/src/recorder.cpp b/src/recorder.cpp
index 07d9a771..03fa2855 100644
--- a/src/recorder.cpp
+++ b/src/recorder.cpp
@@ -1,21 +1,21 @@
 /*
- *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  A chat recorder
+ *  Copyright (C) 2008  Lloyd Bryant <lloyd_bryant@netzero.net>
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  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/recorder.h b/src/recorder.h
index 4a220166..faf3c76a 100644
--- a/src/recorder.h
+++ b/src/recorder.h
@@ -1,8 +1,8 @@
 /*
- *  Aethyra
- *  Copyright (C) 2008 Aethyra Development Team
+ *  A chat recorder
+ *  Copyright (C) 2008  Lloyd Bryant <lloyd_bryant@netzero.net>
  *
- *  This file is part of Aethyra.
+ *  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
@@ -45,4 +45,5 @@ class Recorder : public ButtonBoxListener
         bool isRecording() {return (bool) mStream.is_open();}
         virtual ~Recorder();
 };
+
 #endif
diff --git a/src/text.cpp b/src/text.cpp
index e148c117..b8e56338 100644
--- a/src/text.cpp
+++ b/src/text.cpp
@@ -1,5 +1,5 @@
 /*
- *  The Mana World
+ *  Support for non-overlapping floating text
  *  Copyright (C) 2008  Douglas Boffey <DougABoffey@netscape.net>
  *  Copyright (C) 2008  The Mana World Development Team
  *
diff --git a/src/text.h b/src/text.h
index 8d463223..9895ab30 100644
--- a/src/text.h
+++ b/src/text.h
@@ -1,5 +1,5 @@
 /*
- *  The Mana World
+ *  Support for non-overlapping floating text
  *  Copyright (C) 2008  Douglas Boffey <DougABoffey@netscape.net>
  *  Copyright (C) 2008  The Mana World Development Team
  *
diff --git a/src/textmanager.cpp b/src/textmanager.cpp
index e22f6f4f..f792d463 100644
--- a/src/textmanager.cpp
+++ b/src/textmanager.cpp
@@ -1,7 +1,6 @@
 /*
- *  The Mana World
+ *  Support for non-overlapping floating text
  *  Copyright (C) 2008  Douglas Boffey <DougABoffey@netscape.net>
- *  Copyright (C) 2008  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
diff --git a/src/textmanager.h b/src/textmanager.h
index 15c65195..3e851c3f 100644
--- a/src/textmanager.h
+++ b/src/textmanager.h
@@ -1,7 +1,6 @@
 /*
- *  The Mana World
+ *  Support for non-overlapping floating text
  *  Copyright (C) 2008  Douglas Boffey <DougABoffey@netscape.net>
- *  Copyright (C) 2008  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *