Merge remote-tracking branch 'upstream/master'

yxsos · Aug 11, 2016 · a183ab1 · a183ab1
2 parents 269b2b7 + eda5f7b
commit a183ab1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -242,7 +242,7 @@ class boss_urom : public CreatureScript
                 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();