--- deliantra/server/include/commands.h	2006/02/03 07:12:47	1.1
+++ deliantra/server/include/commands.h	2007/03/02 12:14:57	1.8
@@ -1,32 +1,28 @@
 /*
- * static char *rcsid_commands_h =
- *   "$Id$";
+ * CrossFire, A Multiplayer game for X-windows
+ * 
+ * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
+ * Copyright (C) 1994 Mark Wedel
+ * Copyright (C) 1992 Frank Tore Johansen
+ * 
+ * This 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 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * The author can be reached via e-mail to mark@pyramid.com
  */
 
 /*
-    CrossFire, A Multiplayer game for X-windows
-
-    Copyright (C) 1994 Mark Wedel
-    Copyright (C) 1992 Frank Tore Johansen
-
-    This 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 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., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    The author can be reached via e-mail to mark@pyramid.com
-*/
-
-/*
  * Crossfire commands
  *	++Jam
  *
@@ -34,13 +30,13 @@
  */
 
 
-/* The initialized arrays were removed from this file and are now
- * in commands.c.  Initializing the arrays in any header file
+/* The initialised arrays were removed from this file and are now
+ * in commands.c.  initialising the arrays in any header file
  * is stupid, as it means that header file can only be included
  * in one source file (so what is the point of putting them in a header
  * file then?).  Header files should be used like this one - to declare
  * the structures externally - they actual structures should resided/
- * be initialized in one of the source files.
+ * be initialised in one of the source files.
  */
 
 #ifndef COMMANDS_H
@@ -48,18 +44,18 @@
 
 typedef int (*CommFunc)(object *op, char *params);
 
-typedef struct {		/* global list's structure */
+struct CommArray_s {		/* global list's structure */
   const char *name;
   CommFunc func;
   float	time;			/* How long it takes to execute this command */
-} CommArray_s;
+};
 
 
-extern CommArray_s Commands[],NewServerCommands [],SocketCommands[],
-	WizCommands [], CommunicationCommands[];
+extern CommArray_s Commands[], SocketCommands[],
+       WizCommands[], CommunicationCommands[];
 
-extern const int CommandsSize,NewServerCommandSize,
-	SocketCommandsSize, WizCommandsSize, CommunicationCommandSize;
+extern const int CommandsSize, SocketCommandsSize,
+       WizCommandsSize, CommunicationCommandSize;
 
 #define EMOTE_NOD	1
 #define EMOTE_DANCE	2