ALTER TABLE `creature_template` CHANGE `equipslot1` `equipslot1` INTEGER NOT NULL DEFAULT '0';
ALTER TABLE `creature_template` CHANGE `equipslot2` `equipslot2` INTEGER NOT NULL DEFAULT '0';
ALTER TABLE `creature_template` CHANGE `equipslot3` `equipslot3` INTEGER NOT NULL DEFAULT '0';
ALTER TABLE `creature_template` ADD    `npc_emote_state` INTEGER NOT NULL DEFAULT '0' AFTER `maxgold`;
ALTER TABLE `creature_template` ADD    `bytes_2` INTEGER NOT NULL DEFAULT '0' AFTER `npc_emote_state`;



Index: src/game/Creature.cpp
===================================================================
--- src/game/Creature.cpp	(revision 137)
+++ src/game/Creature.cpp	(working copy)
@@ -994,8 +994,10 @@
 
     SetUInt32Value(UNIT_FIELD_DISPLAYID,display_id );
     SetUInt32Value(UNIT_FIELD_NATIVEDISPLAYID,display_id );
-    SetUInt32Value(UNIT_FIELD_BYTES_2,1);                   // let creature used equiped weapon in fight
 
+    SetUInt32Value(UNIT_FIELD_BYTES_2,cinfo->bytes_2);
+    SetUInt32Value(UNIT_NPC_EMOTESTATE,cinfo->npc_emote_state);
+ 
     SetName(GetCreatureInfo()->Name);
 
     SelectLevel(cinfo);
Index: src/game/Creature.h
===================================================================
--- src/game/Creature.h	(revision 137)
+++ src/game/Creature.h	(working copy)
@@ -198,7 +198,9 @@
     uint32  spell3;
     uint32  spell4;
     uint32  mingold;
-    uint32  maxgold;
+    uint32  maxgold;
+    uint32  npc_emote_state;
+    uint32  bytes_2;
     char const* AIName;
     uint32  MovementType;
     char const* ScriptName;
Index: src/shared/Database/SQLStorage.cpp
===================================================================
--- src/shared/Database/SQLStorage.cpp	(revision 137)
+++ src/shared/Database/SQLStorage.cpp	(working copy)
@@ -25,7 +25,7 @@
 
 const char ItemPrototypefmt[]="iiiissssiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiffiffiffiffiffiiiiiiiiiifiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiisiiiiiiiiiiiiiiiiiiiiiiiiiisi";
 const char GameObjectInfofmt[]="iiisiifiiiiiiiiiis";
-const char CreatureInfofmt[]="iiissiiiiiiiiififfiiiiiififiiiiffifiiiiiiiiiiiiiiiiiiiiiiiiiiisis";
+const char CreatureInfofmt[]="iiissiiiiiiiiififfiiiiiififiiiiffifiiiiiiiiiiiiiiiiiiiiiiiiiiiiisis";
 const char PageTextfmt[]="isi";
 const char SpellProcEventfmt[]="iiiiiif";
 const char SpellThreatfmt[]="ii";