summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/gui/changepassworddialog.cpp2
-rw-r--r--src/gui/changepassworddialog.h2
-rw-r--r--src/gui/guildwindow.h2
-rw-r--r--src/guild.cpp8
-rw-r--r--src/guild.h23
-rw-r--r--src/net/chatserver/party.cpp2
-rw-r--r--src/net/chatserver/party.h2
-rw-r--r--src/net/guildhandler.cpp2
-rw-r--r--src/net/guildhandler.h2
-rw-r--r--src/net/partyhandler.cpp2
-rw-r--r--src/net/partyhandler.h2
-rw-r--r--src/resources/npcdb.cpp2
-rw-r--r--src/resources/npcdb.h2
13 files changed, 37 insertions, 16 deletions
diff --git a/src/gui/changepassworddialog.cpp b/src/gui/changepassworddialog.cpp
index ac4b8610..6f30d296 100644
--- a/src/gui/changepassworddialog.cpp
+++ b/src/gui/changepassworddialog.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
*
- * $Id: $
+ * $Id$
*/
#include "changepassworddialog.h"
diff --git a/src/gui/changepassworddialog.h b/src/gui/changepassworddialog.h
index 9a809745..450cce61 100644
--- a/src/gui/changepassworddialog.h
+++ b/src/gui/changepassworddialog.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
*
- * $Id: $
+ * $Id$
*/
#ifndef _TMW_CHANGEPASSWORDDIALOG_H
diff --git a/src/gui/guildwindow.h b/src/gui/guildwindow.h
index 7b38c197..c2ac2b4d 100644
--- a/src/gui/guildwindow.h
+++ b/src/gui/guildwindow.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
*
- * $Id: $
+ * $Id$
*/
#ifndef _TMW_GUI_GUILDWINDOW_H
diff --git a/src/guild.cpp b/src/guild.cpp
index 0141db2f..4f28d8b5 100644
--- a/src/guild.cpp
+++ b/src/guild.cpp
@@ -21,14 +21,12 @@
* $Id$
*/
-
#include "guild.h"
-Guild::Guild(short id, bool inviteRights) :
-mId(id),
-mCanInviteUsers(inviteRights)
+Guild::Guild(short id, bool inviteRights):
+ mId(id),
+ mCanInviteUsers(inviteRights)
{
-
}
void Guild::addMember(const std::string &name)
diff --git a/src/guild.h b/src/guild.h
index 68806eec..969b146e 100644
--- a/src/guild.h
+++ b/src/guild.h
@@ -1,3 +1,26 @@
+/*
+ * 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_GUILD_H
#define TMW_GUILD_H
diff --git a/src/net/chatserver/party.cpp b/src/net/chatserver/party.cpp
index e09803de..63e2ddf9 100644
--- a/src/net/chatserver/party.cpp
+++ b/src/net/chatserver/party.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
*
- * $Id: $
+ * $Id$
*/
diff --git a/src/net/chatserver/party.h b/src/net/chatserver/party.h
index f1bd7a7f..1d47c2c5 100644
--- a/src/net/chatserver/party.h
+++ b/src/net/chatserver/party.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
*
- * $Id: $
+ * $Id$
*/
diff --git a/src/net/guildhandler.cpp b/src/net/guildhandler.cpp
index 7bc362e1..459c5ac4 100644
--- a/src/net/guildhandler.cpp
+++ b/src/net/guildhandler.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
*
- * $Id: $
+ * $Id$
*/
#include <iostream>
diff --git a/src/net/guildhandler.h b/src/net/guildhandler.h
index 698a623c..01ad428b 100644
--- a/src/net/guildhandler.h
+++ b/src/net/guildhandler.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
*
- * $Id: $
+ * $Id$
*/
#ifndef _TMW_NET_GUILDHANDLER_H
diff --git a/src/net/partyhandler.cpp b/src/net/partyhandler.cpp
index 0eef0d51..dd169b8d 100644
--- a/src/net/partyhandler.cpp
+++ b/src/net/partyhandler.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
*
- * $Id: $
+ * $Id$
*/
#include <iostream>
diff --git a/src/net/partyhandler.h b/src/net/partyhandler.h
index 5ca0583e..dda78d94 100644
--- a/src/net/partyhandler.h
+++ b/src/net/partyhandler.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
*
- * $Id: $
+ * $Id$
*/
#ifndef _TMW_NET_PARTYHANDLER_H
diff --git a/src/resources/npcdb.cpp b/src/resources/npcdb.cpp
index 6c205bc9..589effa9 100644
--- a/src/resources/npcdb.cpp
+++ b/src/resources/npcdb.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
*
- * $Id: monsterdb.cpp 3999 2008-03-23 01:27:13Z b_lindeijer $
+ * $Id$
*/
#include "npcdb.h"
diff --git a/src/resources/npcdb.h b/src/resources/npcdb.h
index 3b2acd89..62ac9f48 100644
--- a/src/resources/npcdb.h
+++ b/src/resources/npcdb.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
*
- * $Id: monsterdb.h 3456 2007-08-13 21:09:12Z gmelquio $
+ * $Id$
*/
#ifndef _TMW_NPC_DB_H