diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-09-26 02:41:35 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-09-26 02:41:35 +0300 |
commit | 52fdc7544c117b058fb1321a24795d64fe3d3887 (patch) | |
tree | 903955c78f5911e09c8cb9a7cf00c720de842f4d /src/net | |
parent | 3a97fc3fd6f316882af762017443c410632d65eb (diff) | |
download | manaplus-52fdc7544c117b058fb1321a24795d64fe3d3887.tar.gz manaplus-52fdc7544c117b058fb1321a24795d64fe3d3887.tar.bz2 manaplus-52fdc7544c117b058fb1321a24795d64fe3d3887.tar.xz manaplus-52fdc7544c117b058fb1321a24795d64fe3d3887.zip |
Read all fields from new quest packets and send to quests and skills window.
But for now not using this fields.
Diffstat (limited to 'src/net')
-rw-r--r-- | src/net/eathena/questrecv.cpp | 36 | ||||
-rw-r--r-- | src/net/tmwa/questrecv.cpp | 8 |
2 files changed, 22 insertions, 22 deletions
diff --git a/src/net/eathena/questrecv.cpp b/src/net/eathena/questrecv.cpp index ca5f706e8..88f804330 100644 --- a/src/net/eathena/questrecv.cpp +++ b/src/net/eathena/questrecv.cpp @@ -51,12 +51,12 @@ void QuestRecv::processAddQuest(Net::MessageIn &msg) if (questsWindow) { - questsWindow->updateQuest(var, val); + questsWindow->updateQuest(var, val, 0, 0, 0); questsWindow->rebuild(true); } if (skillDialog) { - skillDialog->updateQuest(var, val); + skillDialog->updateQuest(var, val, 0, 0, 0); skillDialog->playUpdateEffect(var + SKILL_VAR_MIN_ID); } } @@ -65,20 +65,20 @@ void QuestRecv::processAddQuest2(Net::MessageIn &msg) { const int var = msg.readInt32("quest id"); msg.readUInt8("state"); - const int val = msg.readInt32("count1"); + const int val1 = msg.readInt32("count1"); // +++ need use all this fields - msg.readInt32("count2"); - msg.readInt32("count3"); - msg.readInt32("time"); + const int val2 = msg.readInt32("count2"); + const int val3 = msg.readInt32("count3"); + const int time = msg.readInt32("time"); if (questsWindow) { - questsWindow->updateQuest(var, val); + questsWindow->updateQuest(var, val1, val2, val3, time); questsWindow->rebuild(true); } if (skillDialog) { - skillDialog->updateQuest(var, val); + skillDialog->updateQuest(var, val1, val2, val3, time); skillDialog->playUpdateEffect(var + SKILL_VAR_MIN_ID); } } @@ -98,9 +98,9 @@ void QuestRecv::processAddQuests(Net::MessageIn &msg) msg.readInt16("objectives count"); } if (questsWindow) - questsWindow->updateQuest(var, val); + questsWindow->updateQuest(var, val, 0, 0, 0); if (skillDialog) - skillDialog->updateQuest(var, val); + skillDialog->updateQuest(var, val, 0, 0, 0); } if (questsWindow) @@ -115,15 +115,15 @@ void QuestRecv::processAddQuests2(Net::MessageIn &msg) { const int var = msg.readInt32("quest id"); msg.readUInt8("state"); - const int val = msg.readInt32("count1"); + const int val1 = msg.readInt32("count1"); // +++ need use all this fields - msg.readInt32("count2"); - msg.readInt32("count3"); - msg.readInt32("time"); + const int val2 = msg.readInt32("count2"); + const int val3 = msg.readInt32("count3"); + const int time = msg.readInt32("time"); if (questsWindow) - questsWindow->updateQuest(var, val); + questsWindow->updateQuest(var, val1, val2, val3, time); if (skillDialog) - skillDialog->updateQuest(var, val); + skillDialog->updateQuest(var, val1, val2, val3, time); } if (questsWindow) @@ -174,12 +174,12 @@ void QuestRecv::processRemoveQuest(Net::MessageIn &msg) // but changing status to -1 if (questsWindow) { - questsWindow->updateQuest(var, val); + questsWindow->updateQuest(var, val, 0, 0, 0); questsWindow->rebuild(true); } if (skillDialog) { - skillDialog->updateQuest(var, val); + skillDialog->updateQuest(var, val, 0, 0, 0); skillDialog->playUpdateEffect(var + SKILL_VAR_MIN_ID); } } diff --git a/src/net/tmwa/questrecv.cpp b/src/net/tmwa/questrecv.cpp index b4e0f36b5..43d1b13c0 100644 --- a/src/net/tmwa/questrecv.cpp +++ b/src/net/tmwa/questrecv.cpp @@ -38,12 +38,12 @@ void QuestRecv::processSetQuestVar(Net::MessageIn &msg) const int val = msg.readInt32("value"); if (questsWindow) { - questsWindow->updateQuest(var, val); + questsWindow->updateQuest(var, val, 0, 0, 0); questsWindow->rebuild(true); } if (skillDialog) { - skillDialog->updateQuest(var, val); + skillDialog->updateQuest(var, val, 0, 0, 0); skillDialog->playUpdateEffect(var + SKILL_VAR_MIN_ID); } } @@ -56,9 +56,9 @@ void QuestRecv::processPlayerQuests(Net::MessageIn &msg) const int var = msg.readInt16("variable"); const int val = msg.readInt32("value"); if (questsWindow) - questsWindow->updateQuest(var, val); + questsWindow->updateQuest(var, val, 0, 0, 0); if (skillDialog) - skillDialog->updateQuest(var, val); + skillDialog->updateQuest(var, val, 0, 0, 0); } if (questsWindow) questsWindow->rebuild(false); |