summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/AUTHORS.txt40
-rw-r--r--file.list1
-rw-r--r--src/Makefile.am1
-rw-r--r--src/gui/button.cpp2
-rw-r--r--src/gui/button.h2
-rw-r--r--src/gui/buy.cpp2
-rw-r--r--src/gui/buy.h2
-rw-r--r--src/gui/char_select.cpp2
-rw-r--r--src/gui/char_select.h2
-rw-r--r--src/gui/char_server.cpp2
-rw-r--r--src/gui/char_server.h2
-rw-r--r--src/gui/chat.cpp2
-rw-r--r--src/gui/chat.h6
-rw-r--r--src/gui/checkbox.cpp2
-rw-r--r--src/gui/checkbox.h2
-rw-r--r--src/gui/gui.cpp2
-rw-r--r--src/gui/gui.h8
-rw-r--r--src/gui/inventory.cpp2
-rw-r--r--src/gui/inventory.h2
-rw-r--r--src/gui/login.cpp2
-rw-r--r--src/gui/login.h2
-rw-r--r--src/gui/npc.cpp2
-rw-r--r--src/gui/npc.h2
-rw-r--r--src/gui/ok_dialog.cpp4
-rw-r--r--src/gui/ok_dialog.h4
-rw-r--r--src/gui/passwordfield.cpp2
-rw-r--r--src/gui/passwordfield.h2
-rw-r--r--src/gui/progressbar.cpp2
-rw-r--r--src/gui/progressbar.h2
-rw-r--r--src/gui/setup.cpp28
-rw-r--r--src/gui/setup.h24
-rw-r--r--src/gui/shop.cpp2
-rw-r--r--src/gui/shop.h2
-rw-r--r--src/gui/skill.cpp2
-rw-r--r--src/gui/skill.h2
-rw-r--r--src/gui/slider.cpp2
-rw-r--r--src/gui/slider.h2
-rw-r--r--src/gui/stats.cpp2
-rw-r--r--src/gui/stats.h2
-rw-r--r--src/gui/textfield.cpp2
-rw-r--r--src/gui/textfield.h2
-rw-r--r--src/gui/window.cpp2
-rw-r--r--src/gui/window.h6
43 files changed, 166 insertions, 22 deletions
diff --git a/docs/AUTHORS.txt b/docs/AUTHORS.txt
new file mode 100644
index 00000000..89339377
--- /dev/null
+++ b/docs/AUTHORS.txt
@@ -0,0 +1,40 @@
+-----------------------
+The Mana World Dev Team
+-----------------------
+
+ ElvenProgrammer aka Eugenio Favalli (umperio@users.sourceforge.net)
+ Project leader, programmer (various parts)
+
+
+Programmers
+
+ Hammerbear aka Bjorn lindeijer (bjorn@lindeijer.nl)
+ (various parts, Guichan expert)
+
+ nym
+ (several GUI parts)
+
+ Shura aka kth5
+ (configuration, sound, Linux expert)
+
+ SimEdw
+ (network code)
+
+ Usiu
+ (several GUI parts)
+
+
+Artists
+
+ Chetic
+ (maps)
+
+ Neko-mon
+
+ Neorice
+
+ Rotonen
+ (backstory, art director)
+
+ Vlady
+ (several items)
diff --git a/file.list b/file.list
index 164debee..85045d58 100644
--- a/file.list
+++ b/file.list
@@ -12,6 +12,7 @@ MODULES = src/sound/sound.cpp \
src/gui/inventory.cpp \
src/gui/login.cpp \
src/gui/npc.cpp \
+ src/gui/ok_dialog.cpp \
src/gui/passwordfield.cpp \
src/gui/progressbar.cpp \
src/gui/setup.cpp \
diff --git a/src/Makefile.am b/src/Makefile.am
index 3e0415ad..9a91e2f5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,6 +13,7 @@ tmw_SOURCES = sound/sound.cpp \
gui/inventory.cpp \
gui/login.cpp \
gui/npc.cpp \
+ gui/ok_dialog.cpp \
gui/passwordfield.cpp \
gui/progressbar.cpp \
gui/setup.cpp \
diff --git a/src/gui/button.cpp b/src/gui/button.cpp
index fd82b9b1..3d7b3b18 100644
--- a/src/gui/button.cpp
+++ b/src/gui/button.cpp
@@ -17,6 +17,8 @@
* You should have received a copy of the GNU General Public License
* along with The Mana World; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * $Id$
*/
#include "button.h"
diff --git a/src/gui/button.h b/src/gui/button.h
index 0c45b133..17c700c5 100644
--- a/src/gui/button.h
+++ b/src/gui/button.h
@@ -17,6 +17,8 @@
* You should have received a copy of the GNU General Public License
* along with The Mana World; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * $Id$
*/
#ifndef _TMW_BUTTON_H
diff --git a/src/gui/buy.cpp b/src/gui/buy.cpp
index ee0ccf2f..c2648ef3 100644
--- a/src/gui/buy.cpp
+++ b/src/gui/buy.cpp
@@ -17,6 +17,8 @@
* You should have received a copy of the GNU General Public License
* along with The Mana World; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * $Id$
*/
#include "buy.h"
diff --git a/src/gui/buy.h b/src/gui/buy.h
index 67978409..0926c52e 100644
--- a/src/gui/buy.h
+++ b/src/gui/buy.h
@@ -17,6 +17,8 @@
* You should have received a copy of the GNU General Public License
* along with The Mana World; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * $Id$
*/
#ifndef _TMW_BUY_H
diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index 9084c6e9..4e2ef1a9 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -17,6 +17,8 @@
* You should have received a copy of the GNU General Public License
* along with The Mana World; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * $Id$
*/
#include "char_select.h"
diff --git a/src/gui/char_select.h b/src/gui/char_select.h
index b0f8a135..ef643725 100644
--- a/src/gui/char_select.h
+++ b/src/gui/char_select.h
@@ -17,6 +17,8 @@
* You should have received a copy of the GNU General Public License
* along with The Mana World; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * $Id$
*/
#ifndef _CHAR_SELECT_H
diff --git a/src/gui/char_server.cpp b/src/gui/char_server.cpp
index 50810128..eee37277 100644
--- a/src/gui/char_server.cpp
+++ b/src/gui/char_server.cpp
@@ -17,6 +17,8 @@
* You should have received a copy of the GNU General Public License
* along with The Mana World; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * $Id$
*/
#include "char_server.h"
diff --git a/src/gui/char_server.h b/src/gui/char_server.h
index c1cb704b..31c7c448 100644
--- a/src/gui/char_server.h
+++ b/src/gui/char_server.h
@@ -17,6 +17,8 @@
* You should have received a copy of the GNU General Public License
* along with The Mana World; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * $Id$
*/
#ifndef _CHAR_SEL_SERVER_H
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index 76d7ff0e..a1bbfd8c 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -17,6 +17,8 @@
* You should have received a copy of the GNU General Public License
* along with The Mana World; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * $Id$
*/
#include "chat.h"
diff --git a/src/gui/chat.h b/src/gui/chat.h
index ea482aa1..4c4bb933 100644
--- a/src/gui/chat.h
+++ b/src/gui/chat.h
@@ -17,10 +17,12 @@
* You should have received a copy of the GNU General Public License
* along with The Mana World; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * $Id$
*/
-#ifndef _CHAT_H
-#define _CHAT_H
+#ifndef _TMW_CHAT_H
+#define _TMW_CHAT_H
#include "../main.h"
#include <list>
diff --git a/src/gui/checkbox.cpp b/src/gui/checkbox.cpp
index d30298ea..4d348e98 100644
--- a/src/gui/checkbox.cpp
+++ b/src/gui/checkbox.cpp
@@ -17,6 +17,8 @@
* You should have received a copy of the GNU General Public License
* along with The Mana World; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * $Id$
*/
#include "checkbox.h"
diff --git a/src/gui/checkbox.h b/src/gui/checkbox.h
index d519020d..5e410a7e 100644
--- a/src/gui/checkbox.h
+++ b/src/gui/checkbox.h
@@ -17,6 +17,8 @@
* You should have received a copy of the GNU General Public License
* along with The Mana World; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * $Id$
*/
#ifndef _TMW_CHECKBOX_H
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index ee6d2a0a..45599520 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -17,6 +17,8 @@
* You should have received a copy of the GNU General Public License
* along with The Mana World; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * $Id$
*/
#include "gui.h"
diff --git a/src/gui/gui.h b/src/gui/gui.h
index d987c54f..81e533bf 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -17,15 +17,17 @@
* You should have received a copy of the GNU General Public License
* along with The Mana World; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * $Id$
*/
+#ifndef _TMW_GUI
+#define _TMW_GUI
+
#ifdef WIN32
#pragma warning (disable:4312)
#endif
-#ifndef _TMW_GUI
-#define _TMW_GUI
-
#include <guichan.hpp>
#include <guichan/allegro.hpp>
#include <allegro.h>
diff --git a/src/gui/inventory.cpp b/src/gui/inventory.cpp
index 0b44807c..f5479d29 100644
--- a/src/gui/inventory.cpp
+++ b/src/gui/inventory.cpp
@@ -17,6 +17,8 @@
* You should have received a copy of the GNU General Public License
* along with The Mana World; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * $Id$
*/
#include "inventory.h"
diff --git a/src/gui/inventory.h b/src/gui/inventory.h
index c2bf9d71..d21f4ebd 100644
--- a/src/gui/inventory.h
+++ b/src/gui/inventory.h
@@ -17,6 +17,8 @@
* You should have received a copy of the GNU General Public License
* along with The Mana World; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * $Id$
*/
#ifndef _INVENTORY_H
diff --git a/src/gui/login.cpp b/src/gui/login.cpp
index ddcb73cf..45968c25 100644
--- a/src/gui/login.cpp
+++ b/src/gui/login.cpp
@@ -18,7 +18,7 @@
* along with The Mana World; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * By ElvenProgrammer aka Eugenio Favalli (umperio@users.sourceforge.net)
+ * $Id$
*/
#include "login.h"
diff --git a/src/gui/login.h b/src/gui/login.h
index fba708c2..3157a727 100644
--- a/src/gui/login.h
+++ b/src/gui/login.h
@@ -17,6 +17,8 @@
* You should have received a copy of the GNU General Public License
* along with The Mana World; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * $Id$
*/
#ifndef _TMW_LOGIN_H
diff --git a/src/gui/npc.cpp b/src/gui/npc.cpp
index 29dc12d2..eb864c39 100644
--- a/src/gui/npc.cpp
+++ b/src/gui/npc.cpp
@@ -17,6 +17,8 @@
* You should have received a copy of the GNU General Public License
* along with The Mana World; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * $Id$
*/
#include <stdio.h>
diff --git a/src/gui/npc.h b/src/gui/npc.h
index f18aece6..a8077dcf 100644
--- a/src/gui/npc.h
+++ b/src/gui/npc.h
@@ -17,6 +17,8 @@
* You should have received a copy of the GNU General Public License
* along with The Mana World; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * $Id$
*/
#ifndef _NPC_H
diff --git a/src/gui/ok_dialog.cpp b/src/gui/ok_dialog.cpp
index 85ff20a6..6a1ba126 100644
--- a/src/gui/ok_dialog.cpp
+++ b/src/gui/ok_dialog.cpp
@@ -18,7 +18,7 @@
* along with The Mana World; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * By ElvenProgrammer aka Eugenio Favalli (umperio@users.sourceforge.net)
+ * $Id$
*/
#include "ok_dialog.h"
@@ -53,4 +53,4 @@ void OkDialog::action(const std::string& eventId)
{
if (eventId == "ok") {
}
-} \ No newline at end of file
+}
diff --git a/src/gui/ok_dialog.h b/src/gui/ok_dialog.h
index 41e0c5f2..cc04546b 100644
--- a/src/gui/ok_dialog.h
+++ b/src/gui/ok_dialog.h
@@ -18,7 +18,7 @@
* along with The Mana World; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * By ElvenProgrammer aka Eugenio Favalli (umperio@users.sourceforge.net)
+ * $Id$
*/
#ifndef _OK_DIALOG_H
@@ -57,4 +57,4 @@ class OkDialog : public Window, public gcn::ActionListener {
gcn::Button *okButton;
};
-#endif \ No newline at end of file
+#endif
diff --git a/src/gui/passwordfield.cpp b/src/gui/passwordfield.cpp
index 028d435b..ee849c45 100644
--- a/src/gui/passwordfield.cpp
+++ b/src/gui/passwordfield.cpp
@@ -17,6 +17,8 @@
* You should have received a copy of the GNU General Public License
* along with The Mana World; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * $Id$
*/
#include "passwordfield.h"
diff --git a/src/gui/passwordfield.h b/src/gui/passwordfield.h
index 74fea79d..e093efa8 100644
--- a/src/gui/passwordfield.h
+++ b/src/gui/passwordfield.h
@@ -17,6 +17,8 @@
* You should have received a copy of the GNU General Public License
* along with The Mana World; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * $Id$
*/
#ifndef __PASSWORDFIELD_H__
diff --git a/src/gui/progressbar.cpp b/src/gui/progressbar.cpp
index 4b754b77..0a4afcf6 100644
--- a/src/gui/progressbar.cpp
+++ b/src/gui/progressbar.cpp
@@ -17,6 +17,8 @@
* You should have received a copy of the GNU General Public License
* along with The Mana World; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * $Id$
*/
#include "progressbar.h"
diff --git a/src/gui/progressbar.h b/src/gui/progressbar.h
index d5bde55d..71d5c8f6 100644
--- a/src/gui/progressbar.h
+++ b/src/gui/progressbar.h
@@ -17,6 +17,8 @@
* You should have received a copy of the GNU General Public License
* along with The Mana World; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * $Id$
*/
#ifndef __PROGRESSBAR_H__
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index 051f4a7c..ee50ad06 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -1,9 +1,31 @@
-/*----------------------------------------------------------------
- * setup.cpp -- setup routines
- *----------------------------------------------------------------
+/*
+ * The Mana World
+ * Copyright 2004 The Mana World Development Team
+ *
+ * This file is part of 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
+ * 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,
+ * 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
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * $Id$
+ */
+
+/*
* This module takes care of everything relating to the
* setup dialog.
*/
+
#include "setup.h"
#include <allegro.h>
diff --git a/src/gui/setup.h b/src/gui/setup.h
index 7c56f3c9..7768ef34 100644
--- a/src/gui/setup.h
+++ b/src/gui/setup.h
@@ -1,6 +1,24 @@
-/*----------------------------------------------------------------
- * setup.h -- setup dialog module
- *----------------------------------------------------------------
+/*
+ * The Mana World
+ * Copyright 2004 The Mana World Development Team
+ *
+ * This file is part of 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
+ * 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,
+ * 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
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * $Id$
*/
#ifndef tmw_included_setup_h
diff --git a/src/gui/shop.cpp b/src/gui/shop.cpp
index 942df5cf..a7a9e358 100644
--- a/src/gui/shop.cpp
+++ b/src/gui/shop.cpp
@@ -18,7 +18,7 @@
* along with The Mana World; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * By ElvenProgrammer aka Eugenio Favalli (umperio@users.sourceforge.net)
+ * $Id$
*/
#include "shop.h"
diff --git a/src/gui/shop.h b/src/gui/shop.h
index 73b14e97..70b24b4e 100644
--- a/src/gui/shop.h
+++ b/src/gui/shop.h
@@ -18,7 +18,7 @@
* along with The Mana World; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * By ElvenProgrammer aka Eugenio Favalli (umperio@users.sourceforge.net)
+ * $Id$
*/
#ifndef _SHOP_H
diff --git a/src/gui/skill.cpp b/src/gui/skill.cpp
index 5deb270a..455036ef 100644
--- a/src/gui/skill.cpp
+++ b/src/gui/skill.cpp
@@ -18,7 +18,7 @@
* along with The Mana World; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * By ElvenProgrammer aka Eugenio Favalli (umperio@users.sourceforge.net)
+ * $Id$
*/
#include "skill.h"
diff --git a/src/gui/skill.h b/src/gui/skill.h
index a6f93267..33e94a18 100644
--- a/src/gui/skill.h
+++ b/src/gui/skill.h
@@ -18,7 +18,7 @@
* along with The Mana World; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * By ElvenProgrammer aka Eugenio Favalli (umperio@users.sourceforge.net)
+ * $Id$
*/
#ifdef WIN32
diff --git a/src/gui/slider.cpp b/src/gui/slider.cpp
index fbc28342..612d2e2e 100644
--- a/src/gui/slider.cpp
+++ b/src/gui/slider.cpp
@@ -17,6 +17,8 @@
* You should have received a copy of the GNU General Public License
* along with The Mana World; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * $Id$
*/
#include "slider.h"
diff --git a/src/gui/slider.h b/src/gui/slider.h
index ba5b5757..dcd562fd 100644
--- a/src/gui/slider.h
+++ b/src/gui/slider.h
@@ -17,6 +17,8 @@
* You should have received a copy of the GNU General Public License
* along with The Mana World; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * $Id$
*/
#ifndef _TMW_SLIDER_H
diff --git a/src/gui/stats.cpp b/src/gui/stats.cpp
index 521f2dbd..949c6c27 100644
--- a/src/gui/stats.cpp
+++ b/src/gui/stats.cpp
@@ -17,6 +17,8 @@
* You should have received a copy of the GNU General Public License
* along with The Mana World; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * $Id$
*/
#include "stats.h"
diff --git a/src/gui/stats.h b/src/gui/stats.h
index a10a9c70..19971469 100644
--- a/src/gui/stats.h
+++ b/src/gui/stats.h
@@ -17,6 +17,8 @@
* You should have received a copy of the GNU General Public License
* along with The Mana World; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * $Id$
*/
#ifdef WIN32
diff --git a/src/gui/textfield.cpp b/src/gui/textfield.cpp
index 3b838126..3479355d 100644
--- a/src/gui/textfield.cpp
+++ b/src/gui/textfield.cpp
@@ -17,6 +17,8 @@
* You should have received a copy of the GNU General Public License
* along with The Mana World; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * $Id$
*/
#include "textfield.h"
diff --git a/src/gui/textfield.h b/src/gui/textfield.h
index 619b87f8..a8aa9245 100644
--- a/src/gui/textfield.h
+++ b/src/gui/textfield.h
@@ -17,6 +17,8 @@
* You should have received a copy of the GNU General Public License
* along with The Mana World; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * $Id$
*/
#ifndef __TEXTFIELD_H__
diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index d39bc590..4d386071 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -17,6 +17,8 @@
* You should have received a copy of the GNU General Public License
* along with The Mana World; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * $Id$
*/
#include "window.h"
diff --git a/src/gui/window.h b/src/gui/window.h
index 7ad1a0d2..58f0e9b7 100644
--- a/src/gui/window.h
+++ b/src/gui/window.h
@@ -17,10 +17,12 @@
* You should have received a copy of the GNU General Public License
* along with The Mana World; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * $Id$
*/
-#ifndef __WINDOW_H__
-#define __WINDOW_H__
+#ifndef _TMW_WINDOW_H__
+#define _TMW_WINDOW_H__
#include <iostream>
#include <allegro.h>