From a2c8a0a24e5e5acc1f35b1b9de106bdafac77e00 Mon Sep 17 00:00:00 2001 From: Luth31 Date: Thu, 11 Aug 2016 00:03:15 +0300 Subject: Fix CMake on Windows --- modules/dep/mysqllite/CMakeLists.txt | 6 +++--- src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/dep/mysqllite/CMakeLists.txt b/modules/dep/mysqllite/CMakeLists.txt index 919648e7dc..af1d108b69 100644 --- a/modules/dep/mysqllite/CMakeLists.txt +++ b/modules/dep/mysqllite/CMakeLists.txt @@ -10,11 +10,11 @@ # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # Include the platform-specific file. -include(${CMAKE_CURRENT_SOURCE_DIR}/src/cmake/os/Windows.cmake) +include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/os/Windows.cmake) # Add macros -include(${CMAKE_CURRENT_SOURCE_DIR}/src/cmake/character_sets.cmake) -include(${CMAKE_CURRENT_SOURCE_DIR}/src/cmake/mysql_version.cmake) +include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/character_sets.cmake) +include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/mysql_version.cmake) # Advanced options (mostly useless, but usually still in config.h, so they need to be set...) set(CYBOZU OFF) diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp index 2ad55a1aa6..9fd7b6a5a3 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp @@ -242,7 +242,7 @@ public: case SPELL_SUMMON_MENAGERIE_3: { for( uint8 i=0; i<4; ++i ) -+ me->SummonCreature(summons[2][i], cords[2][0] + ((i%2) ? 4.0f : -4.0f), cords[2][1] + (i<2 ? 4.0f : -4.0f), cords[2][2], 0.0f, TEMPSUMMON_TIMED_DESPAWN, 300000); + me->SummonCreature(summons[2][i], cords[2][0] + ((i%2) ? 4.0f : -4.0f), cords[2][1] + (i<2 ? 4.0f : -4.0f), cords[2][2], 0.0f, TEMPSUMMON_TIMED_DESPAWN, 300000); uint8 phase = GetPhaseByCurrentPosition(); me->SetHomePosition(cords[phase+1][0], cords[phase+1][1], cords[phase+1][2], cords[phase+1][3]); me->DestroyForNearbyPlayers(); -- cgit v1.2.3