pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-27 08:17:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into Warning_Cleanup

Browse Source
This commit is contained in:
Arthur Dene Ice
2014-05-28 09:19:11 -07:00
parent cb60c9404c dd73b82ec2
commit 641f0ae291
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/QuestParserCollection.cpp
+2 -2
View File
@@ -165,10 +165,10 @@ bool QuestParserCollection::PlayerHasQuestSubLocal(QuestEventID evt) {
bool QuestParserCollection::PlayerHasQuestSubGlobal(QuestEventID evt) { bool QuestParserCollection::PlayerHasQuestSubGlobal(QuestEventID evt) {
if(_global_player_quest_status == QuestUnloaded) { if(_global_player_quest_status == QuestUnloaded) {
std::string filename; std::string filename;
QuestInterface *qi = GetQIByPlayerQuest(filename); QuestInterface *qi = GetQIByGlobalPlayerQuest(filename);
if(qi) { if(qi) {
_global_player_quest_status = qi->GetIdentifier(); _global_player_quest_status = qi->GetIdentifier();
qi->LoadPlayerScript(filename); qi->LoadGlobalPlayerScript(filename);
return qi->GlobalPlayerHasQuestSub(evt); return qi->GlobalPlayerHasQuestSub(evt);
} }
} else if(_global_player_quest_status != QuestFailedToLoad) { } else if(_global_player_quest_status != QuestFailedToLoad) {