Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-04 08:07:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4

Browse Source 
# Conflicts:
#	src/server/game/AI/CoreAI/PetAI.cpp
#	src/server/game/Battlegrounds/Battleground.cpp
#	src/server/game/Battlegrounds/Zones/BattlegroundTP.cpp
#	src/server/game/DungeonFinding/LFGMgr.h
#	src/server/game/DungeonFinding/LFGQueue.h
#	src/server/game/Entities/Creature/Creature.h
#	src/server/game/Entities/Pet/Pet.cpp
#	src/server/game/Entities/Player/Player.cpp
#	src/server/game/Entities/Player/Player.h
#	src/server/game/Entities/Unit/Unit.h
#	src/server/game/Globals/ObjectMgr.h
#	src/server/game/Groups/Group.cpp
#	src/server/game/Groups/Group.h
#	src/server/game/Guilds/Guild.cpp
#	src/server/game/Guilds/Guild.h
#	src/server/game/Handlers/GuildHandler.cpp
#	src/server/game/Handlers/LFGHandler.cpp
#	src/server/game/Handlers/MiscHandler.cpp
#	src/server/game/Handlers/NPCHandler.cpp
#	src/server/game/Instances/InstanceScript.cpp
#	src/server/game/Maps/Map.cpp
#	src/server/game/Maps/Map.h
#	src/server/game/Maps/ZoneScript.cpp
#	src/server/game/Server/WorldSession.cpp
#	src/server/game/Spells/SpellEffects.cpp
#	src/server/game/Weather/Weather.cpp
#	src/server/game/Weather/WeatherMgr.cpp
#	src/server/scripts/Commands/cs_reload.cpp
#	src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp
#	src/server/scripts/EasternKingdoms/Deadmines/deadmines.h
#	src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
#	src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
#	src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h
#	src/server/scripts/EasternKingdoms/eastern_kingdoms_script_loader.cpp
#	src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.h
#	src/server/scripts/Spells/spell_dk.cpp
#	src/server/scripts/Spells/spell_druid.cpp
#	src/server/scripts/Spells/spell_generic.cpp
#	src/server/scripts/Spells/spell_hunter.cpp
#	src/server/scripts/Spells/spell_mage.cpp
#	src/server/scripts/Spells/spell_pet.cpp
#	src/server/scripts/Spells/spell_shaman.cpp
#	src/server/scripts/Spells/spell_warrior.cpp
This commit is contained in:
Ovahlord
2018-03-28 12:35:52 +02:00
parent 68c0096419 ad07191b89
commit 2cfdd3cbe0
1450 changed files with 72503 additions and 36529 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
src/server/game/Scripting/ScriptMgr.h
View File

@@ -20,12 +20,8 @@
#define SC_SCRIPTMGR_H
#include "Common.h"
#include <atomic>
#include "DBCStores.h"
#include "QuestDef.h"
#include "SharedDefines.h"
#include "World.h"
#include "Weather.h"
#include "ObjectGuid.h"
#include <vector>
class AccountMgr;
class AuctionHouseObject;
@@ -59,17 +55,32 @@ class SpellCastTargets;
class Transport;
class Unit;
class Vehicle;
class Weather;
class WorldPacket;
class WorldSocket;
class WorldObject;
class WorldSession;
struct AuctionEntry;
struct AreaTriggerEntry;
struct ConditionSourceInfo;
struct Condition;
struct CreatureTemplate;
struct CreatureData;
struct ItemTemplate;
struct MapEntry;
enum BattlegroundTypeId : uint32;
enum ContentLevels : uint8;
enum Difficulty : uint8;
enum DuelCompleteType : uint8;
enum QuestStatus : uint8;
enum RemoveMethod : uint8;
enum ShutdownExitCode : uint32;
enum ShutdownMask : uint32;
enum SpellEffIndex : uint8;
enum WeatherState : uint32;
enum XPColorChar : uint8;
#define VISIBLE_RANGE 166.0f //MAX visible range (size of grid)
@@ -99,7 +110,7 @@ struct ItemTemplate;
protected:
MyScriptType(const char* name, uint32 someId)
MyScriptType(char const* name, uint32 someId)
: ScriptObject(name), _someId(someId)
{
ScriptRegistry<MyScriptType>::AddScript(this);
@@ -160,7 +171,7 @@ class TC_GAME_API ScriptObject
protected:
ScriptObject(const char* name);
ScriptObject(char const* name);
virtual ~ScriptObject();
private:
@@ -187,7 +198,7 @@ class TC_GAME_API SpellScriptLoader : public ScriptObject
{
protected:
SpellScriptLoader(const char* name);
SpellScriptLoader(char const* name);
public:
@@ -202,7 +213,7 @@ class TC_GAME_API ServerScript : public ScriptObject
{
protected:
ServerScript(const char* name);
ServerScript(char const* name);
public:
@@ -232,7 +243,7 @@ class TC_GAME_API WorldScript : public ScriptObject
{
protected:
WorldScript(const char* name);
WorldScript(char const* name);
public:
@@ -265,7 +276,7 @@ class TC_GAME_API FormulaScript : public ScriptObject
{
protected:
FormulaScript(const char* name);
FormulaScript(char const* name);
public:
@@ -297,16 +308,11 @@ template<class TMap> class MapScript : public UpdatableScript<TMap>
protected:
MapScript(uint32 mapId)
: _mapEntry(sMapStore.LookupEntry(mapId))
{
if (!_mapEntry)
TC_LOG_ERROR("scripts", "Invalid MapScript for %u; no such map ID.", mapId);
}
MapScript(MapEntry const* mapEntry) : _mapEntry(mapEntry) { }
public:
// Gets the MapEntry structure associated with this script. Can return NULL.
// Gets the MapEntry structure associated with this script. Can return nullptr.
MapEntry const* GetEntry() { return _mapEntry; }
// Called when the map is created.
@@ -332,7 +338,7 @@ class TC_GAME_API WorldMapScript : public ScriptObject, public MapScript<Map>
{
protected:
WorldMapScript(const char* name, uint32 mapId);
WorldMapScript(char const* name, uint32 mapId);
};
class TC_GAME_API InstanceMapScript
@@ -340,26 +346,26 @@ class TC_GAME_API InstanceMapScript
{
protected:
InstanceMapScript(const char* name, uint32 mapId);
InstanceMapScript(char const* name, uint32 mapId);
public:
// Gets an InstanceScript object for this instance.
virtual InstanceScript* GetInstanceScript(InstanceMap* /*map*/) const { return NULL; }
virtual InstanceScript* GetInstanceScript(InstanceMap* /*map*/) const { return nullptr; }
};
class TC_GAME_API BattlegroundMapScript : public ScriptObject, public MapScript<BattlegroundMap>
{
protected:
BattlegroundMapScript(const char* name, uint32 mapId);
BattlegroundMapScript(char const* name, uint32 mapId);
};
class TC_GAME_API ItemScript : public ScriptObject
{
protected:
ItemScript(const char* name);
ItemScript(char const* name);
public:
@@ -384,7 +390,7 @@ class TC_GAME_API UnitScript : public ScriptObject
{
protected:
UnitScript(const char* name, bool addToScripts = true);
UnitScript(char const* name, bool addToScripts = true);
public:
// Called when a unit deals healing to another unit
@@ -407,7 +413,7 @@ class TC_GAME_API CreatureScript : public UnitScript
{
protected:
CreatureScript(const char* name);
CreatureScript(char const* name);
public:
@@ -422,7 +428,7 @@ class TC_GAME_API GameObjectScript : public ScriptObject, public UpdatableScript
{
protected:
GameObjectScript(const char* name);
GameObjectScript(char const* name);
public:
@@ -434,7 +440,7 @@ class TC_GAME_API AreaTriggerScript : public ScriptObject
{
protected:
AreaTriggerScript(const char* name);
AreaTriggerScript(char const* name);
public:
@@ -459,7 +465,7 @@ class TC_GAME_API BattlegroundScript : public ScriptObject
{
protected:
BattlegroundScript(const char* name);
BattlegroundScript(char const* name);
public:
@@ -471,7 +477,7 @@ class TC_GAME_API OutdoorPvPScript : public ScriptObject
{
protected:
OutdoorPvPScript(const char* name);
OutdoorPvPScript(char const* name);
public:
@@ -483,7 +489,7 @@ class TC_GAME_API CommandScript : public ScriptObject
{
protected:
CommandScript(const char* name);
CommandScript(char const* name);
public:
@@ -495,7 +501,7 @@ class TC_GAME_API WeatherScript : public ScriptObject, public UpdatableScript<We
{
protected:
WeatherScript(const char* name);
WeatherScript(char const* name);
public:
@@ -507,7 +513,7 @@ class TC_GAME_API AuctionHouseScript : public ScriptObject
{
protected:
AuctionHouseScript(const char* name);
AuctionHouseScript(char const* name);
public:
@@ -528,7 +534,7 @@ class TC_GAME_API ConditionScript : public ScriptObject
{
protected:
ConditionScript(const char* name);
ConditionScript(char const* name);
public:
@@ -540,7 +546,7 @@ class TC_GAME_API VehicleScript : public ScriptObject
{
protected:
VehicleScript(const char* name);
VehicleScript(char const* name);
public:
@@ -567,14 +573,14 @@ class TC_GAME_API DynamicObjectScript : public ScriptObject, public UpdatableScr
{
protected:
DynamicObjectScript(const char* name);
DynamicObjectScript(char const* name);
};
class TC_GAME_API TransportScript : public ScriptObject, public UpdatableScript<Transport>
{
protected:
TransportScript(const char* name);
TransportScript(char const* name);
public:
@@ -595,7 +601,7 @@ class TC_GAME_API AchievementCriteriaScript : public ScriptObject
{
protected:
AchievementCriteriaScript(const char* name);
AchievementCriteriaScript(char const* name);
public:
@@ -607,7 +613,7 @@ class TC_GAME_API PlayerScript : public UnitScript
{
protected:
PlayerScript(const char* name);
PlayerScript(char const* name);
public:
@@ -707,7 +713,7 @@ class TC_GAME_API AccountScript : public ScriptObject
{
protected:
AccountScript(const char* name);
AccountScript(char const* name);
public:
@@ -734,7 +740,7 @@ class TC_GAME_API GuildScript : public ScriptObject
{
protected:
GuildScript(const char* name);
GuildScript(char const* name);
public:
@@ -775,7 +781,7 @@ class TC_GAME_API GroupScript : public ScriptObject
{
protected:
GroupScript(const char* name);
GroupScript(char const* name);
public:
@@ -786,7 +792,7 @@ class TC_GAME_API GroupScript : public ScriptObject
virtual void OnInviteMember(Group* /*group*/, ObjectGuid /*guid*/) { }
// Called when a member is removed from a group.
virtual void OnRemoveMember(Group* /*group*/, ObjectGuid /*guid*/, RemoveMethod /*method*/, ObjectGuid /*kicker*/, const char* /*reason*/) { }
virtual void OnRemoveMember(Group* /*group*/, ObjectGuid /*guid*/, RemoveMethod /*method*/, ObjectGuid /*kicker*/, char const* /*reason*/) { }
// Called when the leader of a group is changed.
virtual void OnChangeLeader(Group* /*group*/, ObjectGuid /*newLeaderGuid*/, ObjectGuid /*oldLeaderGuid*/) { }
@@ -1040,7 +1046,7 @@ class TC_GAME_API ScriptMgr
void OnGroupAddMember(Group* group, ObjectGuid guid);
void OnGroupInviteMember(Group* group, ObjectGuid guid);
void OnGroupRemoveMember(Group* group, ObjectGuid guid, RemoveMethod method, ObjectGuid kicker, const char* reason);
void OnGroupRemoveMember(Group* group, ObjectGuid guid, RemoveMethod method, ObjectGuid kicker, char const* reason);
void OnGroupChangeLeader(Group* group, ObjectGuid newLeaderGuid, ObjectGuid oldLeaderGuid);
void OnGroupDisband(Group* group);