Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-29 05:11:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Loading: Re-enable validation for quest_template currency loading

Browse Source
This commit is contained in:
Nay
2012-08-13 23:30:42 +01:00
parent 64bf663ecd
commit aa25336602
1 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/server/game/Globals/ObjectMgr.cpp
View File

@@ -4039,23 +4039,21 @@ void ObjectMgr::LoadQuests()
for (uint8 j = 0; j < QUEST_REWARD_CURRENCY_COUNT; ++j)
{
uint32 currency = qinfo->RewardCurrencyId[j];
if (currency)
if (qinfo->RewardCurrencyId[j])
{
if (qinfo->RewardCurrencyCount[j] == 0)
{
sLog->outError(LOG_FILTER_SQL, "Quest %u has `RewardCurrencyId%d` = %u but `RewardCurrencyCount%d` = 0, quest can't be done.",
qinfo->GetQuestId(), j+1, currency, j+1);
qinfo->GetQuestId(), j+1, qinfo->RewardCurrencyId[j], j+1);
// no changes, quest can't be done for this requirement
}
/* TODO: Re-enable once currency dbc getters are implemented
if (!sObjectMgr->GetCurrency(currency))
if (!sCurrencyTypesStore.LookupEntry(qinfo->RewardCurrencyId[j]))
{
sLog->outError(LOG_FILTER_SQL, "Quest %u has `RewardCurrencyId%d` = %u but currency with entry %u does not exist, quest can't be done.",
qinfo->GetQuestId(), j+1, currency, currency);
qinfo->GetQuestId(), j+1, qinfo->RewardCurrencyId[j], qinfo->RewardCurrencyId[j]);
qinfo->RewardCurrencyCount[j] = 0; // prevent incorrect work of quest
}*/
}
}
else if (qinfo->RewardCurrencyCount[j] > 0)
{
@@ -4067,23 +4065,21 @@ void ObjectMgr::LoadQuests()
for (uint8 j = 0; j < QUEST_REQUIRED_CURRENCY_COUNT; ++j)
{
uint32 currency = qinfo->RequiredCurrencyId[j];
if (currency)
if (qinfo->RequiredCurrencyId[j])
{
if (qinfo->RequiredCurrencyCount[j] == 0)
{
sLog->outError(LOG_FILTER_SQL, "Quest %u has `RequiredCurrencyId%d` = %u but `RequiredCurrencyCount%d` = 0, quest can't be done.",
qinfo->GetQuestId(), j+1, currency, j+1);
qinfo->GetQuestId(), j+1, qinfo->RequiredCurrencyId[j], j+1);
// no changes, quest can't be done for this requirement
}
/* TODO: Re-enable once currency dbc getters are implemented
if (!sObjectMgr->GetCurrency(currency))
if (!sCurrencyTypesStore.LookupEntry(qinfo->RequiredCurrencyId[j]))
{
sLog->outError(LOG_FILTER_SQL, "Quest %u has `RequiredCurrencyId%d` = %u but currency with entry %u does not exist, quest can't be done.",
qinfo->GetQuestId(), j+1, currency, currency);
qinfo->GetQuestId(), j+1, qinfo->RequiredCurrencyId[j], qinfo->RequiredCurrencyId[j]);
qinfo->RequiredCurrencyCount[j] = 0; // prevent incorrect work of quest
}*/
}
}
else if (qinfo->RequiredCurrencyCount[j] > 0)
{