Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-17 16:10:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 4.3.4

Browse Source 
Conflicts:
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/World/World.h
	src/server/scripts/Kalimdor/moonglade.cpp
This commit is contained in:
Spp
2012-12-19 08:23:34 +01:00
parent a227a34947 a2832805af
commit 80b1b6c494
32 changed files with 865 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/server/game/Scripting/ScriptMgr.cpp
View File

@@ -1379,10 +1379,11 @@ FormulaScript::FormulaScript(const char* name)
ScriptRegistry<FormulaScript>::AddScript(this);
}
UnitScript::UnitScript(const char* name)
UnitScript::UnitScript(const char* name, bool addToScripts)
: ScriptObject(name)
{
ScriptRegistry<UnitScript>::AddScript(this);
if (addToScripts)
ScriptRegistry<UnitScript>::AddScript(this);
}
WorldMapScript::WorldMapScript(const char* name, uint32 mapId)
@@ -1419,7 +1420,7 @@ ItemScript::ItemScript(const char* name)
}
CreatureScript::CreatureScript(const char* name)
: UnitScript(name)
: UnitScript(name, false)
{
ScriptRegistry<CreatureScript>::AddScript(this);
}
@@ -1473,7 +1474,7 @@ ConditionScript::ConditionScript(const char* name)
}
VehicleScript::VehicleScript(const char* name)
: UnitScript(name)
: ScriptObject(name)
{
ScriptRegistry<VehicleScript>::AddScript(this);
}
@@ -1497,7 +1498,7 @@ AchievementCriteriaScript::AchievementCriteriaScript(const char* name)
}
PlayerScript::PlayerScript(const char* name)
: UnitScript(name)
: UnitScript(name, false)
{
ScriptRegistry<PlayerScript>::AddScript(this);
}