Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 01:15:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Spells: Fixed gcc 14 build

Browse Source 
(cherry picked from commit 0fb81435bc)
This commit is contained in:
Shauren
2024-05-23 22:32:15 +02:00
committed by Ovahlord
parent 3451ce7c7a
commit e231bd010e
4 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/game/Spells/Spell.cpp
View File

@@ -2188,6 +2188,8 @@ void Spell::SearchTargets(SEARCHER& searcher, uint32 containerMask, WorldObject*
}
}
template TC_GAME_API void Spell::SearchTargets<Trinity::WorldObjectListSearcher<Trinity::WorldObjectSpellAreaTargetCheck>>(Trinity::WorldObjectListSearcher<Trinity::WorldObjectSpellAreaTargetCheck>& searcher, uint32 containerMask, WorldObject* referer, Position const* pos, float radius);
WorldObject* Spell::SearchNearbyTarget(SpellEffectInfo const& spellEffectInfo, float range, SpellTargetObjectTypes objectType, SpellTargetCheckTypes selectionType, ConditionContainer const* condList)
{
WorldObject* target = nullptr;

5
src/server/game/Spells/Spell.h
View File

@@ -71,6 +71,9 @@ enum WeaponAttackType : uint8;
namespace Trinity
{
enum class WorldObjectSpellAreaTargetSearchReason;
template <class Check>
struct WorldObjectListSearcher;
}
#define SPELL_CHANNEL_UPDATE_INTERVAL (1 * IN_MILLISECONDS)
@@ -1011,6 +1014,8 @@ namespace Trinity
TC_GAME_API void SelectRandomInjuredTargets(std::list<WorldObject*>& targets, size_t maxTargets, bool prioritizePlayers, Unit const* prioritizeGroupMembersOf = nullptr);
}
extern template void Spell::SearchTargets<Trinity::WorldObjectListSearcher<Trinity::WorldObjectSpellAreaTargetCheck>>(Trinity::WorldObjectListSearcher<Trinity::WorldObjectSpellAreaTargetCheck>& searcher, uint32 containerMask, WorldObject* referer, Position const* pos, float radius);
using SpellEffectHandlerFn = void(Spell::*)();
#endif

4
src/server/game/Time/GameTime.cpp
View File

@@ -68,13 +68,13 @@ namespace GameTime
}
template<>
TC_GAME_API SystemTimePoint GetTime<std::chrono::system_clock>()
SystemTimePoint GetTime<std::chrono::system_clock>()
{
return GetSystemTime();
}
template<>
TC_GAME_API TimePoint GetTime<std::chrono::steady_clock>()
TimePoint GetTime<std::chrono::steady_clock>()
{
return Now();
}

3
src/server/game/Time/GameTime.h
View File

@@ -54,6 +54,9 @@ namespace GameTime
TC_GAME_API WowTime const* GetWowTime();
void UpdateGameTimers();
template<> TC_GAME_API SystemTimePoint GetTime<std::chrono::system_clock>();
template<> TC_GAME_API TimePoint GetTime<std::chrono::steady_clock>();
}
#endif