OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2024-11-22 13:30:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent duplicate running tasks from loading into the Player struct

Browse Source
This commit is contained in:
Gent S 2020-12-22 13:31:11 -05:00
parent f28c643b48
commit 772f80188e
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Database.cpp
View File

@ -1,5 +1,4 @@
#include "Database.hpp" #include "Database.hpp"
#include "Database.hpp"
#include "CNProtocol.hpp" #include "CNProtocol.hpp"
#include "CNStructs.hpp" #include "CNStructs.hpp"
#include "settings.hpp" #include "settings.hpp"
@ -995,13 +994,18 @@ void Database::getPlayer(Player* plr, int id) {
sqlite3_prepare_v2(db, sql, -1, &stmt, NULL); sqlite3_prepare_v2(db, sql, -1, &stmt, NULL);
sqlite3_bind_int(stmt, 1, id); sqlite3_bind_int(stmt, 1, id);
int i = 0; std::set<int> tasksSet; // used to prevent duplicate tasks from loading in
while (sqlite3_step(stmt) == SQLITE_ROW && i < ACTIVE_MISSION_COUNT) { for (int i = 0; sqlite3_step(stmt) == SQLITE_ROW && i < ACTIVE_MISSION_COUNT; i++) {
plr->tasks[i] = sqlite3_column_int(stmt, 0);
int taskID = sqlite3_column_int(stmt, 0);
if (tasksSet.find(taskID) != tasksSet.end())
continue;
plr->tasks[i] = taskID;
tasksSet.insert(taskID);
plr->RemainingNPCCount[i][0] = sqlite3_column_int(stmt, 1); plr->RemainingNPCCount[i][0] = sqlite3_column_int(stmt, 1);
plr->RemainingNPCCount[i][1] = sqlite3_column_int(stmt, 2); plr->RemainingNPCCount[i][1] = sqlite3_column_int(stmt, 2);
plr->RemainingNPCCount[i][2] = sqlite3_column_int(stmt, 3); plr->RemainingNPCCount[i][2] = sqlite3_column_int(stmt, 3);
i++;
} }
sqlite3_finalize(stmt); sqlite3_finalize(stmt);
@ -1017,7 +1021,7 @@ void Database::getPlayer(Player* plr, int id) {
sqlite3_bind_int(stmt, 1, id); sqlite3_bind_int(stmt, 1, id);
sqlite3_bind_int(stmt, 2, id); sqlite3_bind_int(stmt, 2, id);
i = 0; int i = 0;
while (sqlite3_step(stmt) == SQLITE_ROW && i < 50) { while (sqlite3_step(stmt) == SQLITE_ROW && i < 50) {
int PlayerAId = sqlite3_column_int(stmt, 0); int PlayerAId = sqlite3_column_int(stmt, 0);
int PlayerBId = sqlite3_column_int(stmt, 1); int PlayerBId = sqlite3_column_int(stmt, 1);