diff --git a/src/game/CMakeLists.txt b/src/game/CMakeLists.txt index 82de8ae6..2abb252f 100644 --- a/src/game/CMakeLists.txt +++ b/src/game/CMakeLists.txt @@ -85,7 +85,7 @@ source_group("Movement" FILES ${SRC_GRP_MOVEMENT}) #Object group file(GLOB SRC_GRP_OBJECT Object/*.cpp Object/*.h) -source_group("Object" FILES ${SRC_GRP_OBJECT}) +source_group("Object" FILES ${SRC_GRP_OBJECT}) #Outdoors PvP group file(GLOB SRC_GRP_OUTDOOR_PVP OutdoorPvP/*.cpp OutdoorPvP/*.h) @@ -98,7 +98,7 @@ source_group("References" FILES ${SRC_GRP_REFERENCES}) #Server group file(GLOB SRC_GRP_SERVER Server/*.cpp Server/*.h) source_group("Server" FILES ${SRC_GRP_SERVER}) - + #Tools group file(GLOB SRC_GRP_TOOL Tools/*.cpp Tools/*.h) source_group("Tool" FILES ${SRC_GRP_TOOL}) @@ -114,11 +114,11 @@ source_group("Warden" FILES ${SRC_GRP_WARDEN}) #Warden Modules group file(GLOB SRC_GRP_WARDEN_MODULES Warden/Modules/*.cpp Warden/Modules/*.h) source_group("Warden\\Modules" FILES ${SRC_GRP_WARDEN_MODULES}) - + #World and Handlers group file(GLOB SRC_GRP_WORLD_HANDLERS WorldHandlers/*.cpp WorldHandlers/*.h) source_group("World/Handlers" FILES ${SRC_GRP_WORLD_HANDLERS}) - + set(LIBRARY_SRCS ${SRC_GRP_AHBOT} ${SRC_GRP_BATTLEGROUND} @@ -183,11 +183,11 @@ if(SCRIPT_LIB_ELUNA) ${CMAKE_SOURCE_DIR}/dep/lualib ${CMAKE_SOURCE_DIR}/src/modules/Eluna ) - list(APPEND LIBRARY_SRCS ${SRC_GRP_LUAENGINE}) - target_link_libraries(${LIBRARY_NAME} LuaEngine) - target_link_libraries(${LIBRARY_NAME} lualib) - add_dependencies(${LIBRARY_NAME} LuaEngine) - add_dependencies(${LIBRARY_NAME} lualib) + list(APPEND LIBRARY_SRCS ${SRC_GRP_LUAENGINE}) + target_link_libraries(${LIBRARY_NAME} LuaEngine) + target_link_libraries(${LIBRARY_NAME} lualib) + add_dependencies(${LIBRARY_NAME} LuaEngine) + add_dependencies(${LIBRARY_NAME} lualib) endif() #AH Bot Config diff --git a/src/modules/SD2/scripts/eastern_kingdoms/blackrock_mountain/molten_core/boss_garr.cpp b/src/modules/SD2/scripts/eastern_kingdoms/blackrock_mountain/molten_core/boss_garr.cpp index 2e84c59a..e51c48a9 100644 --- a/src/modules/SD2/scripts/eastern_kingdoms/blackrock_mountain/molten_core/boss_garr.cpp +++ b/src/modules/SD2/scripts/eastern_kingdoms/blackrock_mountain/molten_core/boss_garr.cpp @@ -133,7 +133,10 @@ struct boss_garr : public CreatureScript m_uiAntiMagicPulseTimer = urand(10 * IN_MILLISECONDS, 15 * IN_MILLISECONDS); } } - else m_uiAntiMagicPulseTimer -= uiDiff; + else + { + m_uiAntiMagicPulseTimer -= uiDiff; + } // MagmaShackles_Timer if (m_uiMagmaShacklesTimer < uiDiff) @@ -143,7 +146,10 @@ struct boss_garr : public CreatureScript m_uiMagmaShacklesTimer = urand(8 * IN_MILLISECONDS, 12 * IN_MILLISECONDS); } } - else m_uiMagmaShacklesTimer -= uiDiff; + else + { + m_uiMagmaShacklesTimer -= uiDiff; + } // Explode an add if (m_uiExplodeAddTimer < uiDiff) @@ -229,7 +235,10 @@ struct mob_firesworn : public CreatureScript m_uiSeparationCheckTimer = 5000; } - else m_uiSeparationCheckTimer -= uiDiff; + else + { + m_uiSeparationCheckTimer -= uiDiff; + } // Immolate_Timer if (m_uiImmolateTimer < uiDiff) @@ -242,7 +251,10 @@ struct mob_firesworn : public CreatureScript } } } - else m_uiImmolateTimer -= uiDiff; + else + { + m_uiImmolateTimer -= uiDiff; + } DoMeleeAttackIfReady(); } diff --git a/src/modules/SD2/scripts/eastern_kingdoms/blackrock_mountain/molten_core/instance_molten_core.cpp b/src/modules/SD2/scripts/eastern_kingdoms/blackrock_mountain/molten_core/instance_molten_core.cpp index 9cf2e931..e1278920 100644 --- a/src/modules/SD2/scripts/eastern_kingdoms/blackrock_mountain/molten_core/instance_molten_core.cpp +++ b/src/modules/SD2/scripts/eastern_kingdoms/blackrock_mountain/molten_core/instance_molten_core.cpp @@ -219,8 +219,8 @@ struct is_molten_core : public InstanceScript case TYPE_GOLEMAGG: case TYPE_SULFURON: case TYPE_RAGNAROS: - m_auiEncounter[uiType] = uiData; - break; + m_auiEncounter[uiType] = uiData; + break; case TYPE_FLAME_DOSED: if (sRuneEncounters const *rstr = GetRuneStructForTrapEntry(uiData)) { @@ -280,7 +280,9 @@ struct is_molten_core : public InstanceScript uint32 GetData(uint32 uiType) const override { if (uiType < MAX_ENCOUNTER) + { return m_auiEncounter[uiType]; + } else if (sRuneEncounters const *rstr = GetRuneStructForTrapEntry(uiType)) return m_auiRuneState[rstr->getRuneType()];