--- deliantra/server/include/commands.h	2006/02/03 07:12:47	1.1.1.1
+++ deliantra/server/include/commands.h	2010/04/06 22:59:28	1.18
@@ -1,32 +1,28 @@
 /*
- * static char *rcsid_commands_h =
- *   "$Id$";
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
+ * 
+ * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 1994 Mark Wedel
+ * Copyright (©) 1992 Frank Tore Johansen
+ * 
+ * Deliantra is free software: you can redistribute it and/or modify it under
+ * the terms of the Affero GNU General Public License as published by the
+ * Free Software Foundation, either version 3 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 Affero GNU General Public License
+ * and the GNU General Public License along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
+ * 
+ * The authors can be reached via e-mail to <support@deliantra.net>
  */
 
 /*
-    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,71 +44,14 @@
 
 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[];
 
-extern const int CommandsSize,NewServerCommandSize,
-	SocketCommandsSize, WizCommandsSize, CommunicationCommandSize;
+extern const int CommandsSize, SocketCommandsSize, WizCommandsSize;
 
-#define EMOTE_NOD	1
-#define EMOTE_DANCE	2
-#define EMOTE_KISS	3
-#define EMOTE_BOUNCE	4
-#define EMOTE_SMILE	5
-#define EMOTE_CACKLE	6
-#define EMOTE_LAUGH	7
-#define EMOTE_GIGGLE	8
-#define EMOTE_SHAKE	9
-#define EMOTE_PUKE	10
-#define EMOTE_GROWL	11
-#define EMOTE_SCREAM	12
-#define EMOTE_SIGH	13
-#define EMOTE_SULK	14
-#define EMOTE_HUG	15
-#define EMOTE_CRY	16
-#define EMOTE_POKE	17
-#define EMOTE_ACCUSE	18
-#define EMOTE_GRIN	19
-#define EMOTE_BOW	20
-#define EMOTE_CLAP	21
-#define EMOTE_BLUSH	22
-#define EMOTE_BURP	23
-#define EMOTE_CHUCKLE	24
-#define EMOTE_COUGH	25
-#define EMOTE_FLIP	26
-#define EMOTE_FROWN	27
-#define EMOTE_GASP	28
-#define EMOTE_GLARE	29
-#define EMOTE_GROAN	30
-#define EMOTE_HICCUP	31
-#define EMOTE_LICK	32
-#define EMOTE_POUT	33
-#define EMOTE_SHIVER	34
-#define EMOTE_SHRUG	35
-#define EMOTE_SLAP	36
-#define EMOTE_SMIRK	37
-#define EMOTE_SNAP	38
-#define EMOTE_SNEEZE	39
-#define EMOTE_SNICKER	40
-#define EMOTE_SNIFF	41
-#define EMOTE_SNORE	42
-#define EMOTE_SPIT	43
-#define EMOTE_STRUT	44
-#define EMOTE_THANK	45
-#define EMOTE_TWIDDLE	46
-#define EMOTE_WAVE	47
-#define EMOTE_WHISTLE	48
-#define EMOTE_WINK	49
-#define EMOTE_YAWN	50
-#define EMOTE_BEG	51
-#define EMOTE_BLEED	52
-#define EMOTE_CRINGE	53
-#define EMOTE_THINK	54
 #endif