pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-14 03:11:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

One fix to QuestParserCollection for global npc quests, HasSub is not working at all right with it. Need to check it out later tonight

Browse Source
This commit is contained in:
KimLS 2013-02-17 15:22:35 -08:00
parent 23b2b599a7
commit c6d8895b70
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
zone/QuestParserCollection.cpp
View File

@ -15,6 +15,7 @@ extern Zone* zone;
QuestParserCollection::QuestParserCollection() { QuestParserCollection::QuestParserCollection() {
_player_quest_status = QuestUnloaded; _player_quest_status = QuestUnloaded;
_global_player_quest_status = QuestUnloaded; _global_player_quest_status = QuestUnloaded;
_global_npc_quest_status = QuestUnloaded;
} }
QuestParserCollection::~QuestParserCollection() { QuestParserCollection::~QuestParserCollection() {
@ -57,6 +58,7 @@ bool QuestParserCollection::HasQuestSub(uint32 npcid, const char *subname) {
return qi->HasGlobalQuestSub(subname); return qi->HasGlobalQuestSub(subname);
} }
} }
if(iter != _npc_quest_status.end()) { if(iter != _npc_quest_status.end()) {
//loaded or failed to load //loaded or failed to load
if(iter->second != QuestFailedToLoad) { if(iter->second != QuestFailedToLoad) {
@ -169,16 +171,15 @@ void QuestParserCollection::EventNPC(QuestEventID evt, NPC* npc, Mob *init, std:
// K, lets also parse templates/global_npc.pl // K, lets also parse templates/global_npc.pl
if(_global_npc_quest_status != QuestUnloaded) { if(_global_npc_quest_status != QuestUnloaded) {
QuestInterface *qi = GetQIByGlobalNPCQuest(); std::map<uint32, QuestInterface*>::iterator qiter = _interfaces.find(_global_npc_quest_status);
qiter->second->EventGlobalNPC(evt, npc, init, data, extra_data);
} else {
QuestInterface *qi = GetQIByGlobalNPCQuest();
if(qi) { if(qi) {
_global_npc_quest_status = qi->GetIdentifier(); _global_npc_quest_status = qi->GetIdentifier();
qi->EventGlobalNPC(evt, npc, init, data, extra_data); qi->EventGlobalNPC(evt, npc, init, data, extra_data);
} } else {
} else { _global_npc_quest_status = QuestFailedToLoad;
if(_global_npc_quest_status != QuestFailedToLoad) {
std::map<uint32, QuestInterface*>::iterator iter = _interfaces.find(_global_npc_quest_status);
if(iter != _interfaces.end())
iter->second->EventGlobalNPC(evt, npc, init, data, extra_data);
} }
} }
} }