aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Scripting/ScriptMgr.h
diff options
context:
space:
mode:
authorGiacomo Pozzoni <giacomopoz@gmail.com>2019-02-15 20:29:14 +0100
committerGitHub <noreply@github.com>2019-02-15 20:29:14 +0100
commit5b7ead65bb116195f4336934bcff830e1b2af5bb (patch)
treea1c3ad975a1f50c77784b22f4ef593ba22e1e2c0 /src/server/game/Scripting/ScriptMgr.h
parenta0056951f7e425341760ebf3a7770477ef7f4446 (diff)
Core/Scripts: Change PlayerScript and CreatureScript inheritance (#23048)
Remove UnitScript from PlayerScript and CreatureScript classes as that's how the original system that was PR'd worked, see https://github.com/TrinityCore/TrinityCore/pull/7867 for reference. Please note these are used as global hooks and should really just invoke stateless functions. If you need to hook methods from PlayerScript/CreatureScript and UnitScript, just define 2 different scripts (this is how the original system worked and how it was designed to work)
Diffstat (limited to 'src/server/game/Scripting/ScriptMgr.h')
-rw-r--r--src/server/game/Scripting/ScriptMgr.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h
index 2e8a3eb9f75..910ccb8612c 100644
--- a/src/server/game/Scripting/ScriptMgr.h
+++ b/src/server/game/Scripting/ScriptMgr.h
@@ -390,7 +390,7 @@ class TC_GAME_API UnitScript : public ScriptObject
{
protected:
- UnitScript(char const* name, bool addToScripts = true);
+ UnitScript(char const* name);
public:
// Called when a unit deals healing to another unit
@@ -409,7 +409,7 @@ class TC_GAME_API UnitScript : public ScriptObject
virtual void ModifySpellDamageTaken(Unit* /*target*/, Unit* /*attacker*/, int32& /*damage*/) { }
};
-class TC_GAME_API CreatureScript : public UnitScript
+class TC_GAME_API CreatureScript : public ScriptObject
{
protected:
@@ -606,7 +606,7 @@ class TC_GAME_API AchievementCriteriaScript : public ScriptObject
virtual bool OnCheck(Player* source, Unit* target) = 0;
};
-class TC_GAME_API PlayerScript : public UnitScript
+class TC_GAME_API PlayerScript : public ScriptObject
{
protected: