Browse Source

🚨 Fix bool warning

pull/2240/head
Anders Jenbo 5 years ago
parent
commit
d9a04b8390
  1. 2
      Source/msg.cpp
  2. 5
      Source/quests.cpp
  3. 2
      Source/quests.h

2
Source/msg.cpp

@ -2377,7 +2377,7 @@ static DWORD On_SYNCQUEST(TCmd *pCmd, int pnum)
msg_send_packet(pnum, p, sizeof(*p)); msg_send_packet(pnum, p, sizeof(*p));
else { else {
if (pnum != myplr) if (pnum != myplr)
SetMultiQuest(p->q, p->qstate, p->qlog, p->qvar1); SetMultiQuest(p->q, p->qstate, p->qlog != 0, p->qvar1);
sgbDeltaChanged = true; sgbDeltaChanged = true;
} }

5
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) if (gbIsSpawn)
return; return;
@ -821,7 +821,8 @@ void SetMultiQuest(int q, quest_state s, int l, int v1)
if (quests[q]._qactive != QUEST_DONE) { if (quests[q]._qactive != QUEST_DONE) {
if (s > quests[q]._qactive) if (s > quests[q]._qactive)
quests[q]._qactive = s; quests[q]._qactive = s;
quests[q]._qlog |= l; if (log)
quests[q]._qlog = true;
if (v1 > quests[q]._qvar1) if (v1 > quests[q]._qvar1)
quests[q]._qvar1 = v1; quests[q]._qvar1 = v1;
} }

2
Source/quests.h

@ -94,7 +94,7 @@ void QuestlogUp();
void QuestlogDown(); void QuestlogDown();
void QuestlogEnter(); void QuestlogEnter();
void QuestlogESC(); 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 */ /* rdata */
extern QuestData questlist[]; extern QuestData questlist[];

Loading…
Cancel
Save