Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-15 23:20:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Misc: Fixed sql import, added new changes to world_database.sql, removed duplicate definition of ObjectGuidGenerator<HIGHGUID_PET>

Browse Source
This commit is contained in:
Shauren
2014-10-26 10:34:33 +01:00
parent 9c6f88d31c
commit a231777c50
6 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/base/characters_database.sql
View File

@@ -2674,7 +2674,7 @@ DROP TABLE IF EXISTS `quest_tracker`;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `quest_tracker` (
`id` mediumint(8) unsigned NOT NULL DEFAULT '0',
`character_guid` int(10) unsigned NOT NULL DEFAULT '0',
`character_guid` bigint(20) unsigned NOT NULL DEFAULT '0',
`quest_accept_time` datetime NOT NULL,
`quest_complete_time` datetime DEFAULT NULL,
`quest_abandon_time` datetime DEFAULT NULL,

77
sql/base/dev/world_database.sql
View File

@@ -962,17 +962,18 @@ CREATE TABLE `game_event_seasonal_questrelation` (
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Table structure for table `game_graveyard_zone`
-- Table structure for table `graveyard_zone`
--
DROP TABLE IF EXISTS `game_graveyard_zone`;
DROP TABLE IF EXISTS `graveyard_zone`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `game_graveyard_zone` (
`id` mediumint(8) unsigned NOT NULL DEFAULT '0',
`ghost_zone` mediumint(8) unsigned NOT NULL DEFAULT '0',
`faction` smallint(5) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`id`,`ghost_zone`)
CREATE TABLE `graveyard_zone` (
`ID` mediumint(8) unsigned NOT NULL DEFAULT '0',
`GhostZone` mediumint(8) unsigned NOT NULL DEFAULT '0',
`Faction` smallint(5) unsigned NOT NULL DEFAULT '0',
`Comment` TEXT,
PRIMARY KEY (`ID`,`GhostZone`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Trigger System';
/*!40101 SET character_set_client = @saved_cs_client */;
@@ -1968,7 +1969,7 @@ DROP TABLE IF EXISTS `locales_page_text`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `locales_page_text` (
`entry` mediumint(8) unsigned NOT NULL DEFAULT '0',
`ID` mediumint(8) unsigned NOT NULL DEFAULT '0',
`Text_loc1` longtext,
`Text_loc2` longtext,
`Text_loc3` longtext,
@@ -1977,7 +1978,7 @@ CREATE TABLE `locales_page_text` (
`Text_loc6` longtext,
`Text_loc7` longtext,
`Text_loc8` longtext,
PRIMARY KEY (`entry`)
PRIMARY KEY (`ID`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
@@ -1989,16 +1990,16 @@ DROP TABLE IF EXISTS `locales_points_of_interest`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `locales_points_of_interest` (
`entry` mediumint(8) unsigned NOT NULL DEFAULT '0',
`icon_name_loc1` text,
`icon_name_loc2` text,
`icon_name_loc3` text,
`icon_name_loc4` text,
`icon_name_loc5` text,
`icon_name_loc6` text,
`icon_name_loc7` text,
`icon_name_loc8` text,
PRIMARY KEY (`entry`)
`ID` mediumint(8) unsigned NOT NULL DEFAULT '0',
`Name_loc1` text,
`Name_loc2` text,
`Name_loc3` text,
`Name_loc4` text,
`Name_loc5` text,
`Name_loc6` text,
`Name_loc7` text,
`Name_loc8` text,
PRIMARY KEY (`ID`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
@@ -2316,13 +2317,13 @@ DROP TABLE IF EXISTS `npc_trainer`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `npc_trainer` (
`entry` mediumint(8) unsigned NOT NULL DEFAULT '0',
`spell` mediumint(8) NOT NULL DEFAULT '0',
`spellcost` int(10) unsigned NOT NULL DEFAULT '0',
`reqskill` smallint(5) unsigned NOT NULL DEFAULT '0',
`reqskillvalue` smallint(5) unsigned NOT NULL DEFAULT '0',
`reqlevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`entry`,`spell`)
`ID` mediumint(8) unsigned NOT NULL DEFAULT '0',
`SpellID` mediumint(8) NOT NULL DEFAULT '0',
`MoneyCost` int(10) unsigned NOT NULL DEFAULT '0',
`ReqSkillLine` smallint(5) unsigned NOT NULL DEFAULT '0',
`ReqSkillRank` smallint(5) unsigned NOT NULL DEFAULT '0',
`ReqLevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`ID`,`SpellID`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
@@ -2370,11 +2371,11 @@ DROP TABLE IF EXISTS `page_text`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `page_text` (
`entry` mediumint(8) unsigned NOT NULL DEFAULT '0',
`text` longtext NOT NULL,
`next_page` mediumint(8) unsigned NOT NULL DEFAULT '0',
`ID` mediumint(8) unsigned NOT NULL DEFAULT '0',
`Text` longtext NOT NULL,
`NextPageID` mediumint(8) unsigned NOT NULL DEFAULT '0',
`VerifiedBuild` smallint(5) DEFAULT '0',
PRIMARY KEY (`entry`)
PRIMARY KEY (`ID`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Item System';
/*!40101 SET character_set_client = @saved_cs_client */;
@@ -2703,15 +2704,15 @@ DROP TABLE IF EXISTS `points_of_interest`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `points_of_interest` (
`entry` mediumint(8) unsigned NOT NULL DEFAULT '0',
`x` float NOT NULL DEFAULT '0',
`y` float NOT NULL DEFAULT '0',
`icon` mediumint(8) unsigned NOT NULL DEFAULT '0',
`flags` mediumint(8) unsigned NOT NULL DEFAULT '0',
`data` mediumint(8) unsigned NOT NULL DEFAULT '0',
`icon_name` text NOT NULL,
`ID` mediumint(8) unsigned NOT NULL DEFAULT '0',
`PositionX` float NOT NULL DEFAULT '0',
`PositionY` float NOT NULL DEFAULT '0',
`Icon` mediumint(8) unsigned NOT NULL DEFAULT '0',
`Flags` mediumint(8) unsigned NOT NULL DEFAULT '0',
`Importance` mediumint(8) unsigned NOT NULL DEFAULT '0',
`Name` text NOT NULL,
`VerifiedBuild` smallint(5) DEFAULT '0',
PRIMARY KEY (`entry`)
PRIMARY KEY (`ID`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;

2
sql/updates/characters/2014_10_26_00_characters.sql
View File

@@ -18,7 +18,7 @@ ALTER TABLE `petition_sign` CHANGE `ownerguid` `ownerguid` BIGINT(20) UNSIGNED N
ALTER TABLE `petition_sign` CHANGE `petitionguid` `petitionguid` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0';
ALTER TABLE `petition_sign` CHANGE `playerguid` `playerguid` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0';
ALTER TABLE `pvpstats_players` CHANGE `character_guid` `character_guid` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0';
ALTER TABLE `quest_tracker` CHANGE `guid` `guid` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0';
ALTER TABLE `quest_tracker` CHANGE `character_guid` `character_guid` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0';
ALTER TABLE `calendar_events` CHANGE `creator` `creator` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0';
ALTER TABLE `calendar_invites` CHANGE `invitee` `invitee` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0';
ALTER TABLE `calendar_invites` CHANGE `sender` `sender` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0';

20
sql/updates/world/2014_10_24_03_world.sql
View File

@@ -1,14 +1,14 @@
ALTER TABLE `locales_page_text` CHANGE `entry` `ID` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0';
ALTER TABLE `locales_points_of_interest` CHANGE `entry` `ID` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0';
ALTER TABLE `locales_points_of_interest` CHANGE `icon_name_loc1` `Name_loc1` TEXT NOT NULL DEFAULT '';
ALTER TABLE `locales_points_of_interest` CHANGE `icon_name_loc2` `Name_loc2` TEXT NOT NULL DEFAULT '';
ALTER TABLE `locales_points_of_interest` CHANGE `icon_name_loc3` `Name_loc3` TEXT NOT NULL DEFAULT '';
ALTER TABLE `locales_points_of_interest` CHANGE `icon_name_loc4` `Name_loc4` TEXT NOT NULL DEFAULT '';
ALTER TABLE `locales_points_of_interest` CHANGE `icon_name_loc5` `Name_loc5` TEXT NOT NULL DEFAULT '';
ALTER TABLE `locales_points_of_interest` CHANGE `icon_name_loc6` `Name_loc6` TEXT NOT NULL DEFAULT '';
ALTER TABLE `locales_points_of_interest` CHANGE `icon_name_loc7` `Name_loc7` TEXT NOT NULL DEFAULT '';
ALTER TABLE `locales_points_of_interest` CHANGE `icon_name_loc8` `Name_loc8` TEXT NOT NULL DEFAULT '';
ALTER TABLE `locales_points_of_interest` CHANGE `icon_name_loc1` `Name_loc1` TEXT;
ALTER TABLE `locales_points_of_interest` CHANGE `icon_name_loc2` `Name_loc2` TEXT;
ALTER TABLE `locales_points_of_interest` CHANGE `icon_name_loc3` `Name_loc3` TEXT;
ALTER TABLE `locales_points_of_interest` CHANGE `icon_name_loc4` `Name_loc4` TEXT;
ALTER TABLE `locales_points_of_interest` CHANGE `icon_name_loc5` `Name_loc5` TEXT;
ALTER TABLE `locales_points_of_interest` CHANGE `icon_name_loc6` `Name_loc6` TEXT;
ALTER TABLE `locales_points_of_interest` CHANGE `icon_name_loc7` `Name_loc7` TEXT;
ALTER TABLE `locales_points_of_interest` CHANGE `icon_name_loc8` `Name_loc8` TEXT;
ALTER TABLE `npc_trainer` CHANGE `entry` `ID` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0';
ALTER TABLE `npc_trainer` CHANGE `spell` `SpellID` MEDIUMINT(8) NOT NULL DEFAULT '0';
@@ -18,7 +18,7 @@ ALTER TABLE `npc_trainer` CHANGE `reqskillvalue` `ReqSkillRank` SMALLINT(5) UNSI
ALTER TABLE `npc_trainer` CHANGE `reqLevel` `ReqLevel` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0';
ALTER TABLE `page_text` CHANGE `entry` `ID` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0';
ALTER TABLE `page_text` CHANGE `text` `Text` LONGTEXT NOT NULL DEFAULT '';
ALTER TABLE `page_text` CHANGE `text` `Text` LONGTEXT;
ALTER TABLE `page_text` CHANGE `next_page` `NextPageID` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0';
ALTER TABLE `points_of_interest` CHANGE `entry` `ID` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0';
@@ -27,4 +27,4 @@ ALTER TABLE `points_of_interest` CHANGE `y` `PositionY` FLOAT NOT NULL DEFAULT '
ALTER TABLE `points_of_interest` CHANGE `icon` `Icon` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0';
ALTER TABLE `points_of_interest` CHANGE `flags` `Flags` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0';
ALTER TABLE `points_of_interest` CHANGE `data` `Importance` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0';
ALTER TABLE `points_of_interest` CHANGE `icon_name` `Name` TEXT NOT NULL DEFAULT '';
ALTER TABLE `points_of_interest` CHANGE `icon_name` `Name` TEXT;

2
sql/updates/world/2014_10_26_01_world.sql
View File

@@ -2,7 +2,7 @@ RENAME TABLE `game_graveyard_zone` TO `graveyard_zone`;
ALTER TABLE `graveyard_zone` CHANGE `id` `ID` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0';
ALTER TABLE `graveyard_zone` CHANGE `ghost_zone` `GhostZone` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0';
ALTER TABLE `graveyard_zone` CHANGE `faction` `Faction` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0';
ALTER TABLE `graveyard_zone` ADD COLUMN `Comment` TEXT NOT NULL DEFAULT '' AFTER `Faction`;
ALTER TABLE `graveyard_zone` ADD COLUMN `Comment` TEXT AFTER `Faction`;
UPDATE `graveyard_zone` SET `Comment`='Redridge Mountains - Redridge Mountains' WHERE `ID`=2;
UPDATE `graveyard_zone` SET `Comment`='Duskwood, Darkshire - Duskwood' WHERE `ID`=3;

1
src/server/game/Entities/Object/ObjectGuid.cpp
View File

@@ -141,7 +141,6 @@ template ObjectGuid::LowType ObjectGuidGenerator<HIGHGUID_UNIT>::Generate();
template ObjectGuid::LowType ObjectGuidGenerator<HIGHGUID_PET>::Generate();
template ObjectGuid::LowType ObjectGuidGenerator<HIGHGUID_VEHICLE>::Generate();
template ObjectGuid::LowType ObjectGuidGenerator<HIGHGUID_ITEM>::Generate();
template ObjectGuid::LowType ObjectGuidGenerator<HIGHGUID_PET>::Generate();
template ObjectGuid::LowType ObjectGuidGenerator<HIGHGUID_GAMEOBJECT>::Generate();
template ObjectGuid::LowType ObjectGuidGenerator<HIGHGUID_DYNAMICOBJECT>::Generate();
template ObjectGuid::LowType ObjectGuidGenerator<HIGHGUID_CORPSE>::Generate();