aboutsummaryrefslogtreecommitdiff
path: root/src/scripts
diff options
context:
space:
mode:
authorXanadu <none@none>2010-02-05 13:01:32 +0100
committerXanadu <none@none>2010-02-05 13:01:32 +0100
commitf8d1920fa591d2aba16bf70023c64f4379c0114d (patch)
tree2c62d72bd6d0941e1969e8820b890ee5a43a827e /src/scripts
parenta5d1bc77abc275402240bec1380fa87f04461ba8 (diff)
Yet more cleanup, mostly in the script system. This should conclude the script integration into core.
--HG-- branch : trunk
Diffstat (limited to 'src/scripts')
-rw-r--r--src/scripts/world/npcs_special.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/scripts/world/npcs_special.cpp b/src/scripts/world/npcs_special.cpp
index 417490e2d6d..839a4154ed3 100644
--- a/src/scripts/world/npcs_special.cpp
+++ b/src/scripts/world/npcs_special.cpp
@@ -43,6 +43,7 @@ EndContentData */
#include "ScriptedEscortAI.h"
#include "ObjectMgr.h"
#include "ScriptMgr.h"
+#include "World.h"
/*########
# npc_air_force_bots
@@ -1220,7 +1221,7 @@ bool GossipHello_npc_rogue_trainer(Player* pPlayer, Creature* pCreature)
if (pCreature->isCanTrainingAndResetTalentsOf(pPlayer))
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_HELLO_ROGUE1, GOSSIP_SENDER_MAIN, GOSSIP_OPTION_UNLEARNTALENTS);
- if (!(pPlayer->GetSpecsCount() == 1 && pCreature->isCanTrainingAndResetTalentsOf(pPlayer) && !(pPlayer->getLevel() < sScriptMgr.GetConfigValueInt32("MinDualSpecLevel"))))
+ if (!(pPlayer->GetSpecsCount() == 1 && pCreature->isCanTrainingAndResetTalentsOf(pPlayer) && !(pPlayer->getLevel() < sWorld.getConfig(CONFIG_MIN_DUALSPEC_LEVEL))))
pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_HELLO_ROGUE3, GOSSIP_SENDER_MAIN, GOSSIP_OPTION_LEARNDUALSPEC);
if (pPlayer->getClass() == CLASS_ROGUE && pPlayer->getLevel() >= 24 && !pPlayer->HasItemCount(17126,1) && !pPlayer->GetQuestRewardStatus(6681))
@@ -1249,7 +1250,7 @@ bool GossipSelect_npc_rogue_trainer(Player* pPlayer, Creature* pCreature, uint32
pPlayer->SendTalentWipeConfirm(pCreature->GetGUID());
break;
case GOSSIP_OPTION_LEARNDUALSPEC:
- if(pPlayer->GetSpecsCount() == 1 && !(pPlayer->getLevel() < sScriptMgr.GetConfigValueInt32("MinDualSpecLevel")))
+ if(pPlayer->GetSpecsCount() == 1 && !(pPlayer->getLevel() < sWorld.getConfig(CONFIG_MIN_DUALSPEC_LEVEL)))
{
if (pPlayer->GetMoney() < 10000000)
{