Core/Entities:

- Rename creature_linked_respawn to linked_respawn
- Update functionality: add field ´linkType´.
** 0 = creature respawn dependant on creature (default)
** 1 = creature respawn dependant on gameobject
** 2 = gameobject respawn dependant on gameobject
** 3 = gameobject respawn dependant on creature

--HG--
branch : trunk

2 files changed, 29 insertions, 23 deletions

diff --git a/sql/base/world_database.sql b/sql/base/world_database.sql
index 6a9990a6f16..0e705852df0 100644
--- a/sql/base/world_database.sql
+++ b/sql/base/world_database.sql
@@ -1451,29 +1451,6 @@ LOCK TABLES `creature_involvedrelation` WRITE;
 UNLOCK TABLES;
 
 --
--- Table structure for table `creature_linked_respawn`
---
-
-DROP TABLE IF EXISTS `creature_linked_respawn`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `creature_linked_respawn` (
-  `guid` int(10) unsigned NOT NULL COMMENT 'dependent creature',
-  `linkedGuid` int(10) unsigned NOT NULL COMMENT 'master creature',
-  PRIMARY KEY (`guid`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Creature Respawn Link System';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `creature_linked_respawn`
---
-
-LOCK TABLES `creature_linked_respawn` WRITE;
-/*!40000 ALTER TABLE `creature_linked_respawn` DISABLE KEYS */;
-/*!40000 ALTER TABLE `creature_linked_respawn` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
 -- Table structure for table `creature_loot_template`
 --
 
@@ -3144,6 +3121,30 @@ LOCK TABLES `lfg_dungeon_rewards` WRITE;
 UNLOCK TABLES;
 
 --
+-- Table structure for table `linked_respawn`
+--
+
+DROP TABLE IF EXISTS `linked_respawn`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `linked_respawn` (
+  `guid` int(10) unsigned NOT NULL COMMENT 'slave entity',
+  `linkedGuid` int(10) unsigned NOT NULL COMMENT 'master entity',
+  `linkType` tinyint(3) unsigned NOT NULL DEFAULT '0' COMMENT '0: creature->creature, 1: creature->GO, 2: GO->GO, 3: GO->creature', 
+  PRIMARY KEY (`guid`, `linkType`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Respawn Link System';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `linked_respawn`
+--
+
+LOCK TABLES `linked_respawn` WRITE;
+/*!40000 ALTER TABLE `linked_respawn` DISABLE KEYS */;
+/*!40000 ALTER TABLE `linked_respawn` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
 -- Table structure for table `locales_achievement_reward`
 --
 
diff --git a/sql/updates/10801_world_creature_linked_respawn.sql b/sql/updates/10801_world_creature_linked_respawn.sql
new file mode 100644
index 00000000000..4be48e58e84
--- /dev/null
+++ b/sql/updates/10801_world_creature_linked_respawn.sql
@@ -0,0 +1,5 @@
+ALTER table `creature_linked_respawn`
+RENAME TO `linked_respawn`,
+ADD COLUMN linkType tinyint(3) UNSIGNED NOT NULL DEFAULT '0',
+DROP PRIMARY KEY,
+ADD PRIMARY KEY(`guid`, `linkType`);