From 7b49da48f9c3c21406fbe350de170757ea6e285f Mon Sep 17 00:00:00 2001 From: click Date: Tue, 29 Jan 2013 15:53:21 +0100 Subject: [PATCH 1/4] Buildsystem/CMake: Change policy CMP0005 to NEW and corect some buildvariables accordingly ** Info from CMake: ** The OLD behavior for this policy is to place definition values given to add_definitions directly in the generated build rules without attempting to escape anything. ** The NEW behavior for this policy is to generate correct escapes for all native build tools automatically. If this breaks build, let us know on irc : irc.rizon.net/#trinity --- CMakeLists.txt | 6 +++++- cmake/compiler/clang/settings.cmake | 2 +- cmake/compiler/gcc/settings.cmake | 2 +- cmake/compiler/msvc/settings.cmake | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5335207aaa5..b57ec9adda4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,11 @@ project(TrinityCore) # CMake policies (can not be handled elsewhere) cmake_minimum_required(VERSION 2.8) -cmake_policy(SET CMP0005 OLD) +cmake_policy(SET CMP0005 NEW) + +# add this options before PROJECT keyword +set(CMAKE_DISABLE_SOURCE_CHANGES ON) +set(CMAKE_DISABLE_IN_SOURCE_BUILD ON) # Set RPATH-handing (CMake parameters) set(CMAKE_SKIP_BUILD_RPATH 0) diff --git a/cmake/compiler/clang/settings.cmake b/cmake/compiler/clang/settings.cmake index ae07b1fc39b..e48e00ae78e 100644 --- a/cmake/compiler/clang/settings.cmake +++ b/cmake/compiler/clang/settings.cmake @@ -1,5 +1,5 @@ # Set build-directive (used in core to tell which buildtype we used) -add_definitions(-D_BUILD_DIRECTIVE='"$(CONFIGURATION)"') +add_definitions(-D_BUILD_DIRECTIVE="$(CONFIGURATION)") if(WITH_WARNINGS) set(WARNING_FLAGS "-W -Wall -Wextra -Winit-self -Wfatal-errors") diff --git a/cmake/compiler/gcc/settings.cmake b/cmake/compiler/gcc/settings.cmake index 25ee96c8562..9438662bee9 100644 --- a/cmake/compiler/gcc/settings.cmake +++ b/cmake/compiler/gcc/settings.cmake @@ -1,5 +1,5 @@ # Set build-directive (used in core to tell which buildtype we used) -add_definitions(-D_BUILD_DIRECTIVE='"${CMAKE_BUILD_TYPE}"') +add_definitions(-D_BUILD_DIRECTIVE="${CMAKE_BUILD_TYPE}") if(PLATFORM EQUAL 32) # Required on 32-bit systems to enable SSE2 (standard on x64) diff --git a/cmake/compiler/msvc/settings.cmake b/cmake/compiler/msvc/settings.cmake index d758d466407..3ede406a4a4 100644 --- a/cmake/compiler/msvc/settings.cmake +++ b/cmake/compiler/msvc/settings.cmake @@ -25,7 +25,7 @@ else() endif() # Set build-directive (used in core to tell which buildtype we used) -add_definitions(-D_BUILD_DIRECTIVE=\\"$(ConfigurationName)\\") +add_definitions(-D_BUILD_DIRECTIVE="$(ConfigurationName)") # multithreaded compiling on VS set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP") From 76910472d824a409adefc774604653e78c7d1041 Mon Sep 17 00:00:00 2001 From: FH3095 Date: Tue, 29 Jan 2013 15:02:54 +0000 Subject: [PATCH 2/4] DB/Achievements: Fix Portal Jockey Current Status: Portal Jockey(10) is rewarded from 10nh and 25nh, Portal Jockey(25) is rewarded from 10hc and 25hc. Reason: Achievement-criteria 12971 is required for Portal Jockey(25), but checks for map-difficulty 2=10hc. On the other side achievment-criteria 12979 is required for Portal Jockey(10), but checks for map-difficulty 1=25nh. Closes #9081 Ref #6810 --- .../world/2013_01_29_01_world_achievement_criteria_data.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/2013_01_29_01_world_achievement_criteria_data.sql diff --git a/sql/updates/world/2013_01_29_01_world_achievement_criteria_data.sql b/sql/updates/world/2013_01_29_01_world_achievement_criteria_data.sql new file mode 100644 index 00000000000..39627a943cc --- /dev/null +++ b/sql/updates/world/2013_01_29_01_world_achievement_criteria_data.sql @@ -0,0 +1,2 @@ +UPDATE `achievement_criteria_data` SET `value1`=2 WHERE `criteria_id`=12979 AND `type`=12; +UPDATE `achievement_criteria_data` SET `value1`=1 WHERE `criteria_id`=12971 AND `type`=12; From ea9c6524dd4209c0074faecdf48d53b006fe6f5d Mon Sep 17 00:00:00 2001 From: click Date: Tue, 29 Jan 2013 23:18:25 +0100 Subject: [PATCH 3/4] Buildsystem/CMake: Revoke commit 7b49da48f9c3c21406fbe350de170757ea6e285f - it creates unwanted results when used with PCh on *nix platforms. --- CMakeLists.txt | 2 +- cmake/compiler/clang/settings.cmake | 2 +- cmake/compiler/gcc/settings.cmake | 2 +- cmake/compiler/icc/settings.cmake | 2 +- cmake/compiler/msvc/settings.cmake | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b57ec9adda4..7b075b6ede3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ project(TrinityCore) # CMake policies (can not be handled elsewhere) cmake_minimum_required(VERSION 2.8) -cmake_policy(SET CMP0005 NEW) +cmake_policy(SET CMP0005 OLD) # add this options before PROJECT keyword set(CMAKE_DISABLE_SOURCE_CHANGES ON) diff --git a/cmake/compiler/clang/settings.cmake b/cmake/compiler/clang/settings.cmake index e48e00ae78e..ae07b1fc39b 100644 --- a/cmake/compiler/clang/settings.cmake +++ b/cmake/compiler/clang/settings.cmake @@ -1,5 +1,5 @@ # Set build-directive (used in core to tell which buildtype we used) -add_definitions(-D_BUILD_DIRECTIVE="$(CONFIGURATION)") +add_definitions(-D_BUILD_DIRECTIVE='"$(CONFIGURATION)"') if(WITH_WARNINGS) set(WARNING_FLAGS "-W -Wall -Wextra -Winit-self -Wfatal-errors") diff --git a/cmake/compiler/gcc/settings.cmake b/cmake/compiler/gcc/settings.cmake index 9438662bee9..25ee96c8562 100644 --- a/cmake/compiler/gcc/settings.cmake +++ b/cmake/compiler/gcc/settings.cmake @@ -1,5 +1,5 @@ # Set build-directive (used in core to tell which buildtype we used) -add_definitions(-D_BUILD_DIRECTIVE="${CMAKE_BUILD_TYPE}") +add_definitions(-D_BUILD_DIRECTIVE='"${CMAKE_BUILD_TYPE}"') if(PLATFORM EQUAL 32) # Required on 32-bit systems to enable SSE2 (standard on x64) diff --git a/cmake/compiler/icc/settings.cmake b/cmake/compiler/icc/settings.cmake index 58eb63b081d..133bc15e59e 100644 --- a/cmake/compiler/icc/settings.cmake +++ b/cmake/compiler/icc/settings.cmake @@ -1,5 +1,5 @@ # Set build-directive (used in core to tell which buildtype we used) -add_definitions(-D_BUILD_DIRECTIVE="${CMAKE_BUILD_TYPE}") +add_definitions(-D_BUILD_DIRECTIVE="'${CMAKE_BUILD_TYPE}'") if(PLATFORM EQUAL 32) add_definitions(-axSSE2) diff --git a/cmake/compiler/msvc/settings.cmake b/cmake/compiler/msvc/settings.cmake index 3ede406a4a4..d758d466407 100644 --- a/cmake/compiler/msvc/settings.cmake +++ b/cmake/compiler/msvc/settings.cmake @@ -25,7 +25,7 @@ else() endif() # Set build-directive (used in core to tell which buildtype we used) -add_definitions(-D_BUILD_DIRECTIVE="$(ConfigurationName)") +add_definitions(-D_BUILD_DIRECTIVE=\\"$(ConfigurationName)\\") # multithreaded compiling on VS set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP") From 02814975732f8e919d33ff8f2cbaf98f13e04f91 Mon Sep 17 00:00:00 2001 From: Nay Date: Tue, 29 Jan 2013 23:48:39 +0000 Subject: [PATCH 4/4] DB/Loot: Fix 9 drop chance in gameobject_template (7 quests should be fixed by this) If a GO with flags 4 drops a quest item, ChanceOrQuestChance for that items needs to be negative Query used to find the issue: ``` SELECT * FROM `gameobject_loot_template` WHERE (`item` IN (SELECT `questItem1` FROM `gameobject_template` WHERE (`flags` & 4) != 0) OR `item` IN (SELECT `questItem2` FROM `gameobject_template` WHERE (`flags` & 4) != 0) OR `item` IN (SELECT `questItem3` FROM `gameobject_template` WHERE (`flags` & 4) != 0) OR `item` IN (SELECT `questItem4` FROM `gameobject_template` WHERE (`flags` & 4) != 0) OR `item` IN (SELECT `questItem5` FROM `gameobject_template` WHERE (`flags` & 4) != 0) OR `item` IN (SELECT `questItem6` FROM `gameobject_template` WHERE (`flags` & 4) != 0)) AND `ChanceOrQuestChance` > 0; ``` --- .../2013_01_29_02_world_gameobject_loot_template.sql | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 sql/updates/world/2013_01_29_02_world_gameobject_loot_template.sql diff --git a/sql/updates/world/2013_01_29_02_world_gameobject_loot_template.sql b/sql/updates/world/2013_01_29_02_world_gameobject_loot_template.sql new file mode 100644 index 00000000000..c3f2d0f0fb9 --- /dev/null +++ b/sql/updates/world/2013_01_29_02_world_gameobject_loot_template.sql @@ -0,0 +1,9 @@ +UPDATE `gameobject_loot_template` SET `ChanceOrQuestChance`=-100 WHERE `entry`=27310 AND `item`=47035; +UPDATE `gameobject_loot_template` SET `ChanceOrQuestChance`=-100 WHERE `entry`=27239 AND `item`=46364; +UPDATE `gameobject_loot_template` SET `ChanceOrQuestChance`=-100 WHERE `entry`=24589 AND `item`=43697; +UPDATE `gameobject_loot_template` SET `ChanceOrQuestChance`=-100 WHERE `entry`=26666 AND `item`=44319; +UPDATE `gameobject_loot_template` SET `ChanceOrQuestChance`=-100 WHERE `entry`=26667 AND `item`=44320; +UPDATE `gameobject_loot_template` SET `ChanceOrQuestChance`=-100 WHERE `entry`=26668 AND `item`=44321; +UPDATE `gameobject_loot_template` SET `ChanceOrQuestChance`=-100 WHERE `entry`=26878 AND `item`=45062; +UPDATE `gameobject_loot_template` SET `ChanceOrQuestChance`=-100 WHERE `entry`=27725 AND `item`=49648; +UPDATE `gameobject_loot_template` SET `ChanceOrQuestChance`=-100 WHERE `entry`=27723 AND `item`=49678;