From d9a04b8390efe5432ce2cb8a044a4993ee1eff66 Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Sat, 26 Jun 2021 23:26:23 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A8=20Fix=20bool=20warning?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Source/msg.cpp | 2 +- Source/quests.cpp | 5 +++-- Source/quests.h | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Source/msg.cpp b/Source/msg.cpp index 4e756f619..bd0d97fb3 100644 --- a/Source/msg.cpp +++ b/Source/msg.cpp @@ -2377,7 +2377,7 @@ static DWORD On_SYNCQUEST(TCmd *pCmd, int pnum) msg_send_packet(pnum, p, sizeof(*p)); else { if (pnum != myplr) - SetMultiQuest(p->q, p->qstate, p->qlog, p->qvar1); + SetMultiQuest(p->q, p->qstate, p->qlog != 0, p->qvar1); sgbDeltaChanged = true; } diff --git a/Source/quests.cpp b/Source/quests.cpp index 935c536bb..0cafb36b3 100644 --- a/Source/quests.cpp +++ b/Source/quests.cpp @@ -813,7 +813,7 @@ void QuestlogESC() } } -void SetMultiQuest(int q, quest_state s, int l, int v1) +void SetMultiQuest(int q, quest_state s, bool log, int v1) { if (gbIsSpawn) return; @@ -821,7 +821,8 @@ void SetMultiQuest(int q, quest_state s, int l, int v1) if (quests[q]._qactive != QUEST_DONE) { if (s > quests[q]._qactive) quests[q]._qactive = s; - quests[q]._qlog |= l; + if (log) + quests[q]._qlog = true; if (v1 > quests[q]._qvar1) quests[q]._qvar1 = v1; } diff --git a/Source/quests.h b/Source/quests.h index 10e714267..cf097905f 100644 --- a/Source/quests.h +++ b/Source/quests.h @@ -94,7 +94,7 @@ void QuestlogUp(); void QuestlogDown(); void QuestlogEnter(); void QuestlogESC(); -void SetMultiQuest(int q, quest_state s, int l, int v1); +void SetMultiQuest(int q, quest_state s, bool log, int v1); /* rdata */ extern QuestData questlist[];