Fix compile and travis errors

This commit is contained in:
ariel- committed 2016-01-15 01:37:43 -03:00
1 parent 0e1e9daabb
commit ccac1f504f
12 files changed
+86 -54

No files matched your search

+77 -38
View File
@@ -2997,86 +2997,99 @@ DROP TABLE IF EXISTS `quest_template`;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `quest_template` (
`ID` mediumint(8) unsigned NOT NULL DEFAULT '0',
`QuestType` tinyint(3) unsigned NOT NULL DEFAULT '2',
`Method` tinyint(3) unsigned NOT NULL DEFAULT '2',
`QuestLevel` smallint(3) NOT NULL DEFAULT '1',
`MinLevel` smallint(6) NOT NULL DEFAULT '0',
`MaxLevel` smallint(6) NOT NULL DEFAULT '0',
`QuestSortID` smallint(6) NOT NULL DEFAULT '0',
`QuestInfoID` smallint(5) unsigned NOT NULL DEFAULT '0',
`QuestType` smallint(5) unsigned NOT NULL DEFAULT '0',
`SuggestedGroupNum` tinyint(3) unsigned NOT NULL DEFAULT '0',
`LimitTime` int(10) unsigned NOT NULL DEFAULT '0',
`RequiredClasses` smallint(5) unsigned NOT NULL DEFAULT '0',
`RequiredRaces` mediumint(8) unsigned NOT NULL DEFAULT '0',
`RequiredSkillId` smallint(5) unsigned NOT NULL DEFAULT '0',
`RequiredSkillPoints` smallint(5) unsigned NOT NULL DEFAULT '0',
`RequiredFactionId1` smallint(5) unsigned NOT NULL DEFAULT '0',
`RequiredFactionId2` smallint(5) unsigned NOT NULL DEFAULT '0',
`RequiredFactionValue1` mediumint(8) NOT NULL DEFAULT '0',
`RequiredFactionValue2` mediumint(8) NOT NULL DEFAULT '0',
`RewardNextQuest` mediumint(8) unsigned NOT NULL DEFAULT '0',
`RewardXPDifficulty` tinyint(3) unsigned NOT NULL DEFAULT '0',
`RewardMoney` int(11) NOT NULL DEFAULT '0',
`RewardBonusMoney` int(10) unsigned NOT NULL DEFAULT '0',
`RewardDisplaySpell` mediumint(8) unsigned NOT NULL DEFAULT '0',
`RewardSpell` int(11) NOT NULL DEFAULT '0',
`RequiredMinRepFaction` smallint(5) unsigned NOT NULL DEFAULT '0',
`RequiredMaxRepFaction` smallint(5) unsigned NOT NULL DEFAULT '0',
`RequiredMinRepValue` mediumint(8) NOT NULL DEFAULT '0',
`RequiredMaxRepValue` mediumint(8) NOT NULL DEFAULT '0',
`PrevQuestId` mediumint(8) NOT NULL DEFAULT '0',
`NextQuestId` mediumint(8) NOT NULL DEFAULT '0',
`ExclusiveGroup` mediumint(8) NOT NULL DEFAULT '0',
`NextQuestIdChain` mediumint(8) unsigned NOT NULL DEFAULT '0',
`RewardXPId` tinyint(3) unsigned NOT NULL DEFAULT '0',
`RewardOrRequiredMoney` int(11) NOT NULL DEFAULT '0',
`RewardMoneyMaxLevel` int(10) unsigned NOT NULL DEFAULT '0',
`RewardSpell` mediumint(8) unsigned NOT NULL DEFAULT '0',
`RewardSpellCast` int(11) NOT NULL DEFAULT '0',
`RewardHonor` int(11) NOT NULL DEFAULT '0',
`RewardHonorMultiplier` float NOT NULL DEFAULT '0',
`RewardMailTemplateId` mediumint(8) unsigned NOT NULL DEFAULT '0',
`RewardMailDelay` int(11) unsigned NOT NULL DEFAULT '0',
`SourceItemId` mediumint(8) unsigned NOT NULL DEFAULT '0',
`SourceItemCount` tinyint(3) unsigned NOT NULL DEFAULT '0',
`SourceSpellId` mediumint(8) unsigned NOT NULL DEFAULT '0',
`Flags` int(10) unsigned NOT NULL DEFAULT '0',
`SpecialFlags` tinyint(3) unsigned NOT NULL DEFAULT '0',
`MinimapTargetMark` tinyint(3) unsigned NOT NULL DEFAULT '0',
`RewardTitle` tinyint(3) unsigned NOT NULL DEFAULT '0',
`RequiredPlayerKills` tinyint(3) unsigned NOT NULL DEFAULT '0',
`RewardTalents` tinyint(3) unsigned NOT NULL DEFAULT '0',
`RewardArenaPoints` smallint(5) unsigned NOT NULL DEFAULT '0',
`RewardSkillId` smallint(5) unsigned NOT NULL DEFAULT '0',
`RewardSkillPoints` tinyint(3) unsigned NOT NULL DEFAULT '0',
`RewardReputationMask` tinyint(3) unsigned NOT NULL DEFAULT '0',
`QuestGiverPortrait` mediumint(8) unsigned NOT NULL DEFAULT '0',
`QuestTurnInPortrait` mediumint(8) unsigned NOT NULL DEFAULT '0',
`ItemDrop1` mediumint(8) unsigned NOT NULL DEFAULT '0',
`ItemDropQuantity1` smallint(5) unsigned NOT NULL DEFAULT '0',
`ItemDrop2` mediumint(8) unsigned NOT NULL DEFAULT '0',
`ItemDropQuantity2` smallint(5) unsigned NOT NULL DEFAULT '0',
`ItemDrop3` mediumint(8) unsigned NOT NULL DEFAULT '0',
`ItemDropQuantity3` smallint(5) unsigned NOT NULL DEFAULT '0',
`ItemDrop4` mediumint(8) unsigned NOT NULL DEFAULT '0',
`ItemDropQuantity4` smallint(5) unsigned NOT NULL DEFAULT '0',
`RewardItem1` mediumint(8) unsigned NOT NULL DEFAULT '0',
`RewardItem2` mediumint(8) unsigned NOT NULL DEFAULT '0',
`RewardItem3` mediumint(8) unsigned NOT NULL DEFAULT '0',
`RewardItem4` mediumint(8) unsigned NOT NULL DEFAULT '0',
`RewardAmount1` smallint(5) unsigned NOT NULL DEFAULT '0',
`RewardAmount2` smallint(5) unsigned NOT NULL DEFAULT '0',
`RewardAmount3` smallint(5) unsigned NOT NULL DEFAULT '0',
`RewardAmount4` smallint(5) unsigned NOT NULL DEFAULT '0',
`RewardChoiceItemID1` mediumint(8) unsigned NOT NULL DEFAULT '0',
`RewardChoiceItemQuantity1` smallint(5) unsigned NOT NULL DEFAULT '0',
`RewardChoiceItemID2` mediumint(8) unsigned NOT NULL DEFAULT '0',
`RewardChoiceItemQuantity2` smallint(5) unsigned NOT NULL DEFAULT '0',
`RewardChoiceItemID3` mediumint(8) unsigned NOT NULL DEFAULT '0',
`RewardChoiceItemQuantity3` smallint(5) unsigned NOT NULL DEFAULT '0',
`RewardChoiceItemID4` mediumint(8) unsigned NOT NULL DEFAULT '0',
`RewardChoiceItemQuantity4` smallint(5) unsigned NOT NULL DEFAULT '0',
`RewardChoiceItemID5` mediumint(8) unsigned NOT NULL DEFAULT '0',
`RewardChoiceItemQuantity5` smallint(5) unsigned NOT NULL DEFAULT '0',
`RewardChoiceItemID6` mediumint(8) unsigned NOT NULL DEFAULT '0',
`RewardChoiceItemQuantity1` smallint(5) unsigned NOT NULL DEFAULT '0',
`RewardChoiceItemQuantity2` smallint(5) unsigned NOT NULL DEFAULT '0',
`RewardChoiceItemQuantity3` smallint(5) unsigned NOT NULL DEFAULT '0',
`RewardChoiceItemQuantity4` smallint(5) unsigned NOT NULL DEFAULT '0',
`RewardChoiceItemQuantity5` smallint(5) unsigned NOT NULL DEFAULT '0',
`RewardChoiceItemQuantity6` smallint(5) unsigned NOT NULL DEFAULT '0',
`POIContinent` smallint(5) unsigned NOT NULL DEFAULT '0',
`POIx` float NOT NULL DEFAULT '0',
`POIy` float NOT NULL DEFAULT '0',
`POIPriority` mediumint(8) unsigned NOT NULL DEFAULT '0',
`RewardTitle` tinyint(3) unsigned NOT NULL DEFAULT '0',
`RewardTalents` tinyint(3) unsigned NOT NULL DEFAULT '0',
`RewardArenaPoints` smallint(5) unsigned NOT NULL DEFAULT '0',
`RewardFactionID1` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'faction id from Faction.dbc in this case',
`RewardFactionValue1` mediumint(8) NOT NULL DEFAULT '0',
`RewardFactionOverride1` mediumint(8) NOT NULL DEFAULT '0',
`RewardFactionID2` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'faction id from Faction.dbc in this case',
`RewardFactionValue2` mediumint(8) NOT NULL DEFAULT '0',
`RewardFactionOverride2` mediumint(8) NOT NULL DEFAULT '0',
`RewardFactionID3` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'faction id from Faction.dbc in this case',
`RewardFactionValue3` mediumint(8) NOT NULL DEFAULT '0',
`RewardFactionOverride3` mediumint(8) NOT NULL DEFAULT '0',
`RewardFactionID4` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'faction id from Faction.dbc in this case',
`RewardFactionValue4` mediumint(8) NOT NULL DEFAULT '0',
`RewardFactionOverride4` mediumint(8) NOT NULL DEFAULT '0',
`RewardFactionID5` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'faction id from Faction.dbc in this case',
`RewardFactionValue1` mediumint(8) NOT NULL DEFAULT '0',
`RewardFactionValue2` mediumint(8) NOT NULL DEFAULT '0',
`RewardFactionValue3` mediumint(8) NOT NULL DEFAULT '0',
`RewardFactionValue4` mediumint(8) NOT NULL DEFAULT '0',
`RewardFactionValue5` mediumint(8) NOT NULL DEFAULT '0',
`RewardFactionOverride1` mediumint(8) NOT NULL DEFAULT '0',
`RewardFactionOverride2` mediumint(8) NOT NULL DEFAULT '0',
`RewardFactionOverride3` mediumint(8) NOT NULL DEFAULT '0',
`RewardFactionOverride4` mediumint(8) NOT NULL DEFAULT '0',
`RewardFactionOverride5` mediumint(8) NOT NULL DEFAULT '0',
`TimeAllowed` int(10) unsigned NOT NULL DEFAULT '0',
`PointMapId` smallint(5) unsigned NOT NULL DEFAULT '0',
`PointX` float NOT NULL DEFAULT '0',
`PointY` float NOT NULL DEFAULT '0',
`PointOption` mediumint(8) unsigned NOT NULL DEFAULT '0',
`LogTitle` text,
`LogDescription` text,
`QuestDescription` text,
`AreaDescription` text,
`EndText` text,
`OfferRewardText` text,
`RequestItemsText` text,
`QuestCompletionLog` text,
`RequiredNpcOrGo1` mediumint(8) NOT NULL DEFAULT '0',
`RequiredNpcOrGo2` mediumint(8) NOT NULL DEFAULT '0',
@@ -3086,6 +3099,14 @@ CREATE TABLE `quest_template` (
`RequiredNpcOrGoCount2` smallint(5) unsigned NOT NULL DEFAULT '0',
`RequiredNpcOrGoCount3` smallint(5) unsigned NOT NULL DEFAULT '0',
`RequiredNpcOrGoCount4` smallint(5) unsigned NOT NULL DEFAULT '0',
`RequiredSourceItemId1` mediumint(8) unsigned NOT NULL DEFAULT '0',
`RequiredSourceItemId2` mediumint(8) unsigned NOT NULL DEFAULT '0',
`RequiredSourceItemId3` mediumint(8) unsigned NOT NULL DEFAULT '0',
`RequiredSourceItemId4` mediumint(8) unsigned NOT NULL DEFAULT '0',
`RequiredSourceItemCount1` smallint(5) unsigned NOT NULL DEFAULT '0',
`RequiredSourceItemCount2` smallint(5) unsigned NOT NULL DEFAULT '0',
`RequiredSourceItemCount3` smallint(5) unsigned NOT NULL DEFAULT '0',
`RequiredSourceItemCount4` smallint(5) unsigned NOT NULL DEFAULT '0',
`RequiredItemId1` mediumint(8) unsigned NOT NULL DEFAULT '0',
`RequiredItemId2` mediumint(8) unsigned NOT NULL DEFAULT '0',
`RequiredItemId3` mediumint(8) unsigned NOT NULL DEFAULT '0',
@@ -3125,6 +3146,24 @@ CREATE TABLE `quest_template` (
`QuestTurnTargetName` text,
`SoundAccept` smallint(5) unsigned NOT NULL DEFAULT '890',
`SoundTurnIn` smallint(5) unsigned NOT NULL DEFAULT '878',
`DetailsEmote1` smallint(5) unsigned NOT NULL DEFAULT '0',
`DetailsEmote2` smallint(5) unsigned NOT NULL DEFAULT '0',
`DetailsEmote3` smallint(5) unsigned NOT NULL DEFAULT '0',
`DetailsEmote4` smallint(5) unsigned NOT NULL DEFAULT '0',
`DetailsEmoteDelay1` int(10) unsigned NOT NULL DEFAULT '0',
`DetailsEmoteDelay2` int(10) unsigned NOT NULL DEFAULT '0',
`DetailsEmoteDelay3` int(10) unsigned NOT NULL DEFAULT '0',
`DetailsEmoteDelay4` int(10) unsigned NOT NULL DEFAULT '0',
`EmoteOnIncomplete` smallint(5) unsigned NOT NULL DEFAULT '0',
`EmoteOnComplete` smallint(5) unsigned NOT NULL DEFAULT '0',
`OfferRewardEmote1` smallint(5) unsigned NOT NULL DEFAULT '0',
`OfferRewardEmote2` smallint(5) unsigned NOT NULL DEFAULT '0',
`OfferRewardEmote3` smallint(5) unsigned NOT NULL DEFAULT '0',
`OfferRewardEmote4` smallint(5) unsigned NOT NULL DEFAULT '0',
`OfferRewardEmoteDelay1` int(10) unsigned NOT NULL DEFAULT '0',
`OfferRewardEmoteDelay2` int(10) unsigned NOT NULL DEFAULT '0',
`OfferRewardEmoteDelay3` int(10) unsigned NOT NULL DEFAULT '0',
`OfferRewardEmoteDelay4` int(10) unsigned NOT NULL DEFAULT '0',
`VerifiedBuild` smallint(5) DEFAULT '0',
PRIMARY KEY (`ID`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Quest System';