pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-12 13:41:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Some tweaks to GCC errors, still think there's a couple

Browse Source
This commit is contained in:
KimLS 2017-08-20 15:37:46 -07:00
parent 563878f20e
commit 17544d4577
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
zone/pathfinder_null.cpp
View File

@ -1,5 +1,4 @@
#include "pathfinder_null.h" #include "pathfinder_null.h"
#pragma once
IPathfinder::IPath PathfinderNull::FindRoute(const glm::vec3 &start, const glm::vec3 &end) IPathfinder::IPath PathfinderNull::FindRoute(const glm::vec3 &start, const glm::vec3 &end)
{ {

4
zone/pathfinder_waypoint.cpp
View File

@ -158,7 +158,7 @@ IPathfinder::IPath PathfinderWaypoint::FindRoute(const glm::vec3 &start, const g
else { else {
auto &node = m_impl->Nodes[v]; 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()) { if (iter != node.edges.end()) {
auto &edge = iter->second; auto &edge = iter->second;
if (edge.teleport) { if (edge.teleport) {
@ -333,7 +333,7 @@ void PathfinderWaypoint::LoadV3(FILE *f, const PathFileHeader &header)
uint32 edge_count = 0; uint32 edge_count = 0;
fread(&edge_count, sizeof(uint32), 1, f); 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; uint32 id = 0;
float x = 0.0f; float x = 0.0f;

4
zone/pathing.cpp
View File

@ -198,10 +198,10 @@ void CullPoints(std::vector<FindPerson_Point> &points) {
void Client::SendPathPacket(const std::vector<FindPerson_Point> &points) { void Client::SendPathPacket(const std::vector<FindPerson_Point> &points) {
EQ::BackgroundTask task([](EQEmu::Any &data) { EQ::BackgroundTask task([](EQEmu::Any &data) {
auto &points = EQEmu::any_cast<std::vector<FindPerson_Point>>(data); auto &points = EQEmu::any_cast<std::vector<FindPerson_Point>&>(data);
CullPoints(points); CullPoints(points);
}, [this](EQEmu::Any &data) { }, [this](EQEmu::Any &data) {
auto &points = EQEmu::any_cast<std::vector<FindPerson_Point>>(data); auto &points = EQEmu::any_cast<std::vector<FindPerson_Point>&>(data);
if (points.size() < 2) { if (points.size() < 2) {
if (Admin() > 10) { if (Admin() > 10) {