master #3

Open
cacahuetes wants to merge 640 commits from liza/Questionable:master into cacahuetes-ShB-Healer
Showing only changes of commit e8b9124119 - Show all commits

View File

@ -135,17 +135,14 @@ internal sealed unsafe class QuestFunctions
currentQuest = new QuestId(questManager->NormalQuests[trackedQuest.Index].QuestId); currentQuest = new QuestId(questManager->NormalQuests[trackedQuest.Index].QuestId);
if (_questRegistry.IsKnownQuest(currentQuest)) if (_questRegistry.IsKnownQuest(currentQuest))
return (currentQuest, QuestManager.GetQuestSequence(currentQuest.Value)); return (currentQuest, QuestManager.GetQuestSequence(currentQuest.Value));
break; continue;
case 2: // leve case 2: // leve
currentQuest = new LeveId(questManager->LeveQuests[trackedQuest.Index].LeveId); currentQuest = new LeveId(questManager->LeveQuests[trackedQuest.Index].LeveId);
if (_questRegistry.IsKnownQuest(currentQuest)) if (_questRegistry.IsKnownQuest(currentQuest))
return (currentQuest, questManager->GetLeveQuestById(currentQuest.Value)->Sequence); return (currentQuest, questManager->GetLeveQuestById(currentQuest.Value)->Sequence);
break; continue;
} }
if (_questRegistry.IsKnownQuest(currentQuest))
return (currentQuest, QuestManager.GetQuestSequence(currentQuest.Value));
} }
ElementId? priorityQuest = GetNextPriorityQuestThatCanBeAccepted(); ElementId? priorityQuest = GetNextPriorityQuestThatCanBeAccepted();