Merge branch 'master' into 4.3.4
Conflicts: src/server/game/Globals/ObjectMgr.cpp src/server/game/World/World.h src/server/scripts/Kalimdor/moonglade.cpp
This commit is contained in:
commit
80b1b6c494
32 files changed
+865
-239
No files matched your search
@@ -395,7 +395,7 @@ class UnitScript : public ScriptObject
|
||||
{
|
||||
protected:
|
||||
|
||||
UnitScript(const char* name);
|
||||
UnitScript(const char* name, bool addToScripts = true);
|
||||
|
||||
public:
|
||||
// Called when DoT's Tick Damage is being Dealt
|
||||
@@ -599,7 +599,7 @@ class ConditionScript : public ScriptObject
|
||||
virtual bool OnConditionCheck(Condition* /*condition*/, ConditionSourceInfo& /*sourceInfo*/) { return true; }
|
||||
};
|
||||
|
||||
class VehicleScript : public UnitScript
|
||||
class VehicleScript : public ScriptObject
|
||||
{
|
||||
protected:
|
||||
|
||||
|
||||
Reference in new issue
Block a user