From 17544d4577a8abf9bec4314a4f11d29433b72441 Mon Sep 17 00:00:00 2001 From: KimLS Date: Sun, 20 Aug 2017 15:37:46 -0700 Subject: [PATCH] Some tweaks to GCC errors, still think there's a couple --- zone/pathfinder_null.cpp | 1 - zone/pathfinder_waypoint.cpp | 4 ++-- zone/pathing.cpp | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/zone/pathfinder_null.cpp b/zone/pathfinder_null.cpp index 98a9ce5d7..cccf61ebc 100644 --- a/zone/pathfinder_null.cpp +++ b/zone/pathfinder_null.cpp @@ -1,5 +1,4 @@ #include "pathfinder_null.h" -#pragma once IPathfinder::IPath PathfinderNull::FindRoute(const glm::vec3 &start, const glm::vec3 &end) { diff --git a/zone/pathfinder_waypoint.cpp b/zone/pathfinder_waypoint.cpp index b3859472a..7514a8252 100644 --- a/zone/pathfinder_waypoint.cpp +++ b/zone/pathfinder_waypoint.cpp @@ -158,7 +158,7 @@ IPathfinder::IPath PathfinderWaypoint::FindRoute(const glm::vec3 &start, const g else { auto &node = m_impl->Nodes[v]; - auto iter = node.edges.find(p[v + 1]); + auto iter = node.edges.find((int)p[v + 1]); if (iter != node.edges.end()) { auto &edge = iter->second; if (edge.teleport) { @@ -333,7 +333,7 @@ void PathfinderWaypoint::LoadV3(FILE *f, const PathFileHeader &header) uint32 edge_count = 0; fread(&edge_count, sizeof(uint32), 1, f); - for (int i = 0; i < header.PathNodeCount; ++i) + for (uint32 i = 0; i < header.PathNodeCount; ++i) { uint32 id = 0; float x = 0.0f; diff --git a/zone/pathing.cpp b/zone/pathing.cpp index 62c80a5d5..3756f449b 100644 --- a/zone/pathing.cpp +++ b/zone/pathing.cpp @@ -198,10 +198,10 @@ void CullPoints(std::vector &points) { void Client::SendPathPacket(const std::vector &points) { EQ::BackgroundTask task([](EQEmu::Any &data) { - auto &points = EQEmu::any_cast>(data); + auto &points = EQEmu::any_cast&>(data); CullPoints(points); }, [this](EQEmu::Any &data) { - auto &points = EQEmu::any_cast>(data); + auto &points = EQEmu::any_cast&>(data); if (points.size() < 2) { if (Admin() > 10) {