ElderShell/EverWrath
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #52 from Luth31/master

Browse source 
Fix CMake on Windows
This commit is contained in:
Yehonal 2016-08-11 00:01:20 +02:00 • committed by GitHub
commit eda5f7bac4
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/dep/mysqllite/CMakeLists.txt
View file

@ -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)

2
src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp
View file

@ -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();