From 9c4cf9b39c17854fac3c1323e5e3bd1d2f164e3d Mon Sep 17 00:00:00 2001 From: Gacko Date: Sun, 21 Oct 2012 14:33:20 +0200 Subject: Core/DB: Children's Week --- src/server/game/Scripting/ScriptLoader.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/server/game/Scripting/ScriptLoader.cpp') diff --git a/src/server/game/Scripting/ScriptLoader.cpp b/src/server/game/Scripting/ScriptLoader.cpp index 54a74a021c1..7ced64930f8 100755 --- a/src/server/game/Scripting/ScriptLoader.cpp +++ b/src/server/game/Scripting/ScriptLoader.cpp @@ -89,6 +89,7 @@ void AddSC_npc_innkeeper(); void AddSC_npcs_special(); void AddSC_npc_taxi(); void AddSC_achievement_scripts(); +void AddSC_event_scripts(); //eastern kingdoms void AddSC_alterac_valley(); //Alterac Valley @@ -711,6 +712,7 @@ void AddWorldScripts() AddSC_npc_taxi(); AddSC_achievement_scripts(); AddSC_chat_log(); + AddSC_event_scripts(); #endif } -- cgit v1.2.3 From ca85c3b4759c111fa8dd277a037aab7a0968dbaf Mon Sep 17 00:00:00 2001 From: Spp Date: Tue, 23 Oct 2012 19:09:50 +0200 Subject: Core/Dungeon Finder: Fix teleport to dungeon and add missing code from 1be638e731 --- src/server/game/Groups/Group.cpp | 6 ++++-- src/server/game/Scripting/ScriptLoader.cpp | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'src/server/game/Scripting/ScriptLoader.cpp') diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index 11d9f502bab..ac1c04215da 100755 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -104,12 +104,14 @@ bool Group::Create(Player* leader) m_leaderGuid = leaderGuid; m_leaderName = leader->GetName(); - m_groupType = (isBGGroup() || isBFGroup()) ? GROUPTYPE_BGRAID : GROUPTYPE_NORMAL; + if (isBGGroup() || isBFGroup()) + m_groupType = GROUPTYPE_BGRAID; if (m_groupType & GROUPTYPE_RAID) _initRaidSubGroupsCounter(); - m_lootMethod = GROUP_LOOT; + if (!isLFGGroup()) + m_lootMethod = GROUP_LOOT; m_lootThreshold = ITEM_QUALITY_UNCOMMON; m_looterGuid = leaderGuid; diff --git a/src/server/game/Scripting/ScriptLoader.cpp b/src/server/game/Scripting/ScriptLoader.cpp index 54a74a021c1..905443a3766 100755 --- a/src/server/game/Scripting/ScriptLoader.cpp +++ b/src/server/game/Scripting/ScriptLoader.cpp @@ -61,6 +61,7 @@ void AddSC_guild_commandscript(); void AddSC_honor_commandscript(); void AddSC_instance_commandscript(); void AddSC_learn_commandscript(); +void AddSC_lfg_commandscript(); void AddSC_list_commandscript(); void AddSC_lookup_commandscript(); void AddSC_message_commandscript(); @@ -681,6 +682,7 @@ void AddCommandScripts() AddSC_instance_commandscript(); AddSC_learn_commandscript(); AddSC_lookup_commandscript(); + AddSC_lfg_commandscript(); AddSC_list_commandscript(); AddSC_message_commandscript(); AddSC_misc_commandscript(); -- cgit v1.2.3