3.3.5

.travis.yml

@@ -11,7 +11,7 @@ before_install:
   - echo "yes" | sudo add-apt-repository ppa:ubuntu-toolchain-r/test
   - sudo apt-get -qq update
   - sudo apt-get -qq install build-essential libtool gcc-4.8 g++-4.8 make cmake openssl
-  - sudo apt-get -qq install libssl-dev libmysqlclient15-dev libmysql++-dev libreadline6-dev zlib1g-dev libbz2-dev
+  - sudo apt-get -qq install libssl-dev libmysqlclient-dev libmysql++-dev libreadline6-dev zlib1g-dev libbz2-dev
   - sudo apt-get -qq install libboost1.55-dev libboost-thread1.55-dev libboost-filesystem1.55-dev libboost-system1.55-dev libboost-program-options1.55-dev libboost-iostreams1.55-dev
 
 install:

cmake/macros/ConfigureBoost.cmake

@@ -1,35 +1,35 @@
-macro(get_WIN32_WINNT version)
-    if (WIN32 AND CMAKE_SYSTEM_VERSION)
-        set(ver ${CMAKE_SYSTEM_VERSION})
-        string(REPLACE "." "" ver ${ver})
-        string(REGEX REPLACE "([0-9])" "0\\1" ver ${ver})
-
-        set(${version} "0x${ver}")
-    endif()
-endmacro()
-
-if(WIN32)
- set(BOOST_DEBUG ON)
-  if(DEFINED ENV{BOOST_ROOT})
-    set(BOOST_ROOT $ENV{BOOST_ROOT})
-    set(BOOST_LIBRARYDIR ${BOOST_ROOT}/lib${PLATFORM}-msvc-12.0)
-  else()
-    message(FATAL_ERROR "No BOOST_ROOT environment variable could be found! Please make sure it is set and the points to your Boost installation.")
-  endif()
-
-  set(Boost_USE_STATIC_LIBS        ON)
-  set(Boost_USE_MULTITHREADED      ON)
-  set(Boost_USE_STATIC_RUNTIME     OFF)
-
-  get_WIN32_WINNT(ver)
-  add_definitions(-D_WIN32_WINNT=${ver})
-endif()
-
+macro(get_WIN32_WINNT version)
+    if (WIN32 AND CMAKE_SYSTEM_VERSION)
+        set(ver ${CMAKE_SYSTEM_VERSION})
+        string(REPLACE "." "" ver ${ver})
+        string(REGEX REPLACE "([0-9])" "0\\1" ver ${ver})
+
+        set(${version} "0x${ver}")
+    endif()
+endmacro()
+
+if(WIN32)
+ set(BOOST_DEBUG ON)
+  if(DEFINED ENV{BOOST_ROOT})
+    set(BOOST_ROOT $ENV{BOOST_ROOT})
+    set(BOOST_LIBRARYDIR ${BOOST_ROOT}/lib${PLATFORM}-msvc-12.0)
+  else()
+    message(FATAL_ERROR "No BOOST_ROOT environment variable could be found! Please make sure it is set and the points to your Boost installation.")
+  endif()
+
+  set(Boost_USE_STATIC_LIBS        ON)
+  set(Boost_USE_MULTITHREADED      ON)
+  set(Boost_USE_STATIC_RUNTIME     OFF)
+
+  get_WIN32_WINNT(ver)
+  add_definitions(-D_WIN32_WINNT=${ver})
+endif()
+
 find_package(Boost 1.49 REQUIRED system filesystem thread program_options iostreams)
-add_definitions(-DBOOST_DATE_TIME_NO_LIB)
-add_definitions(-DBOOST_REGEX_NO_LIB)
-add_definitions(-DBOOST_CHRONO_NO_LIB)
-
+add_definitions(-DBOOST_DATE_TIME_NO_LIB)
+add_definitions(-DBOOST_REGEX_NO_LIB)
+add_definitions(-DBOOST_CHRONO_NO_LIB)
+
 # Find if Boost was compiled in C++03 mode because it requires -DBOOST_NO_CXX11_SCOPED_ENUMS
 
 include (CheckCXXSourceCompiles)
@@ -55,6 +55,6 @@ if (NOT boost_filesystem_copy_links_without_NO_SCOPED_ENUM)
   endif()
 endif()
 
-if(Boost_FOUND)
-  include_directories(${Boost_INCLUDE_DIRS})
-endif()
+if(Boost_FOUND)
+  include_directories(${Boost_INCLUDE_DIRS})
+endif()

cmake/platform/unix/settings.cmake

@@ -40,5 +40,5 @@ elseif(CMAKE_C_COMPILER MATCHES "icc")
 elseif(CMAKE_C_COMPILER MATCHES "clang" OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
   include(${CMAKE_SOURCE_DIR}/cmake/compiler/clang/settings.cmake)
 else()
-add_definitions(-D_BUILD_DIRECTIVE='"${CMAKE_BUILD_TYPE}"')
+  add_definitions(-D_BUILD_DIRECTIVE='"${CMAKE_BUILD_TYPE}"')
 endif()

sql/updates/world/2015_04_13_00_world.sql

@@ -0,0 +1,4 @@
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (34767, 34769);
+INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `comment`) VALUES
+(34767, 31726, 'Summon Charger - Blood Elf'),
+(34769, 31726, 'Summon Warhorse - Blood Elf');

sql/updates/world/2015_04_18_00_world.sql

@@ -0,0 +1,2 @@
+--
+UPDATE `creature_template` SET `InhabitType`=3 WHERE `entry` IN (5931, 3989, 3988, 3991, 3999, 4004, 4003);

sql/updates/world/2015_04_18_01_world.sql

@@ -0,0 +1,6 @@
+--
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=40060 AND `ConditionTypeOrReference`=29;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(15,40060,0,0,0,29,0,9461,100,0,1,0,0,'','Gor Grimgut cannot be a target for Exhaustion.'),
+(15,40060,0,0,1,29,0,9461,100,0,1,0,0,'','Gor Grimgut cannot be a target for Exhaustion.'),
+(15,40060,0,0,2,29,0,9461,100,0,1,0,0,'','Gor Grimgut cannot be a target for Exhaustion.');

sql/updates/world/2015_04_18_02_world.sql

@@ -0,0 +1,13 @@
+--
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=17918;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=17918 AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+
+(17918, 0, 0, 0, 0, 0, 100, 0, 3000, 7000, 8000, 12000, 11, 31478, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0,0,'Time Keeper - IC - Cast Sand Breath'),
+(17918, 0, 1, 0, 0, 0, 100, 0, 5000, 10000, 20000, 30000, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0,0,'Time Keeper - IC - Cast Sand Breath');
+
+DELETE FROM `creature_text` WHERE `entry` IN (17918);
+INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES 
+(17918, 0, 0, 'Victory will be ours!', 14, 0, 100, 0, 0, 0, 15194, 0, 'Time Keeper'),
+(17918, 0, 1, 'Carry on! Victory at all costs!', 14, 0, 100, 0, 0, 0, 15195, 0, 'Time Keeper'),
+(17918, 0, 2, 'Continue the fight! Do not falter!', 14, 0, 100, 0, 0, 0, 15196, 0, 'Time Keeper');

sql/updates/world/2015_04_18_03_world.sql

@@ -0,0 +1,4 @@
+--
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger` = 54355 AND `spell_effect` = 54402;
+INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES
+(54355, 54402, 0, 'Land Mine');

sql/updates/world/2015_04_18_04_world.sql

@@ -0,0 +1,2 @@
+--
+UPDATE `spell_proc_event` SET `SchoolMask`=126 WHERE `entry`=71564;

sql/updates/world/2015_04_18_05_world.sql

@@ -0,0 +1,9 @@
+--
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (-24869, -61874, -71074, -71068, -71073, -71071)  AND `spell_effect` = 24870;
+INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES
+(-24869, 24870, 0, 'Bobbing Apple, Bread of the Dead, Winter Veil Cookie'),
+(-61874, 24870, 0, 'Noblegarden Chocolate'),
+(-71074, 24870, 0, 'Buttermilk Delight'),
+(-71068, 24870, 0, 'Sweet Surprise'),
+(-71073, 24870, 0, 'Dark Desire'),
+(-71071, 24870, 0, 'Very Berry Cream');

sql/updates/world/2015_04_18_05_world_335.sql

@@ -0,0 +1,32 @@
+--
+DELETE FROM `gossip_menu` WHERE `entry`=10144 AND `text_id`=14088;
+INSERT INTO `gossip_menu` (`entry`, `text_id`) VALUES (10144, 14088);
+
+DELETE FROM `gossip_menu_option` WHERE `menu_id` = 10144;
+INSERT INTO `gossip_menu_option` (`menu_id`, id, option_icon, `option_text`, `OptionBroadcastTextID`, `option_id`, `npc_option_npcflag`, `action_menu_id`) VALUES 
+(10144, 0, 0, 'I''m interested.', 32566, 1, 1, 0),
+(10144, 1, 0, 'I''m interested.', 32566, 1, 1, 0);
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=10144;
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=10144;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`,`NegativeCondition`) VALUES
+(15,10144,0,0,27,77,3,0,0,'','The player must be level 77 or higher', 0),
+(15,10144,0,0,25,54197,0,0,0,'','Show the gossip if the player doesn''t learn Cold Weather Flying', 1),
+(15,10144,0,0,2,44221,1,1,0,'','Show the gossip if the player doesn''t have the item', 1),
+(15,10144,0,0,16,1101,0,0,0,'','Show the gossip if the player is from the alliance', 0),
+(15,10144,1,0,27,77,3,0,0,'','The player must be level 77 or higher', 0),
+(15,10144,1,0,25,54197,0,0,0,'','Show the gossip if the player doesn''t learn Cold Weather Flying', 1),
+(15,10144,1,0,2,44229,1,1,0,'','Show the gossip if the player doesn''t have the item', 1),
+(15,10144,1,0,16,690,0,0,0,'','Show the gossip if the player is from the horde', 0),
+(14,10144,14088,0,27,77,3,0,0,'','Show the text if the player is level 77 or higher', 0),
+(14,10144,14088,0,25,54197,0,0,0,'','Show the text if the player doesn''t learn Cold Weather Flying', 1),
+(14,10144,14088,0,2,44221,1,1,0,'','Show the text if the player doesn''t have the item', 1),
+(14,10144,14088,0,2,44229,1,1,0,'','Show the text if the player doesn''t have the item', 1);
+
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=30464;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 30464  AND `source_type` = 0;
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(30464, 0, 0, 1, 62, 0, 100, 0, 10144, 0, 0, 0, 85, 60126, 1, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, '"Honest" Max  - On Gossip select - additem'),
+(30464, 0, 1, 0, 61, 0, 100, 0, 10144, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, '"Honest" Max  - On Gossip select - close gossip'),
+(30464, 0, 2, 3, 62, 0, 100, 0, 10144, 1, 0, 0, 85, 60128, 1, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, '"Honest" Max  - On Gossip select - additem'),
+(30464, 0, 3, 0, 61, 0, 100, 0, 10144, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, '"Honest" Max  - On Gossip select - close gossip');

sql/updates/world/2015_04_18_06_world.sql

@@ -0,0 +1,5 @@
+DELETE FROM `smart_scripts` WHERE `entryorguid`=26472 AND `source_type`=0 AND `id` IN(4,5,6);
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES 
+(26472, 0, 4, 5, 8, 0, 100, 1, 49319, 0, 0, 0, 89, 10, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Highland Mustang - On Spellhit \'Scare Highland Mustang\' - Flee For Assist (No Repeat)'),
+(26472, 0, 5, 6, 61, 0, 100, 0, 0, 0, 0, 0, 11, 49323, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Highland Mustang - On Spellhit \'Scare Highland Mustang\' - Cast \'Highland Mustang Spooking Credit\' (No Repeat)'),
+(26472, 0, 6, 0, 61, 0, 100, 0, 0, 0, 0, 0, 41, 5000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Highland Mustang - On Spellhit \'Scare Highland Mustang\' - Despawn In 5000 ms (No Repeat)');

sql/updates/world/2015_04_18_07_world.sql

@@ -0,0 +1 @@
+DELETE FROM `gameobject` WHERE  `guid`=49312 AND `id`=187493;