*Merge to solve EOL issue.

--HG--
branch : trunk

2 files changed, 82 insertions, 21 deletions

diff --git a/sql/updates/444_world.sql b/sql/updates/444_world.sql
new file mode 100644
index 00000000000..004cf626f88
--- /dev/null
+++ b/sql/updates/444_world.sql
@@ -0,0 +1,36 @@
+DROP TABLE IF EXISTS `waypoint_data`;
+
+CREATE TABLE `waypoint_data` (
+  `id` int(10) unsigned NOT NULL default '0' COMMENT 'Creature GUID',
+  `point` mediumint(8) unsigned NOT NULL default '0',
+  `position_x` float NOT NULL default '0',
+  `position_y` float NOT NULL default '0',
+  `position_z` float NOT NULL default '0',
+  `delay` int(10) unsigned NOT NULL default '0',
+  `move_flag` tinyint(1) NOT NULL default '0',
+  `action` int(11) NOT NULL default '0',
+  `action_chance` smallint(3) NOT NULL default '100',
+  `wpguid` int(11) NOT NULL default '0'
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+DROP TABLE IF EXISTS `waypoint_scripts`;
+
+CREATE TABLE `waypoint_scripts` (
+  `id` int(11) unsigned NOT NULL default '0',
+  `delay` int(11) unsigned NOT NULL default '0',
+  `command` int(11) unsigned NOT NULL default '0',
+  `datalong` int(11) unsigned NOT NULL default '0',
+  `datalong2` int(11) unsigned NOT NULL default '0',
+  `dataint` int(11) unsigned NOT NULL default '0',
+  `x` float NOT NULL default '0',
+  `y` float NOT NULL default '0',
+  `z` float NOT NULL default '0',
+  `o` float NOT NULL default '0',
+  `guid` int(11) NOT NULL default '0',
+  PRIMARY KEY  (`guid`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+ALTER TABLE `creature_addon`
+    ADD `path_id` int(11) unsigned NOT NULL default '0' AFTER `guid`;
+ALTER TABLE `creature_template_addon`
+    ADD `path_id` int(11) unsigned NOT NULL default '0' AFTER `entry`;
diff --git a/sql/world.sql b/sql/world.sql
index 01c94db3ce6..ca5af56edd1 100644
--- a/sql/world.sql
+++ b/sql/world.sql
@@ -220,6 +220,7 @@ UNLOCK TABLES;
 DROP TABLE IF EXISTS `creature_addon`;
 CREATE TABLE `creature_addon` (
   `guid` int(10) unsigned NOT NULL default '0',
+  `path_id` int(11) unsigned NOT NULL default '0',
   `mount` mediumint(8) unsigned NOT NULL default '0',
   `bytes0` int(10) unsigned NOT NULL default '0',
   `bytes1` int(10) unsigned NOT NULL default '0',
@@ -337,39 +338,62 @@ LOCK TABLES `creature_model_info` WRITE;
 /*!40000 ALTER TABLE `creature_model_info` ENABLE KEYS */;
 UNLOCK TABLES;
 
+
 --
--- Table structure for table `creature_movement`
+-- Table structure for table `waypoint_data`
 --
 
-DROP TABLE IF EXISTS `creature_movement`;
-CREATE TABLE `creature_movement` (
-  `id` int(10) unsigned NOT NULL COMMENT 'Creature GUID',
+DROP TABLE IF EXISTS `waypoint_data`;
+CREATE TABLE `waypoint_data` (
+  `id` int(10) unsigned NOT NULL default '0' COMMENT 'Creature GUID',
   `point` mediumint(8) unsigned NOT NULL default '0',
   `position_x` float NOT NULL default '0',
   `position_y` float NOT NULL default '0',
   `position_z` float NOT NULL default '0',
-  `waittime` int(10) unsigned NOT NULL default '0',
-  `text1` text,
-  `text2` text,
-  `text3` text,
-  `text4` text,
-  `text5` text,
-  `emote` mediumint(8) unsigned NOT NULL default '0',
-  `spell` mediumint(8) unsigned NOT NULL default '0',
-  `wpguid` int(11) NOT NULL default '0',
-  `orientation` float NOT NULL default '0',
-  `model1` mediumint(9) NOT NULL default '0',
-  `model2` mediumint(9) NOT NULL default '0',
-  PRIMARY KEY  (`id`,`point`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Creature System';
+  `delay` int(10) unsigned NOT NULL default '0',
+  `move_flag` tinyint(1) NOT NULL default '0',
+  `action` int(11) NOT NULL default '0',
+  `action_chance` smallint(3) NOT NULL default '100',
+  `wpguid` int(11) NOT NULL default '0'
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+--
+-- Dumping data for table `creature_movement`
+--
+
+LOCK TABLES `waypoint_data` WRITE;
+/*!40000 ALTER TABLE `waypoint_data` DISABLE KEYS */;
+/*!40000 ALTER TABLE `waypoint_data` ENABLE KEYS */;
+UNLOCK TABLES;
+
+
+--
+-- Table structure for table `waypoint_scripts`
+--
+
+DROP TABLE IF EXISTS `waypoint_scripts`;
+CREATE TABLE `waypoint_scripts` (
+  `id` int(11) unsigned NOT NULL default '0',
+  `delay` int(11) unsigned NOT NULL default '0',
+  `command` int(11) unsigned NOT NULL default '0',
+  `datalong` int(11) unsigned NOT NULL default '0',
+  `datalong2` int(11) unsigned NOT NULL default '0',
+  `dataint` int(11) unsigned NOT NULL default '0',
+  `x` float NOT NULL default '0',
+  `y` float NOT NULL default '0',
+  `z` float NOT NULL default '0',
+  `o` float NOT NULL default '0',
+  `guid` int(11) NOT NULL default '0',
+  PRIMARY KEY  (`guid`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 --
 -- Dumping data for table `creature_movement`
 --
 
-LOCK TABLES `creature_movement` WRITE;
-/*!40000 ALTER TABLE `creature_movement` DISABLE KEYS */;
-/*!40000 ALTER TABLE `creature_movement` ENABLE KEYS */;
+LOCK TABLES `waypoint_scripts` WRITE;
+/*!40000 ALTER TABLE `waypoint_scripts` DISABLE KEYS */;
+/*!40000 ALTER TABLE `waypoint_scripts` ENABLE KEYS */;
 UNLOCK TABLES;
 
 --
@@ -533,6 +557,7 @@ UNLOCK TABLES;
 DROP TABLE IF EXISTS `creature_template_addon`;
 CREATE TABLE `creature_template_addon` (
   `entry` mediumint(8) unsigned NOT NULL default '0',
+  `path_id' int(11) unsigned NOT NULL default '0',
   `mount` mediumint(8) unsigned NOT NULL default '0',
   `bytes0` int(10) unsigned NOT NULL default '0',
   `bytes1` int(10) unsigned NOT NULL default '0',