--- deliantra/server/include/commands.h	2008/05/06 16:55:25	1.12
+++ deliantra/server/include/commands.h	2009/06/26 16:32:10	1.14
@@ -49,65 +49,8 @@
   float	time;			/* How long it takes to execute this command */
 };
 
+extern CommArray_s Commands[], SocketCommands[], WizCommands[];
 
-extern CommArray_s Commands[], SocketCommands[],
-       WizCommands[], CommunicationCommands[];
+extern const int CommandsSize, SocketCommandsSize, WizCommandsSize;
 
-extern const int CommandsSize, SocketCommandsSize,
-       WizCommandsSize, CommunicationCommandSize;
-
-#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