From 37b1d11948264daaf09c8128aed16c0583d941cb Mon Sep 17 00:00:00 2001 From: gsemaj Date: Tue, 4 May 2021 13:42:16 -0400 Subject: [PATCH] Fix JSON type ambiguity in loadPaths --- src/TableData.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/TableData.cpp b/src/TableData.cpp index 2f39352..a978e9d 100644 --- a/src/TableData.cpp +++ b/src/TableData.cpp @@ -372,9 +372,9 @@ static void loadPaths(json& pathData, int32_t* nextId) { std::vector targetIDs; std::vector targetTypes; std::vector pathPoints; - int speed = pathVal.find("iBaseSpeed") == pathVal.end() ? NPC_DEFAULT_SPEED : pathVal["iBaseSpeed"]; - int taskID = pathVal.find("iTaskID") == pathVal.end() ? -1 : pathVal["iTaskID"]; - bool relative = pathVal.find("bRelative") == pathVal.end() ? false : pathVal["bRelative"]; + int speed = pathVal.find("iBaseSpeed") == pathVal.end() ? NPC_DEFAULT_SPEED : (int)pathVal["iBaseSpeed"]; + int taskID = pathVal.find("iTaskID") == pathVal.end() ? -1 : (int)pathVal["iTaskID"]; + bool relative = pathVal.find("bRelative") == pathVal.end() ? false : (bool)pathVal["bRelative"]; // target IDs for (json::iterator _tID = pathVal["aNPCIDs"].begin(); _tID != pathVal["aNPCIDs"].end(); _tID++) @@ -385,7 +385,7 @@ static void loadPaths(json& pathData, int32_t* nextId) { // points for (json::iterator _point = pathVal["aPoints"].begin(); _point != pathVal["aPoints"].end(); _point++) { json point = _point.value(); - for (int stopTicks = 0; stopTicks < point["iStopTicks"] + 1; stopTicks++) + for (int stopTicks = 0; stopTicks < (int)point["iStopTicks"] + 1; stopTicks++) pathPoints.push_back({point["iX"], point["iY"], point["iZ"]}); }