mirror of
https://github.com/EQEmu/Server.git
synced 2026-03-22 09:42:26 +00:00
Some compile fixes for older versions of C++ on windows
This commit is contained in:
parent
c6b637e5a5
commit
a2e86ebec5
@ -32,8 +32,8 @@ float Map::FindBestZ(Vertex &start, Vertex *result) const {
|
|||||||
result = &tmp;
|
result = &tmp;
|
||||||
|
|
||||||
start.z += RuleI(Map, FindBestZHeightAdjust);
|
start.z += RuleI(Map, FindBestZHeightAdjust);
|
||||||
Vertex from = { start.x, start.y, start.z };
|
Vertex from(start.x, start.y, start.z);
|
||||||
Vertex to = { start.x, start.y, BEST_Z_INVALID };
|
Vertex to(start.x, start.y, BEST_Z_INVALID);
|
||||||
float hit_distance;
|
float hit_distance;
|
||||||
bool hit = false;
|
bool hit = false;
|
||||||
|
|
||||||
|
|||||||
@ -1185,7 +1185,7 @@ bool PathManager::NoHazardsAccurate(Map::Vertex From, Map::Vertex To)
|
|||||||
stepy = (stepy / factor)*step_size;
|
stepy = (stepy / factor)*step_size;
|
||||||
stepz = (stepz / factor)*step_size;
|
stepz = (stepz / factor)*step_size;
|
||||||
|
|
||||||
Map::Vertex TestPoint = { curx, cury, curz };
|
Map::Vertex TestPoint(curx, cury, curz);
|
||||||
float NewZ = zone->zonemap->FindBestZ(TestPoint, nullptr);
|
float NewZ = zone->zonemap->FindBestZ(TestPoint, nullptr);
|
||||||
if (ABS(NewZ - last_z) > 5.0f)
|
if (ABS(NewZ - last_z) > 5.0f)
|
||||||
{
|
{
|
||||||
@ -1204,7 +1204,7 @@ bool PathManager::NoHazardsAccurate(Map::Vertex From, Map::Vertex To)
|
|||||||
|
|
||||||
if (zone->watermap->InLiquid(TestPoint.x, TestPoint.y, NewZ))
|
if (zone->watermap->InLiquid(TestPoint.x, TestPoint.y, NewZ))
|
||||||
{
|
{
|
||||||
Map::Vertex TestPointWater = { TestPoint.x, TestPoint.y, NewZ - 0.5f };
|
Map::Vertex TestPointWater(TestPoint.x, TestPoint.y, NewZ - 0.5f);
|
||||||
Map::Vertex TestPointWaterDest = TestPointWater;
|
Map::Vertex TestPointWaterDest = TestPointWater;
|
||||||
Map::Vertex hit;
|
Map::Vertex hit;
|
||||||
TestPointWaterDest.z -= 500;
|
TestPointWaterDest.z -= 500;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user