diff --git a/Source/quests.cpp b/Source/quests.cpp index 8acbfd03c..07a92620e 100644 --- a/Source/quests.cpp +++ b/Source/quests.cpp @@ -445,15 +445,15 @@ bool ForceQuests() return false; } -bool QuestStatus(int i) +bool QuestStatus(quest_id questId) { if (setlevel) return false; - if (currlevel != Quests[i]._qlevel) + if (currlevel != Quests[questId]._qlevel) return false; - if (Quests[i]._qactive == QUEST_NOTAVAIL) + if (Quests[questId]._qactive == QUEST_NOTAVAIL) return false; - if (gbIsMultiplayer && QuestData[i].isSinglePlayerOnly) + if (gbIsMultiplayer && QuestData[questId].isSinglePlayerOnly) return false; return true; } @@ -518,7 +518,7 @@ void CheckQuestKill(const MonsterStruct &monster, bool sendmsg) void DRLG_CheckQuests(int x, int y) { for (int i = 0; i < MAXQUESTS; i++) { - if (QuestStatus(i)) { + if (QuestStatus(static_cast(i))) { switch (Quests[i]._qtype) { case Q_BUTCHER: DrawButcher(); diff --git a/Source/quests.h b/Source/quests.h index dfde7b4c2..47ff6a459 100644 --- a/Source/quests.h +++ b/Source/quests.h @@ -12,6 +12,7 @@ #include "engine/point.hpp" #include "gendung.h" #include "monster.h" +#include "objdat.h" #include "textdat.h" #include "utils/stdcompat/optional.hpp" @@ -87,7 +88,7 @@ void InitQuests(); void InitialiseQuestPools(uint32_t seed, QuestStruct quests[]); void CheckQuests(); bool ForceQuests(); -bool QuestStatus(int i); +bool QuestStatus(quest_id questId); void CheckQuestKill(const MonsterStruct &monster, bool sendmsg); void DRLG_CheckQuests(int x, int y); void SetReturnLvlPos();