From 0e18bc37c2e391baf540d78126d8f05ec9573f63 Mon Sep 17 00:00:00 2001
From: _manuel_ <none@none>
Date: Sat, 2 Jan 2010 19:52:08 -0300
Subject: [PATCH] Removed moveflags column from creature_addon and
 creature_template_addon. Thanks to Zor and raczman.

--HG--
branch : trunk
---
 sql/updates/6882_world_creature_addon.sql          | 1 +
 sql/updates/6882_world_creature_template_addon.sql | 1 +
 sql/world.sql                                      | 2 --
 src/game/Creature.cpp                              | 6 ------
 src/game/Creature.h                                | 1 -
 src/shared/Database/SQLStorage.cpp                 | 4 ++--
 6 files changed, 4 insertions(+), 11 deletions(-)
 create mode 100644 sql/updates/6882_world_creature_addon.sql
 create mode 100644 sql/updates/6882_world_creature_template_addon.sql

diff --git a/sql/updates/6882_world_creature_addon.sql b/sql/updates/6882_world_creature_addon.sql
new file mode 100644
index 0000000000..6c8c54b75a
--- /dev/null
+++ b/sql/updates/6882_world_creature_addon.sql
@@ -0,0 +1 @@
+ALTER TABLE `creature_addon` DROP COLUMN `moveflags`;
diff --git a/sql/updates/6882_world_creature_template_addon.sql b/sql/updates/6882_world_creature_template_addon.sql
new file mode 100644
index 0000000000..cd5b3e5bde
--- /dev/null
+++ b/sql/updates/6882_world_creature_template_addon.sql
@@ -0,0 +1 @@
+ALTER TABLE `creature_template_addon` DROP COLUMN `moveflags`;
diff --git a/sql/world.sql b/sql/world.sql
index 8ad219f700..5113bcea1f 100644
--- a/sql/world.sql
+++ b/sql/world.sql
@@ -754,7 +754,6 @@ CREATE TABLE `creature_addon` (
   `bytes1` int(10) unsigned NOT NULL DEFAULT '0',
   `bytes2` int(10) unsigned NOT NULL DEFAULT '0',
   `emote` int(10) unsigned NOT NULL DEFAULT '0',
-  `moveflags` int(10) unsigned NOT NULL DEFAULT '0',
   `auras` text,
   PRIMARY KEY (`guid`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
@@ -1703,7 +1702,6 @@ CREATE TABLE `creature_template_addon` (
   `bytes1` int(10) unsigned NOT NULL DEFAULT '0',
   `bytes2` int(10) unsigned NOT NULL DEFAULT '0',
   `emote` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `moveflags` int(10) unsigned NOT NULL DEFAULT '0',
   `auras` text,
   PRIMARY KEY (`entry`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index 22a5d82c1b..818e01bb39 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -1967,12 +1967,6 @@ bool Creature::LoadCreaturesAddon(bool reload)
     if (cainfo->emote != 0)
         SetUInt32Value(UNIT_NPC_EMOTESTATE, cainfo->emote);
 
-    if (cainfo->move_flags != 0)
-        SetUnitMovementFlags(cainfo->move_flags);
-
-    if (cainfo->move_flags & (MOVEMENTFLAG_FLY_MODE | MOVEMENTFLAG_FLYING))
-        sLog.outErrorDb("Creature (GUID: %u Entry: %u) has improper `moveflags` value in `creature_template_addon`. Use `InhabitType` = 4 (Flying) in `creature_template`, not MOVEMENTFLAG_FLY_MODE or MOVEMENTFLAG_FLYING in `creature_template_addon`.",GetGUIDLow(),GetEntry());
-
     //Load Path
     if (cainfo->path_id != 0)
         m_path_id = cainfo->path_id;
diff --git a/src/game/Creature.h b/src/game/Creature.h
index b3e3a8a455..efe77737dc 100644
--- a/src/game/Creature.h
+++ b/src/game/Creature.h
@@ -253,7 +253,6 @@ struct CreatureDataAddon
     uint32 bytes1;
     uint32 bytes2;
     uint32 emote;
-    uint32 move_flags;
     CreatureDataAddonAura const* auras;                     // loaded as char* "spell1 eff1 spell2 eff2 ... "
 };
 
diff --git a/src/shared/Database/SQLStorage.cpp b/src/shared/Database/SQLStorage.cpp
index 9e856464b4..484c2278c1 100644
--- a/src/shared/Database/SQLStorage.cpp
+++ b/src/shared/Database/SQLStorage.cpp
@@ -29,9 +29,9 @@ extern DatabaseMysql  WorldDatabase;
 
 const char CreatureInfosrcfmt[]="iiiiiiiiiisssiiiiiiiiffiffiifiiiiiiiiiiffiiiiiiiiiiiiiiiiiiiiiiiisiiffliiiiiiiliiis";
 const char CreatureInfodstfmt[]="iiiiiiiiiisssiiiiiiiiffiffiifiiiiiiiiiiffiiiiiiiiiiiiiiiiiiiiiiiisiiffliiiiiiiliiii";
-const char CreatureDataAddonInfofmt[]="iiiiiiis";
+const char CreatureDataAddonInfofmt[]="iiiiiis";
 const char CreatureModelfmt[]="iffbi";
-const char CreatureInfoAddonInfofmt[]="iiiiiiis";
+const char CreatureInfoAddonInfofmt[]="iiiiiis";
 const char EquipmentInfofmt[]="iiii";
 const char GameObjectInfosrcfmt[]="iiissssiifiiiiiiiiiiiiiiiiiiiiiiiiiiiiiis";
 const char GameObjectInfodstfmt[]="iiissssiifiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii";