aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2012-12-17 15:01:20 +0100
committerShauren <shauren.trinity@gmail.com>2012-12-17 15:01:20 +0100
commit1297a93d90ecbbb1a8743462aed2370bd3b0b397 (patch)
tree17a565686edbff34fc1bbab7720d202b09010ec8 /src
parent7be13b6fda29daf825e24bffe6095d0a987afce1 (diff)
Core/Scipts: Missed changes from 7be13b6fda29daf825e24bffe6095d0a987afce1
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Scripting/ScriptMgr.cpp2
-rw-r--r--src/server/game/Scripting/ScriptMgr.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp
index 3be9557e61e..401b0e1728b 100644
--- a/src/server/game/Scripting/ScriptMgr.cpp
+++ b/src/server/game/Scripting/ScriptMgr.cpp
@@ -1474,7 +1474,7 @@ ConditionScript::ConditionScript(const char* name)
}
VehicleScript::VehicleScript(const char* name)
- : UnitScript(name)
+ : ScriptObject(name)
{
ScriptRegistry<VehicleScript>::AddScript(this);
}
diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h
index 785e5662156..0f6fd5d018b 100644
--- a/src/server/game/Scripting/ScriptMgr.h
+++ b/src/server/game/Scripting/ScriptMgr.h
@@ -600,7 +600,7 @@ class ConditionScript : public ScriptObject
virtual bool OnConditionCheck(Condition* /*condition*/, ConditionSourceInfo& /*sourceInfo*/) { return true; }
};
-class VehicleScript : public UnitScript
+class VehicleScript : public ScriptObject
{
protected: