josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace World::getConfig with World::getFloatConfig, World::getIntConfig, and World::getBoolConfig.

Browse Source 
Also fix a warning from a previous commit.

--HG--
branch : trunk
This commit is contained in:
silinoron
2010-08-23 19:56:47 -07:00
parent b30800e9bc
commit 8649bee17f
65 changed files with 885 additions and 889 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/World/chat_log.cpp
+17 -17
View File
@@ -30,31 +30,31 @@ public:
switch (type)
{
case CHAT_MSG_ADDON:
if (sWorld.getConfig(CONFIG_CHATLOG_ADDON))
if (sWorld.getBoolConfig(CONFIG_CHATLOG_ADDON))
sLog.outChat("[ADDON] Player %s sends: %s",
player->GetName(), msg.c_str());
break;
case CHAT_MSG_SAY:
if (sWorld.getConfig(CONFIG_CHATLOG_PUBLIC))
if (sWorld.getBoolConfig(CONFIG_CHATLOG_PUBLIC))
sLog.outChat("[SAY] Player %s says (language %u): %s",
player->GetName(), lang, msg.c_str());
break;
case CHAT_MSG_EMOTE:
if (sWorld.getConfig(CONFIG_CHATLOG_PUBLIC))
if (sWorld.getBoolConfig(CONFIG_CHATLOG_PUBLIC))
sLog.outChat("[TEXTEMOTE] Player %s emotes: %s",
player->GetName(), msg.c_str());
break;
case CHAT_MSG_YELL:
if (sWorld.getConfig(CONFIG_CHATLOG_PUBLIC))
if (sWorld.getBoolConfig(CONFIG_CHATLOG_PUBLIC))
sLog.outChat("[YELL] Player %s yells (language %u): %s",
player->GetName(), lang, msg.c_str());
break;
case CHAT_MSG_WHISPER:
if (sWorld.getConfig(CONFIG_CHATLOG_WHISPER))
if (sWorld.getBoolConfig(CONFIG_CHATLOG_WHISPER))
{
Player* pReceiver = reinterpret_cast <Player*> (param);
sLog.outChat("[WHISPER] Player %s tells %s: %s",
@@ -63,7 +63,7 @@ public:
break;
case CHAT_MSG_PARTY:
if (sWorld.getConfig(CONFIG_CHATLOG_PARTY))
if (sWorld.getBoolConfig(CONFIG_CHATLOG_PARTY))
{
Group* pGroup = reinterpret_cast <Group*> (param);
sLog.outChat("[PARTY] Player %s tells group with leader %s: %s",
@@ -72,7 +72,7 @@ public:
break;
case CHAT_MSG_PARTY_LEADER:
if (sWorld.getConfig(CONFIG_CHATLOG_PARTY))
if (sWorld.getBoolConfig(CONFIG_CHATLOG_PARTY))
sLog.outChat("[PARTY] Leader %s tells group: %s",
player->GetName(), msg.c_str());
break;
@@ -80,12 +80,12 @@ public:
case CHAT_MSG_GUILD:
{
Guild* pGuild = reinterpret_cast <Guild*> (param);
if (lang != LANG_ADDON && sWorld.getConfig(CONFIG_CHATLOG_GUILD))
if (lang != LANG_ADDON && sWorld.getBoolConfig(CONFIG_CHATLOG_GUILD))
{
sLog.outChat("[GUILD] Player %s tells guild %s: %s",
player->GetName(), pGuild ? pGuild->GetName().c_str() : "<unknown>", msg.c_str());
}
else if (lang == LANG_ADDON && sWorld.getConfig(CONFIG_CHATLOG_ADDON))
else if (lang == LANG_ADDON && sWorld.getBoolConfig(CONFIG_CHATLOG_ADDON))
{
sLog.outChat("[ADDON] Player %s sends to guild %s: %s",
player->GetName(), pGuild ? pGuild->GetName().c_str() : "<unknown>", msg.c_str());
@@ -94,7 +94,7 @@ public:
}
case CHAT_MSG_OFFICER:
if (sWorld.getConfig(CONFIG_CHATLOG_GUILD))
if (sWorld.getBoolConfig(CONFIG_CHATLOG_GUILD))
{
Guild* pGuild = reinterpret_cast <Guild*> (param);
sLog.outChat("[OFFICER] Player %s tells guild %s officers: %s",
@@ -103,7 +103,7 @@ public:
break;
case CHAT_MSG_RAID:
if (sWorld.getConfig(CONFIG_CHATLOG_RAID))
if (sWorld.getBoolConfig(CONFIG_CHATLOG_RAID))
{
Group* pGroup = reinterpret_cast <Group*> (param);
sLog.outChat("[RAID] Player %s tells raid with leader %s: %s",
@@ -112,19 +112,19 @@ public:
break;
case CHAT_MSG_RAID_LEADER:
if (sWorld.getConfig(CONFIG_CHATLOG_RAID))
if (sWorld.getBoolConfig(CONFIG_CHATLOG_RAID))
sLog.outChat("[RAID] Leader player %s tells raid: %s",
player->GetName(), msg.c_str());
break;
case CHAT_MSG_RAID_WARNING:
if (sWorld.getConfig(CONFIG_CHATLOG_RAID))
if (sWorld.getBoolConfig(CONFIG_CHATLOG_RAID))
sLog.outChat("[RAID] Leader player %s warns raid with: %s",
player->GetName(), msg.c_str());
break;
case CHAT_MSG_BATTLEGROUND:
if (sWorld.getConfig(CONFIG_CHATLOG_BGROUND))
if (sWorld.getBoolConfig(CONFIG_CHATLOG_BGROUND))
{
Group* pGroup = reinterpret_cast <Group*> (param);
sLog.outChat("[BATTLEGROUND] Player %s tells battleground with leader %s: %s",
@@ -133,7 +133,7 @@ public:
break;
case CHAT_MSG_BATTLEGROUND_LEADER:
if (sWorld.getConfig(CONFIG_CHATLOG_BGROUND))
if (sWorld.getBoolConfig(CONFIG_CHATLOG_BGROUND))
sLog.outChat("[RAID] Leader player %s tells battleground: %s",
player->GetName(), msg.c_str());
break;
@@ -146,10 +146,10 @@ public:
pChannel->HasFlag(CHANNEL_FLAG_GENERAL) ||
pChannel->HasFlag(CHANNEL_FLAG_CITY) ||
pChannel->HasFlag(CHANNEL_FLAG_LFG));
if (sWorld.getConfig(CONFIG_CHATLOG_SYSCHAN) && isSystem)
if (sWorld.getBoolConfig(CONFIG_CHATLOG_SYSCHAN) && isSystem)
sLog.outChat("[SYSCHAN] Player %s tells channel %s: %s",
player->GetName(), pChannel->GetName().c_str(), msg.c_str());
else if (sWorld.getConfig(CONFIG_CHATLOG_CHANNEL))
else if (sWorld.getBoolConfig(CONFIG_CHATLOG_CHANNEL))
sLog.outChat("[CHANNEL] Player %s tells channel %s: %s",
player->GetName(), pChannel ? pChannel->GetName().c_str() : "<unknown>", msg.c_str());
break;
src/server/scripts/World/npcs_special.cpp
+2 -2
View File
@@ -1283,7 +1283,7 @@ public:
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() < sWorld.getConfig(CONFIG_MIN_DUALSPEC_LEVEL))))
if (!(pPlayer->GetSpecsCount() == 1 && pCreature->isCanTrainingAndResetTalentsOf(pPlayer) && !(pPlayer->getLevel() < sWorld.getIntConfig(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))
@@ -1312,7 +1312,7 @@ public:
pPlayer->SendTalentWipeConfirm(pCreature->GetGUID());
break;
case GOSSIP_OPTION_LEARNDUALSPEC:
if (pPlayer->GetSpecsCount() == 1 && !(pPlayer->getLevel() < sWorld.getConfig(CONFIG_MIN_DUALSPEC_LEVEL)))
if (pPlayer->GetSpecsCount() == 1 && !(pPlayer->getLevel() < sWorld.getIntConfig(CONFIG_MIN_DUALSPEC_LEVEL)))
{
if (!pPlayer->HasEnoughMoney(10000000))
{