Fixed build at branch.

Signed-off-by: VladimirMangos <vladimir@getmangos.com>

Also fix some lines related to internal quest flags mask.
This commit is contained in:
Hiram 2010-01-01 16:52:45 +03:00 committed by VladimirMangos
parent 33cd1a0aca
commit 253ad70197
3 changed files with 4 additions and 4 deletions

View file

@ -3345,7 +3345,7 @@ void ObjectMgr::LoadQuests()
if (qinfo->QuestFlags & ~QUEST_MANGOS_FLAGS_DB_ALLOWED) if (qinfo->QuestFlags & ~QUEST_MANGOS_FLAGS_DB_ALLOWED)
{ {
sLog.outErrorDb("Quest %u has `SpecialFlags` = %u > max allowed value. Correct `SpecialFlags` to value <= %u", sLog.outErrorDb("Quest %u has `SpecialFlags` = %u > max allowed value. Correct `SpecialFlags` to value <= %u",
qinfo->GetQuestId(),qinfo->QuestFlags,QUEST_MANGOS_FLAGS_DB_ALLOWED >> 16); qinfo->GetQuestId(),qinfo->QuestFlags >> 24,QUEST_MANGOS_FLAGS_DB_ALLOWED >> 24);
qinfo->QuestFlags &= QUEST_MANGOS_FLAGS_DB_ALLOWED; qinfo->QuestFlags &= QUEST_MANGOS_FLAGS_DB_ALLOWED;
} }

View file

@ -1320,7 +1320,7 @@ enum Opcodes
UMSG_UNKNOWN_1283 = 0x503, UMSG_UNKNOWN_1283 = 0x503,
UMSG_UNKNOWN_1284 = 0x504, UMSG_UNKNOWN_1284 = 0x504,
UMSG_UNKNOWN_1285 = 0x505, UMSG_UNKNOWN_1285 = 0x505,
UMSG_UNKNOWN_1285 = 0x506, UMSG_UNKNOWN_1286 = 0x506,
NUM_MSG_TYPES = 0x507 NUM_MSG_TYPES = 0x507
}; };

View file

@ -138,12 +138,12 @@ enum __QuestFlags
QUEST_FLAGS_UNK4 = 0x00004000, // ? Membership Card Renewal QUEST_FLAGS_UNK4 = 0x00004000, // ? Membership Card Renewal
QUEST_FLAGS_WEEKLY = 0x00008000, // Not used currently: Weekly quests QUEST_FLAGS_WEEKLY = 0x00008000, // Not used currently: Weekly quests
// 0x20000 - 1 quest in 3.3, 0x40000 - 1 quest in 3.3 // 0x20000 - 1 quest in 3.3, 0x40000 - 1 quest in 3.3
QUEST_FLAGS_LOW_LEVEL = 0x00080000 // quests in starting areas QUEST_FLAGS_LOW_LEVEL = 0x00080000, // quests in starting areas
// Mangos flags for set SpecialFlags in DB if required but used only at server // Mangos flags for set SpecialFlags in DB if required but used only at server
QUEST_MANGOS_FLAGS_REPEATABLE = 0x01000000, // Set by 1 in SpecialFlags from DB QUEST_MANGOS_FLAGS_REPEATABLE = 0x01000000, // Set by 1 in SpecialFlags from DB
QUEST_MANGOS_FLAGS_EXPLORATION_OR_EVENT = 0x02000000, // Set by 2 in SpecialFlags from DB (if required area explore, spell SPELL_EFFECT_QUEST_COMPLETE casting, table `*_script` command SCRIPT_COMMAND_QUEST_EXPLORED use, set from script DLL) QUEST_MANGOS_FLAGS_EXPLORATION_OR_EVENT = 0x02000000, // Set by 2 in SpecialFlags from DB (if required area explore, spell SPELL_EFFECT_QUEST_COMPLETE casting, table `*_script` command SCRIPT_COMMAND_QUEST_EXPLORED use, set from script DLL)
QUEST_MANGOS_FLAGS_DB_ALLOWED = 0xFFFF | QUEST_MANGOS_FLAGS_REPEATABLE | QUEST_MANGOS_FLAGS_EXPLORATION_OR_EVENT, QUEST_MANGOS_FLAGS_DB_ALLOWED = 0xFFFFFF | QUEST_MANGOS_FLAGS_REPEATABLE | QUEST_MANGOS_FLAGS_EXPLORATION_OR_EVENT,
// Mangos flags for internal use only // Mangos flags for internal use only
QUEST_MANGOS_FLAGS_DELIVER = 0x04000000, // Internal flag computed only QUEST_MANGOS_FLAGS_DELIVER = 0x04000000, // Internal flag computed only